ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/main.C
(Generate patch)

Comparing rxvt-unicode/src/main.C (file contents):
Revision 1.48 by pcg, Wed Mar 3 04:07:52 2004 UTC vs.
Revision 1.364 by sf-exg, Mon Jan 9 15:30:17 2012 UTC

1/*--------------------------------*-C-*---------------------------------*; 1/*----------------------------------------------------------------------*
2 * File: main.c 2 * File: main.C
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * 4 *
5 * All portions of code are copyright by their respective author/s. 5 * All portions of code are copyright by their respective author/s.
6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk> 6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk>
7 * - original version 7 * - original version
11 * Copyright (c) 1997 mj olesen <olesen@me.QueensU.CA> 11 * Copyright (c) 1997 mj olesen <olesen@me.QueensU.CA>
12 * - extensive modifications 12 * - extensive modifications
13 * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de> 13 * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de>
14 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com> 14 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com>
15 * - extensive modifications 15 * - extensive modifications
16 * Copyright (c) 2003-2004 Marc Lehmann <pcg@goof.com> 16 * Copyright (c) 2003-2010 Marc Lehmann <schmorp@schmorp.de>
17 * 17 *
18 * This program is free software; you can redistribute it and/or modify 18 * This program is free software; you can redistribute it and/or modify
19 * it under the terms of the GNU General Public License as published by 19 * it under the terms of the GNU General Public License as published by
20 * the Free Software Foundation; either version 2 of the License, or 20 * the Free Software Foundation; either version 2 of the License, or
21 * (at your option) any later version. 21 * (at your option) any later version.
30 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 30 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
31 *---------------------------------------------------------------------*/ 31 *---------------------------------------------------------------------*/
32 32
33#include "../config.h" /* NECESSARY */ 33#include "../config.h" /* NECESSARY */
34#include "rxvt.h" /* NECESSARY */ 34#include "rxvt.h" /* NECESSARY */
35#include "main.intpro" /* PROTOS for internal routines */ 35#include "init.h"
36#include "keyboard.h"
37#include "rxvtperl.h"
36 38
39#include <limits>
40
41#include <cassert>
37#include <signal.h> 42#include <csignal>
38
39#ifdef TTY_GID_SUPPORT
40# include <grp.h>
41#endif
42
43#ifdef HAVE_TERMIOS_H
44# include <termios.h>
45#endif
46
47#include <cstring> 43#include <cstring>
48 44
45#include <termios.h>
46
47#ifdef HAVE_XSETLOCALE
48# define X_LOCALE
49# include <X11/Xlocale.h>
50#else
51# ifdef HAVE_SETLOCALE
52# include <clocale>
53# endif
54#endif
55
56struct termios rxvt_term::def_tio;
57vector<rxvt_term *> rxvt_term::termlist;
58
59// used to tell global functions which terminal instance is "active"
60rxvt_t rxvt_current_term;
61
49static char curlocale[128]; 62static char curlocale[128], savelocale[128];
50 63
51void 64bool
52rxvt_set_locale (const char *locale) 65rxvt_set_locale (const char *locale) NOTHROW
53{ 66{
54 if (locale && STRNCMP (locale, curlocale, 128)) 67 int size = strlen (locale) + 1;
55 { 68
56 STRNCPY (curlocale, locale, 128); 69 if (size > sizeof (curlocale))
70 rxvt_fatal ("locale string too long, aborting.\n");
71
72 if (!locale || !memcmp (locale, curlocale, size))
73 return false;
74
75 memcpy (curlocale, locale, size);
57 setlocale (LC_CTYPE, curlocale); 76 setlocale (LC_CTYPE, curlocale);
58 } 77 return true;
59} 78}
60 79
61void * 80void
62rxvt_term::operator new (size_t s) 81rxvt_push_locale (const char *locale) NOTHROW
63{ 82{
64 void *p = malloc (s); 83 strcpy (savelocale, curlocale);
84 rxvt_set_locale (locale);
85}
65 86
66 MEMSET (p, 0, s); 87void
88rxvt_pop_locale () NOTHROW
89{
90 rxvt_set_locale (savelocale);
91}
92
93#if ENABLE_COMBINING
94class rxvt_composite_vec rxvt_composite;
95
96text_t rxvt_composite_vec::compose (unicode_t c1, unicode_t c2)
97{
98 compose_char *cc;
99
100 // break compose chains, as stupid readline really likes to duplicate
101 // composing characters for some reason, near the end of a line.
102 cc = (*this)[c1];
103 while (cc)
104 {
105 if (cc->c2 == c2) return c1;
106 cc = (*this)[cc->c1];
107 }
108
109 // check to see whether this combination already exists otherwise
110 for (cc = v.begin (); cc < v.end (); cc++)
111 if (cc->c1 == c1 && cc->c2 == c2)
112 return COMPOSE_LO + (cc - v.begin ());
113
114 // allocate a new combination
115 if (v.size () == COMPOSE_HI - COMPOSE_LO + 1)
116 {
117 static int seen;
118
119 if (!seen++)
120 rxvt_warn ("too many unrepresentable composite characters, try --enable-unicode3\n");
121
122 return REPLACEMENT_CHAR;
123 }
124
125 v.push_back (compose_char (c1, c2));
126
127 return v.size () - 1 + COMPOSE_LO;
128}
129
130int rxvt_composite_vec::expand (unicode_t c, wchar_t *r)
131{
132 compose_char *cc = (*this)[c];
133
134 if (!cc)
135 {
136 if (r) *r = c;
137 return 1;
138 }
139
140 int len = expand (cc->c1, r);
141
142 if (r) r += len;
143
144 if (cc->c2 != NOCHAR)
145 {
146 len++;
147 if (r) *r++ = cc->c2;
148 }
149
67 return p; 150 return len;
68}
69 151
70void
71rxvt_term::operator delete (void *p, size_t s)
72{
73 free (p);
74} 152}
153#endif
75 154
76rxvt_term::rxvt_term () 155rxvt_term::rxvt_term ()
77 : 156{
78 rootwin_ev (this, &rxvt_term::rootwin_cb), 157#if HAVE_BG_PIXMAP
79 termwin_ev (this, &rxvt_term::x_cb), 158 update_background_ev.set<rxvt_term, &rxvt_term::update_background_cb> (this);
80 vt_ev (this, &rxvt_term::x_cb),
81#ifdef HAVE_SCROLLBARS
82 scrollbar_ev (this, &rxvt_term::x_cb),
83#endif
84#ifdef MENUBAR
85 menubar_ev (this, &rxvt_term::x_cb),
86#endif 159#endif
87#ifdef CURSOR_BLINK 160#ifdef CURSOR_BLINK
88 cursor_blink_ev (this, &rxvt_term::cursor_blink_cb), 161 cursor_blink_ev.set <rxvt_term, &rxvt_term::cursor_blink_cb> (this); cursor_blink_ev.set (0., CURSOR_BLINK_INTERVAL);
89#endif 162#endif
90#ifdef TEXT_BLINK 163#ifdef TEXT_BLINK
91 text_blink_ev (this, &rxvt_term::text_blink_cb), 164 text_blink_ev.set <rxvt_term, &rxvt_term::text_blink_cb> (this); text_blink_ev.set (0., TEXT_BLINK_INTERVAL);
165#endif
166#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
167 cont_scroll_ev.set <rxvt_term, &rxvt_term::cont_scroll_cb> (this);
168#endif
169#ifdef SELECTION_SCROLLING
170 sel_scroll_ev.set <rxvt_term, &rxvt_term::sel_scroll_cb> (this);
171#endif
172#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
173 slip_wheel_ev.set <rxvt_term, &rxvt_term::slip_wheel_cb> (this);
174#endif
175#if ENABLE_TRANSPARENCY || ENABLE_PERL
176 rootwin_ev.set <rxvt_term, &rxvt_term::rootwin_cb> (this),
177#endif
178 scrollbar_ev.set <rxvt_term, &rxvt_term::x_cb> (this),
179#ifdef USE_XIM
180 im_ev.set <rxvt_term, &rxvt_term::im_cb> (this),
92#endif 181#endif
93#ifdef POINTER_BLANK 182#ifdef POINTER_BLANK
94 pointer_ev (this, &rxvt_term::pointer_cb), 183 pointer_ev.set <rxvt_term, &rxvt_term::pointer_cb> (this);
95#endif 184#endif
185#ifndef NO_BELL
186 bell_ev.set <rxvt_term, &rxvt_term::bell_cb> (this);
187#endif
188 child_ev.set <rxvt_term, &rxvt_term::child_cb> (this);
189 flush_ev.set <rxvt_term, &rxvt_term::flush_cb> (this);
190 destroy_ev.set <rxvt_term, &rxvt_term::destroy_cb> (this);
191 pty_ev.set <rxvt_term, &rxvt_term::pty_cb> (this);
192 termwin_ev.set <rxvt_term, &rxvt_term::x_cb> (this);
193 vt_ev.set <rxvt_term, &rxvt_term::x_cb> (this);
194
195 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base;
196
197 termlist.push_back (this);
198
199#ifdef KEYSYM_RESOURCE
200 keyboard = new keyboard_manager;
201#endif
202}
203
204// clean up the most important stuff, do *not* call x or free mem etc.
205// for use before an emergency exit
206void
207rxvt_term::emergency_cleanup ()
208{
209 if (cmd_pid)
210 kill (-cmd_pid, SIGHUP);
211
212 pty_ev.stop ();
213 delete pty; pty = 0;
214}
215
216rxvt_term::~rxvt_term ()
217{
218 termlist.erase (find (termlist.begin (), termlist.end(), this));
219
220 emergency_cleanup ();
221
222#if ENABLE_STYLES
223 for (int i = RS_styleCount; --i; )
224 if (fontset[i] != fontset[0])
225 delete fontset[i];
226#endif
227 delete fontset[0];
228
229#ifdef HAVE_BG_PIXMAP
230 bg_destroy ();
231#endif
232
233 if (display)
234 {
235 selection_clear ();
236 selection_clear (true);
237
96#ifdef USE_XIM 238#ifdef USE_XIM
97 im_ev (this, &rxvt_term::im_cb), 239 im_destroy ();
98#endif 240#endif
99 check_ev (this, &rxvt_term::check_cb), 241 scrollBar.destroy ();
100 destroy_ev (this, &rxvt_term::destroy_cb), 242 if (gc) XFreeGC (dpy, gc);
101 pty_ev (this, &rxvt_term::pty_cb),
102 incr_ev (this, &rxvt_term::incr_cb)
103{
104 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base;
105}
106 243
107rxvt_term::~rxvt_term ()
108{
109 if (cmd_fd >= 0)
110 close (cmd_fd);
111
112#ifndef NO_SETOWNER_TTYDEV
113 privileged_ttydev (RESTORE);
114#endif
115#ifdef UTMP_SUPPORT
116 privileged_utmp (RESTORE);
117#endif
118
119 delete TermWin.fontset;
120
121 if (display)
122 {
123#if defined(MENUBAR) && (MENUBAR_MAX > 1)
124 delete menuBar.drawable; 244 delete drawable;
125 //if (menuBar.win)
126 // XDestroyWindow (display->display, menuBar.win);
127#endif
128 delete TermWin.drawable;
129 // destroy all windows 245 // destroy all windows
130 if (TermWin.parent[0]) 246 if (parent)
131 XDestroyWindow (display->display, TermWin.parent[0]); 247 XDestroyWindow (dpy, parent);
132 }
133 248
134 // TODO: free pixcolours, colours should become part of rxvt_display 249 for (int i = 0; i < TOTAL_COLORS; i++)
250 if (ISSET_PIXCOLOR (i))
251 {
252 pix_colors_focused [i].free (this);
253#if OFF_FOCUS_FADING
254 pix_colors_unfocused [i].free (this);
255#endif
256 }
135 257
136 delete PixColors; 258 clear ();
137 259
260 display->flush (); /* ideally .put should do this */
138 displays.put (display); 261 displays.put (display);
262 }
139 263
140 scr_release (); 264 scr_release ();
141 265
142 free (env_windowid); 266 /* clear all resources */
143 free (env_display); 267 for (int i = 0; i < allocated.size (); i++)
144 free (env_term); 268 free (allocated [i]);
145 free (env_colorfgbg); 269
270 free (selection.text);
271 free (selection.clip_text);
146 free (locale); 272 free (locale);
147 free (codeset); 273 free (v_buffer);
274
275 delete selection_req;
148 276
149 delete envv; 277 delete envv;
150 delete argv; 278 delete argv;
279
280#ifdef KEYSYM_RESOURCE
281 delete keyboard;
282#endif
283#ifndef NO_RESOURCES
284 XrmDestroyDatabase (option_db);
285#endif
286}
287
288// child has exited, usually destroys
289void
290rxvt_term::child_cb (ev::child &w, int status)
291{
292 HOOK_INVOKE ((this, HOOK_CHILD_EXIT, DT_INT, status, DT_END));
293
294 cmd_pid = 0;
295
296 if (!option (Opt_hold))
297 destroy ();
151} 298}
152 299
153void 300void
154rxvt_term::destroy () 301rxvt_term::destroy ()
155{ 302{
303 if (destroy_ev.is_active ())
304 return;
305
306 HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));
307
308#if ENABLE_OVERLAY
309 scr_overlay_off ();
310#endif
311
156 if (display) 312 if (display)
157 { 313 {
314#if USE_XIM
315 im_ev.stop (display);
316#endif
317 scrollbar_ev.stop (display);
318#if ENABLE_TRANSPARENCY || ENABLE_PERL
158 rootwin_ev.stop (display); 319 rootwin_ev.stop (display);
320#endif
159 termwin_ev.stop (display); 321 termwin_ev.stop (display);
160 vt_ev.stop (display); 322 vt_ev.stop (display);
161#ifdef USE_XIM
162 im_destroy ();
163 im_ev.stop (display);
164#endif
165#ifdef HAVE_SCROLLBARS
166 scrollbar_ev.stop (display);
167#endif
168#ifdef MENUBAR
169 menubar_ev.stop (display);
170#endif
171 } 323 }
172 324
173 check_ev.stop (); 325 flush_ev.stop ();
174 pty_ev.stop (); 326 pty_ev.stop ();
175#ifdef CURSOR_BLINK 327#ifdef CURSOR_BLINK
176 cursor_blink_ev.stop (); 328 cursor_blink_ev.stop ();
177#endif 329#endif
178#ifdef TEXT_BLINK 330#ifdef TEXT_BLINK
179 text_blink_ev.stop (); 331 text_blink_ev.stop ();
180#endif 332#endif
333#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
334 cont_scroll_ev.stop ();
335#endif
336#ifdef SELECTION_SCROLLING
337 sel_scroll_ev.stop ();
338#endif
181#ifdef POINTER_BLANK 339#ifdef POINTER_BLANK
182 pointer_ev.stop (); 340 pointer_ev.stop ();
183#endif 341#endif
184 342
185 destroy_ev.start (0); 343 destroy_ev.start ();
186} 344}
187 345
188void 346void
189rxvt_term::destroy_cb (time_watcher &w) 347rxvt_term::destroy_cb (ev::idle &w, int revents)
190{ 348{
191 SET_R (this); 349 make_current ();
192 350
193 delete this; 351 delete this;
194} 352}
195 353
196/*----------------------------------------------------------------------*/
197/* rxvt_init () */
198/* LIBPROTO */
199rxvt_t
200rxvt_init (int argc, const char *const *argv)
201{
202 SET_R (new rxvt_term);
203
204 if (!GET_R->init_vars () || !GET_R->init (argc, argv))
205 {
206 delete GET_R;
207 SET_R (0);
208 }
209
210 return GET_R;
211}
212
213static int (*old_xerror_handler) (Display *dpy, XErrorEvent *event);
214
215void 354void
216rxvt_init_signals () 355rxvt_term::set_option (uint8_t opt, bool set)
217{ 356{
218 /* install exit handler for cleanup */ 357 if (!opt)
219#if 0
220#ifdef HAVE_ATEXIT
221 atexit (rxvt_clean_exit);
222#else
223#endif
224#endif
225
226 struct sigaction sa;
227
228 sigfillset (&sa.sa_mask);
229 sa.sa_flags = SA_NOCLDSTOP | SA_RESTART;
230 sa.sa_handler = SIG_IGN; sigaction (SIGHUP , &sa, 0);
231 sa.sa_handler = SIG_IGN; sigaction (SIGPIPE, &sa, 0);
232 sa.sa_handler = rxvt_Exit_signal; sigaction (SIGINT , &sa, 0);
233 sa.sa_handler = rxvt_Exit_signal; sigaction (SIGQUIT, &sa, 0);
234 sa.sa_handler = rxvt_Exit_signal; sigaction (SIGTERM, &sa, 0);
235 sa.sa_handler = rxvt_Child_signal; sigaction (SIGCHLD, &sa, 0);
236
237 /* need to trap SIGURG for SVR4 (Unixware) rlogin */
238 /* signal (SIGURG, SIG_DFL); */
239
240 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
241 //XSetIOErrorHandler ((XErrorHandler) rxvt_xioerror_handler);
242}
243
244bool
245rxvt_term::init (int argc, const char *const *argv)
246{
247 /*
248 * Save and then give up any super-user privileges
249 * If we need privileges in any area then we must specifically request it.
250 * We should only need to be root in these cases:
251 * 1. write utmp entries on some systems
252 * 2. chown tty on some systems
253 */
254 privileges (SAVE);
255 privileges (IGNORE);
256
257 init_secondary ();
258
259 const char **cmd_argv = init_resources (argc, argv);
260
261 set_locale ("");
262
263#if MENUBAR_MAX
264 menubar_read (rs[Rs_menu]);
265#endif
266#ifdef HAVE_SCROLLBARS
267 if (Options & Opt_scrollBar)
268 scrollBar.setIdle (); /* set existence for size calculations */
269#endif
270
271 create_windows (argc, argv);
272
273 init_xlocale ();
274
275 scr_reset (); /* initialize screen */
276
277#if 0
278 XSynchronize (display->display, True);
279#endif
280
281#ifdef HAVE_SCROLLBARS
282 if (Options & Opt_scrollBar)
283 resize_scrollbar (); /* create and map scrollbar */
284#endif
285#if (MENUBAR_MAX)
286 if (menubar_visible ())
287 XMapWindow (display->display, menuBar.win);
288#endif
289#ifdef TRANSPARENT
290 if (Options & Opt_transparent)
291 {
292 XSelectInput (display->display, display->root, PropertyChangeMask);
293 check_our_parents ();
294 }
295#endif
296
297 rootwin_ev.start (display, display->root);
298
299 XMapWindow (display->display, TermWin.vt);
300 XMapWindow (display->display, TermWin.parent[0]);
301
302 init_command (cmd_argv);
303
304 pty_ev.start (cmd_fd, EVENT_READ);
305
306 check_ev.start ();
307
308 return true;
309}
310
311/* ------------------------------------------------------------------------- *
312 * SIGNAL HANDLING & EXIT HANDLER *
313 * ------------------------------------------------------------------------- */
314/*
315 * Catch a SIGCHLD signal and exit if the direct child has died
316 */
317/* ARGSUSED */
318/* EXTPROTO */
319RETSIGTYPE
320rxvt_Child_signal (int sig __attribute__ ((unused)))
321{
322 int pid, save_errno = errno;
323 while ((pid = waitpid (-1, NULL, WNOHANG)) == -1 && errno == EINTR)
324 ;
325 errno = save_errno;
326
327#if 0
328 if (pid == cmd_pid)
329 exit (EXIT_SUCCESS);
330#endif
331}
332
333/*
334 * Catch a fatal signal and tidy up before quitting
335 */
336/* EXTPROTO */
337RETSIGTYPE
338rxvt_Exit_signal (int sig)
339{
340 signal (sig, SIG_DFL);
341#ifdef DEBUG_CMD
342 rxvt_print_error ("signal %d", sig);
343#endif
344 rxvt_clean_exit ();
345 kill (getpid (), sig);
346}
347
348/* INTPROTO */
349int
350rxvt_xerror_handler (Display *display, XErrorEvent *event)
351{
352 if (GET_R->allowedxerror == -1)
353 GET_R->allowedxerror = event->error_code;
354 else
355 {
356 old_xerror_handler (display, event);
357 GET_R->destroy ();
358 }
359
360 return 0; 358 return;
359
360 uint8_t mask = 1 << (opt & 7);
361 uint8_t &val = options [opt >> 3];
362
363 val = val & ~mask | (set ? mask : 0);
361} 364}
362 365
363/*----------------------------------------------------------------------*/ 366/*----------------------------------------------------------------------*/
364/* 367/*
365 * Exit gracefully, clearing the utmp entry and restoring tty attributes 368 * Exit gracefully, clearing the utmp entry and restoring tty attributes
366 * TODO: if debugging, this should free up any known resources if we can 369 * TODO: if debugging, this should free up any known resources if we can
367 */ 370 */
368/* EXTPROTO */ 371static XErrorHandler old_xerror_handler;
369void
370rxvt_clean_exit ()
371{
372 // TODO: rxvtd should clean up all ressources
373 if (GET_R)
374 GET_R->destroy ();
375}
376 372
377/* ------------------------------------------------------------------------- * 373static void
378 * MEMORY ALLOCATION WRAPPERS * 374rxvt_emergency_cleanup ()
379 * ------------------------------------------------------------------------- */
380/* EXTPROTO */
381void *
382rxvt_malloc (size_t size)
383{ 375{
384 void *p; 376 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)
385 377 (*t)->emergency_cleanup ();
386 p = malloc (size);
387 if (p)
388 return p;
389
390 fprintf (stderr, RESNAME ": memory allocation failure. Aborting");
391 rxvt_clean_exit ();
392 exit (EXIT_FAILURE);
393 /* NOTREACHED */
394} 378}
395 379
396/* EXTPROTO */ 380#if !ENABLE_MINIMAL
397void * 381static void
398rxvt_calloc (size_t number, size_t size) 382print_x_error (Display *dpy, XErrorEvent *event)
399{ 383{
400 void *p; 384 char buffer[BUFSIZ];
401 385 char mesg[BUFSIZ];
402 p = calloc (number, size); 386 char number[32];
403 if (p) 387 const char mtype[] = "XlibMessage";
404 return p; 388 XGetErrorText(dpy, event->error_code, buffer, BUFSIZ);
405 389 XGetErrorDatabaseText(dpy, mtype, "XError", "X Error", mesg, BUFSIZ);
406 fprintf (stderr, RESNAME ": memory allocation failure. Aborting"); 390 rxvt_warn ("An X Error occurred, trying to continue after report.\n");
407 rxvt_clean_exit (); 391 rxvt_warn ("%s: %s\n", mesg, buffer);
408 exit (EXIT_FAILURE); 392 XGetErrorDatabaseText(dpy, mtype, "MajorCode", "Request Major code %d", mesg, BUFSIZ);
409 /* NOTREACHED */ 393 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->request_code);
394 sprintf(number, "%d", event->request_code);
395 XGetErrorDatabaseText(dpy, "XRequest", number, "", buffer, BUFSIZ);
396 rxvt_warn ("(which is %s)\n", buffer);
397 if (event->request_code >= 128) {
398 XGetErrorDatabaseText(dpy, mtype, "MinorCode", "Request Minor code %d",
399 mesg, BUFSIZ);
400 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->minor_code);
401 }
402 if ((event->error_code == BadWindow) ||
403 (event->error_code == BadPixmap) ||
404 (event->error_code == BadCursor) ||
405 (event->error_code == BadFont) ||
406 (event->error_code == BadDrawable) ||
407 (event->error_code == BadColor) ||
408 (event->error_code == BadGC) ||
409 (event->error_code == BadIDChoice) ||
410 (event->error_code == BadValue) ||
411 (event->error_code == BadAtom)) {
412 if (event->error_code == BadValue)
413 XGetErrorDatabaseText(dpy, mtype, "Value", "Value 0x%x",
414 mesg, BUFSIZ);
415 else if (event->error_code == BadAtom)
416 XGetErrorDatabaseText(dpy, mtype, "AtomID", "AtomID 0x%x",
417 mesg, BUFSIZ);
418 else
419 XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x",
420 mesg, BUFSIZ);
421 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid);
422 }
423 XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d",
424 mesg, BUFSIZ);
425 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial);
410} 426}
427#endif
411 428
412/* EXTPROTO */ 429int
413void * 430rxvt_xerror_handler (Display *display, XErrorEvent *event)
414rxvt_realloc (void *ptr, size_t size)
415{ 431{
416 void *p; 432 if (GET_R->allowedxerror == -1)
417 433 GET_R->allowedxerror = event->error_code;
418 if (ptr)
419 p = realloc (ptr, size);
420 else 434 else
421 p = malloc (size); 435 {
422 if (p) 436 // GET_R is most likely not the terminal which caused the error,
437 // so just output the error and continue
438#if ENABLE_MINIMAL
439 old_xerror_handler (display, event);
440#else
441 print_x_error (display, event);
442#endif
443 }
444
423 return p; 445 return 0;
446}
424 447
425 fprintf (stderr, RESNAME ": memory allocation failure. Aborting"); 448int
426 rxvt_clean_exit (); 449rxvt_xioerror_handler (Display *display)
450{
451 rxvt_warn ("X connection to '%s' broken, unable to recover, exiting.\n",
452 DisplayString (display));
453 rxvt_emergency_cleanup ();
427 exit (EXIT_FAILURE); 454 _exit (EXIT_FAILURE);
428 /* NOTREACHED */
429} 455}
430 456
431/* ------------------------------------------------------------------------- * 457static struct sig_handlers
432 * PRIVILEGED OPERATIONS *
433 * ------------------------------------------------------------------------- */
434/* take care of suid/sgid super-user (root) privileges */
435void
436rxvt_term::privileges (int mode)
437{ 458{
438#if ! defined(__CYGWIN32__) 459 ev::sig sw_term, sw_int;
439# if !defined(HAVE_SETEUID) && defined(HAVE_SETREUID) 460
440 /* setreuid () is the poor man's setuid (), seteuid () */ 461 /*
441# define seteuid(a) setreuid(-1, (a)) 462 * Catch a fatal signal and tidy up before quitting
442# define setegid(a) setregid(-1, (a)) 463 */
443# define HAVE_SETEUID 464 void sig_term (ev::sig &w, int revents);
465
466 sig_handlers ()
467 {
468 sw_term.set<sig_handlers, &sig_handlers::sig_term> (this);
469 sw_int .set<sig_handlers, &sig_handlers::sig_term> (this);
470 }
471} sig_handlers;
472
473void
474sig_handlers::sig_term (ev::sig &w, int revents)
475{
476 rxvt_emergency_cleanup ();
477 w.stop ();
478 kill (getpid (), w.signum);
479}
480
481static void
482rxvt_get_ttymode (struct termios *tio)
483{
484 if (tcgetattr (STDIN_FILENO, tio) < 0)
485 memset (tio, 0, sizeof (struct termios));
486
487 for (int i = 0; i < NCCS; i++)
488 tio->c_cc[i] = VDISABLE;
489
490 tio->c_cc[VINTR] = CINTR;
491 tio->c_cc[VQUIT] = CQUIT;
492 tio->c_cc[VERASE] = CERASE;
493#ifdef VERASE2
494 tio->c_cc[VERASE2] = CERASE2;
495#endif
496 tio->c_cc[VKILL] = CKILL;
497 tio->c_cc[VEOF] = CEOF;
498 tio->c_cc[VSTART] = CSTART;
499 tio->c_cc[VSTOP] = CSTOP;
500 tio->c_cc[VSUSP] = CSUSP;
501# ifdef VDSUSP
502 tio->c_cc[VDSUSP] = CDSUSP;
444# endif 503# endif
445# ifdef HAVE_SETEUID 504# ifdef VREPRINT
446 switch (mode) 505 tio->c_cc[VREPRINT] = CRPRNT;
447 {
448 case IGNORE:
449 /*
450 * change effective uid/gid - not real uid/gid - so we can switch
451 * back to root later, as required
452 */
453 seteuid (getuid ());
454 setegid (getgid ());
455 break;
456 case SAVE:
457 euid = geteuid ();
458 egid = getegid ();
459 break;
460 case RESTORE:
461 seteuid (euid);
462 setegid (egid);
463 break;
464 }
465# else
466 switch (mode)
467 {
468 case IGNORE:
469 setuid (getuid ());
470 setgid (getgid ());
471 /* FALLTHROUGH */
472 case SAVE:
473 /* FALLTHROUGH */
474 case RESTORE:
475 break;
476 }
477# endif 506# endif
478#endif 507# ifdef VDISCRD
479} 508 tio->c_cc[VDISCRD] = CFLUSH;
480
481#ifdef UTMP_SUPPORT
482void
483rxvt_term::privileged_utmp (char action)
484{
485 D_MAIN ((stderr, "rxvt_privileged_utmp (%c); waiting for: %c (pid: %d)",
486 action, next_utmp_action, getpid ()));
487 if (next_utmp_action != action || (action != SAVE && action != RESTORE)
488 || (Options & Opt_utmpInhibit)
489 || ttydev == NULL || *ttydev == '\0')
490 return;
491
492 privileges (RESTORE);
493 if (action == SAVE)
494 {
495 next_utmp_action = RESTORE;
496 makeutent (ttydev, rs[Rs_display_name]);
497 }
498 else
499 { /* action == RESTORE */
500 next_utmp_action = IGNORE;
501 cleanutent ();
502 }
503 privileges (IGNORE);
504}
505#endif
506
507#ifndef NO_SETOWNER_TTYDEV
508void
509rxvt_term::privileged_ttydev (char action)
510{
511 D_MAIN ((stderr,
512 "privileged_ttydev (%c); waiting for: %c (pid: %d)",
513 action, next_tty_action, getpid ()));
514 if (next_tty_action != action || (action != SAVE && action != RESTORE)
515 || ttydev == NULL || *ttydev == '\0')
516 return;
517
518 privileges (RESTORE);
519
520 if (action == SAVE)
521 {
522 next_tty_action = RESTORE;
523# ifndef RESET_TTY_TO_COMMON_DEFAULTS
524 /* store original tty status for restoration rxvt_clean_exit () -- rgg 04/12/95 */
525 if (lstat (ttydev, &ttyfd_stat) < 0) /* you lose out */
526 next_tty_action = IGNORE;
527 else
528# endif 509# endif
529 510# ifdef VWERSE
530 { 511 tio->c_cc[VWERSE] = CWERASE;
531 chown (ttydev, getuid (), ttygid); /* fail silently */
532 chmod (ttydev, ttymode);
533# ifdef HAVE_REVOKE
534 revoke (ttydev);
535# endif 512# endif
536 513# ifdef VLNEXT
537 } 514 tio->c_cc[VLNEXT] = CLNEXT;
538 }
539 else
540 { /* action == RESTORE */
541 next_tty_action = IGNORE;
542# ifndef RESET_TTY_TO_COMMON_DEFAULTS
543 chmod (ttydev, ttyfd_stat.st_mode);
544 chown (ttydev, ttyfd_stat.st_uid, ttyfd_stat.st_gid);
545# else
546 chmod (ttydev,
547 (S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH | S_IWOTH));
548 chown (ttydev, 0, 0);
549# endif 515# endif
550 516# ifdef VSTATUS
551 } 517 tio->c_cc[VSTATUS] = CSTATUS;
552
553 privileges (IGNORE);
554
555# ifndef RESET_TTY_TO_COMMON_DEFAULTS
556 D_MAIN ((stderr, "%s \"%s\": mode %03o, uid %d, gid %d",
557 action == RESTORE ? "Restoring" : (action ==
558 SAVE ? "Saving" :
559 "UNKNOWN ERROR for"), ttydev,
560 ttyfd_stat.st_mode, ttyfd_stat.st_uid,
561 ttyfd_stat.st_gid));
562# endif 518# endif
563} 519
520# if VMIN != VEOF
521 tio->c_cc[VMIN] = 1;
564#endif 522# endif
523# if VTIME != VEOL
524 tio->c_cc[VTIME] = 0;
525# endif
526
527 /* input modes */
528 tio->c_iflag = (BRKINT | IGNPAR | ICRNL
529# ifdef IMAXBEL
530 | IMAXBEL
531# endif
532 | IXON);
533
534 /* output modes */
535 tio->c_oflag = (OPOST | ONLCR);
536
537 /* control modes */
538 tio->c_cflag = (CS8 | CREAD);
539
540 /* local modes */
541 tio->c_lflag = (ISIG | ICANON | IEXTEN | ECHO
542# if defined (ECHOCTL) && defined (ECHOKE)
543 | ECHOCTL | ECHOKE
544# endif
545 | ECHOE | ECHOK);
546}
547
548char **rxvt_environ; // startup environment
549
550void
551rxvt_init ()
552{
553 assert (("fontMask must not overlap other RS masks",
554 0 == (RS_fontMask & (RS_Sel | RS_baseattrMask | RS_customMask | RS_bgMask | RS_fgMask))));
555
556 rxvt_get_ttymode (&rxvt_term::def_tio);
557
558 // get rid of stdin/stdout as we don't need them, to free resources
559 dup2 (STDERR_FILENO, STDIN_FILENO);
560 dup2 (STDERR_FILENO, STDOUT_FILENO);
561
562 if (!ev_default_loop ())
563 rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n");
564
565 rxvt_environ = environ;
566
567 signal (SIGHUP, SIG_IGN);
568 signal (SIGPIPE, SIG_IGN);
569
570 sig_handlers.sw_term.start (SIGTERM); ev_unref ();
571 sig_handlers.sw_int.start (SIGINT); ev_unref ();
572
573 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
574 // TODO: handle this with exceptions and tolerate the memory loss
575 XSetIOErrorHandler (rxvt_xioerror_handler);
576
577 XrmInitialize ();
578}
565 579
566/*----------------------------------------------------------------------*/ 580/*----------------------------------------------------------------------*/
567/* 581/*
568 * window size/position calculcations for XSizeHint and other storage. 582 * window size/position calculations for XSizeHint and other storage.
569 * if width/height are non-zero then override calculated width/height 583 * if width/height are non-zero then override calculated width/height
570 */ 584 */
571void 585void
572rxvt_term::window_calc (unsigned int width, unsigned int height) 586rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
573{ 587{
574 short recalc_x, recalc_y; 588 short recalc_x, recalc_y;
575 int x, y, sb_w, mb_h, flags; 589 int x, y, flags;
576 unsigned int w, h; 590 unsigned int w, h;
577 unsigned int max_width, max_height; 591 unsigned int max_width, max_height;
578 592
579 D_SIZE ((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
580 TermWin.ncol, TermWin.nrow, szHint.width,
581 szHint.height));
582 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity; 593 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity;
583 szHint.win_gravity = NorthWestGravity; 594 szHint.win_gravity = NorthWestGravity;
584 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */ 595 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */
585 596
586 recalc_x = recalc_y = 0; 597 recalc_x = recalc_y = 0;
587 flags = 0; 598 flags = 0;
599
588 if (!parsed_geometry) 600 if (!parsed_geometry)
589 { 601 {
590 parsed_geometry = 1; 602 parsed_geometry = 1;
603
591 if (rs[Rs_geometry]) 604 if (rs[Rs_geometry])
592 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h); 605 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h);
606
593 if (flags & WidthValue) 607 if (flags & WidthValue)
594 { 608 {
595 TermWin.ncol = BOUND_POSITIVE_INT16 (w); 609 if (!w)
610 rxvt_fatal ("illegal window geometry (width and height must be non-zero), aborting.\n");
611
612 ncol = clamp (w, 1, std::numeric_limits<int16_t>::max ());
596 szHint.flags |= USSize; 613 szHint.flags |= USSize;
597 } 614 }
615
598 if (flags & HeightValue) 616 if (flags & HeightValue)
599 { 617 {
600 TermWin.nrow = BOUND_POSITIVE_INT16 (h); 618 if (!h)
619 rxvt_fatal ("illegal window geometry (width and height must be non-zero), aborting.\n");
620
621 nrow = clamp (h, 1, std::numeric_limits<int16_t>::max ());
601 szHint.flags |= USSize; 622 szHint.flags |= USSize;
602 } 623 }
624
603 if (flags & XValue) 625 if (flags & XValue)
604 { 626 {
605 szHint.x = x; 627 szHint.x = x;
606 szHint.flags |= USPosition; 628 szHint.flags |= USPosition;
629
607 if (flags & XNegative) 630 if (flags & XNegative)
608 { 631 {
609 recalc_x = 1; 632 recalc_x = 1;
610 szHint.win_gravity = NorthEastGravity; 633 szHint.win_gravity = NorthEastGravity;
611 } 634 }
612 } 635 }
636
613 if (flags & YValue) 637 if (flags & YValue)
614 { 638 {
615 szHint.y = y; 639 szHint.y = y;
616 szHint.flags |= USPosition; 640 szHint.flags |= USPosition;
641
617 if (flags & YNegative) 642 if (flags & YNegative)
618 { 643 {
619 recalc_y = 1; 644 recalc_y = 1;
645
620 if (szHint.win_gravity == NorthEastGravity) 646 if (szHint.win_gravity == NorthEastGravity)
621 szHint.win_gravity = SouthEastGravity; 647 szHint.win_gravity = SouthEastGravity;
622 else 648 else
623 szHint.win_gravity = SouthWestGravity; 649 szHint.win_gravity = SouthWestGravity;
624 } 650 }
625 } 651 }
626 } 652 }
653
627 /* TODO: BOUNDS */ 654 /* TODO: BOUNDS */
628 TermWin.width = TermWin.ncol * TermWin.fwidth; 655 width = ncol * fwidth;
629 TermWin.height = TermWin.nrow * TermWin.fheight; 656 height = nrow * fheight;
630 max_width = MAX_COLS * TermWin.fwidth; 657 max_width = MAX_COLS * fwidth;
631 max_height = MAX_ROWS * TermWin.fheight; 658 max_height = MAX_ROWS * fheight;
632 659
633 szHint.base_width = szHint.base_height = 2 * TermWin.int_bwidth; 660 szHint.base_width = szHint.base_height = 2 * int_bwidth;
634 661
635 sb_w = mb_h = 0;
636 window_vt_x = window_vt_y = 0; 662 window_vt_x = window_vt_y = int_bwidth;
637 if (scrollbar_visible ()) 663
664 if (scrollBar.state)
638 { 665 {
639 sb_w = scrollbar_TotalWidth (); 666 int sb_w = scrollBar.total_width ();
640 szHint.base_width += sb_w; 667 szHint.base_width += sb_w;
668
641 if (! (Options & Opt_scrollBar_right)) 669 if (!option (Opt_scrollBar_right))
642 window_vt_x = sb_w; 670 window_vt_x += sb_w;
643 }
644 if (menubar_visible ())
645 { 671 }
646 mb_h = menuBar_TotalHeight (); 672
647 szHint.base_height += mb_h;
648 window_vt_y = mb_h;
649 }
650 szHint.width_inc = TermWin.fwidth; 673 szHint.width_inc = fwidth;
651 szHint.height_inc = TermWin.fheight; 674 szHint.height_inc = fheight;
652 szHint.min_width = szHint.base_width + szHint.width_inc; 675 szHint.min_width = szHint.base_width + szHint.width_inc;
653 szHint.min_height = szHint.base_height + szHint.height_inc; 676 szHint.min_height = szHint.base_height + szHint.height_inc;
654 677
655 if (width && width - szHint.base_width < max_width) 678 if (newwidth && newwidth - szHint.base_width < max_width)
656 { 679 {
657 szHint.width = width; 680 szHint.width = newwidth;
658 TermWin.width = width - szHint.base_width; 681 width = newwidth - szHint.base_width;
659 } 682 }
660 else 683 else
661 { 684 {
662 MIN_IT (TermWin.width, max_width); 685 min_it (width, max_width);
663 szHint.width = szHint.base_width + TermWin.width; 686 szHint.width = szHint.base_width + width;
664 } 687 }
688
665 if (height && height - szHint.base_height < max_height) 689 if (newheight && newheight - szHint.base_height < max_height)
666 { 690 {
667 szHint.height = height; 691 szHint.height = newheight;
668 TermWin.height = height - szHint.base_height; 692 height = newheight - szHint.base_height;
669 } 693 }
670 else 694 else
671 { 695 {
672 MIN_IT (TermWin.height, max_height); 696 min_it (height, max_height);
673 szHint.height = szHint.base_height + TermWin.height; 697 szHint.height = szHint.base_height + height;
674 } 698 }
675 if (scrollbar_visible () && (Options & Opt_scrollBar_right))
676 window_sb_x = szHint.width - sb_w;
677 699
678 if (recalc_x) 700 if (recalc_x)
679 szHint.x += (DisplayWidth (display->display, DefaultScreen (display->display)) 701 szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth;
680 - szHint.width - 2 * TermWin.ext_bwidth); 702
681 if (recalc_y) 703 if (recalc_y)
682 szHint.y += (DisplayHeight (display->display, DefaultScreen (display->display)) 704 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth;
683 - szHint.height - 2 * TermWin.ext_bwidth);
684 705
685 TermWin.ncol = TermWin.width / TermWin.fwidth; 706 ncol = width / fwidth;
686 TermWin.nrow = TermWin.height / TermWin.fheight; 707 nrow = height / fheight;
687 D_SIZE ((stderr, "> Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d", 708
688 TermWin.ncol, TermWin.nrow, szHint.width, 709 // When the size of the vt window is not a multiple of the cell
689 szHint.height)); 710 // size, i.e., when the wm does not honour our size hints, there are
690 return; 711 // extra areas not covered by the terminal screen. Such gaps, when a
712 // bg pixmap is set, would have to be cleared manually to properly
713 // refresh the background. We take the simpler route and shrink the
714 // vt window so as to avoid creating gaps.
715 width = ncol * fwidth;
716 height = nrow * fheight;
691} 717}
692 718
693/*----------------------------------------------------------------------*/ 719/*----------------------------------------------------------------------*/
694/* 720/*
695 * Tell the teletype handler what size the window is. 721 * Tell the teletype handler what size the window is.
696 * Called after a window size change. 722 * Called after a window size change.
697 */ 723 */
698void 724void
699rxvt_term::tt_winch () 725rxvt_term::tt_winch ()
700{ 726{
727 if (pty->pty < 0)
728 return;
729
701 struct winsize ws; 730 struct winsize ws;
702 731
703 if (cmd_fd < 0)
704 return;
705
706 ws.ws_col = TermWin.ncol; 732 ws.ws_col = ncol;
707 ws.ws_row = TermWin.nrow; 733 ws.ws_row = nrow;
708 ws.ws_xpixel = ws.ws_ypixel = 0; 734 ws.ws_xpixel = width;
709#ifndef DEBUG_SIZE 735 ws.ws_ypixel = height;
710 (void)ioctl (cmd_fd, TIOCSWINSZ, &ws); 736 ioctl (pty->pty, TIOCSWINSZ, &ws);
737
738#if 0
739 // TIOCSWINSZ is supposed to do this automatically and correctly
740 if (cmd_pid) /* force through to the command */
741 kill (-cmd_pid, SIGWINCH);
742#endif
743}
744
745/*----------------------------------------------------------------------*/
746/* load and set the various fonts */
747bool
748rxvt_term::set_fonts ()
749{
750 rxvt_fontset *fs = new rxvt_fontset (this);
751 rxvt_fontprop prop;
752
753 if (!fs
754 || !fs->populate (rs[Rs_font] ? rs[Rs_font] : "fixed")
755 || !fs->realize_font (1))
756 {
757 delete fs;
758 return false;
759 }
760
761#if ENABLE_STYLES
762 for (int i = RS_styleCount; --i; )
763 if (fontset[i] != fontset[0])
764 delete fontset[i];
765#endif
766
767 delete fontset[0];
768 fontset[0] = fs;
769
770 prop = (*fs)[rxvt_fontset::firstFont]->properties ();
771 prop.height += lineSpace;
772 prop.width += letterSpace;
773
774 fs->set_prop (prop, false);
775
776 fwidth = prop.width;
777 fheight = prop.height;
778 fbase = prop.ascent;
779
780 for (int style = 1; style < 4; style++)
781 {
782#if ENABLE_STYLES
783 const char *res = rs[Rs_font + style];
784
785 if (res && !*res)
786 fontset[style] = fontset[0];
787 else
788 {
789 fontset[style] = fs = new rxvt_fontset (this);
790 rxvt_fontprop prop2 = prop;
791
792 if (res)
793 {
794 fs->populate (res);
795 fs->set_prop (prop2, false);
796 }
797 else
798 {
799 fs->populate (fontset[0]->fontdesc);
800
801 if (SET_STYLE (0, style) & RS_Bold) prop2.weight = rxvt_fontprop::bold;
802 if (SET_STYLE (0, style) & RS_Italic) prop2.slant = rxvt_fontprop::italic;
803
804 fs->set_prop (prop2, true);
805 }
806
807 }
711#else 808#else
712 if (ioctl (cmd_fd, TIOCSWINSZ, &ws) < 0) 809 fontset[style] = fontset[0];
713 D_SIZE ((stderr, "Failed to send TIOCSWINSZ to fd %d", fd));
714# ifdef SIGWINCH
715 else if (cmd_pid) /* force through to the command */
716 kill (cmd_pid, SIGWINCH);
717# endif 810#endif
718#endif
719}
720
721/*----------------------------------------------------------------------*/
722/* rxvt_change_font () - Switch to a new font */
723/*
724 * init = 1 - initialize
725 *
726 * fontname == FONT_UP - switch to bigger font
727 * fontname == FONT_DN - switch to smaller font
728 */
729bool
730rxvt_term::change_font (const char *fontname)
731{
732 if (fontname == FONT_UP)
733 { 811 }
734 // TODO 812
813 if (parent)
735 } 814 {
736 else if (fontname == FONT_DN)
737 {
738 // TODO
739 }
740 else
741 {
742 rxvt_fontset *fs = new rxvt_fontset (this);
743
744 if (fs && fs->populate (fontname ? fontname : "fixed"))
745 {
746 delete TermWin.fontset;
747 TermWin.fontset = fs;
748 TermWin.fwidth = fs->base_font ()->width;
749 TermWin.fheight = fs->base_font ()->height;
750 TermWin.fbase = fs->base_font ()->ascent;
751
752 if (TermWin.parent[0])
753 {
754 resize_all_windows (0, 0, 0); 815 resize_all_windows (0, 0, 0);
755 scr_remap_chars (); 816 scr_remap_chars ();
756 scr_touch (true); 817 scr_touch (true);
757 } 818 }
758 819
759 return true; 820 return true;
760 } 821}
822
823void
824rxvt_term::set_string_property (Atom prop, const char *str, int len)
825{
826 XChangeProperty (dpy, parent,
827 prop, XA_STRING, 8, PropModeReplace,
828 (const unsigned char *)str, len >= 0 ? len : strlen (str));
829}
830
831void
832rxvt_term::set_mbstring_property (Atom prop, const char *str, int len)
833{
834 XTextProperty ct;
835
836 if (XmbTextListToTextProperty (dpy, (char **)&str, 1, XStdICCTextStyle, &ct) >= 0)
761 } 837 {
762 838 XSetTextProperty (dpy, parent, &ct, prop);
763 return false; 839 XFree (ct.value);
840 }
764} 841}
765 842
766bool 843void
767rxvt_term::font_up_down (int n, int direction) 844rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
768{ 845{
769 return false; 846 wchar_t *ws = rxvt_mbstowcs (str, len);
847 char *s = rxvt_wcstoutf8 (ws);
848
849 XChangeProperty (dpy, parent,
850 prop, xa[XA_UTF8_STRING], 8, PropModeReplace,
851 (const unsigned char *)s, strlen (s));
852
853 free (s);
854 free (ws);
770} 855}
771 856
772/*----------------------------------------------------------------------*/ 857/*----------------------------------------------------------------------*/
773/*----------------------------------------------------------------------*/ 858/*----------------------------------------------------------------------*/
774/* xterm sequences - title, iconName, color (exptl) */ 859/* xterm sequences - title, iconName, color (exptl) */
775void 860void
776rxvt_term::set_title (const char *str) 861rxvt_term::set_title (const char *str)
777{ 862{
778#ifndef SMART_WINDOW_TITLE 863 set_mbstring_property (XA_WM_NAME, str);
779 XStoreName (display->display, TermWin.parent[0], str); 864#if ENABLE_EWMH
780#else 865 set_utf8_property (xa[XA_NET_WM_NAME], str);
781 char *name;
782
783 if (XFetchName (display->display, TermWin.parent[0], &name) == 0)
784 name = NULL;
785 if (name == NULL || STRCMP (name, str))
786 XStoreName (display->display, TermWin.parent[0], str);
787 if (name)
788 XFree (name);
789#endif 866#endif
790} 867}
791 868
792void 869void
793rxvt_term::set_iconName (const char *str) 870rxvt_term::set_icon_name (const char *str)
794{ 871{
795#ifndef SMART_WINDOW_TITLE 872 set_mbstring_property (XA_WM_ICON_NAME, str);
796 XSetIconName (display->display, TermWin.parent[0], str); 873#if ENABLE_EWMH
797#else 874 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str);
798 char *name;
799
800 if (XGetIconName (display->display, TermWin.parent[0], &name))
801 name = NULL;
802 if (name == NULL || STRCMP (name, str))
803 XSetIconName (display->display, TermWin.parent[0], str);
804 if (name)
805 XFree (name);
806#endif 875#endif
807} 876}
808 877
878void
879rxvt_term::set_window_color (int idx, const char *color)
880{
809#ifdef XTERM_COLOR_CHANGE 881#ifdef XTERM_COLOR_CHANGE
810void
811rxvt_term::set_window_color (int idx, const char *color)
812{
813 rxvt_color xcol; 882 rxvt_color xcol;
814 int i;
815 883
816 if (color == NULL || *color == '\0') 884 if (color == NULL || *color == '\0')
817 return; 885 return;
818 886
887 color = strdup (color);
888 allocated.push_back ((void *)color);
889 rs[Rs_color + idx] = color;
890
819 /* handle color aliases */ 891 /* handle color aliases */
820 if (isdigit (*color)) 892 if (isdigit (*color))
821 { 893 {
822 i = atoi (color); 894 int i = atoi (color);
895
823 if (i >= 8 && i <= 15) 896 if (i >= 8 && i <= 15)
897 {
824 { /* bright colors */ 898 /* bright colors */
825 i -= 8;
826# ifndef NO_BRIGHTCOLOR
827 PixColors[idx] = PixColors[minBrightCOLOR + i]; 899 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i - 8];
828 SET_PIXCOLOR (idx);
829 goto Done; 900 goto done;
830# endif
831
832 } 901 }
902
833 if (i >= 0 && i <= 7) 903 if (i >= 0 && i <= 7)
904 {
834 { /* normal colors */ 905 /* normal colors */
835 PixColors[idx] = PixColors[minCOLOR + i]; 906 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];
836 SET_PIXCOLOR (idx);
837 goto Done; 907 goto done;
838 } 908 }
839 } 909 }
840 if (!rXParseAllocColor (& xcol, color)) 910
841 return; 911 set_color (xcol, color);
842 /* XStoreColor (display->display, XCMAP, XColor*); */
843 912
844 /* 913 /*
845 * FIXME: should free colors here, but no idea how to do it so instead, 914 * FIXME: should free colors here, but no idea how to do it so instead,
846 * so just keep gobbling up the colormap 915 * so just keep gobbling up the colormap
847 */ 916 */
848# if 0
849 for (i = Color_Black; i <= Color_White; i++)
850 if (PixColors[idx] == PixColors[i])
851 break;
852 if (i > Color_White)
853 {
854 /* fprintf (stderr, "XFreeColors: PixColors [%d] = %lu\n", idx, PixColors [idx]); */
855 XFreeColors (display->display, XCMAP, (PixColors + idx), 1,
856 DisplayPlanes (display->display, display->screen));
857 }
858# endif
859 917
860 PixColors[idx] = xcol; 918 pix_colors_focused[idx] = xcol;
861 SET_PIXCOLOR (idx);
862 919
863 /* XSetWindowAttributes attr; */
864 /* Cursor cursor; */
865Done: 920done:
866 if (idx == Color_bg && ! (Options & Opt_transparent))
867 XSetWindowBackground (display->display, TermWin.vt,
868 PixColors[Color_bg]);
869
870 /* handle Color_BD, scrollbar background, etc. */ 921 /*TODO: handle Color_BD, scrollbar background, etc. */
871 922
872 set_colorfgbg (); 923 update_fade_color (idx);
873 recolour_cursor (); 924 recolour_cursor ();
874 /* the only reasonable way to enforce a clean update */ 925 scr_recolour ();
875 scr_poweron (); 926#endif /* XTERM_COLOR_CHANGE */
876} 927}
877
878#else
879# define set_window_color (idx,color) ((void)0)
880#endif /* XTERM_COLOR_CHANGE */
881 928
882void 929void
883rxvt_term::recolour_cursor () 930rxvt_term::recolour_cursor ()
884{ 931{
885#if TODO 932 XColor fg, bg;
886 rxvt_color xcol[2];
887 933
888 xcol[0] = PixColors[Color_pointer]; 934 (ISSET_PIXCOLOR (Color_pointer_fg)
889 xcol[1] = PixColors[Color_bg]; 935 ? pix_colors_focused[Color_pointer_fg]
890 XQueryColors (display->display, XCMAP, xcol, 2); 936 : pix_colors_focused[Color_fg]).get (fg);
891 XRecolorCursor (display->display, TermWin_cursor, & (xcol[0]), & (xcol[1])); 937
892#endif 938 (ISSET_PIXCOLOR (Color_pointer_bg)
939 ? pix_colors_focused[Color_pointer_bg]
940 : pix_colors_focused[Color_bg]).get (bg);
941
942 XRecolorCursor (dpy, TermWin_cursor, &fg, &bg);
893} 943}
894 944
895/*----------------------------------------------------------------------*/ 945/*----------------------------------------------------------------------*/
896/* 946/*
897 * find if fg/bg matches any of the normal (low-intensity) colors 947 * find if fg/bg matches any of the normal (low-intensity) colors
898 */ 948 */
899void 949void
900rxvt_term::set_colorfgbg () 950rxvt_term::set_colorfgbg ()
901{ 951{
902 unsigned int i; 952 unsigned int i;
903 const char *xpmb = "\0"; 953 const char *xpmb = "";
904 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1]; 954 char fstr[] = "default";
955 char bstr[] = "default";
905 956
906 env_colorfgbg =
907 (char *)rxvt_malloc (sizeof ("COLORFGBG=default;default;bg") + 1);
908 STRCPY (fstr, "default");
909 STRCPY (bstr, "default");
910 for (i = Color_Black; i <= Color_White; i++) 957 for (i = Color_Black; i <= Color_White; i++)
911 if (PixColors[Color_fg] == PixColors[i]) 958 if (pix_colors[Color_fg] == pix_colors[i])
912 { 959 {
913 sprintf (fstr, "%d", (i - Color_Black)); 960 sprintf (fstr, "%d", i - Color_Black);
914 break; 961 break;
915 } 962 }
963
916 for (i = Color_Black; i <= Color_White; i++) 964 for (i = Color_Black; i <= Color_White; i++)
917 if (PixColors[Color_bg] == PixColors[i]) 965 if (pix_colors[Color_bg] == pix_colors[i])
918 { 966 {
919 sprintf (bstr, "%d", (i - Color_Black)); 967 sprintf (bstr, "%d", i - Color_Black);
920#ifdef XPM_BACKGROUND 968#ifdef BG_IMAGE_FROM_FILE
921 xpmb = "default;"; 969 xpmb = "default;";
922#endif 970#endif
923 break; 971 break;
924 } 972 }
925 973
926 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr); 974 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr);
927
928#ifndef NO_BRIGHTCOLOR
929 colorfgbg = DEFAULT_RSTYLE;
930 for (i = minCOLOR; i <= maxCOLOR; i++)
931 {
932 if (PixColors[Color_fg] == PixColors[i])
933 colorfgbg = SET_FGCOLOR (colorfgbg, i);
934 if (PixColors[Color_bg] == PixColors[i])
935 colorfgbg = SET_BGCOLOR (colorfgbg, i);
936 }
937#endif
938} 975}
939 976
940/*----------------------------------------------------------------------*/ 977/*----------------------------------------------------------------------*/
941/*
942 * Colour determination for low colour displays, routine from
943 * Hans de Goede <hans@highrise.nl>
944 */
945 978
946int 979bool
947rxvt_term::rXParseAllocColor (rxvt_color *screen_in_out, const char *colour) 980rxvt_term::set_color (rxvt_color &color, const char *name)
948{ 981{
949 if (!screen_in_out->set (display, colour)) 982 if (color.set (this, name))
950 {
951 rxvt_print_error ("can't allocate colour: %s", colour);
952 return false;
953 }
954
955 return true; 983 return true;
984
985 rxvt_warn ("can't get colour '%s', continuing without.\n", name);
986 return false;
987}
988
989void
990rxvt_term::alias_color (int dst, int src)
991{
992 pix_colors[dst].set (this, rs[Rs_color + dst] = rs[Rs_color + src]);
956} 993}
957 994
958/* -------------------------------------------------------------------- * 995/* -------------------------------------------------------------------- *
959 * - WINDOW RESIZING - * 996 * - WINDOW RESIZING - *
960 * -------------------------------------------------------------------- */ 997 * -------------------------------------------------------------------- */
961void 998void
962rxvt_term::resize_all_windows (unsigned int width, unsigned int height, int ignoreparent) 999rxvt_term::resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent)
963{ 1000{
964 int fix_screen; 1001 int fix_screen;
1002 int old_width = szHint.width;
1003 int old_height = szHint.height;
965 1004
966#ifdef SMART_RESIZE
967 int old_width = szHint.width, old_height = szHint.height;
968#endif
969
970 window_calc (width, height); 1005 window_calc (newwidth, newheight);
1006
1007 bool set_hint = !HOOK_INVOKE ((this, HOOK_RESIZE_ALL_WINDOWS, DT_INT, newwidth, DT_INT, newheight, DT_END));
1008
1009 // to avoid races between us and the wm, we clear the incremental size hints around the xresizewindow
1010 if (set_hint)
1011 {
1012 szHint.flags &= ~(PBaseSize | PResizeInc);
971 XSetWMNormalHints (display->display, TermWin.parent[0], &szHint); 1013 XSetWMNormalHints (dpy, parent, &szHint);
1014 szHint.flags |= PBaseSize | PResizeInc;
1015 }
1016
972 if (!ignoreparent) 1017 if (!ignoreparent)
973 { 1018 {
974#ifdef SMART_RESIZE 1019#ifdef SMART_RESIZE
975 /* 1020 /*
976 * resize by Marius Gedminas <marius.gedminas@uosis.mif.vu.lt> 1021 * resize by Marius Gedminas <marius.gedminas@uosis.mif.vu.lt>
979 int x, y, x1, y1; 1024 int x, y, x1, y1;
980 int dx, dy; 1025 int dx, dy;
981 unsigned int unused_w1, unused_h1, unused_b1, unused_d1; 1026 unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
982 Window unused_cr; 1027 Window unused_cr;
983 1028
984 XTranslateCoordinates (display->display, TermWin.parent[0], display->root, 1029 XTranslateCoordinates (dpy, parent, display->root,
985 0, 0, &x, &y, &unused_cr); 1030 0, 0, &x, &y, &unused_cr);
986 XGetGeometry (display->display, TermWin.parent[0], &unused_cr, &x1, &y1, 1031 XGetGeometry (dpy, parent, &unused_cr, &x1, &y1,
987 &unused_w1, &unused_h1, &unused_b1, &unused_d1); 1032 &unused_w1, &unused_h1, &unused_b1, &unused_d1);
988 /* 1033 /*
989 * if display->root isn't the parent window, a WM will probably have offset 1034 * if display->root isn't the parent window, a WM will probably have offset
990 * our position for handles and decorations. Counter it 1035 * our position for handles and decorations. Counter it
991 */ 1036 */
993 { 1038 {
994 x -= x1; 1039 x -= x1;
995 y -= y1; 1040 y -= y1;
996 } 1041 }
997 1042
998 x1 = (DisplayWidth (display->display, display->screen) - old_width) / 2; 1043 x1 = (DisplayWidth (dpy, display->screen) - old_width ) / 2;
999 y1 = (DisplayHeight (display->display, display->screen) - old_height) / 2; 1044 y1 = (DisplayHeight (dpy, display->screen) - old_height) / 2;
1000 dx = old_width - szHint.width; 1045 dx = old_width - szHint.width;
1001 dy = old_height - szHint.height; 1046 dy = old_height - szHint.height;
1002 1047
1003 /* Check position of the center of the window */ 1048 /* Check position of the center of the window */
1004 if (x < x1) /* left half */ 1049 if (x < x1) /* left half */
1005 dx = 0; 1050 dx = 0;
1008 if (y < y1) /* top half */ 1053 if (y < y1) /* top half */
1009 dy = 0; 1054 dy = 0;
1010 else if (y == y1) /* exact center */ 1055 else if (y == y1) /* exact center */
1011 dy /= 2; 1056 dy /= 2;
1012 1057
1013 XMoveResizeWindow (display->display, TermWin.parent[0], x + dx, y + dy, 1058 XMoveResizeWindow (dpy, parent, x + dx, y + dy,
1014 szHint.width, szHint.height); 1059 szHint.width, szHint.height);
1015#else 1060#else
1016 XResizeWindow (display->display, TermWin.parent[0], szHint.width, 1061 XResizeWindow (dpy, parent, szHint.width, szHint.height);
1017 szHint.height);
1018#endif 1062#endif
1019
1020 } 1063 }
1021 1064
1022 fix_screen = (TermWin.ncol != prev_ncol 1065 if (set_hint)
1023 || TermWin.nrow != prev_nrow); 1066 XSetWMNormalHints (dpy, parent, &szHint);
1024 1067
1068 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
1069
1025 if (fix_screen || width != old_width || height != old_height) 1070 if (fix_screen || newwidth != old_width || newheight != old_height)
1026 { 1071 {
1027 if (scrollbar_visible ()) 1072 if (scrollBar.state)
1028 { 1073 scrollBar.resize ();
1029 XMoveResizeWindow (display->display, scrollBar.win, window_sb_x,
1030 0, scrollbar_TotalWidth (), szHint.height);
1031 resize_scrollbar ();
1032 }
1033 1074
1034 if (menubar_visible ()) 1075 XMoveResizeWindow (dpy, vt,
1035 XMoveResizeWindow (display->display, menuBar.win, window_vt_x, 1076 window_vt_x, window_vt_y,
1036 0, TermWin_TotalWidth (), menuBar_TotalHeight ());
1037
1038 XMoveResizeWindow (display->display, TermWin.vt, window_vt_x,
1039 window_vt_y, TermWin_TotalWidth (),
1040 TermWin_TotalHeight ()); 1077 width, height);
1041 scr_clear (height != old_height);
1042#ifdef XPM_BACKGROUND
1043 resize_pixmap ();
1044#endif
1045 1078
1079#ifdef HAVE_BG_PIXMAP
1080 if (bg_window_size_sensitive ())
1081 update_background ();
1082#endif
1046 } 1083 }
1047 1084
1048 if (fix_screen || old_height == 0) 1085 if (fix_screen || old_height == 0)
1049 {
1050 int curr_screen = -1;
1051 int old_ncol = prev_ncol;
1052
1053 /* scr_reset only works on the primary screen */
1054 if (old_height) /* this is not the first time through */
1055 {
1056 unsigned int ncol = TermWin.ncol;
1057 TermWin.ncol = prev_ncol; // save b/c scr_blank_screen_mem uses this
1058 curr_screen = scr_change_screen (PRIMARY);
1059 TermWin.ncol = ncol;
1060 }
1061
1062 scr_reset (); 1086 scr_reset ();
1063
1064 if (curr_screen >= 0) /* this is not the first time through */
1065 {
1066 scr_change_screen (curr_screen);
1067 selection_check (old_ncol != TermWin.ncol ? 4 : 0);
1068 }
1069 }
1070
1071 old_width = szHint.width;
1072 old_height = szHint.height;
1073 1087
1074#ifdef USE_XIM 1088#ifdef USE_XIM
1075 IMSetStatusPosition (); 1089 im_set_position ();
1076#endif 1090#endif
1077} 1091}
1078 1092
1079/* 1093/*
1080 * Set the width/height of the vt window in characters. Units are pixels. 1094 * Set the width/height of the vt window in characters. Units are pixels.
1081 * good for toggling 80/132 columns 1095 * good for toggling 80/132 columns
1082 */ 1096 */
1083void 1097void
1084rxvt_term::set_widthheight (unsigned int width, unsigned int height) 1098rxvt_term::set_widthheight (unsigned int newwidth, unsigned int newheight)
1085{ 1099{
1086 XWindowAttributes wattr; 1100 XWindowAttributes wattr;
1087 1101
1088 if (width == 0 || height == 0) 1102 if (newwidth == 0 || newheight == 0)
1089 { 1103 {
1090 XGetWindowAttributes (display->display, display->root, &wattr); 1104 XGetWindowAttributes (dpy, display->root, &wattr);
1105
1091 if (width == 0) 1106 if (newwidth == 0)
1092 width = wattr.width - szHint.base_width; 1107 newwidth = wattr.width - szHint.base_width;
1093 if (height == 0) 1108 if (newheight == 0)
1094 height = wattr.height - szHint.base_height; 1109 newheight = wattr.height - szHint.base_height;
1095 }
1096 if (width != TermWin.width || height != TermWin.height)
1097 { 1110 }
1111
1112 if (newwidth != width || newheight != height)
1113 {
1098 width += szHint.base_width; 1114 newwidth += szHint.base_width;
1099 height += szHint.base_height; 1115 newheight += szHint.base_height;
1100 resize_all_windows (width, height, 0); 1116 resize_all_windows (newwidth, newheight, 0);
1101 } 1117 }
1102} 1118}
1103 1119
1104/* -------------------------------------------------------------------- * 1120/* -------------------------------------------------------------------- *
1105 * - X INPUT METHOD ROUTINES - * 1121 * - X INPUT METHOD ROUTINES - *
1106 * -------------------------------------------------------------------- */ 1122 * -------------------------------------------------------------------- */
1107#ifdef USE_XIM 1123#ifdef USE_XIM
1108 1124
1109void 1125void
1126rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg)
1127{
1128 fg = pix_colors [Color_fg];
1129 bg = pix_colors [Color_bg];
1130}
1131
1132void
1110rxvt_term::im_set_size (XRectangle *size) 1133rxvt_term::im_set_size (XRectangle &size)
1111{ 1134{
1112 size->x = TermWin.int_bwidth; 1135 // the int_bwidth terms make no sense to me
1113 size->y = TermWin.int_bwidth; 1136 size.x = int_bwidth;
1114 size->width = Width2Pixel (TermWin.ncol); 1137 size.y = int_bwidth;
1115 size->height = Height2Pixel (TermWin.nrow); 1138 size.width = Width2Pixel (ncol) + int_bwidth;
1139 size.height = Height2Pixel (nrow) + int_bwidth;
1116} 1140}
1117 1141
1118void 1142void
1119rxvt_term::im_set_color (unsigned long *fg, unsigned long *bg) 1143rxvt_term::im_set_preedit_area (XRectangle &preedit_rect,
1144 XRectangle &status_rect,
1145 const XRectangle &needed_rect)
1120{ 1146{
1121 *fg = PixColors[Color_fg]; 1147 preedit_rect.x = needed_rect.width;
1122 *bg = PixColors[Color_bg]; 1148 preedit_rect.y = 0;
1149 preedit_rect.width = Width2Pixel (ncol) - needed_rect.width + 1;
1150 preedit_rect.height = fheight;
1151
1152 status_rect.x = 0;
1153 status_rect.y = 0;
1154 status_rect.width = needed_rect.width ? needed_rect.width : Width2Pixel (ncol) + 1;
1155 status_rect.height = fheight;
1123} 1156}
1124 1157
1125/* Checking whether input method is running. */ 1158/* Checking whether input method is running. */
1126bool 1159bool
1127rxvt_term::IMisRunning () 1160rxvt_term::im_is_running ()
1128{ 1161{
1129 char *p; 1162 Atom atom;
1130 Atom atom; 1163 Window win;
1131 Window win;
1132 char server[IMBUFSIZ]; 1164 char server[IMBUFSIZ];
1133 1165
1134 /* get current locale modifier */ 1166 /* get current locale modifier */
1135 if ((p = XSetLocaleModifiers (NULL)) != NULL) 1167 if (char *p = XSetLocaleModifiers (0))
1136 { 1168 {
1137 STRCPY (server, "@server="); 1169 strcpy (server, "@server=");
1138 STRNCAT (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */ 1170 strncat (server, p + 4, IMBUFSIZ - 9); /* skip "@im=" */
1171
1139 if ((p = STRCHR (server + 1, '@')) != NULL) /* first one only */ 1172 if (p = strchr (server + 1, '@')) /* first one only */
1140 *p = '\0'; 1173 *p = '\0';
1141 1174
1142 atom = XInternAtom (display->display, server, False); 1175 atom = XInternAtom (dpy, server, False);
1143 win = XGetSelectionOwner (display->display, atom); 1176 win = XGetSelectionOwner (dpy, atom);
1177
1144 if (win != None) 1178 if (win != None)
1145 return True; 1179 return true;
1146 } 1180 }
1181
1147 return False; 1182 return false;
1148} 1183}
1149 1184
1150void 1185void
1151rxvt_term::IMSendSpot () 1186rxvt_term::im_send_spot ()
1152{ 1187{
1153 XPoint spot; 1188 XPoint nspot;
1154 XVaNestedList preedit_attr; 1189 XVaNestedList preedit_attr;
1155 1190
1156 if (Input_Context == NULL 1191 if (!Input_Context
1157 || !TermWin.focus || ! (input_style & XIMPreeditPosition) 1192 || !focus
1158 || ! (event_type == KeyPress 1193 || !(input_style & (XIMPreeditPosition | XIMPreeditCallbacks)))
1159 || event_type == Expose
1160 || event_type == NoExpose
1161 || event_type == SelectionNotify
1162 || event_type == ButtonRelease || event_type == FocusIn)
1163 || !IMisRunning ())
1164 return; 1194 return;
1165 1195
1166 im_set_position (&spot); 1196 im_set_position (nspot);
1197
1198 if (nspot.x == spot.x && nspot.y == spot.y)
1199 return;
1200
1201 spot = nspot;
1167 1202
1168 preedit_attr = XVaCreateNestedList (0, XNSpotLocation, &spot, NULL); 1203 preedit_attr = XVaCreateNestedList (0, XNSpotLocation, &spot, NULL);
1169 XSetICValues (Input_Context, XNPreeditAttributes, preedit_attr, NULL); 1204 XSetICValues (Input_Context, XNPreeditAttributes, preedit_attr, NULL);
1170 XFree (preedit_attr); 1205 XFree (preedit_attr);
1171} 1206}
1172 1207
1173void 1208void
1174rxvt_term::im_set_preedit_area (XRectangle * preedit_rect, XRectangle * status_rect,
1175 XRectangle * needed_rect)
1176{
1177 int mbh, vtx = 0;
1178
1179 if (scrollbar_visible () && ! (Options & Opt_scrollBar_right))
1180 vtx = scrollbar_TotalWidth ();
1181
1182 mbh = menubar_visible () ? menuBar_TotalHeight () : 0;
1183 mbh -= TermWin.lineSpace;
1184
1185 preedit_rect->x = needed_rect->width + vtx;
1186 preedit_rect->y = Height2Pixel (TermWin.nrow - 1) + mbh;
1187
1188 preedit_rect->width = Width2Pixel (TermWin.ncol + 1) - needed_rect->width + vtx;
1189 preedit_rect->height = Height2Pixel (1);
1190
1191 status_rect->x = vtx;
1192 status_rect->y = Height2Pixel (TermWin.nrow - 1) + mbh;
1193
1194 status_rect->width = needed_rect->width ? needed_rect->width : Width2Pixel (TermWin.ncol + 1);
1195 status_rect->height = Height2Pixel (1);
1196}
1197
1198void
1199rxvt_term::im_destroy () 1209rxvt_term::im_destroy ()
1200{ 1210{
1201 if (Input_Context)
1202 {
1203 XDestroyIC (Input_Context);
1204 Input_Context = NULL;
1205 }
1206
1207 if (input_method) 1211 if (input_method)
1208 { 1212 {
1213 if (Input_Context && input_method->xim)
1214 XDestroyIC (Input_Context);
1215
1209 display->put_xim (input_method); 1216 display->put_xim (input_method);
1210 input_method = 0; 1217 input_method = 0;
1211 } 1218 }
1219
1220 Input_Context = 0;
1212} 1221}
1222
1223#ifdef ENABLE_XIM_ONTHESPOT
1224
1225static void
1226xim_preedit_start (XIC ic, XPointer client_data, XPointer call_data)
1227{
1228 ((rxvt_term *)client_data)->make_current ();
1229 HOOK_INVOKE (((rxvt_term *)client_data, HOOK_XIM_PREEDIT_START, DT_END));
1230}
1231
1232static void
1233xim_preedit_done (XIC ic, XPointer client_data, XPointer call_data)
1234{
1235 ((rxvt_term *)client_data)->make_current ();
1236 HOOK_INVOKE (((rxvt_term *)client_data, HOOK_XIM_PREEDIT_DONE, DT_END));
1237}
1238
1239static void
1240xim_preedit_draw (XIC ic, XPointer client_data, XIMPreeditDrawCallbackStruct *call_data)
1241{
1242 rxvt_term *term = (rxvt_term *)client_data;
1243 XIMText *text = call_data->text;
1244
1245 term->make_current ();
1246
1247 if (text)
1248 {
1249 wchar_t *str;
1250
1251 if (!text->encoding_is_wchar && text->string.multi_byte)
1252 {
1253 // of course, X makes it ugly again
1254 if (term->rs[Rs_imLocale])
1255 SET_LOCALE (term->rs[Rs_imLocale]);
1256
1257 str = rxvt_temp_buf<wchar_t> (text->length + 1);
1258 mbstowcs (str, text->string.multi_byte, text->length + 1);
1259
1260 if (term->rs[Rs_imLocale])
1261 SET_LOCALE (term->locale);
1262 }
1263 else
1264 str = text->string.wide_char;
1265
1266 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
1267 DT_INT, call_data->caret,
1268 DT_INT, call_data->chg_first,
1269 DT_INT, call_data->chg_length,
1270 DT_LCS_LEN, (void *)text->feedback, text->feedback ? (int)text->length : 0,
1271 DT_WCS_LEN, str, str ? (int)text->length : 0,
1272 DT_END));
1273 }
1274 else
1275 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
1276 DT_INT, call_data->caret,
1277 DT_INT, call_data->chg_first,
1278 DT_INT, call_data->chg_length,
1279 DT_END));
1280}
1281
1282#if 0
1283static void
1284xim_preedit_caret (XIC ic, XPointer client_data, XIMPreeditCaretCallbackStruct *call_data)
1285{
1286 ((rxvt_term *)client_data)->make_current ();
1287 HOOK_INVOKE (((rxvt_term *)client_data, HOOK_XIM_PREEDIT_CARET,
1288 DT_INT, call_data->position,
1289 DT_INT, call_data->direction,
1290 DT_INT, call_data->style,
1291 DT_END));
1292}
1293#endif
1294
1295#endif
1213 1296
1214/* 1297/*
1215 * Try to open a XIM with the current modifiers, then see if we can 1298 * Try to open a XIM with the current modifiers, then see if we can
1216 * open a suitable preedit type 1299 * open a suitable preedit type
1217 */ 1300 */
1218bool 1301bool
1219rxvt_term::IM_get_IC (const char *modifiers) 1302rxvt_term::im_get_ic (const char *modifiers)
1220{ 1303{
1221 int i, j, found; 1304 int i, j, found;
1222 XIM xim; 1305 XIM xim;
1223 XPoint spot; 1306 XPoint spot;
1224 XRectangle rect, status_rect, needed_rect; 1307 XRectangle rect, status_rect, needed_rect;
1225 unsigned long fg, bg; 1308 unsigned long fg, bg;
1226 const char *p; 1309 const char *p;
1227 char **s; 1310 char **s;
1228 XIMStyles *xim_styles; 1311 XIMStyles *xim_styles;
1229 XVaNestedList preedit_attr, status_attr; 1312
1313 set_environ (envv);
1230 1314
1231 if (! ((p = XSetLocaleModifiers (modifiers)) && *p)) 1315 if (! ((p = XSetLocaleModifiers (modifiers)) && *p))
1232 return false; 1316 return false;
1233 1317
1234 D_MAIN ((stderr, "rxvt_IM_get_IC ()"));
1235 input_method = display->get_xim (locale, modifiers); 1318 input_method = display->get_xim (locale, modifiers);
1236 if (input_method == NULL) 1319 if (input_method == NULL)
1237 return false; 1320 return false;
1238 1321
1239 xim = input_method->xim; 1322 xim = input_method->xim;
1323 spot.x = spot.y = -1;
1240 1324
1241 xim_styles = NULL; 1325 xim_styles = NULL;
1242 if (XGetIMValues (xim, XNQueryInputStyle, &xim_styles, NULL) 1326 if (XGetIMValues (xim, XNQueryInputStyle, &xim_styles, NULL)
1243 || !xim_styles || !xim_styles->count_styles) 1327 || !xim_styles || !xim_styles->count_styles)
1244 { 1328 {
1245 display->put_xim (input_method); 1329 im_destroy ();
1246 return false; 1330 return false;
1247 } 1331 }
1248 1332
1249 p = rs[Rs_preeditType] ? rs[Rs_preeditType] : "OverTheSpot,OffTheSpot,Root"; 1333 const char *pet[] = { rs[Rs_preeditType], "OverTheSpot,OffTheSpot,Root,None" };
1250 s = rxvt_splitcommastring (p); 1334
1335 for (int pi = 0; pi < 2; pi++)
1336 {
1337 p = pet[pi];
1338
1339 if (!p)
1340 continue;
1341
1342 s = rxvt_strsplit (',', p);
1343
1251 for (i = found = 0; !found && s[i]; i++) 1344 for (i = found = 0; !found && s[i]; i++)
1252 { 1345 {
1253 if (!STRCMP (s[i], "OverTheSpot")) 1346 if (!strcmp (s[i], "OverTheSpot"))
1254 input_style = (XIMPreeditPosition | XIMStatusNothing); 1347 input_style = XIMPreeditPosition | XIMStatusNothing;
1255 else if (!STRCMP (s[i], "OffTheSpot")) 1348 else if (!strcmp (s[i], "OffTheSpot"))
1256 input_style = (XIMPreeditArea | XIMStatusArea); 1349 input_style = XIMPreeditArea | XIMStatusArea;
1257 else if (!STRCMP (s[i], "Root")) 1350 else if (!strcmp (s[i], "Root"))
1258 input_style = (XIMPreeditNothing | XIMStatusNothing); 1351 input_style = XIMPreeditNothing | XIMStatusNothing;
1352 else if (!strcmp (s[i], "None"))
1353 input_style = XIMPreeditNone | XIMStatusNone;
1354#ifdef ENABLE_XIM_ONTHESPOT
1355 else if (SHOULD_INVOKE (HOOK_XIM_PREEDIT_START) && !strcmp (s[i], "OnTheSpot"))
1356 input_style = XIMPreeditCallbacks | XIMStatusNothing;
1357#endif
1358 else
1359 input_style = XIMPreeditNothing | XIMStatusNothing;
1259 1360
1260 for (j = 0; j < xim_styles->count_styles; j++) 1361 for (j = 0; j < xim_styles->count_styles; j++)
1261 if (input_style == xim_styles->supported_styles[j]) 1362 if (input_style == xim_styles->supported_styles[j])
1262 { 1363 {
1364 rxvt_free_strsplit (s);
1365
1263 found = 1; 1366 found = 1;
1264 break; 1367 goto foundpet;
1368 }
1369
1265 } 1370 }
1266 }
1267 1371
1268 for (i = 0; s[i]; i++) 1372 rxvt_free_strsplit (s);
1269 free (s[i]); 1373 }
1270 1374
1271 free (s); 1375foundpet:
1376
1272 XFree (xim_styles); 1377 XFree (xim_styles);
1273 1378
1274 if (!found) 1379 if (!found)
1275 { 1380 {
1276 display->put_xim (input_method); 1381 im_destroy ();
1277 return false; 1382 return false;
1278 } 1383 }
1279 1384
1280 preedit_attr = status_attr = NULL; 1385 XFontSet fs = 0;
1386 XVaNestedList preedit_attr = 0, status_attr = 0;
1387
1388 if (input_style & (XIMPreeditPosition | XIMPreeditArea))
1389 {
1390 // fake us a font-set, please
1391 char **missing_charset_list;
1392 int missing_charset_count;
1393 char *def_string;
1394 char pat[512];
1395
1396 sprintf (pat,
1397 "-*-*-*-R-*-*-%d-*-*-*-*-*-*,"
1398 "-*-*-*-R-*-*-%d-*-*-*-*-*-*,"
1399 "-*-*-*-R-*-*-%d-*-*-*-*-*-*,"
1400 "-*-*-*-R-*-*-%d-*-*-*-*-*-*,"
1401 "-*-*-*-R-*-*-%d-*-*-*-*-*-*,"
1402 "*",
1403 fheight,
1404 fheight + 1, fheight - 1,
1405 fheight - 2, fheight + 2);
1406
1407 fs = XCreateFontSet (dpy, rs[Rs_imFont] ? rs[Rs_imFont] : pat,
1408 &missing_charset_list, &missing_charset_count, &def_string);
1409
1410 if (missing_charset_list)
1411 XFreeStringList (missing_charset_list);
1412
1413 if (!fs)
1414 {
1415 input_style &= ~(XIMPreeditPosition | XIMPreeditArea);
1416 rxvt_warn ("unable to create fontset for input method, try \"-pt Root\". Continuing.\n");
1417 }
1418 }
1281 1419
1282 if (input_style & XIMPreeditPosition) 1420 if (input_style & XIMPreeditPosition)
1283 { 1421 {
1284 im_set_size (&rect); 1422 im_set_size (rect);
1285 im_set_position (&spot); 1423 im_set_position (spot);
1286 im_set_color (&fg, &bg); 1424 im_set_color (fg, bg);
1287 1425
1288 preedit_attr = XVaCreateNestedList (0, XNArea, &rect, 1426 preedit_attr = XVaCreateNestedList (0,
1427 XNForeground, fg,
1428 XNBackground, bg,
1429 XNArea, &rect,
1289 XNSpotLocation, &spot, 1430 XNSpotLocation, &spot,
1290 XNForeground, fg, XNBackground, bg,
1291 //XNFontSet, TermWin.fontset, 1431 XNFontSet, fs,
1292 NULL); 1432 NULL);
1293 } 1433 }
1294 else if (input_style & XIMPreeditArea) 1434 else if (input_style & XIMPreeditArea)
1295 { 1435 {
1296 im_set_color (&fg, &bg); 1436 im_set_color (fg, bg);
1297 1437
1298 /* 1438 /*
1299 * The necessary width of preedit area is unknown 1439 * The necessary width of preedit area is unknown
1300 * until create input context. 1440 * until create input context.
1301 */ 1441 */
1302 needed_rect.width = 0; 1442 needed_rect.width = 0;
1303
1304 im_set_preedit_area (&rect, &status_rect, &needed_rect); 1443 im_set_preedit_area (rect, status_rect, needed_rect);
1305 1444
1306 preedit_attr = XVaCreateNestedList (0, XNArea, &rect, 1445 preedit_attr = XVaCreateNestedList (0,
1446 XNForeground, fg,
1307 XNForeground, fg, XNBackground, bg, 1447 XNBackground, bg,
1448 XNArea, &rect,
1449 XNFontSet, fs,
1450 NULL);
1451 status_attr = XVaCreateNestedList (0,
1452 XNForeground, fg,
1453 XNBackground, bg,
1454 XNArea, &status_rect,
1308 //XNFontSet, TermWin.fontset, 1455 XNFontSet, fs,
1309 NULL); 1456 NULL);
1310 status_attr = XVaCreateNestedList (0, XNArea, &status_rect, 1457 }
1311 XNForeground, fg, XNBackground, bg, 1458#if ENABLE_XIM_ONTHESPOT
1312 //XNFontSet, TermWin.fontset, 1459 else if (input_style & XIMPreeditCallbacks)
1460 {
1461 XIMCallback xcb[4];
1462
1463 im_set_position (spot);
1464
1465 xcb[0].client_data = (XPointer)this; xcb[0].callback = (XIMProc)xim_preedit_start;
1466 xcb[1].client_data = (XPointer)this; xcb[1].callback = (XIMProc)xim_preedit_done;
1467 xcb[2].client_data = (XPointer)this; xcb[2].callback = (XIMProc)xim_preedit_draw;
1468# if 0
1469 xcb[3].client_data = (XPointer)this; xcb[3].callback = (XIMProc)xim_preedit_caret;
1470# endif
1471
1472 preedit_attr = XVaCreateNestedList (0,
1473 XNSpotLocation, &spot,
1474 XNPreeditStartCallback, &xcb[0],
1475 XNPreeditDoneCallback , &xcb[1],
1476 XNPreeditDrawCallback , &xcb[2],
1477# if 0
1478 XNPreeditCaretCallback, &xcb[3],
1479# endif
1313 NULL); 1480 NULL);
1314 } 1481 }
1482#endif
1315 1483
1316 Input_Context = XCreateIC (xim, XNInputStyle, input_style, 1484 Input_Context = XCreateIC (xim,
1485 XNInputStyle, input_style,
1317 XNClientWindow, TermWin.parent[0], 1486 XNClientWindow, vt,
1318 XNFocusWindow, TermWin.parent[0], 1487 XNFocusWindow, parent,
1319 preedit_attr ? XNPreeditAttributes : NULL, 1488 preedit_attr ? XNPreeditAttributes : NULL,
1320 preedit_attr, 1489 preedit_attr,
1321 status_attr ? XNStatusAttributes : NULL, 1490 status_attr ? XNStatusAttributes : NULL,
1322 status_attr, NULL); 1491 status_attr, NULL);
1492
1323 if (preedit_attr) XFree (preedit_attr); 1493 if (preedit_attr) XFree (preedit_attr);
1324 if (status_attr) XFree (status_attr); 1494 if (status_attr) XFree (status_attr);
1495 if (fs) XFreeFontSet (dpy, fs);
1325 1496
1326 if (Input_Context == NULL) 1497 if (Input_Context == NULL)
1327 { 1498 {
1328 rxvt_print_error ("failed to create input context"); 1499 rxvt_warn ("failed to create input context, continuing without XIM.\n");
1329 display->put_xim (input_method); 1500 im_destroy ();
1330 return false; 1501 return false;
1331 } 1502 }
1332 1503
1333 if (input_style & XIMPreeditArea) 1504#if 0
1334 IMSetStatusPosition (); 1505 // unfortunately, only the focus window is used by XIM, hard to fix
1506 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL))
1507 vt_select_input ();
1508#endif
1335 1509
1336 D_MAIN ((stderr, "rxvt_IM_get_IC () - successful connection")); 1510 im_set_position ();
1511
1337 return true; 1512 return true;
1338} 1513}
1339 1514
1340void 1515void
1341rxvt_term::im_cb () 1516rxvt_term::im_cb ()
1342{ 1517{
1343 int i, found, had_im; 1518 int i;
1344 const char *p; 1519 const char *p;
1345 char **s; 1520 char **s;
1346 char buf[IMBUFSIZ]; 1521 char buf[IMBUFSIZ];
1347 1522
1523 make_current ();
1524
1348 im_destroy (); 1525 im_destroy ();
1349 1526
1350 D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()"));
1351 if (Input_Context) 1527 if (Input_Context)
1352 return; 1528 return;
1353 1529
1354#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE) 1530#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1355 if (rs[Rs_imLocale]) 1531 if (rs[Rs_imLocale])
1359 p = rs[Rs_inputMethod]; 1535 p = rs[Rs_inputMethod];
1360 if (p && *p) 1536 if (p && *p)
1361 { 1537 {
1362 bool found = false; 1538 bool found = false;
1363 1539
1364 s = rxvt_splitcommastring (p); 1540 s = rxvt_strsplit (',', p);
1541
1365 for (i = 0; s[i]; i++) 1542 for (i = 0; s[i]; i++)
1366 { 1543 {
1367 if (*s[i]) 1544 if (*s[i])
1368 { 1545 {
1369 STRCPY (buf, "@im="); 1546 strcpy (buf, "@im=");
1370 STRNCAT (buf, s[i], IMBUFSIZ - 5); 1547 strncat (buf, s[i], IMBUFSIZ - 5);
1371 if (IM_get_IC (buf)) 1548 if (im_get_ic (buf))
1372 { 1549 {
1373 found = true; 1550 found = true;
1374 break; 1551 break;
1375 } 1552 }
1376 } 1553 }
1377 } 1554 }
1378 for (i = 0; s[i]; i++) 1555
1379 free (s[i]); 1556 rxvt_free_strsplit (s);
1380 free (s);
1381 1557
1382 if (found) 1558 if (found)
1383 goto done; 1559 goto done;
1384 } 1560 }
1385 1561
1386 /* try with XMODIFIERS env. var. */ 1562 /* try with XMODIFIERS env. var. */
1387 if (IM_get_IC ("")) 1563 if (im_get_ic (""))
1388 goto done; 1564 goto done;
1389 1565
1390 /* try with no modifiers base IF the user didn't specify an IM */ 1566 /* try with no modifiers base IF the user didn't specify an IM */
1391 if (IM_get_IC ("@im=none")) 1567 if (im_get_ic ("@im=none"))
1392 goto done; 1568 goto done;
1393 1569
1394done: 1570done:
1395#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE) 1571#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1396 if (rs[Rs_imLocale]) 1572 if (rs[Rs_imLocale])
1397 SET_LOCALE (locale); 1573 SET_LOCALE (locale);
1398#endif 1574#endif
1399} 1575}
1400 1576
1401void 1577void
1402rxvt_term::IMSetStatusPosition () 1578rxvt_term::im_set_position ()
1403{ 1579{
1404 XRectangle preedit_rect, status_rect, *needed_rect; 1580 XRectangle preedit_rect, status_rect, *needed_rect;
1405 XVaNestedList preedit_attr, status_attr; 1581 XVaNestedList preedit_attr, status_attr;
1406 1582
1407 if (Input_Context == NULL 1583 if (!Input_Context
1408 || !TermWin.focus || ! (input_style & XIMPreeditArea) 1584 || !focus
1585 || !(input_style & (XIMPreeditArea | XIMPreeditPosition))
1409 || !IMisRunning ()) 1586 || !im_is_running ())
1410 return; 1587 return;
1411 1588
1589 if (input_style & XIMPreeditPosition)
1590 {
1591 im_set_size (preedit_rect);
1592 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);
1593
1594 XSetICValues (Input_Context,
1595 XNPreeditAttributes, preedit_attr, NULL);
1596 }
1597 else
1598 {
1412 /* Getting the necessary width of preedit area */ 1599 /* Getting the necessary width of preedit area */
1413 status_attr = XVaCreateNestedList (0, XNAreaNeeded, &needed_rect, NULL); 1600 status_attr = XVaCreateNestedList (0, XNAreaNeeded, &needed_rect, NULL);
1414 XGetICValues (Input_Context, XNStatusAttributes, status_attr, NULL); 1601 XGetICValues (Input_Context, XNStatusAttributes, status_attr, NULL);
1415 XFree (status_attr); 1602 XFree (status_attr);
1416 1603
1417 im_set_preedit_area (&preedit_rect, &status_rect, needed_rect); 1604 im_set_preedit_area (preedit_rect, status_rect, *needed_rect);
1605 XFree (needed_rect);
1418 1606
1419 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL); 1607 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);
1420 status_attr = XVaCreateNestedList (0, XNArea, &status_rect, NULL); 1608 status_attr = XVaCreateNestedList (0, XNArea, &status_rect, NULL);
1421 1609
1422 XSetICValues (Input_Context, 1610 XSetICValues (Input_Context,
1423 XNPreeditAttributes, preedit_attr, 1611 XNPreeditAttributes, preedit_attr,
1424 XNStatusAttributes, status_attr, NULL); 1612 XNStatusAttributes, status_attr,
1613 NULL);
1425 1614
1615 XFree (status_attr);
1616 }
1617
1426 XFree (preedit_attr); 1618 XFree (preedit_attr);
1427 XFree (status_attr);
1428} 1619}
1429#endif /* USE_XIM */ 1620#endif /* USE_XIM */
1430 1621
1431/*----------------------------------------------------------------------*/ 1622void
1432rxvt_t rxvt_current_term; 1623rxvt_term::get_window_origin (int &x, int &y)
1624{
1625 Window cr;
1626 XTranslateCoordinates (dpy, parent, display->root, 0, 0, &x, &y, &cr);
1627}
1628
1629Pixmap
1630rxvt_term::get_pixmap_property (Atom property)
1631{
1632 Pixmap pixmap = None;
1633
1634 int aformat;
1635 unsigned long nitems, bytes_after;
1636 Atom atype;
1637 unsigned char *prop;
1638 int result = XGetWindowProperty (dpy, display->root, property,
1639 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1640 &nitems, &bytes_after, &prop);
1641 if (result == Success)
1642 {
1643 if (atype == XA_PIXMAP)
1644 pixmap = *(Pixmap *)prop;
1645 XFree (prop);
1646 }
1647
1648 return pixmap;
1649}
1650
1651#ifdef HAVE_BG_PIXMAP
1652
1653void
1654rxvt_term::update_background ()
1655{
1656 if (update_background_ev.is_active ())
1657 return;
1658
1659 bg_invalidate ();
1660
1661 if (!mapped)
1662 return;
1663
1664 ev_tstamp to_wait = 0.5 - (ev::now () - bg_valid_since);
1665
1666 if (to_wait <= 0.)
1667 bg_render ();
1668 else
1669 update_background_ev.start (to_wait);
1670}
1671
1672void
1673rxvt_term::update_background_cb (ev::timer &w, int revents)
1674{
1675 make_current ();
1676
1677 update_background_ev.stop ();
1678 bg_render ();
1679 refresh_check ();
1680}
1681
1682#endif /* HAVE_BG_PIXMAP */
1433 1683
1434/*----------------------- end-of-file (C source) -----------------------*/ 1684/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines