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

Diff Legend

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