Mercurial > hg > xemacs-beta

comparison src/window.c @ 5043:d0c14ea98592

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 0d4c9d0f6a8d
children 07dcc7000bbf
comparison
equal deleted inserted replaced
5042:f395ee7ad844 5043:d0c14ea98592
1 /* Window creation, deletion and examination for XEmacs. 1 /* Window creation, deletion and examination for XEmacs.
2 Copyright (C) 1985-1987, 1992-1995 Free Software Foundation, Inc. 2 Copyright (C) 1985-1987, 1992-1995 Free Software Foundation, Inc.
3 Copyright (C) 1994, 1995 Board of Trustees, University of Illinois. 3 Copyright (C) 1994, 1995 Board of Trustees, University of Illinois.
4 Copyright (C) 1995, 1996, 2002 Ben Wing. 4 Copyright (C) 1995, 1996, 2002, 2010 Ben Wing.
5 Copyright (C) 1996 Chuck Thompson. 5 Copyright (C) 1996 Chuck Thompson.
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
3493 minimal allowed values. WIDTH and HEIGHT are in pixels */ 3493 minimal allowed values. WIDTH and HEIGHT are in pixels */
3494 int 3494 int
3495 frame_pixsize_valid_p (struct frame *frame, int width, int height) 3495 frame_pixsize_valid_p (struct frame *frame, int width, int height)
3496 { 3496 {
3497 int rows, cols; 3497 int rows, cols;
3498 pixel_to_real_char_size (frame, width, height, &cols, &rows); 3498 pixel_to_char_size (frame, width, height, &cols, &rows);
3499 return frame_size_valid_p (frame, rows, cols); 3499 return frame_size_valid_p (frame, rows, cols);
3500 } 3500 }
3501 3501
3502 /* If *ROWS or *COLS are too small a size for FRAME, set them to the 3502 /* If *ROWS or *COLS are too small a size for FRAME, set them to the
3503 minimum allowable size. */ 3503 minimum allowable size. */
3504 void 3504 void
3505 check_frame_size (struct frame *frame, int *rows, int *cols) 3505 check_frame_size (struct frame *frame, int *rows, int *cols)
3506 { 3506 {
3507 int min_height = frame_min_height (frame); 3507 int min_height = frame_min_height (frame);
3508 3508 int min_pixwidth, min_pixheight;
3509 if (*rows < min_height) 3509 int min_geomwidth, min_geomheight;
3510 *rows = min_height; 3510
3511 if (*cols < MIN_SAFE_WINDOW_WIDTH) 3511 /* There is no char_to_frame_unit_size(). This can be done with
3512 *cols = MIN_SAFE_WINDOW_WIDTH; 3512 frame_conversion_internal(), but that's currently static, and we can
3513 do it fine with two steps, as follows. */
3514 char_to_pixel_size (frame, MIN_SAFE_WINDOW_WIDTH, min_height,
3515 &min_pixwidth, &min_pixheight);
3516 pixel_to_frame_unit_size (frame, min_pixwidth, min_pixheight,
3517 &min_geomwidth, &min_geomheight);
3518 if (*rows < min_geomheight)
3519 *rows = min_geomheight;
3520 if (*cols < min_geomwidth)
3521 *cols = min_geomwidth;
3513 } 3522 }
3514 3523
3515 /* Normally the window is deleted if it gets too small. 3524 /* Normally the window is deleted if it gets too small.
3516 nodelete nonzero means do not do this. 3525 nodelete nonzero means do not do this.
3517 (The caller should check later and do so if appropriate) */ 3526 (The caller should check later and do so if appropriate) */