Mercurial > hg > xemacs-beta
comparison src/frame-x.c @ 5050:6f2158fa75ed
Fix quick-build, use asserts() in place of ABORT()
-------------------- ChangeLog entries follow: --------------------
ChangeLog addition:
2010-02-20 Ben Wing <ben@xemacs.org>
* configure.ac (XE_COMPLEX_ARG):
Correct doc of --quick-build: It also doesn't check for Lisp shadows.
src/ChangeLog addition:
2010-02-20 Ben Wing <ben@xemacs.org>
* EmacsFrame.c:
* EmacsFrame.c (EmacsFrameRecomputeCellSize):
* alloca.c (i00afunc):
* buffer.c:
* buffer.c (MARKED_SLOT):
* buffer.c (complex_vars_of_buffer):
* cm.c:
* cm.c (cmcheckmagic):
* console.c:
* console.c (MARKED_SLOT):
* device-x.c:
* device-x.c (x_get_visual_depth):
* emacs.c (sort_args):
* eval.c (throw_or_bomb_out):
* event-stream.c:
* event-stream.c (Fadd_timeout):
* event-stream.c (Fadd_async_timeout):
* event-stream.c (Frecent_keys):
* events.c:
* events.c (Fdeallocate_event):
* events.c (event_pixel_translation):
* extents.c:
* extents.c (process_extents_for_insertion_mapper):
* fns.c (Fbase64_encode_region):
* fns.c (Fbase64_encode_string):
* fns.c (Fbase64_decode_region):
* fns.c (Fbase64_decode_string):
* font-lock.c:
* font-lock.c (find_context):
* frame-x.c:
* frame-x.c (x_wm_mark_shell_size_user_specified):
* frame-x.c (x_wm_mark_shell_position_user_specified):
* frame-x.c (x_wm_set_shell_iconic_p):
* frame-x.c (x_wm_set_cell_size):
* frame-x.c (x_wm_set_variable_size):
* frame-x.c (x_wm_store_class_hints):
* frame-x.c (x_wm_maybe_store_wm_command):
* frame-x.c (x_initialize_frame_size):
* frame.c (delete_frame_internal):
* frame.c (change_frame_size_1):
* free-hook.c (check_free):
* free-hook.c (note_block_input):
* free-hook.c (log_gcpro):
* gccache-gtk.c (gc_cache_lookup):
* gccache-x.c:
* gccache-x.c (gc_cache_lookup):
* glyphs-gtk.c:
* glyphs-gtk.c (init_image_instance_from_gdk_pixmap):
* glyphs-x.c:
* glyphs-x.c (extract_xpm_color_names):
* insdel.c:
* insdel.c (move_gap):
* keymap.c:
* keymap.c (keymap_lookup_directly):
* keymap.c (keymap_delete_inverse_internal):
* keymap.c (accessible_keymaps_mapper_1):
* keymap.c (where_is_recursive_mapper):
* lisp.h:
* lstream.c (make_lisp_buffer_stream_1):
* macros.c:
* macros.c (pop_kbd_macro_event):
* mc-alloc.c (remove_page_from_used_list):
* menubar-x.c:
* menubar-x.c (set_frame_menubar):
* ralloc.c:
* ralloc.c (obtain):
* ralloc.c (relinquish):
* ralloc.c (relocate_blocs):
* ralloc.c (resize_bloc):
* ralloc.c (r_alloc_free):
* ralloc.c (r_re_alloc):
* ralloc.c (r_alloc_thaw):
* ralloc.c (init_ralloc):
* ralloc.c (Free_Addr_Block):
* scrollbar-x.c:
* scrollbar-x.c (x_update_scrollbar_instance_status):
* sunplay.c (init_device):
* unexnt.c:
* unexnt.c (read_in_bss):
* unexnt.c (map_in_heap):
* window.c:
* window.c (real_window):
* window.c (window_display_lines):
* window.c (window_display_buffer):
* window.c (set_window_display_buffer):
* window.c (unshow_buffer):
* window.c (Fget_lru_window):
if (...) ABORT(); ---> assert();
More specifically:
if (x == y) ABORT (); --> assert (x != y);
if (x != y) ABORT (); --> assert (x == y);
if (x > y) ABORT (); --> assert (x <= y);
etc.
if (!x) ABORT (); --> assert (x);
if (x) ABORT (); --> assert (!x);
DeMorgan's Law's applied and manually simplified:
if (x && !y) ABORT (); --> assert (!x || y);
if (!x || y >= z) ABORT (); --> assert (x && y < z);
Checked to make sure that assert() of an expression with side
effects ensures that the side effects get executed even when
asserts are disabled, and add a comment about this being a
requirement of any "disabled assert" expression.
* depend:
* make-src-depend:
* make-src-depend (PrintDeps):
Fix broken code in make-src-depend so it does what it was always
supposed to do, which was separate out config.h and lisp.h and
all the files they include into separate variables in the
depend part of Makefile so that quick-build can turn off the
lisp.h/config.h/text.h/etc. dependencies of the source files, to
speed up recompilation.
author | Ben Wing <ben@xemacs.org> |
---|---|
date | Sat, 20 Feb 2010 05:05:54 -0600 |
parents | 3c3c1d139863 |
children | 5502045ec510 2a462149bd6a 8b2f75cecb89 |
comparison
equal
deleted
inserted
replaced
5030:422b4b4fb2a6 | 5050:6f2158fa75ed |
---|---|
1 /* Functions for the X window system. | 1 /* Functions for the X window system. |
2 Copyright (C) 1989, 1992-5, 1997 Free Software Foundation, Inc. | 2 Copyright (C) 1989, 1992-5, 1997 Free Software Foundation, Inc. |
3 Copyright (C) 1995, 1996, 2001, 2002, 2004 Ben Wing. | 3 Copyright (C) 1995, 1996, 2001, 2002, 2004, 2010 Ben Wing. |
4 | 4 |
5 This file is part of XEmacs. | 5 This file is part of XEmacs. |
6 | 6 |
7 XEmacs is free software; you can redistribute it and/or modify it | 7 XEmacs is free software; you can redistribute it and/or modify it |
8 under the terms of the GNU General Public License as published by the | 8 under the terms of the GNU General Public License as published by the |
224 /* Not currently used. */ | 224 /* Not currently used. */ |
225 | 225 |
226 void | 226 void |
227 x_wm_mark_shell_size_user_specified (Widget wmshell) | 227 x_wm_mark_shell_size_user_specified (Widget wmshell) |
228 { | 228 { |
229 if (! XtIsWMShell (wmshell)) ABORT (); | 229 assert (XtIsWMShell (wmshell)); |
230 EmacsShellSetSizeUserSpecified (wmshell); | 230 EmacsShellSetSizeUserSpecified (wmshell); |
231 } | 231 } |
232 | 232 |
233 void | 233 void |
234 x_wm_mark_shell_position_user_specified (Widget wmshell) | 234 x_wm_mark_shell_position_user_specified (Widget wmshell) |
235 { | 235 { |
236 if (! XtIsWMShell (wmshell)) ABORT (); | 236 assert (XtIsWMShell (wmshell)); |
237 EmacsShellSetPositionUserSpecified (wmshell); | 237 EmacsShellSetPositionUserSpecified (wmshell); |
238 } | 238 } |
239 | 239 |
240 #endif | 240 #endif |
241 | 241 |
242 void | 242 void |
243 x_wm_set_shell_iconic_p (Widget shell, int iconic_p) | 243 x_wm_set_shell_iconic_p (Widget shell, int iconic_p) |
244 { | 244 { |
245 if (! XtIsWMShell (shell)) ABORT (); | 245 assert (XtIsWMShell (shell)); |
246 | 246 |
247 /* Because of questionable logic in Shell.c, this sequence can't work: | 247 /* Because of questionable logic in Shell.c, this sequence can't work: |
248 | 248 |
249 w = XtCreatePopupShell (...); | 249 w = XtCreatePopupShell (...); |
250 Xt_SET_VALUE (w, XtNiconic, True); | 250 Xt_SET_VALUE (w, XtNiconic, True); |
269 void | 269 void |
270 x_wm_set_cell_size (Widget wmshell, int cw, int ch) | 270 x_wm_set_cell_size (Widget wmshell, int cw, int ch) |
271 { | 271 { |
272 Arg al [2]; | 272 Arg al [2]; |
273 | 273 |
274 if (!XtIsWMShell (wmshell)) | 274 assert (XtIsWMShell (wmshell)); |
275 ABORT (); | 275 assert (cw > 0 && ch > 0); |
276 if (cw <= 0 || ch <= 0) | |
277 ABORT (); | |
278 | 276 |
279 Xt_SET_ARG (al[0], XtNwidthInc, cw); | 277 Xt_SET_ARG (al[0], XtNwidthInc, cw); |
280 Xt_SET_ARG (al[1], XtNheightInc, ch); | 278 Xt_SET_ARG (al[1], XtNheightInc, ch); |
281 XtSetValues (wmshell, al, 2); | 279 XtSetValues (wmshell, al, 2); |
282 } | 280 } |
284 void | 282 void |
285 x_wm_set_variable_size (Widget wmshell, int width, int height) | 283 x_wm_set_variable_size (Widget wmshell, int width, int height) |
286 { | 284 { |
287 Arg al [2]; | 285 Arg al [2]; |
288 | 286 |
289 if (!XtIsWMShell (wmshell)) | 287 assert (XtIsWMShell (wmshell)); |
290 ABORT (); | |
291 #ifdef DEBUG_GEOMETRY_MANAGEMENT | 288 #ifdef DEBUG_GEOMETRY_MANAGEMENT |
292 /* See comment in EmacsShell.c */ | 289 /* See comment in EmacsShell.c */ |
293 printf ("x_wm_set_variable_size: %d %d\n", width, height); | 290 printf ("x_wm_set_variable_size: %d %d\n", width, height); |
294 fflush (stdout); | 291 fflush (stdout); |
295 #endif | 292 #endif |
353 { | 350 { |
354 Display *dpy = XtDisplay (shell); | 351 Display *dpy = XtDisplay (shell); |
355 Extbyte *app_name, *app_class; | 352 Extbyte *app_name, *app_class; |
356 XClassHint classhint; | 353 XClassHint classhint; |
357 | 354 |
358 if (!XtIsWMShell (shell)) | 355 assert (XtIsWMShell (shell)); |
359 ABORT (); | |
360 | 356 |
361 XtGetApplicationNameAndClass (dpy, &app_name, &app_class); | 357 XtGetApplicationNameAndClass (dpy, &app_name, &app_class); |
362 classhint.res_name = frame_name; | 358 classhint.res_name = frame_name; |
363 classhint.res_class = app_class; | 359 classhint.res_class = app_class; |
364 XSetClassHint (dpy, XtWindow (shell), &classhint); | 360 XSetClassHint (dpy, XtWindow (shell), &classhint); |
370 x_wm_maybe_store_wm_command (struct frame *f) | 366 x_wm_maybe_store_wm_command (struct frame *f) |
371 { | 367 { |
372 Widget w = FRAME_X_SHELL_WIDGET (f); | 368 Widget w = FRAME_X_SHELL_WIDGET (f); |
373 struct device *d = XDEVICE (FRAME_DEVICE (f)); | 369 struct device *d = XDEVICE (FRAME_DEVICE (f)); |
374 | 370 |
375 if (!XtIsWMShell (w)) | 371 assert (XtIsWMShell (w)); |
376 ABORT (); | |
377 | 372 |
378 if (NILP (DEVICE_X_WM_COMMAND_FRAME (d))) | 373 if (NILP (DEVICE_X_WM_COMMAND_FRAME (d))) |
379 { | 374 { |
380 int argc; | 375 int argc; |
381 Wexttext **argv; | 376 Wexttext **argv; |
1524 } | 1519 } |
1525 #endif | 1520 #endif |
1526 | 1521 |
1527 /* OK, we're a top-level shell. */ | 1522 /* OK, we're a top-level shell. */ |
1528 | 1523 |
1529 if (!XtIsWMShell (wmshell)) | 1524 assert (XtIsWMShell (wmshell)); |
1530 ABORT (); | |
1531 | 1525 |
1532 /* If the EmacsFrame doesn't have a geometry but the shell does, | 1526 /* If the EmacsFrame doesn't have a geometry but the shell does, |
1533 treat that as the geometry of the frame. | 1527 treat that as the geometry of the frame. |
1534 (Is this bogus? I'm not sure.) */ | 1528 (Is this bogus? I'm not sure.) */ |
1535 | 1529 |