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.21 by pcg, Thu Jan 29 23:26:01 2004 UTC vs.
Revision 1.159 by root, Wed Jan 4 04:42:45 2006 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines