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.16 by pcg, Thu Dec 18 07:31:19 2003 UTC vs.
Revision 1.152 by root, Thu Dec 22 16:44:10 2005 UTC

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

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines