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.26 by pcg, Sun Feb 1 01:34:41 2004 UTC vs.
Revision 1.177 by root, Mon Jan 16 06:37:52 2006 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines