Mercurial > hg > xemacs-beta
view src/event-tty.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 | 0c544f2f566c |
children | 308d34e9f07d |
line wrap: on
line source
/* The event_stream interface for tty's. Copyright (C) 1994, 1995 Board of Trustees, University of Illinois. Copyright (C) 1995 Sun Microsystems, Inc. Copyright (C) 1995, 2002, 2003 Ben Wing. 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. */ #include <config.h> #include "lisp.h" #include "device.h" #include "console-tty-impl.h" #include "events.h" #include "frame.h" #include "process.h" #include "sysproc.h" #include "syswait.h" #include "systime.h" /* Mask of bits indicating the descriptors that we wait for input on */ extern SELECT_TYPE input_wait_mask, non_fake_input_wait_mask; extern SELECT_TYPE process_only_mask, tty_only_mask; static struct event_stream *tty_event_stream; #ifdef WIN32_ANY extern int mswindows_is_blocking; #endif static int last_quit_check_signal_tick_count; /************************************************************************/ /* timeout events */ /************************************************************************/ /* The pending timers are stored in an ordered list, where the first timer on the list is the first one to fire. Times recorded here are absolute. */ static struct low_level_timeout *tty_timer_queue; static int emacs_tty_add_timeout (EMACS_TIME thyme) { return add_low_level_timeout (&tty_timer_queue, thyme); } static void emacs_tty_remove_timeout (int id) { remove_low_level_timeout (&tty_timer_queue, id); } static void tty_timeout_to_emacs_event (Lisp_Event *emacs_event) { /* timeout events have nil as channel */ SET_EVENT_TYPE (emacs_event, timeout_event); SET_EVENT_TIMESTAMP_ZERO (emacs_event); /* #### */ SET_EVENT_TIMEOUT_INTERVAL_ID (emacs_event, pop_low_level_timeout (&tty_timer_queue, 0)); SET_EVENT_TIMEOUT_FUNCTION (emacs_event, Qnil); SET_EVENT_TIMEOUT_OBJECT (emacs_event, Qnil); } static int emacs_tty_event_pending_p (int how_many) { Lisp_Object event; int tick_count_val; /* Cf. the comments on emacs_Xt_event_pending_p in event-xlike-inc.c . */ if (!how_many) { EMACS_TIME sometime; /* (1) Any pending events in the dispatch queue? */ if (!NILP(dispatch_event_queue)) { return 1; } /* (2) Any TTY or process input available? */ if (poll_fds_for_input (non_fake_input_wait_mask)) return 1; /* (3) Any timeout input available? */ EMACS_GET_TIME (sometime); if (tty_timer_queue && EMACS_TIME_EQUAL_OR_GREATER (sometime, tty_timer_queue->time)) return 1; } else { /* HOW_MANY > 0 */ EVENT_CHAIN_LOOP (event, dispatch_event_queue) { if (command_event_p (event)) { how_many--; if (how_many <= 0) return 1; } } } tick_count_val = quit_check_signal_tick_count; /* Checking in_modal_loop here is a bit cargo-cultish, since its use is specific to builds with a window system. */ if (!in_modal_loop && (last_quit_check_signal_tick_count != tick_count_val)) { last_quit_check_signal_tick_count = tick_count_val; /* We need to drain the entire queue now -- if we only drain part of it, we may later on end up with events actually pending but detect_input_pending() returning false because there wasn't another SIGIO. */ event_stream_drain_queue (); if (!how_many) return !NILP (dispatch_event_queue); EVENT_CHAIN_LOOP (event, dispatch_event_queue) { if (command_event_p (event)) { how_many--; if (how_many <= 0) return 1; } } } return 0; } static void emacs_tty_next_event (Lisp_Event *emacs_event) { while (1) { int ndesc; int i; SELECT_TYPE temp_mask = input_wait_mask; EMACS_TIME time_to_block; EMACS_SELECT_TIME select_time_to_block, *pointer_to_this; if (!NILP (dispatch_event_queue)) { Lisp_Object event, event2; event2 = wrap_event (emacs_event); event = dequeue_dispatch_event (); Fcopy_event (event, event2); Fdeallocate_event (event); return; } if (!get_low_level_timeout_interval (tty_timer_queue, &time_to_block)) /* no timer events; block indefinitely */ pointer_to_this = 0; else { EMACS_TIME_TO_SELECT_TIME (time_to_block, select_time_to_block); pointer_to_this = &select_time_to_block; } #ifdef WIN32_ANY mswindows_is_blocking = 1; #endif ndesc = select (MAXDESC, &temp_mask, 0, 0, pointer_to_this); #ifdef WIN32_ANY mswindows_is_blocking = 0; #endif if (ndesc > 0) { /* Look for a TTY event */ for (i = 0; i < MAXDESC; i++) { /* To avoid race conditions (among other things, an infinite loop when called from Fdiscard_input()), we must return user events ahead of process events. */ if (FD_ISSET (i, &temp_mask) && FD_ISSET (i, &tty_only_mask)) { struct console *c = find_tty_or_stream_console_from_fd (i); assert (c); if (read_event_from_tty_or_stream_desc (emacs_event, c)) return; } } /* Look for a process event */ for (i = 0; i < MAXDESC; i++) { if (FD_ISSET (i, &temp_mask) && FD_ISSET (i, &process_only_mask)) { Lisp_Object process; Lisp_Process *p = get_process_from_usid (FD_TO_USID(i)); assert (p); process = wrap_process (p); set_event_type (emacs_event, process_event); /* process events have nil as channel */ SET_EVENT_TIMESTAMP_ZERO (emacs_event); /* #### */ SET_EVENT_PROCESS_PROCESS (emacs_event, process); return; } } /* We might get here when a fake event came through a signal. */ /* Return a dummy event, so that a cycle of the command loop will occur. */ drain_signal_event_pipe (); set_event_type (emacs_event, eval_event); /* eval events have nil as channel */ SET_EVENT_EVAL_FUNCTION (emacs_event, Qidentity); SET_EVENT_EVAL_OBJECT (emacs_event, Qnil); return; } else if (ndesc == 0) /* timeout fired */ { tty_timeout_to_emacs_event (emacs_event); return; } } } static void emacs_tty_format_magic_event (Lisp_Event *UNUSED (emacs_event), Lisp_Object UNUSED (pstream)) { /* Nothing to do currently */ } static int emacs_tty_compare_magic_event (Lisp_Event *UNUSED (e1), Lisp_Event *UNUSED (e2)) { return 1; } static Hashcode emacs_tty_hash_magic_event (Lisp_Event *UNUSED (e)) { return 0; } static void emacs_tty_handle_magic_event (Lisp_Event *UNUSED (emacs_event)) { /* Nothing to do currently */ } static void emacs_tty_select_process (Lisp_Process *process, int doin, int doerr) { int infd, errfd; event_stream_unixoid_select_process (process, doin, doerr, &infd, &errfd); } static void emacs_tty_unselect_process (Lisp_Process *process, int doin, int doerr) { int infd, errfd; event_stream_unixoid_unselect_process (process, doin, doerr, &infd, &errfd); } static void emacs_tty_select_console (struct console *con) { event_stream_unixoid_select_console (con); } static void emacs_tty_unselect_console (struct console *con) { event_stream_unixoid_unselect_console (con); } static void emacs_tty_drain_queue (void) { drain_tty_devices (); } static void emacs_tty_create_io_streams (void* inhandle, void* outhandle, void *errhandle, Lisp_Object* instream, Lisp_Object* outstream, Lisp_Object* errstream, USID* in_usid, USID* err_usid, int flags) { event_stream_unixoid_create_io_streams (inhandle, outhandle, errhandle, instream, outstream, errstream, in_usid, err_usid, flags); } static void emacs_tty_delete_io_streams (Lisp_Object instream, Lisp_Object outstream, Lisp_Object errstream, USID* in_usid, USID* err_usid) { event_stream_unixoid_delete_io_streams (instream, outstream, errstream, in_usid, err_usid); } /************************************************************************/ /* initialization */ /************************************************************************/ void reinit_vars_of_event_tty (void) { tty_event_stream = xnew_and_zero (struct event_stream); tty_event_stream->event_pending_p = emacs_tty_event_pending_p; tty_event_stream->next_event_cb = emacs_tty_next_event; tty_event_stream->handle_magic_event_cb = emacs_tty_handle_magic_event; tty_event_stream->format_magic_event_cb = emacs_tty_format_magic_event; tty_event_stream->compare_magic_event_cb= emacs_tty_compare_magic_event; tty_event_stream->hash_magic_event_cb = emacs_tty_hash_magic_event; tty_event_stream->add_timeout_cb = emacs_tty_add_timeout; tty_event_stream->remove_timeout_cb = emacs_tty_remove_timeout; tty_event_stream->select_console_cb = emacs_tty_select_console; tty_event_stream->unselect_console_cb = emacs_tty_unselect_console; tty_event_stream->select_process_cb = emacs_tty_select_process; tty_event_stream->unselect_process_cb = emacs_tty_unselect_process; tty_event_stream->drain_queue_cb = emacs_tty_drain_queue; tty_event_stream->create_io_streams_cb = emacs_tty_create_io_streams; tty_event_stream->delete_io_streams_cb = emacs_tty_delete_io_streams; last_quit_check_signal_tick_count = 0; } void vars_of_event_tty (void) { } void init_event_tty_late (void) { event_stream = tty_event_stream; }