comparison src/input-method-xlib.c @ 5090:0ca81354c4c7

Further frame-geometry cleanups -------------------- ChangeLog entries follow: -------------------- man/ChangeLog addition: 2010-03-03 Ben Wing <ben@xemacs.org> * internals/internals.texi (Intro to Window and Frame Geometry): * internals/internals.texi (The Paned Area): * internals/internals.texi (The Displayable Area): Update to make note of e.g. the fact that the bottom gutter is actually above the minibuffer. src/ChangeLog addition: 2010-03-03 Ben Wing <ben@xemacs.org> * emacs.c: * emacs.c (assert_equal_failed): * lisp.h: * lisp.h (assert_equal): New fun assert_equal, asserting that two values == each other, and printing out both values upon failure. * frame-gtk.c (gtk_initialize_frame_size): * frame-impl.h: * frame-impl.h (FRAME_TOP_INTERNAL_BORDER_START): * frame-impl.h (FRAME_BOTTOM_INTERNAL_BORDER_START): * frame-impl.h (FRAME_LEFT_INTERNAL_BORDER_START): * frame-impl.h (FRAME_PANED_TOP_EDGE): * frame-impl.h (FRAME_NONPANED_SIZE): * frame-x.c (x_initialize_frame_size): * frame.c: * gutter.c (get_gutter_coords): * gutter.c (calculate_gutter_size): * gutter.h: * gutter.h (WINDOW_REAL_TOP_GUTTER_BOUNDS): * gutter.h (FRAME_TOP_GUTTER_BOUNDS): * input-method-xlib.c: * input-method-xlib.c (XIM_SetGeometry): * redisplay-output.c (clear_left_border): * redisplay-output.c (clear_right_border): * redisplay-output.c (redisplay_output_pixmap): * redisplay-output.c (redisplay_clear_region): * redisplay-output.c (redisplay_clear_top_of_window): * redisplay-output.c (redisplay_clear_to_window_end): * redisplay-xlike-inc.c (XLIKE_clear_frame): * redisplay.c: * redisplay.c (UPDATE_CACHE_RETURN): * redisplay.c (pixel_to_glyph_translation): * toolbar.c (update_frame_toolbars_geometry): * window.c (Fwindow_pixel_edges): Get rid of some redundant macros. Consistently use the FRAME_TOP_*_START, FRAME_RIGHT_*_END, etc. format. Rename FRAME_*_BORDER_* to FRAME_*_INTERNAL_BORDER_*. Comment out FRAME_BOTTOM_* for gutters and the paned area due to the uncertainty over where the paned area actually begins. (Eventually we should probably move the gutters outside the minibuffer so that the paned area is contiguous.) Use FRAME_PANED_* more often in the code to make things clearer. Update the diagram to show that the bottom gutter is inside the minibuffer (!) and that there are "junk boxes" when you have left and/or right gutters (dead boxes that are mistakenly left uncleared, unlike the corresponding scrollbar dead boxes). Update the text appropriately to cover the bottom gutter position, etc. Rewrite gutter-geometry code to use the FRAME_*_GUTTER_* in place of equivalent expressions referencing other frame elements, to make the code more portable in case we move around the gutter location. Cleanup FRAME_*_GUTTER_BOUNDS() in gutter.h. Add some #### GEOM! comments where I think code is incorrect -- typically, it wasn't fixed up properly when the gutter was added. Some cosmetic changes.
author Ben Wing <ben@xemacs.org>
date Wed, 03 Mar 2010 05:07:47 -0600
parents 3a87551bfeb5
children 308d34e9f07d
comparison
equal deleted inserted replaced
5080:5502045ec510 5090:0ca81354c4c7
1 /* Various functions for X11R5+ input methods, using the Xlib interface. 1 /* Various functions for X11R5+ input methods, using the Xlib interface.
2 Copyright (C) 1996 Sun Microsystems. 2 Copyright (C) 1996 Sun Microsystems.
3 Copyright (C) 2002 Ben Wing. 3 Copyright (C) 2002, 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
409 XIC_Value (Set, xic, XNStatusAttributes, XNAreaNeeded, &area); 409 XIC_Value (Set, xic, XNStatusAttributes, XNAreaNeeded, &area);
410 XIC_Value (Get, xic, XNStatusAttributes, XNAreaNeeded, &needed); 410 XIC_Value (Get, xic, XNStatusAttributes, XNAreaNeeded, &needed);
411 if (needed->width == 0) /* Use XNArea instead of XNAreaNeeded */ 411 if (needed->width == 0) /* Use XNArea instead of XNAreaNeeded */
412 XIC_Value (Get, xic, XNStatusAttributes, XNArea, &needed); 412 XIC_Value (Get, xic, XNStatusAttributes, XNArea, &needed);
413 413
414 /* #### This will partially cover the gutter if there is a bottom
415 gutter. Perhaps what was intended was FRAME_PANED_RIGHT_EDGE()
416 and FRAME_PANED_BOTTOM_EDGE()? That will actually place itself
417 in the paned area (covering the right edge of the minibuffer)
418 in all circumstances. */
414 area.width = needed->width; 419 area.width = needed->width;
415 area.height = needed->height; 420 area.height = needed->height;
416 area.x = FRAME_RIGHT_BORDER_START (f) - area.width; 421 area.x = FRAME_RIGHT_INTERNAL_BORDER_START (f) - area.width;
417 area.y = FRAME_BOTTOM_BORDER_START (f) - area.height; 422 area.y = FRAME_BOTTOM_INTERNAL_BORDER_START (f) - area.height;
418 423
419 #ifdef DEBUG_XIM 424 #ifdef DEBUG_XIM
420 stderr_out ("Putting StatusArea in x=%d y=%d w=%d h=%d\n", 425 stderr_out ("Putting StatusArea in x=%d y=%d w=%d h=%d\n",
421 area.x, area.y, area.width, area.height); 426 area.x, area.y, area.width, area.height);
422 #endif /* DEBUG_XIM */ 427 #endif /* DEBUG_XIM */
428 { 433 {
429 /* Set Preedit Area to whole frame size (sans border) */ 434 /* Set Preedit Area to whole frame size (sans border) */
430 /* We include the border because Preedit window might be larger 435 /* We include the border because Preedit window might be larger
431 than display line at edge. #### FIX: we should adjust to make 436 than display line at edge. #### FIX: we should adjust to make
432 sure that there is always room for the spot sub-window */ 437 sure that there is always room for the spot sub-window */
433 area.x = FRAME_LEFT_BORDER_START (f); 438 area.x = FRAME_LEFT_INTERNAL_BORDER_START (f);
434 area.y = FRAME_TOP_BORDER_START (f); 439 area.y = FRAME_TOP_INTERNAL_BORDER_START (f);
435 area.width = FRAME_RIGHT_BORDER_END (f) - area.x; 440 area.width = FRAME_RIGHT_INTERNAL_BORDER_END (f) - area.x;
436 area.height = FRAME_BOTTOM_BORDER_END (f) - area.y; 441 area.height = FRAME_BOTTOM_INTERNAL_BORDER_END (f) - area.y;
437 XIC_Value(Set, xic, XNPreeditAttributes, XNArea, &area); 442 XIC_Value(Set, xic, XNPreeditAttributes, XNArea, &area);
438 } 443 }
439 444
440 #ifdef DEBUG_XIM 445 #ifdef DEBUG_XIM
441 describe_XIC (xic); 446 describe_XIC (xic);