Mercurial > hg > xemacs-beta
view lib-src/winclient.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 | 61aff09a7589 |
children | 422b4b4fb2a6 |
line wrap: on
line source
/* DDE client for XEmacs. Copyright (C) 2002 Alastair J. Houghton This file is part of XEmacs. XEmacs is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. XEmacs is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with XEmacs; see the file COPYING. If not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /* Synched up with: Not in FSF. */ /* -- Includes -------------------------------------------------------------- */ #ifdef HAVE_CONFIG_H # include <config.h> #endif #include <windows.h> #include <ddeml.h> #include <stdlib.h> #include <stdio.h> #include <ctype.h> #include <errno.h> static void error (const char* s1, const char* s2); static void fatal (const char *s1, const char *s2); static void * xmalloc (size_t size); static char * getNextArg (const char **ptr, unsigned *len); /* -- Post-Include Defines -------------------------------------------------- */ /* Timeouts & delays */ #define CONNECT_RETRIES 10 #define CONNECT_DELAY 500 /* ms */ #define TRANSACTION_TIMEOUT 5000 /* ms */ #define MAX_INPUT_IDLE_WAIT INFINITE /* ms */ /* DDE Strings */ #define SERVICE_NAME "XEmacs" #define TOPIC_NAME "System" #define COMMAND_FORMAT "[open(\"%s%s\")]" /* XEmacs program name */ #define PROGRAM_TO_RUN "xemacs.exe" /* -- Constants ------------------------------------------------------------- */ /* -- Global Variables ------------------------------------------------------ */ HINSTANCE hInstance; DWORD idInst = 0; /* -- Function Declarations ------------------------------------------------- */ HDDEDATA CALLBACK ddeCallback (UINT uType, UINT uFmt, HCONV hconv, HSZ hsz1, HSZ hsz2, HDDEDATA hdata, DWORD dwData1, DWORD dwData2); int WINAPI WinMain (HINSTANCE hInst, HINSTANCE hPrev, LPSTR lpCmdLine, int nCmdShow); static HCONV openConversation (void); static void closeConversation (HCONV hConv); static int doFile (HCONV hConv, LPSTR lpszFileName1, LPSTR lpszFileName2); static int parseCommandLine (HCONV hConv, LPSTR lpszCommandLine); /* -- Function Definitions -------------------------------------------------- */ /* * Name : ddeCallback * Function: Gets called by DDEML. * */ HDDEDATA CALLBACK ddeCallback (UINT uType, UINT uFmt, HCONV hconv, HSZ hsz1, HSZ hsz2, HDDEDATA hdata, DWORD dwData1, DWORD dwData2) { return (HDDEDATA) NULL; } /* * Name : WinMain * Function: The program's entry point function. * */ int WINAPI WinMain (HINSTANCE hInst, HINSTANCE hPrev, LPSTR lpCmdLine, int nCmdShow) { HCONV hConv; int ret = 0; UINT uiRet; /* Initialise the DDEML library */ uiRet = DdeInitialize (&idInst, (PFNCALLBACK) ddeCallback, APPCMD_CLIENTONLY |CBF_FAIL_ALLSVRXACTIONS, 0); if (uiRet != DMLERR_NO_ERROR) { MessageBox (NULL, "Could not initialise DDE management library.", "winclient", MB_ICONEXCLAMATION | MB_OK); return 1; } /* Open a conversation */ hConv = openConversation (); if (hConv) { /* OK. Next, we need to parse the command line. */ ret = parseCommandLine (hConv, lpCmdLine); /* Close the conversation */ closeConversation (hConv); } DdeUninitialize (idInst); return ret; } /* * Name : openConversation * Function: Start a conversation. * */ static HCONV openConversation (void) { HSZ hszService = NULL, hszTopic = NULL; HCONV hConv = NULL; /* Get the application (service) name */ hszService = DdeCreateStringHandle (idInst, SERVICE_NAME, CP_WINANSI); if (!hszService) { MessageBox (NULL, "Could not create string handle for service.", "winclient", MB_ICONEXCLAMATION | MB_OK); goto error; } /* Get the topic name */ hszTopic = DdeCreateStringHandle (idInst, TOPIC_NAME, CP_WINANSI); if (!hszTopic) { MessageBox (NULL, "Could not create string handle for topic.", "winclient", MB_ICONEXCLAMATION | MB_OK); goto error; } /* Try to connect */ hConv = DdeConnect (idInst, hszService, hszTopic, NULL); if (!hConv) { STARTUPINFO sti; PROCESS_INFORMATION pi; int n; /* Try to start the program */ ZeroMemory (&sti, sizeof (sti)); sti.cb = sizeof (sti); if (!CreateProcess (NULL, PROGRAM_TO_RUN, NULL, NULL, FALSE, 0, NULL, NULL, &sti, &pi)) { MessageBox (NULL, "Could not start process.", "winclient", MB_ICONEXCLAMATION | MB_OK); goto error; } /* Wait for the process to enter an idle state */ WaitForInputIdle (pi.hProcess, MAX_INPUT_IDLE_WAIT); /* Close the handles */ CloseHandle (pi.hThread); CloseHandle (pi.hProcess); /* Try to connect */ for (n = 0; n < CONNECT_RETRIES; n++) { Sleep (CONNECT_DELAY); hConv = DdeConnect (idInst, hszService, hszTopic, NULL); if (hConv) break; } if (!hConv) { /* Still couldn't connect. */ MessageBox (NULL, "Could not connect to DDE server.", "winclient", MB_ICONEXCLAMATION | MB_OK); goto error; } } /* Release the string handles */ DdeFreeStringHandle (idInst, hszService); DdeFreeStringHandle (idInst, hszTopic); return hConv; error: if (hConv) DdeDisconnect (hConv); if (hszService) DdeFreeStringHandle (idInst, hszService); if (hszTopic) DdeFreeStringHandle (idInst, hszTopic); return NULL; } /* * Name : closeConversation * Function: Close a conversation. * */ static void closeConversation (HCONV hConv) { /* Shut down */ DdeDisconnect (hConv); } /* * Name : doFile * Function: Process a file. * */ int doFile (HCONV hConv, LPSTR lpszFileName1, LPSTR lpszFileName2) { char *buf = NULL; unsigned len; /* Calculate the buffer length */ len = strlen (lpszFileName1) + strlen (lpszFileName2) + strlen (COMMAND_FORMAT); /* Allocate a buffer */ buf = (char *) xmalloc (len); if (!buf) { MessageBox (NULL, "Not enough memory.", "winclient", MB_ICONEXCLAMATION | MB_OK); return 1; } /* Build the command */ len = wsprintf (buf, COMMAND_FORMAT, lpszFileName1, lpszFileName2); len++; /* OK. We're connected. Send the message. */ DdeClientTransaction (buf, len, hConv, NULL, 0, XTYP_EXECUTE, TRANSACTION_TIMEOUT, NULL); free (buf); return 0; } /* * Name : getNextArg * Function: Retrieve the next command line argument. * */ static char * getNextArg (const char **ptr, unsigned *len) { int in_quotes = 0, quit = 0, all_in_quotes = 0; const char *p = *ptr, *start; char *buf = NULL; unsigned length = 0; /* Skip whitespace */ while (*p && isspace (*p)) p++; /* If this is the end, return NULL */ if (!*p) return NULL; /* Remember where we are */ start = p; /* Find the next whitespace character outside quotes */ if (*p == '"') all_in_quotes = 1; while (*p && !quit) { switch (*p) { case '"': in_quotes = 1 - in_quotes; p++; break; case '\\': if (!in_quotes) all_in_quotes = 0; p++; if (!*p) break; p++; break; default: if (isspace (*p) && !in_quotes) quit = 1; else if (!in_quotes) all_in_quotes = 0; if (!quit) p++; } } /* Work out the length */ length = p - start; /* Strip quotes if the argument is completely quoted */ if (all_in_quotes) { start++; length -= 2; } /* Copy */ buf = (char *) xmalloc (length + 1); if (!buf) return NULL; strncpy (buf, start, length); buf[length] = '\0'; /* Return the pointer and length */ *ptr = p; *len = length; return buf; } /* * Name : parseCommandLine * Function: Process the command line. This program accepts a list of strings * : (which may contain wildcards) representing filenames. * */ int parseCommandLine (HCONV hConv, LPSTR lpszCommandLine) { char *fullpath, *filepart; char *arg; unsigned len, pathlen; int ret = 0; HANDLE hFindFile = NULL; WIN32_FIND_DATA wfd; /* Retrieve arguments */ while ((arg = getNextArg ((const char**)&lpszCommandLine, &len)) != NULL) { /* First find the canonical path name */ fullpath = filepart = NULL; pathlen = GetFullPathName (arg, 0, fullpath, &filepart); fullpath = (char *) xmalloc (pathlen); if (!fullpath) { MessageBox (NULL, "Not enough memory.", "winclient", MB_ICONEXCLAMATION | MB_OK); ret = 1; free (arg); break; } GetFullPathName (arg, pathlen, fullpath, &filepart); /* Find the first matching file */ hFindFile = FindFirstFile (arg, &wfd); if (hFindFile == INVALID_HANDLE_VALUE) ret = doFile (hConv, fullpath, ""); else { /* Chop off the file part from the full path name */ if (filepart) *filepart = '\0'; /* For each matching file */ do { /* Process it */ ret = doFile (hConv, fullpath, wfd.cFileName); if (ret) break; } while (FindNextFile (hFindFile, &wfd)); FindClose (hFindFile); } /* Release the path name buffers */ free (fullpath); free (arg); if (ret) break; } return ret; } static void fatal (const char *s1, const char *s2) { error (s1, s2); exit (1); } /* Print error message. `s1' is printf control string, `s2' is arg for it. */ static void error (const char* s1, const char* s2) { fprintf (stderr, "winclient: "); fprintf (stderr, s1, s2); fprintf (stderr, "\n"); } /* Like malloc but get fatal error if memory is exhausted. */ static void * xmalloc (size_t size) { void *result = malloc (size); if (result == NULL) fatal ("virtual memory exhausted", (char *) 0); return result; }