annotate nt/xpm.mak @ 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 5274591ce707
children ba07c880114a
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
276
6330739388db Import from CVS: tag r21-0b36
cvs
parents:
diff changeset
1 #
6330739388db Import from CVS: tag r21-0b36
cvs
parents:
diff changeset
2 # XPM Makefile for Microsoft NMAKE without X libraries
6330739388db Import from CVS: tag r21-0b36
cvs
parents:
diff changeset
3 #
4927
5274591ce707 Add copyright and license information for Jonathan Harris's contributions.
Jerry James <james@xemacs.org>
parents: 817
diff changeset
4 # Copyright (C) 1997 Free Software Foundation, Inc.
5274591ce707 Add copyright and license information for Jonathan Harris's contributions.
Jerry James <james@xemacs.org>
parents: 817
diff changeset
5 #
5274591ce707 Add copyright and license information for Jonathan Harris's contributions.
Jerry James <james@xemacs.org>
parents: 817
diff changeset
6 # This file is part of XEmacs.
5274591ce707 Add copyright and license information for Jonathan Harris's contributions.
Jerry James <james@xemacs.org>
parents: 817
diff changeset
7 #
5274591ce707 Add copyright and license information for Jonathan Harris's contributions.
Jerry James <james@xemacs.org>
parents: 817
diff changeset
8 # XEmacs is free software; you can redistribute it and/or modify it
5274591ce707 Add copyright and license information for Jonathan Harris's contributions.
Jerry James <james@xemacs.org>
parents: 817
diff changeset
9 # under the terms of the GNU General Public License as published by the
5274591ce707 Add copyright and license information for Jonathan Harris's contributions.
Jerry James <james@xemacs.org>
parents: 817
diff changeset
10 # Free Software Foundation; either version 2, or (at your option) any
5274591ce707 Add copyright and license information for Jonathan Harris's contributions.
Jerry James <james@xemacs.org>
parents: 817
diff changeset
11 # later version.
5274591ce707 Add copyright and license information for Jonathan Harris's contributions.
Jerry James <james@xemacs.org>
parents: 817
diff changeset
12 #
5274591ce707 Add copyright and license information for Jonathan Harris's contributions.
Jerry James <james@xemacs.org>
parents: 817
diff changeset
13 # XEmacs is distributed in the hope that it will be useful, but WITHOUT
5274591ce707 Add copyright and license information for Jonathan Harris's contributions.
Jerry James <james@xemacs.org>
parents: 817
diff changeset
14 # ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
5274591ce707 Add copyright and license information for Jonathan Harris's contributions.
Jerry James <james@xemacs.org>
parents: 817
diff changeset
15 # FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
5274591ce707 Add copyright and license information for Jonathan Harris's contributions.
Jerry James <james@xemacs.org>
parents: 817
diff changeset
16 # for more details.
5274591ce707 Add copyright and license information for Jonathan Harris's contributions.
Jerry James <james@xemacs.org>
parents: 817
diff changeset
17 #
5274591ce707 Add copyright and license information for Jonathan Harris's contributions.
Jerry James <james@xemacs.org>
parents: 817
diff changeset
18 # You should have received a copy of the GNU General Public License
5274591ce707 Add copyright and license information for Jonathan Harris's contributions.
Jerry James <james@xemacs.org>
parents: 817
diff changeset
19 # along with XEmacs; see the file COPYING. If not, write to
5274591ce707 Add copyright and license information for Jonathan Harris's contributions.
Jerry James <james@xemacs.org>
parents: 817
diff changeset
20 # the Free Software Foundation, Inc., 51 Franklin St. - Fifth Floor,
5274591ce707 Add copyright and license information for Jonathan Harris's contributions.
Jerry James <james@xemacs.org>
parents: 817
diff changeset
21 # Boston, MA 02110-1301, USA.
5274591ce707 Add copyright and license information for Jonathan Harris's contributions.
Jerry James <james@xemacs.org>
parents: 817
diff changeset
22 #
398
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 276
diff changeset
23 !if !defined(DEBUG)
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 276
diff changeset
24 !if defined(DEBUG_XEMACS)
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 276
diff changeset
25 DEBUG=$(DEBUG_XEMACS)
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 276
diff changeset
26 !else
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 276
diff changeset
27 DEBUG=0
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 276
diff changeset
28 !endif
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 276
diff changeset
29 !endif
276
6330739388db Import from CVS: tag r21-0b36
cvs
parents:
diff changeset
30
398
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 276
diff changeset
31 !if !defined(USE_CRTDLL)
817
ece8c2170578 [xemacs-hg @ 2002-04-23 00:44:29 by jhar]
jhar
parents: 398
diff changeset
32 USE_CRTDLL=1
276
6330739388db Import from CVS: tag r21-0b36
cvs
parents:
diff changeset
33 !endif
6330739388db Import from CVS: tag r21-0b36
cvs
parents:
diff changeset
34
398
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 276
diff changeset
35 !if $(DEBUG)
276
6330739388db Import from CVS: tag r21-0b36
cvs
parents:
diff changeset
36 OPT=-Od -Zi
398
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 276
diff changeset
37 LINK_DEBUG=-debug
276
6330739388db Import from CVS: tag r21-0b36
cvs
parents:
diff changeset
38 !else
398
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 276
diff changeset
39 OPT=-Ox
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 276
diff changeset
40 !endif
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 276
diff changeset
41
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 276
diff changeset
42 !if $(USE_CRTDLL)
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 276
diff changeset
43 !if $(DEBUG)
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 276
diff changeset
44 C_LIBFLAG=-MDd
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 276
diff changeset
45 !else
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 276
diff changeset
46 C_LIBFLAG=-MD
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 276
diff changeset
47 !endif
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 276
diff changeset
48 !else
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 276
diff changeset
49 !if $(DEBUG)
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 276
diff changeset
50 C_LIBFLAG=-MLd
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 276
diff changeset
51 !else
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 276
diff changeset
52 C_LIBFLAG=-ML
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 276
diff changeset
53 !endif
276
6330739388db Import from CVS: tag r21-0b36
cvs
parents:
diff changeset
54 !endif
6330739388db Import from CVS: tag r21-0b36
cvs
parents:
diff changeset
55
6330739388db Import from CVS: tag r21-0b36
cvs
parents:
diff changeset
56 WARN_CPP_FLAGS = -W3
6330739388db Import from CVS: tag r21-0b36
cvs
parents:
diff changeset
57
6330739388db Import from CVS: tag r21-0b36
cvs
parents:
diff changeset
58 CC=cl
398
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 276
diff changeset
59 CFLAGS=-nologo -DFOR_MSW $(C_LIBFLAG) $(WARN_CPP_FLAGS) \
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 276
diff changeset
60 $(OPT) $(INCLUDES) -c
276
6330739388db Import from CVS: tag r21-0b36
cvs
parents:
diff changeset
61
6330739388db Import from CVS: tag r21-0b36
cvs
parents:
diff changeset
62 OBJS= data.obj create.obj misc.obj rgb.obj scan.obj parse.obj hashtab.obj \
6330739388db Import from CVS: tag r21-0b36
cvs
parents:
diff changeset
63 WrFFrI.obj RdFToI.obj CrIFrDat.obj CrDatFrI.obj \
6330739388db Import from CVS: tag r21-0b36
cvs
parents:
diff changeset
64 CrIFrBuf.obj CrBufFrI.obj \
6330739388db Import from CVS: tag r21-0b36
cvs
parents:
diff changeset
65 RdFToDat.obj WrFFrDat.obj \
6330739388db Import from CVS: tag r21-0b36
cvs
parents:
diff changeset
66 Attrib.obj Image.obj Info.obj RdFToBuf.obj WrFFrBuf.obj \
6330739388db Import from CVS: tag r21-0b36
cvs
parents:
diff changeset
67 simx.obj
6330739388db Import from CVS: tag r21-0b36
cvs
parents:
diff changeset
68
6330739388db Import from CVS: tag r21-0b36
cvs
parents:
diff changeset
69 # nmake rule
6330739388db Import from CVS: tag r21-0b36
cvs
parents:
diff changeset
70
6330739388db Import from CVS: tag r21-0b36
cvs
parents:
diff changeset
71 .SUFFIXES:
6330739388db Import from CVS: tag r21-0b36
cvs
parents:
diff changeset
72 .SUFFIXES: .c
6330739388db Import from CVS: tag r21-0b36
cvs
parents:
diff changeset
73
398
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 276
diff changeset
74 .c.obj::
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 276
diff changeset
75 $(CC) $(CFLAGS) $<
276
6330739388db Import from CVS: tag r21-0b36
cvs
parents:
diff changeset
76
6330739388db Import from CVS: tag r21-0b36
cvs
parents:
diff changeset
77
6330739388db Import from CVS: tag r21-0b36
cvs
parents:
diff changeset
78 # targets
6330739388db Import from CVS: tag r21-0b36
cvs
parents:
diff changeset
79
6330739388db Import from CVS: tag r21-0b36
cvs
parents:
diff changeset
80 all: ..\X11\xpm.h Xpm.lib
6330739388db Import from CVS: tag r21-0b36
cvs
parents:
diff changeset
81
6330739388db Import from CVS: tag r21-0b36
cvs
parents:
diff changeset
82 ..\X11\xpm.h: ..\X11\NUL xpm.h
6330739388db Import from CVS: tag r21-0b36
cvs
parents:
diff changeset
83 copy xpm.h ..\X11
6330739388db Import from CVS: tag r21-0b36
cvs
parents:
diff changeset
84
6330739388db Import from CVS: tag r21-0b36
cvs
parents:
diff changeset
85 ..\X11\NUL:
6330739388db Import from CVS: tag r21-0b36
cvs
parents:
diff changeset
86 mkdir ..\X11
6330739388db Import from CVS: tag r21-0b36
cvs
parents:
diff changeset
87
6330739388db Import from CVS: tag r21-0b36
cvs
parents:
diff changeset
88 Xpm.lib: $(OBJS)
398
74fd4e045ea6 Import from CVS: tag r21-2-29
cvs
parents: 276
diff changeset
89 lib -nologo -out:$@ $(OBJS)