Mercurial > hg > xemacs-beta
annotate src/intl.c @ 5090:0ca81354c4c7
Further frame-geometry cleanups
-------------------- ChangeLog entries follow: --------------------
man/ChangeLog addition:
2010-03-03 Ben Wing <ben@xemacs.org>
* internals/internals.texi (Intro to Window and Frame Geometry):
* internals/internals.texi (The Paned Area):
* internals/internals.texi (The Displayable Area):
Update to make note of e.g. the fact that the bottom gutter is
actually above the minibuffer.
src/ChangeLog addition:
2010-03-03 Ben Wing <ben@xemacs.org>
* emacs.c:
* emacs.c (assert_equal_failed):
* lisp.h:
* lisp.h (assert_equal):
New fun assert_equal, asserting that two values == each other, and
printing out both values upon failure.
* frame-gtk.c (gtk_initialize_frame_size):
* frame-impl.h:
* frame-impl.h (FRAME_TOP_INTERNAL_BORDER_START):
* frame-impl.h (FRAME_BOTTOM_INTERNAL_BORDER_START):
* frame-impl.h (FRAME_LEFT_INTERNAL_BORDER_START):
* frame-impl.h (FRAME_PANED_TOP_EDGE):
* frame-impl.h (FRAME_NONPANED_SIZE):
* frame-x.c (x_initialize_frame_size):
* frame.c:
* gutter.c (get_gutter_coords):
* gutter.c (calculate_gutter_size):
* gutter.h:
* gutter.h (WINDOW_REAL_TOP_GUTTER_BOUNDS):
* gutter.h (FRAME_TOP_GUTTER_BOUNDS):
* input-method-xlib.c:
* input-method-xlib.c (XIM_SetGeometry):
* redisplay-output.c (clear_left_border):
* redisplay-output.c (clear_right_border):
* redisplay-output.c (redisplay_output_pixmap):
* redisplay-output.c (redisplay_clear_region):
* redisplay-output.c (redisplay_clear_top_of_window):
* redisplay-output.c (redisplay_clear_to_window_end):
* redisplay-xlike-inc.c (XLIKE_clear_frame):
* redisplay.c:
* redisplay.c (UPDATE_CACHE_RETURN):
* redisplay.c (pixel_to_glyph_translation):
* toolbar.c (update_frame_toolbars_geometry):
* window.c (Fwindow_pixel_edges):
Get rid of some redundant macros. Consistently use the
FRAME_TOP_*_START, FRAME_RIGHT_*_END, etc. format. Rename
FRAME_*_BORDER_* to FRAME_*_INTERNAL_BORDER_*. Comment out
FRAME_BOTTOM_* for gutters and the paned area due to the
uncertainty over where the paned area actually begins. (Eventually
we should probably move the gutters outside the minibuffer so that
the paned area is contiguous.) Use FRAME_PANED_* more often in the
code to make things clearer.
Update the diagram to show that the bottom gutter is inside the
minibuffer (!) and that there are "junk boxes" when you have left
and/or right gutters (dead boxes that are mistakenly left uncleared,
unlike the corresponding scrollbar dead boxes). Update the text
appropriately to cover the bottom gutter position, etc.
Rewrite gutter-geometry code to use the FRAME_*_GUTTER_* in place of
equivalent expressions referencing other frame elements, to make the
code more portable in case we move around the gutter location.
Cleanup FRAME_*_GUTTER_BOUNDS() in gutter.h.
Add some #### GEOM! comments where I think code is incorrect --
typically, it wasn't fixed up properly when the gutter was added.
Some cosmetic changes.
| author | Ben Wing <ben@xemacs.org> |
|---|---|
| date | Wed, 03 Mar 2010 05:07:47 -0600 |
| parents | 3c3c1d139863 |
| children | 308d34e9f07d |
| rev | line source |
|---|---|
| 771 | 1 /* Various functions for internationalizing XEmacs. |
| 428 | 2 Copyright (C) 1993, 1994, 1995 Board of Trustees, University of Illinois. |
| 826 | 3 Copyright (C) 2000, 2001, 2002 Ben Wing. |
| 428 | 4 |
| 5 This file is part of XEmacs. | |
| 6 | |
| 7 XEmacs is free software; you can redistribute it and/or modify it | |
| 8 under the terms of the GNU General Public License as published by the | |
| 9 Free Software Foundation; either version 2, or (at your option) any | |
| 10 later version. | |
| 11 | |
| 12 XEmacs is distributed in the hope that it will be useful, but WITHOUT | |
| 13 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or | |
| 14 FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License | |
| 15 for more details. | |
| 16 | |
| 17 You should have received a copy of the GNU General Public License | |
| 18 along with XEmacs; see the file COPYING. If not, write to | |
| 19 the Free Software Foundation, Inc., 59 Temple Place - Suite 330, | |
| 20 Boston, MA 02111-1307, USA. */ | |
| 21 | |
| 22 /* Synched up with: Not in FSF. */ | |
| 23 | |
| 24 #include <config.h> | |
| 25 #include "lisp.h" | |
| 26 | |
| 27 #if defined (HAVE_X_WINDOWS) && defined (HAVE_X11_XLOCALE_H) | |
| 28 #include <X11/Xlocale.h> | |
| 29 #else | |
| 30 #ifdef HAVE_LOCALE_H | |
| 31 #include <locale.h> | |
| 32 #endif | |
| 33 #endif | |
| 34 | |
| 771 | 35 #ifdef HAVE_X_WINDOWS |
| 36 int init_x_locale (Lisp_Object locale); | |
| 37 #endif | |
| 428 | 38 |
| 771 | 39 DEFUN ("current-locale", Fcurrent_locale, 0, 0, 0, /* |
| 40 Return the current locale. | |
| 41 This is of the form LANG_COUNTRY.ENCODING, or LANG_COUNTRY, or LANG, | |
| 42 or .ENCODING. Unfortunately, the meanings of these three values are | |
| 43 system-dependent, and there is no universal agreement. | |
| 44 */ | |
| 45 ()) | |
| 46 { | |
| 47 Extbyte *loc; | |
| 428 | 48 |
| 771 | 49 loc = setlocale (LC_CTYPE, NULL); |
| 50 if (!loc) | |
| 51 return Qnil; | |
|
4953
304aebb79cd3
function renamings to track names of char typedefs
Ben Wing <ben@xemacs.org>
parents:
3659
diff
changeset
|
52 return build_extstring (loc, Qctext); |
| 428 | 53 } |
| 54 | |
| 771 | 55 DEFUN ("set-current-locale", Fset_current_locale, 1, 1, 0, /* |
| 56 Set the user's current locale. | |
| 57 Takes a string, the value passed to setlocale(). | |
| 58 This is of the form LANG_COUNTRY.ENCODING, or LANG_COUNTRY, or LANG, | |
| 59 or .ENCODING. Unfortunately, the meanings of these three values are | |
| 60 system-dependent, and there is no universal agreement. This function | |
| 61 is meant to be called only from `set-language-environment', which | |
| 62 keeps tables to figure out the values to use for particular systems. | |
| 428 | 63 |
| 771 | 64 If the empty string is passed in, the locale is initialized from |
| 65 environment variables. | |
| 428 | 66 |
| 771 | 67 Returns nil if the call failed (typically, an invalid locale was given). |
| 68 Otherwise, returns the locale, or possibly a more-specified version. | |
| 428 | 69 */ |
| 771 | 70 (locale)) |
| 428 | 71 { |
| 771 | 72 Extbyte *loc; |
| 2946 | 73 Lisp_Object str; |
| 428 | 74 |
| 771 | 75 CHECK_STRING (locale); |
| 76 /* RedHat 6.2 contains a locale called "Francais" with the C-cedilla | |
| 77 encoded in ISO2022! */ | |
|
4981
4aebb0131297
Cleanups/renaming of EXTERNAL_TO_C_STRING and friends
Ben Wing <ben@xemacs.org>
parents:
4953
diff
changeset
|
78 loc = LISP_STRING_TO_EXTERNAL (locale, Qctext); |
| 771 | 79 loc = setlocale (LC_ALL, loc); |
| 80 if (!loc) | |
| 81 return Qnil; | |
| 2946 | 82 loc = xstrdup (loc); |
| 83 setlocale (LC_NUMERIC, "C"); | |
| 771 | 84 #ifdef HAVE_X_WINDOWS |
| 85 if (!init_x_locale (locale)) | |
| 428 | 86 { |
| 771 | 87 /* Locale not supported under X. Put it back. */ |
| 88 setlocale (LC_ALL, loc); | |
| 89 setlocale (LC_NUMERIC, "C"); | |
| 2946 | 90 free (loc); |
| 771 | 91 return Qnil; |
| 428 | 92 } |
| 771 | 93 #endif |
| 428 | 94 |
|
4953
304aebb79cd3
function renamings to track names of char typedefs
Ben Wing <ben@xemacs.org>
parents:
3659
diff
changeset
|
95 str = build_extstring (loc, Qctext); |
|
4976
16112448d484
Rename xfree(FOO, TYPE) -> xfree(FOO)
Ben Wing <ben@xemacs.org>
parents:
4953
diff
changeset
|
96 xfree (loc); |
| 2946 | 97 return str; |
| 428 | 98 } |
| 771 | 99 |
| 100 #if 0 | |
| 428 | 101 |
| 771 | 102 /* #### some old code that I really want to nuke, but I'm not completely |
| 103 sure what it did, so I'll leave it until we get around to implementing | |
| 104 message-translation and decide whether the functionality that this | |
| 105 is trying to support makes any sense. --ben */ | |
| 428 | 106 |
| 107 Lisp_Object Qdefer_gettext; | |
| 108 | |
| 826 | 109 DEFUN ("ignore-defer-gettext", Fignore_defer_gettext, 1, 1, 0, /* |
| 444 | 110 If OBJECT is of the form (defer-gettext "string"), return the string. |
| 428 | 111 The purpose of the defer-gettext symbol is to identify strings which |
| 112 are translated when they are referenced instead of when they are defined. | |
| 113 */ | |
| 444 | 114 (object)) |
| 428 | 115 { |
| 444 | 116 if (CONSP (object) |
| 117 && SYMBOLP (Fcar (object)) | |
| 118 && EQ (Fcar (object), Qdefer_gettext)) | |
| 119 return Fcar (Fcdr (object)); | |
| 428 | 120 else |
| 444 | 121 return object; |
| 428 | 122 } |
| 123 | |
| 771 | 124 #endif /* 0 */ |
| 125 | |
| 428 | 126 DEFUN ("gettext", Fgettext, 1, 1, 0, /* |
| 127 Look up STRING in the default message domain and return its translation. | |
| 128 This function does nothing if I18N3 was not enabled when Emacs was compiled. | |
| 129 */ | |
| 130 (string)) | |
| 131 { | |
| 132 #ifdef I18N3 | |
| 133 /* #### What should happen here is: | |
| 134 | |
| 135 1) If the string has no `string-translatable' property or its value | |
| 136 is nil, no translation takes place. The `string-translatable' property | |
| 137 only gets added when a constant string is read in from a .el or .elc | |
| 138 file, to avoid excessive translation. (The user can also explicitly | |
| 139 add this property to a string.) | |
| 140 2) If the string's `string-translatable' property is a string, | |
| 141 that string should be returned. `format' add this property. | |
| 142 This allows translation to take place at the proper time but | |
| 143 avoids excessive translation if the string is not destined for | |
| 144 a translating stream. (See print_internal().) | |
| 145 3) If gettext() returns the same string, then Fgettext() should return | |
| 146 the same object, minus the 'string-translatable' property. */ | |
| 147 | |
| 148 #endif | |
| 149 return string; | |
| 150 } | |
| 151 | |
| 152 #ifdef I18N3 | |
| 153 | |
| 154 /* #### add the function `force-gettext', perhaps in Lisp. This | |
| 155 ignores the `string-translatable' property and simply calls gettext() | |
| 156 on the string. Add the functions `set-string-translatable' and | |
| 157 `set-stream-translating'. */ | |
| 158 | |
| 159 #endif | |
| 160 | |
| 161 | |
| 162 | |
| 163 /************************************************************************/ | |
| 164 /* initialization */ | |
| 165 /************************************************************************/ | |
| 166 | |
| 167 void | |
| 771 | 168 init_intl (void) |
| 428 | 169 { |
| 3659 | 170 /* This function cannot GC, because it explicitly prevents it. */ |
| 771 | 171 if (initialized) |
| 172 { | |
| 173 int count = begin_gc_forbidden (); | |
| 853 | 174 Lisp_Object args[2]; |
| 175 | |
| 771 | 176 specbind (Qinhibit_quit, Qt); |
| 853 | 177 args[0] = Qreally_early_error_handler; |
| 178 args[1] = intern ("init-locale-at-early-startup"); | |
| 179 Fcall_with_condition_handler (2, args); | |
| 180 | |
| 771 | 181 /* Should be calling this here, but problems with |
| 182 `data-directory' and locating the files. See comment in | |
| 183 mule-cmds.el:`init-mule-at-startup'. | |
| 428 | 184 |
| 853 | 185 args[1] = intern ("init-unicode-at-early-startup"); |
| 186 Fcall_with_condition_handler (2, args); | |
| 771 | 187 */ |
| 188 unbind_to (count); | |
| 189 } | |
| 428 | 190 } |
| 191 | |
| 192 void | |
| 193 syms_of_intl (void) | |
| 194 { | |
| 195 DEFSUBR (Fgettext); | |
| 771 | 196 DEFSUBR (Fset_current_locale); |
| 197 DEFSUBR (Fcurrent_locale); | |
| 428 | 198 } |
| 199 | |
| 200 void | |
| 201 vars_of_intl (void) | |
| 202 { | |
| 203 #ifdef I18N3 | |
| 204 Fprovide (intern ("i18n3")); | |
| 205 #endif | |
| 771 | 206 |
| 207 #ifdef MULE | |
| 208 Fprovide (intern ("mule")); | |
| 209 #endif /* MULE */ | |
| 428 | 210 } |