Mercurial > hg > xemacs-beta
view src/intl-x.c @ 4928:ea701c23ed84
change text_width method to take a window, in preparation for unicode-internal changes
-------------------- ChangeLog entries follow: --------------------
src/ChangeLog addition:
2010-01-19 Ben Wing <ben@xemacs.org>
* console-impl.h (struct console_methods):
* console-stream.c (stream_text_width):
* redisplay-msw.c (mswindows_output_string):
* redisplay-msw.c (mswindows_text_width):
* redisplay-tty.c (tty_text_width):
* redisplay-xlike-inc.c (XLIKE_text_width):
* redisplay-xlike-inc.c (XLIKE_output_string):
* redisplay.c:
* redisplay.c (redisplay_window_text_width_ichar_string):
* redisplay.c (redisplay_text_width_string):
Change the text_width method to take a window instead of a frame.
Needed for Unicode-internal.
author | Ben Wing <ben@xemacs.org> |
---|---|
date | Tue, 19 Jan 2010 11:21:34 -0600 |
parents | ba4677f54a05 |
children | 2aa9cd456ae7 |
line wrap: on
line source
/* X-specific functions for internationalizing XEmacs. Copyright (C) 1996 Sun Microsystems. Copyright (C) 2000, 2001 Ben Wing. This file is a 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. */ #include <config.h> #include "lisp.h" #include "console-x.h" #include <X11/Xlocale.h> /* More portable than <locale.h> ? */ Lisp_Object Qxintl; int init_x_locale (Lisp_Object locale); int init_x_locale (Lisp_Object USED_IF_MULE (locale)) { #ifdef MULE /* dverna - Nov. 98: #### DON'T DO THIS !!! The default XtLanguageProc routine calls setlocale(LC_ALL, lang) which fucks up our lower-level locale management, and especially the value of LC_NUMERIC. Anyway, since at this point, we don't know yet whether we're gonna need an X11 frame, we should really do it manually and not use Xlib's dumb default routine */ /*XtSetLanguageProc (NULL, (XtLanguageProc) NULL, NULL);*/ if (!XSupportsLocale ()) { warn_when_safe (Qxintl, Qwarning, "System supports locale `%s' but X Windows does not", XSTRING_DATA (locale)); return 0; } if (XSetLocaleModifiers ("") == NULL) { warn_when_safe (Qxintl, Qwarning, "XSetLocaleModifiers(\"\") failed. Check the value\n" "of the XMODIFIERS environment variable."); return 0; } #endif /* MULE */ return 1; } void syms_of_intl_x (void) { DEFSYMBOL (Qxintl); }