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.5 by pcg, Tue Nov 25 15:44:38 2003 UTC vs.
Revision 1.177 by root, Mon Jan 16 06:37:52 2006 UTC

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

Diff Legend

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