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.28 by pcg, Mon Feb 9 22:45:29 2004 UTC vs.
Revision 1.176 by root, Thu Jan 12 01:30:53 2006 UTC

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

Diff Legend

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