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.

XCOMM platform:  $XConsortium: Win32.cf /main/51 1996/12/19 14:20:08 lehors $

#ifndef OSName
#define OSName			Microsoft Windows NT 4.0
#endif
XCOMM operating system:  OSName
#ifndef OSMajorVersion
#define OSMajorVersion		4
#endif
#ifndef OSMinorVersion
#define OSMinorVersion		0
#endif
#ifndef OSTeenyVersion
#define OSTeenyVersion		0
#endif

#ifndef CompilerMajorVersion
/* 0 == NT 3.1 Win32 SDK, 2 == MSVC++ 2, 4 == MSVC 4 */
#define CompilerMajorVersion	4	
#endif

#define BootstrapCFlags		-DWIN32
#ifdef _M_IX86
#define CpuDefines -D_X86_
#endif
/* brain-damaged windows headers will not compile with -Za */
/*#define StandardDefines -DWIN32 -DWIN32_LEAN_AND_MEAN -D_DLL -D_MT -D__STDC__ CpuDefines*/
/* Try with single threaded libc --marcpa */
#define StandardDefines -DWIN32 -DWIN32_LEAN_AND_MEAN -D__STDC__ CpuDefines
#if CompilerMajorVersion < 4
#define DefaultCCOptions -nologo -batch -G4 -W2
#else
#define DefaultCCOptions -nologo -G4 -W2
#endif
#if CompilerMajorVersion < 4
#define DebuggableCDebugFlags -Zi
#else
#define DebuggableCDebugFlags -Zi -Od
#endif
#define ThreadedX		NO
#define HasThreadSafeAPI	NO
#define CpCmd copy
#define LnCmd copy
#define MvCmd ren
#define RmCmd del
#ifndef RmTreeCmd
/*#define RmTreeCmd del /q /s */
#define RmTreeCmd rm -rf
#endif
#define CcCmd cl
#define HasCplusplus		YES
#define CplusplusCmd cl
#if CompilerMajorVersion < 4
#define PreProcessCmd CcCmd -nologo -batch -EP
#define CppCmd  CcCmd -nologo -batch -E
#else
#define PreProcessCmd CcCmd -nologo -EP
#define CppCmd  CcCmd -nologo -E
#endif
#define PatheticCpp		YES
#define ConstructMFLAGS		YES
#if (CompilerMajorVersion == 0)
#define ArCmdBase lib32
#else
#define ArCmdBase lib
#endif
#define ArCmd ArCmdBase
#define CplusplusCmd cl
#define MkdirHierCmd mkdir
#define InstallCmd copy
#define InstPgmFlags /**/
#define InstBinFlags /**/
#define InstUidFlags /**/
#define InstLibFlags /**/
#define InstIncFlags /**/
#define InstManFlags /**/
#define InstDatFlags /**/
#define InstallFlags /**/
#if (CompilerMajorVersion == 0)
#define ExtraLibraries crtdll.lib kernel32.lib wsock32.lib
#elif (CompilerMajorVersion < 4)
#define ExtraLibraries msvcrt.lib kernel32.lib wsock32.lib
#else
/* Use LIBC.LIB instead of msvcrt.lib since we compile
   with non-thread version. --marcpa */
#define ExtraLibraries libc.lib kernel32.lib wsock32.lib -link -nodefaultlib:libc
#endif
#define MakeCmd nmake -nologo
#if (CompilerMajorVersion == 0)
#define LdCmd link32
#else
#define LdCmd link
#endif
#define MathLibrary
#define HasSymLinks		NO
#define HasPutenv		YES
#define Osuf obj
#ifndef CCsuf
#define CCsuf cxx
#endif
#define BuildServer		NO
#define ConnectionFlags		-DTCPCONN

/* override as necessary in site.def/host.def */
#ifndef StdIncDir
#define StdIncDir 		C:/MSDEVSTD/INCLUDE
#endif
#define LdPreLib /**/
#define LdPostLib /**/
#ifndef UseInstalled
#define ImakeCmd $(IMAKESRC:/=\)\imake
#define DependCmd $(DEPENDSRC:/=\)\makedepend
#endif
#define DependFlags -D_WIN32
#define FilesToClean *.bak *.obj *.lib make.log
#define ShLibDir $(BINDIR)

#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)

#define XawI18nDefines		-DHAS_WCHAR_H
#define UseRgbTxt  YES
#define HasCbrt NO
#define HasFfs NO
#define HasXdmAuth NO

/* the following components haven't been ported yet */
#define BuildLBX NO
#define BuildXprint NO
#define XprtServer NO

#include <Win32.rules>