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.17 by pcg, Thu Dec 18 13:33:02 2003 UTC vs.
Revision 1.148 by root, Wed Nov 30 21:05:39 2005 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines