comparison src/event-msw.c @ 5043:d0c14ea98592

various frame-geometry fixes -------------------- ChangeLog entries follow: -------------------- src/ChangeLog addition: 2010-02-15 Ben Wing <ben@xemacs.org> * EmacsFrame.c: * EmacsFrame.c (EmacsFrameResize): * console-msw-impl.h: * console-msw-impl.h (struct mswindows_frame): * console-msw-impl.h (FRAME_MSWINDOWS_TARGET_RECT): * device-tty.c: * device-tty.c (tty_asynch_device_change): * event-msw.c: * event-msw.c (mswindows_wnd_proc): * faces.c (Fface_list): * faces.h: * frame-gtk.c: * frame-gtk.c (gtk_set_initial_frame_size): * frame-gtk.c (gtk_set_frame_size): * frame-msw.c: * frame-msw.c (mswindows_init_frame_1): * frame-msw.c (mswindows_set_frame_size): * frame-msw.c (mswindows_size_frame_internal): * frame-msw.c (msprinter_init_frame_3): * frame.c: * frame.c (enum): * frame.c (Fmake_frame): * frame.c (adjust_frame_size): * frame.c (store_minibuf_frame_prop): * frame.c (Fframe_property): * frame.c (Fframe_properties): * frame.c (Fframe_displayable_pixel_height): * frame.c (Fframe_displayable_pixel_width): * frame.c (internal_set_frame_size): * frame.c (Fset_frame_height): * frame.c (Fset_frame_pixel_height): * frame.c (Fset_frame_displayable_pixel_height): * frame.c (Fset_frame_width): * frame.c (Fset_frame_pixel_width): * frame.c (Fset_frame_displayable_pixel_width): * frame.c (Fset_frame_size): * frame.c (Fset_frame_pixel_size): * frame.c (Fset_frame_displayable_pixel_size): * frame.c (frame_conversion_internal_1): * frame.c (get_frame_displayable_pixel_size): * frame.c (change_frame_size_1): * frame.c (change_frame_size): * frame.c (generate_title_string): * frame.h: * gtk-xemacs.c: * gtk-xemacs.c (gtk_xemacs_size_request): * gtk-xemacs.c (gtk_xemacs_size_allocate): * gtk-xemacs.c (gtk_xemacs_paint): * gutter.c: * gutter.c (update_gutter_geometry): * redisplay.c (end_hold_frame_size_changes): * redisplay.c (redisplay_frame): * toolbar.c: * toolbar.c (update_frame_toolbars_geometry): * window.c: * window.c (frame_pixsize_valid_p): * window.c (check_frame_size): Various fixes to frame geometry to make it a bit easier to understand and fix some bugs. 1. IMPORTANT: Some renamings. Will need to be applied carefully to the carbon repository, in the following order: -- pixel_to_char_size -> pixel_to_frame_unit_size -- char_to_pixel_size -> frame_unit_to_pixel_size -- pixel_to_real_char_size -> pixel_to_char_size -- char_to_real_pixel_size -> char_to_pixel_size -- Reverse second and third arguments of change_frame_size() and change_frame_size_1() to try to make functions consistent in putting width before height. -- Eliminate old round_size_to_char, because it didn't really do anything differently from round_size_to_real_char() -- round_size_to_real_char -> round_size_to_char; any places that called the old round_size_to_char should just call the new one. 2. IMPORTANT FOR CARBON: The set_frame_size() method is now passed sizes in "frame units", like all other frame-sizing functions, rather than some hacked-up combination of char-cell units and total pixel size. This only affects window systems that use "pixelated geometry", and I'm not sure if Carbon is one of them. MS Windows is pixelated, X and GTK are not. For pixelated-geometry systems, the size in set_frame_size() is in displayable pixels rather than total pixels and needs to be converted appropriately; take a look at the changes made to mswindows_set_frame_size() method if necessary. 3. Add a big long comment in frame.c describing how frame geometry works. 4. Remove MS Windows-specific character height and width fields, duplicative and unused. 5. frame-displayable-pixel-* and set-frame-displayable-pixel-* didn't use to work on MS Windows, but they do now. 6. In general, clean up the handling of "pixelated geometry" so that fewer functions have to worry about this. This is really an abomination that should be removed entirely but that will have to happen later. Fix some buggy code in frame_conversion_internal() that happened to "work" because it was countered by oppositely buggy code in change_frame_size(). 7. Clean up some frame-size code in toolbar.c and use functions already provided in frame.c instead of rolling its own. 8. Fix check_frame_size() in window.c, which formerly didn't take pixelated geometry into account.
author Ben Wing <ben@xemacs.org>
date Mon, 15 Feb 2010 22:14:11 -0600
parents ae48681c47fa
children 8b2f75cecb89
comparison
equal deleted inserted replaced
5042:f395ee7ad844 5043:d0c14ea98592
1 /* The mswindows event_stream interface. 1 /* The mswindows event_stream interface.
2 Copyright (C) 1991, 1992, 1993, 1994, 1995 Free Software Foundation, Inc. 2 Copyright (C) 1991, 1992, 1993, 1994, 1995 Free Software Foundation, Inc.
3 Copyright (C) 1995 Sun Microsystems, Inc. 3 Copyright (C) 1995 Sun Microsystems, Inc.
4 Copyright (C) 1996, 2000, 2001, 2002, 2003, 2005 Ben Wing. 4 Copyright (C) 1996, 2000, 2001, 2002, 2003, 2005, 2010 Ben Wing.
5 Copyright (C) 1997 Jonathan Harris. 5 Copyright (C) 1997 Jonathan Harris.
6 6
7 This file is part of XEmacs. 7 This file is part of XEmacs.
8 8
9 XEmacs is free software; you can redistribute it and/or modify it 9 XEmacs is free software; you can redistribute it and/or modify it
3384 { 3384 {
3385 GetClientRect (hwnd, &rect); 3385 GetClientRect (hwnd, &rect);
3386 FRAME_PIXWIDTH (frame) = rect.right; 3386 FRAME_PIXWIDTH (frame) = rect.right;
3387 FRAME_PIXHEIGHT (frame) = rect.bottom; 3387 FRAME_PIXHEIGHT (frame) = rect.bottom;
3388 3388
3389 pixel_to_real_char_size (frame, rect.right, rect.bottom, 3389 pixel_to_frame_unit_size (frame, rect.right, rect.bottom, &columns,
3390 &FRAME_MSWINDOWS_CHARWIDTH (frame),
3391 &FRAME_MSWINDOWS_CHARHEIGHT (frame));
3392
3393 pixel_to_char_size (frame, rect.right, rect.bottom, &columns,
3394 &rows); 3390 &rows);
3395 change_frame_size (frame, rows, columns, 1); 3391 change_frame_size (frame, columns, rows, 1);
3396 3392
3397 /* If we are inside frame creation, we have to apply geometric 3393 /* If we are inside frame creation, we have to apply geometric
3398 properties now. */ 3394 properties now. */
3399 if (FRAME_MSWINDOWS_TARGET_RECT (frame)) 3395 if (FRAME_MSWINDOWS_TARGET_RECT (frame))
3400 { 3396 {
3475 int pixwidth, pixheight; 3471 int pixwidth, pixheight;
3476 AdjustWindowRectEx (&ncsize, qxeGetWindowLong (hwnd, GWL_STYLE), 3472 AdjustWindowRectEx (&ncsize, qxeGetWindowLong (hwnd, GWL_STYLE),
3477 GetMenu(hwnd) != NULL, 3473 GetMenu(hwnd) != NULL,
3478 qxeGetWindowLong (hwnd, GWL_EXSTYLE)); 3474 qxeGetWindowLong (hwnd, GWL_EXSTYLE));
3479 3475
3480 round_size_to_real_char (XFRAME (mswindows_find_frame (hwnd)), 3476 round_size_to_char (XFRAME (mswindows_find_frame (hwnd)),
3481 wp->cx - (ncsize.right - ncsize.left), 3477 wp->cx - (ncsize.right - ncsize.left),
3482 wp->cy - (ncsize.bottom - ncsize.top), 3478 wp->cy - (ncsize.bottom - ncsize.top),
3483 &pixwidth, &pixheight); 3479 &pixwidth, &pixheight);
3484 3480
3485 /* Convert client sizes to window sizes */ 3481 /* Convert client sizes to window sizes */