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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines