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.9 by pcg, Tue Dec 2 21:49:46 2003 UTC vs.
Revision 1.161 by root, Wed Jan 4 20:43:38 2006 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines