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.6 by pcg, Tue Nov 25 17:11:33 2003 UTC vs.
Revision 1.167 by root, Sun Jan 8 08:43:11 2006 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines