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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines