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.13 by pcg, Wed Dec 17 09:00:35 2003 UTC vs.
Revision 1.185 by root, Tue Jan 17 15:17:39 2006 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines