annotate nt/Win32.cf @ 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 43dd3413c7c7
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
155
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
1 XCOMM platform: $XConsortium: Win32.cf /main/51 1996/12/19 14:20:08 lehors $
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
2
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
3 #ifndef OSName
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
4 #define OSName Microsoft Windows NT 4.0
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
5 #endif
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
6 XCOMM operating system: OSName
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
7 #ifndef OSMajorVersion
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
8 #define OSMajorVersion 4
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
9 #endif
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
10 #ifndef OSMinorVersion
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
11 #define OSMinorVersion 0
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
12 #endif
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
13 #ifndef OSTeenyVersion
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
14 #define OSTeenyVersion 0
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
15 #endif
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
16
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
17 #ifndef CompilerMajorVersion
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
18 /* 0 == NT 3.1 Win32 SDK, 2 == MSVC++ 2, 4 == MSVC 4 */
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
19 #define CompilerMajorVersion 4
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
20 #endif
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
21
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
22 #define BootstrapCFlags -DWIN32
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
23 #ifdef _M_IX86
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
24 #define CpuDefines -D_X86_
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
25 #endif
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
26 /* brain-damaged windows headers will not compile with -Za */
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
27 /*#define StandardDefines -DWIN32 -DWIN32_LEAN_AND_MEAN -D_DLL -D_MT -D__STDC__ CpuDefines*/
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
28 /* Try with single threaded libc --marcpa */
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
29 #define StandardDefines -DWIN32 -DWIN32_LEAN_AND_MEAN -D__STDC__ CpuDefines
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
30 #if CompilerMajorVersion < 4
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
31 #define DefaultCCOptions -nologo -batch -G4 -W2
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
32 #else
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
33 #define DefaultCCOptions -nologo -G4 -W2
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
34 #endif
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
35 #if CompilerMajorVersion < 4
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
36 #define DebuggableCDebugFlags -Zi
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
37 #else
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
38 #define DebuggableCDebugFlags -Zi -Od
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
39 #endif
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
40 #define ThreadedX NO
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
41 #define HasThreadSafeAPI NO
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
42 #define CpCmd copy
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
43 #define LnCmd copy
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
44 #define MvCmd ren
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
45 #define RmCmd del
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
46 #ifndef RmTreeCmd
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
47 /*#define RmTreeCmd del /q /s */
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
48 #define RmTreeCmd rm -rf
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
49 #endif
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
50 #define CcCmd cl
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
51 #define HasCplusplus YES
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
52 #define CplusplusCmd cl
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
53 #if CompilerMajorVersion < 4
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
54 #define PreProcessCmd CcCmd -nologo -batch -EP
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
55 #define CppCmd CcCmd -nologo -batch -E
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
56 #else
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
57 #define PreProcessCmd CcCmd -nologo -EP
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
58 #define CppCmd CcCmd -nologo -E
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
59 #endif
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
60 #define PatheticCpp YES
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
61 #define ConstructMFLAGS YES
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
62 #if (CompilerMajorVersion == 0)
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
63 #define ArCmdBase lib32
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
64 #else
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
65 #define ArCmdBase lib
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
66 #endif
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
67 #define ArCmd ArCmdBase
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
68 #define CplusplusCmd cl
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
69 #define MkdirHierCmd mkdir
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
70 #define InstallCmd copy
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
71 #define InstPgmFlags /**/
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
72 #define InstBinFlags /**/
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
73 #define InstUidFlags /**/
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
74 #define InstLibFlags /**/
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
75 #define InstIncFlags /**/
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
76 #define InstManFlags /**/
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
77 #define InstDatFlags /**/
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
78 #define InstallFlags /**/
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
79 #if (CompilerMajorVersion == 0)
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
80 #define ExtraLibraries crtdll.lib kernel32.lib wsock32.lib
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
81 #elif (CompilerMajorVersion < 4)
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
82 #define ExtraLibraries msvcrt.lib kernel32.lib wsock32.lib
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
83 #else
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
84 /* Use LIBC.LIB instead of msvcrt.lib since we compile
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
85 with non-thread version. --marcpa */
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
86 #define ExtraLibraries libc.lib kernel32.lib wsock32.lib -link -nodefaultlib:libc
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
87 #endif
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
88 #define MakeCmd nmake -nologo
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
89 #if (CompilerMajorVersion == 0)
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
90 #define LdCmd link32
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
91 #else
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
92 #define LdCmd link
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
93 #endif
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
94 #define MathLibrary
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
95 #define HasSymLinks NO
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
96 #define HasPutenv YES
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
97 #define Osuf obj
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
98 #ifndef CCsuf
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
99 #define CCsuf cxx
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
100 #endif
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
101 #define BuildServer NO
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
102 #define ConnectionFlags -DTCPCONN
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
103
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
104 /* override as necessary in site.def/host.def */
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
105 #ifndef StdIncDir
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
106 #define StdIncDir C:/MSDEVSTD/INCLUDE
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
107 #endif
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
108 #define LdPreLib /**/
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
109 #define LdPostLib /**/
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
110 #ifndef UseInstalled
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
111 #define ImakeCmd $(IMAKESRC:/=\)\imake
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
112 #define DependCmd $(DEPENDSRC:/=\)\makedepend
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
113 #endif
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
114 #define DependFlags -D_WIN32
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
115 #define FilesToClean *.bak *.obj *.lib make.log
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
116 #define ShLibDir $(BINDIR)
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
117
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
118 #define XFileSearchPathBase Concat4($(LIBDIR)/;L/;T/;N;C,;S:$(LIBDIR)/;l/;T/;N;C,;S:$(LIBDIR)/;T/;N;C,;S:$(LIBDIR)/;L/;T/;N;S:$(LIBDIR)/;l/;T/;N;S:$(LIBDIR)/;T/;N;S)
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
119
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
120 #define XawI18nDefines -DHAS_WCHAR_H
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
121 #define UseRgbTxt YES
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
122 #define HasCbrt NO
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
123 #define HasFfs NO
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
124 #define HasXdmAuth NO
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
125
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
126 /* the following components haven't been ported yet */
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
127 #define BuildLBX NO
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
128 #define BuildXprint NO
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
129 #define XprtServer NO
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
130
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents:
diff changeset
131 #include <Win32.rules>