Mercurial > hg > xemacs-beta
annotate src/vdb-posix.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 | 896a34d28b71 |
children | ed624ab64583 |
rev | line source |
---|---|
3092 | 1 /* Virtual diry bit implementation for XEmacs. |
2 Copyright (C) 2005 Marcus Crestani. | |
3 | |
4 This file is part of XEmacs. | |
5 | |
6 XEmacs is free software; you can redistribute it and/or modify it | |
7 under the terms of the GNU General Public License as published by the | |
8 Free Software Foundation; either version 2, or (at your option) any | |
9 later version. | |
10 | |
11 XEmacs is distributed in the hope that it will be useful, but WITHOUT | |
12 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or | |
13 FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License | |
14 for more details. | |
15 | |
16 You should have received a copy of the GNU General Public License | |
17 along with XEmacs; see the file COPYING. If not, write to | |
18 the Free Software Foundation, Inc., 59 Temple Place - Suite 330, | |
19 Boston, MA 02111-1307, USA. */ | |
20 | |
21 /* Synched up with: Not in FSF. */ | |
22 | |
23 #include <config.h> | |
24 #include "lisp.h" | |
25 #include "gc.h" | |
26 #include "mc-alloc.h" | |
27 #include "vdb.h" | |
28 | |
29 #include <errno.h> | |
30 #include <signal.h> | |
31 #include <sys/mman.h> | |
32 | |
33 #if defined (HAVE_SIGACTION) | |
34 # if defined (HAVE_STRUCT_SIGINFO_SI_ADDR) | |
35 # define FAULT_HANDLER_ARGUMENTS \ | |
36 int signum, struct siginfo *siginfo, void *UNUSED (ctx) | |
37 # define GET_FAULT_ADDRESS siginfo->si_addr | |
38 # elif defined (HAVE_SIGINFO_T_SI_ADDR) | |
39 # define FAULT_HANDLER_ARGUMENTS \ | |
40 int signum, siginfo_t *siginfo, void *UNUSED (ctx) | |
41 # define GET_FAULT_ADDRESS siginfo->si_addr | |
42 # endif | |
43 # define USE_SIGACTION | |
44 # define FAULT_HANDLER_REMOVE_HANDLER | |
45 #elif defined (HAVE_SIGNAL) | |
46 # define FAULT_HANDLER_ARGUMENTS int signum, struct sigcontext sc | |
47 # define GET_FAULT_ADDRESS (void *) sc.cr2 | |
48 # define USE_SIGNAL | |
49 #endif | |
50 | |
51 | |
52 #ifdef USE_SIGACTION | |
53 struct sigaction act, segv_oact, bus_oact; | |
54 #endif /* USE_SIGACTION */ | |
55 | |
56 #ifdef USE_SIGNAL | |
57 sighandler_t segv_oact, bus_oact; | |
58 #endif /* USE_SIGNAL */ | |
59 | |
60 void vdb_remove_signal_handler (void); | |
61 | |
62 void | |
63 vdb_fault_handler (FAULT_HANDLER_ARGUMENTS) | |
64 { | |
65 if (write_barrier_enabled | |
66 && (fault_on_protected_page (GET_FAULT_ADDRESS))) | |
67 { | |
68 vdb_designate_modified (GET_FAULT_ADDRESS); | |
69 unprotect_page_and_mark_dirty (GET_FAULT_ADDRESS); | |
70 #ifdef FAULT_HANDLER_REINSTALL_HANDLER | |
71 vdb_install_signal_handler (); | |
72 #endif /* FAULT_HANDLER_REINSTALL_HANDLER */ | |
73 } | |
74 else /* default sigsegv handler */ | |
75 { | |
3462 | 76 char *signal_name = ""; |
3092 | 77 if (signum == SIGSEGV) |
78 signal_name = "SIGSEGV"; | |
79 else if (signum == SIGBUS) | |
80 signal_name = "SIGBUS"; | |
81 else | |
82 ABORT (); /* something weird happened: wrong signal caught */ | |
3519 | 83 fprintf (stderr, "\n\nFatal Error: Received %s (%d) for address %p\n", |
84 signal_name, signum, (void *) GET_FAULT_ADDRESS); | |
3092 | 85 #ifdef FAULT_HANDLER_CALL_PREVIOUS_HANDLER |
86 if (signum == SIGSEGV) | |
87 segv_oact (signum); | |
88 else if (signum == SIGBUS) | |
89 bus_oact (signum); | |
90 #endif /* FAULT_HANDLER_CALL_PREVIOUS_HANDLER */ | |
91 #ifdef FAULT_HANDLER_REMOVE_HANDLER | |
92 vdb_remove_signal_handler (); | |
93 #endif /* FAULT_HANDLER_REMOVE_HANDLER */ | |
94 } | |
95 } | |
96 | |
97 void | |
98 vdb_remove_signal_handler (void) | |
99 { | |
100 #ifdef USE_SIGACTION | |
101 sigaction(SIGSEGV, &segv_oact, 0); | |
102 sigaction(SIGBUS, &bus_oact, 0); | |
103 #endif /* USE_SIGACTION */ | |
104 #ifdef USE_SIGNAL | |
105 signal (SIGSEGV, segv_oact); | |
106 signal (SIGBUS, bus_oact); | |
107 #endif | |
108 } | |
109 | |
110 void | |
111 vdb_install_signal_handler (void) | |
112 { | |
113 /* See init_signals_very_early () in signal.c. */ | |
114 if (noninteractive && !initialized) | |
115 { | |
116 allow_incremental_gc = 0; | |
117 return; | |
118 } | |
119 | |
120 #ifdef USE_SIGACTION | |
3307 | 121 memset(&act, 0, sizeof(struct sigaction)); |
3092 | 122 act.sa_sigaction = vdb_fault_handler; |
123 sigemptyset (&act.sa_mask); | |
124 act.sa_flags = SA_SIGINFO; | |
125 sigaction (SIGSEGV, &act, &segv_oact); | |
126 sigaction (SIGBUS, &act, &bus_oact); | |
127 allow_incremental_gc = 1; | |
128 #endif /* USE_SIGACTION */ | |
129 #ifdef USE_SIGNAL | |
130 segv_oact = signal (SIGSEGV, (void (*)(int)) vdb_fault_handler); | |
131 bus_oact = signal (SIGBUS, (void (*)(int)) vdb_fault_handler); | |
132 #endif /* USE_SIGNAL */ | |
133 } | |
134 | |
135 void | |
136 vdb_protect (void *ptr, EMACS_INT len) | |
137 { | |
138 if (mprotect (ptr, len, PROT_READ)) | |
139 { | |
140 perror ("Couldn't mprotect"); | |
141 ABORT (); | |
142 } | |
143 } | |
144 | |
145 void | |
146 vdb_unprotect (void *ptr, EMACS_INT len) | |
147 { | |
148 if (mprotect (ptr, len, PROT_READ | PROT_WRITE)) | |
149 { | |
150 perror ("Couldn't mprotect"); | |
151 ABORT (); | |
152 } | |
153 } |