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.11 by pcg, Mon Dec 8 23:14:40 2003 UTC vs.
Revision 1.158 by root, Tue Jan 3 23:40:58 2006 UTC

1/*--------------------------------*-C-*---------------------------------* 1/*--------------------------------*-C-*---------------------------------*
2 * File: main.c 2 * File: main.C
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * $Id: main.C,v 1.11 2003/12/08 23:14:40 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] && *rs[Rs_perl_ext])
493 {
494 rxvt_perl.init ();
495 PERL_INVOKE ((this, HOOK_INIT, DT_END));
496 }
497#endif
498
499 create_windows (argc, argv);
500
501 dDisp;
502
503 init_xlocale ();
504
505 scr_reset (); /* initialize screen */
506
507#if 0
508 XSynchronize (disp, True);
509#endif
510
511#ifdef HAVE_SCROLLBARS
512 if (OPTION (Opt_scrollBar))
513 resize_scrollbar (); /* create and map scrollbar */
514#endif
515#if (MENUBAR_MAX)
516 if (menubar_visible ())
517 XMapWindow (disp, menuBar.win);
518#endif
519#ifdef TRANSPARENT
520 if (OPTION (Opt_transparent))
521 {
522 XSelectInput (disp, display->root, PropertyChangeMask);
523 check_our_parents ();
524 rootwin_ev.start (display, display->root);
525 }
526#endif
527
528 XMapWindow (disp, vt);
529 XMapWindow (disp, parent[0]);
530
531 set_colorfgbg ();
532
533 init_command (cmd_argv);
534
535 free (cmd_argv);
536
537 pty_ev.start (pty.pty, EVENT_READ);
538
539 check_ev.start ();
540
541 PERL_INVOKE ((this, HOOK_START, DT_END));
542
543 return true;
544}
545
546static struct sig_handlers
547{
548 sig_watcher sw_chld, sw_term, sw_int;
549
550 void sig_chld (sig_watcher &w)
551 {
552 // we are being called for every SIGCHLD, find the corresponding term
553 int pid;
554
555 while ((pid = waitpid (-1, NULL, WNOHANG)) > 0)
556 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)
557 if (pid == (*t)->cmd_pid)
558 {
559 (*t)->child_exit ();
560 break;
561 }
562 }
563
564 /*
565 * Catch a fatal signal and tidy up before quitting
566 */
567 void
568 sig_term (sig_watcher &w)
569 {
570#ifdef DEBUG_CMD
571 rxvt_warn ("caught signal %d, exiting.\n", w.signum);
572#endif
573 rxvt_emergency_cleanup ();
574 signal (w.signum, SIG_DFL);
575 kill (getpid (), w.signum);
576 }
577
578 sig_handlers ()
579 : sw_chld (this, &sig_handlers::sig_chld),
580 sw_term (this, &sig_handlers::sig_term),
581 sw_int (this, &sig_handlers::sig_term)
582 {
583 }
584} sig_handlers;
585
586void
587rxvt_init ()
588{
181 /* 589 /*
182 * Save and then give up any super-user privileges 590 * Save and then give up any super-user privileges
183 * If we need privileges in any area then we must specifically request it. 591 * If we need privileges in any area then we must specifically request it.
184 * We should only need to be root in these cases: 592 * We should only need to be root in these cases:
185 * 1. write utmp entries on some systems 593 * 1. write utmp entries on some systems
186 * 2. chown tty on some systems 594 * 2. chown tty on some systems
187 */ 595 */
188 rxvt_privileges (this, SAVE); 596 rxvt_privileges (SAVE);
189 rxvt_privileges (this, IGNORE); 597 rxvt_privileges (IGNORE);
190 598
191 rxvt_init_secondary (this); 599 signal (SIGHUP, SIG_IGN);
600 signal (SIGPIPE, SIG_IGN);
192 601
193 const char **cmd_argv = rxvt_init_resources (this, argc, argv); 602 sig_handlers.sw_chld.start (SIGCHLD);
603 sig_handlers.sw_term.start (SIGTERM);
604 sig_handlers.sw_int.start (SIGINT);
194 605
195#if (MENUBAR_MAX) 606 /* need to trap SIGURG for SVR4 (Unixware) rlogin */
196 rxvt_menubar_read (this, rs[Rs_menu]); 607 /* 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 608
203 rxvt_Create_Windows (this, argc, argv); 609 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
204 610 // TODO: handle this with exceptions and tolerate the memory loss
205 rxvt_init_xlocale (this); 611 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 process_x_events ();
245
246 return true;
247}
248
249/* ------------------------------------------------------------------------- *
250 * SIGNAL HANDLING & EXIT HANDLER *
251 * ------------------------------------------------------------------------- */
252/*
253 * Catch a SIGCHLD signal and exit if the direct child has died
254 */
255/* ARGSUSED */
256/* EXTPROTO */
257RETSIGTYPE
258rxvt_Child_signal(int sig __attribute__ ((unused)))
259{
260 int pid, save_errno = errno;
261 while ((pid = waitpid (-1, NULL, WNOHANG)) == -1 && errno == EINTR)
262 ;
263 errno = save_errno;
264
265#if 0
266 if (pid == R->cmd_pid)
267 exit (EXIT_SUCCESS);
268#endif
269}
270
271/*
272 * Catch a fatal signal and tidy up before quitting
273 */
274/* EXTPROTO */
275RETSIGTYPE
276rxvt_Exit_signal(int sig)
277{
278 signal(sig, SIG_DFL);
279#ifdef DEBUG_CMD
280 rxvt_print_error("signal %d", sig);
281#endif
282 rxvt_clean_exit();
283 kill(getpid(), sig);
284}
285
286/* ARGSUSED */
287/* INTPROTO */
288int
289rxvt_xerror_handler(const Display * display
290 __attribute__ ((unused)), const XErrorEvent * event)
291{
292 dR;
293
294 if (R->allowedxerror == -1)
295 R->allowedxerror = event->error_code;
296 else
297 {
298 rxvt_print_error("XError: Request: %d . %d, Error: %d",
299 event->request_code, event->minor_code,
300 event->error_code);
301
302 R->destroy ();
303 }
304
305 return 0;
306}
307
308/*----------------------------------------------------------------------*/
309/*
310 * Exit gracefully, clearing the utmp entry and restoring tty attributes
311 * TODO: if debugging, this should free up any known resources if we can
312 */
313/* EXTPROTO */
314void
315rxvt_clean_exit ()
316{
317 dR;
318
319 R->destroy ();
320} 612}
321 613
322/* ------------------------------------------------------------------------- * 614/* ------------------------------------------------------------------------- *
323 * MEMORY ALLOCATION WRAPPERS * 615 * MEMORY ALLOCATION WRAPPERS *
324 * ------------------------------------------------------------------------- */ 616 * ------------------------------------------------------------------------- */
325/* EXTPROTO */ 617void *
618rxvt_malloc (size_t size)
619{
620 void *p = malloc (size);
621
622 if (!p)
623 rxvt_fatal ("memory allocation failure. aborting.\n");
624
625 return p;
626}
627
628void *
629rxvt_calloc (size_t number, size_t size)
630{
631 void *p = calloc (number, size);
632
633 if (!p)
634 rxvt_fatal ("memory allocation failure. aborting.\n");
635
636 return p;
637}
638
326void * 639void *
327rxvt_malloc(size_t size)
328{
329 void *p;
330
331 p = malloc(size);
332 if (p)
333 return p;
334
335 fprintf(stderr, APL_NAME ": memory allocation failure. Aborting");
336 rxvt_clean_exit();
337 exit(EXIT_FAILURE);
338/* NOTREACHED */
339}
340
341/* EXTPROTO */
342void *
343rxvt_calloc(size_t number, size_t size)
344{
345 void *p;
346
347 p = calloc(number, size);
348 if (p)
349 return p;
350
351 fprintf(stderr, APL_NAME ": memory allocation failure. Aborting");
352 rxvt_clean_exit();
353 exit(EXIT_FAILURE);
354/* NOTREACHED */
355}
356
357/* EXTPROTO */
358void *
359rxvt_realloc(void *ptr, size_t size) 640rxvt_realloc (void *ptr, size_t size)
360{ 641{
361 void *p;
362
363 if (ptr)
364 p = realloc(ptr, size); 642 void *p = realloc (ptr, size);
365 else 643
366 p = malloc(size);
367 if (p) 644 if (!p)
645 rxvt_fatal ("memory allocation failure. aborting.\n");
646
368 return p; 647 return p;
369
370 fprintf(stderr, APL_NAME ": memory allocation failure. Aborting");
371 rxvt_clean_exit();
372 exit(EXIT_FAILURE);
373/* NOTREACHED */
374} 648}
375 649
376/* ------------------------------------------------------------------------- * 650/* ------------------------------------------------------------------------- *
377 * PRIVILEGED OPERATIONS * 651 * PRIVILEGED OPERATIONS *
378 * ------------------------------------------------------------------------- */ 652 * ------------------------------------------------------------------------- */
379/* take care of suid/sgid super-user (root) privileges */ 653/* take care of suid/sgid super-user (root) privileges */
380/* INTPROTO */
381void 654void
382rxvt_privileges(pR_ int mode) 655rxvt_privileges (rxvt_privaction action)
383{ 656{
657#if (defined(HAVE_SETEUID) || defined(HAVE_SETREUID)) && !defined(__CYGWIN32__)
658 static uid_t euid;
659 static gid_t egid;
660#endif
661
384#if ! defined(__CYGWIN32__) 662#if ! defined(__CYGWIN32__)
385# if !defined(HAVE_SETEUID) && defined(HAVE_SETREUID) 663# if !defined(HAVE_SETEUID) && defined(HAVE_SETREUID)
386/* setreuid() is the poor man's setuid(), seteuid() */ 664 /* setreuid () is the poor man's setuid (), seteuid () */
387# define seteuid(a) setreuid(-1, (a)) 665# define seteuid(a) setreuid(-1, (a))
388# define setegid(a) setregid(-1, (a)) 666# define setegid(a) setregid(-1, (a))
389# define HAVE_SETEUID 667# define HAVE_SETEUID
390# endif 668# endif
391# ifdef HAVE_SETEUID 669# ifdef HAVE_SETEUID
392 switch (mode) { 670 switch (action)
671 {
393 case IGNORE: 672 case IGNORE:
394 /* 673 /*
395 * change effective uid/gid - not real uid/gid - so we can switch 674 * change effective uid/gid - not real uid/gid - so we can switch
396 * back to root later, as required 675 * back to root later, as required
397 */ 676 */
398 seteuid(getuid()); 677 seteuid (getuid ());
399 setegid(getgid()); 678 setegid (getgid ());
400 break; 679 break;
401 case SAVE: 680 case SAVE:
402 R->euid = geteuid(); 681 euid = geteuid ();
403 R->egid = getegid(); 682 egid = getegid ();
404 break; 683 break;
405 case RESTORE: 684 case RESTORE:
406 seteuid(R->euid); 685 seteuid (euid);
407 setegid(R->egid); 686 setegid (egid);
408 break; 687 break;
409 } 688 }
410# else 689# else
411 switch (mode) { 690 switch (action)
691 {
412 case IGNORE: 692 case IGNORE:
413 setuid(getuid()); 693 setuid (getuid ());
414 setgid(getgid()); 694 setgid (getgid ());
415 /* FALLTHROUGH */ 695 /* FALLTHROUGH */
416 case SAVE: 696 case SAVE:
417 /* FALLTHROUGH */ 697 /* FALLTHROUGH */
418 case RESTORE: 698 case RESTORE:
419 break; 699 break;
420 } 700 }
421# endif 701# endif
422#endif 702#endif
423} 703}
424 704
425#ifdef UTMP_SUPPORT 705#ifdef UTMP_SUPPORT
426/* EXTPROTO */
427void 706void
428rxvt_privileged_utmp(pR_ char action) 707rxvt_term::privileged_utmp (rxvt_privaction action)
429{ 708{
430 D_MAIN((stderr, "rxvt_privileged_utmp(%c); waiting for: %c (pid: %d)", 709 if (OPTION (Opt_utmpInhibit)
431 action, R->next_utmp_action, getpid())); 710 || !pty.name || !*pty.name)
432 if (R->next_utmp_action != action || (action != SAVE && action != RESTORE)
433 || (R->Options & Opt_utmpInhibit)
434 || R->ttydev == NULL || *R->ttydev == '\0')
435 return; 711 return;
436 712
437 rxvt_privileges(aR_ RESTORE); 713 rxvt_privileges (RESTORE);
714
438 if (action == SAVE) { 715 if (action == SAVE)
439 R->next_utmp_action = RESTORE; 716 makeutent (pty.name, rs[Rs_display_name]);
440 rxvt_makeutent(aR_ R->ttydev, R->rs[Rs_display_name]); 717 else
441 } else { /* action == RESTORE */ 718 cleanutent ();
442 R->next_utmp_action = IGNORE; 719
443 rxvt_cleanutent(aR);
444 }
445 rxvt_privileges(aR_ IGNORE); 720 rxvt_privileges (IGNORE);
446}
447#endif
448
449#ifndef NO_SETOWNER_TTYDEV
450/* EXTPROTO */
451void
452rxvt_privileged_ttydev(pR_ char action)
453{
454 D_MAIN((stderr,
455 "rxvt_privileged_ttydev(aR_ %c); waiting for: %c (pid: %d)",
456 action, R->next_tty_action, getpid()));
457 if (R->next_tty_action != action || (action != SAVE && action != RESTORE)
458 || R->ttydev == NULL || *R->ttydev == '\0')
459 return;
460
461 rxvt_privileges(aR_ RESTORE);
462
463 if (action == SAVE) {
464 R->next_tty_action = RESTORE;
465# ifndef RESET_TTY_TO_COMMON_DEFAULTS
466/* store original tty status for restoration rxvt_clean_exit() -- rgg 04/12/95 */
467 if (lstat(R->ttydev, &R->ttyfd_stat) < 0) /* you lose out */
468 R->next_tty_action = IGNORE;
469 else
470# endif
471 {
472 chown(R->ttydev, getuid(), R->ttygid); /* fail silently */
473 chmod(R->ttydev, R->ttymode);
474# ifdef HAVE_REVOKE
475 revoke(R->ttydev);
476# endif
477 }
478 } else { /* action == RESTORE */
479 R->next_tty_action = IGNORE;
480# ifndef RESET_TTY_TO_COMMON_DEFAULTS
481 chmod(R->ttydev, R->ttyfd_stat.st_mode);
482 chown(R->ttydev, R->ttyfd_stat.st_uid, R->ttyfd_stat.st_gid);
483# else
484 chmod(R->ttydev,
485 (S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH | S_IWOTH));
486 chown(R->ttydev, 0, 0);
487# endif
488 }
489
490 rxvt_privileges(aR_ IGNORE);
491
492# ifndef RESET_TTY_TO_COMMON_DEFAULTS
493 D_MAIN((stderr, "%s \"%s\": mode %03o, uid %d, gid %d",
494 action == RESTORE ? "Restoring" : (action ==
495 SAVE ? "Saving" :
496 "UNKNOWN ERROR for"), R->ttydev,
497 R->ttyfd_stat.st_mode, R->ttyfd_stat.st_uid,
498 R->ttyfd_stat.st_gid));
499# endif
500} 721}
501#endif 722#endif
502 723
503/*----------------------------------------------------------------------*/ 724/*----------------------------------------------------------------------*/
504/* 725/*
505 * window size/position calculcations for XSizeHint and other storage. 726 * window size/position calculcations for XSizeHint and other storage.
506 * if width/height are non-zero then override calculated width/height 727 * if width/height are non-zero then override calculated width/height
507 */ 728 */
508/* EXTPROTO */
509void 729void
510rxvt_window_calc(pR_ unsigned int width, unsigned int height) 730rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
511{ 731{
512 short recalc_x, recalc_y; 732 short recalc_x, recalc_y;
513 int x, y, sb_w, mb_h, flags; 733 int x, y, sb_w, mb_h, flags;
514 unsigned int w, h; 734 unsigned int w, h;
515 unsigned int max_width, max_height; 735 unsigned int max_width, max_height;
736 dDisp;
516 737
517 D_SIZE((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d", 738 D_SIZE ((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
518 R->TermWin.ncol, R->TermWin.nrow, R->szHint.width, 739 ncol, nrow, szHint.width, szHint.height));
519 R->szHint.height)); 740
520 R->szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity; 741 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity;
521 R->szHint.win_gravity = NorthWestGravity; 742 szHint.win_gravity = NorthWestGravity;
522/* R->szHint.min_aspect.x = R->szHint.min_aspect.y = 1; */ 743 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */
523 744
524 recalc_x = recalc_y = 0; 745 recalc_x = recalc_y = 0;
525 flags = 0; 746 flags = 0;
747
526 if (!R->parsed_geometry) { 748 if (!parsed_geometry)
749 {
527 R->parsed_geometry = 1; 750 parsed_geometry = 1;
751
528 if (R->rs[Rs_geometry]) 752 if (rs[Rs_geometry])
529 flags = XParseGeometry(R->rs[Rs_geometry], &x, &y, &w, &h); 753 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h);
754
530 if (flags & WidthValue) { 755 if (flags & WidthValue)
531 R->TermWin.ncol = BOUND_POSITIVE_INT16(w); 756 {
757 ncol = clamp (w, 0, std::numeric_limits<int16_t>::max ());
532 R->szHint.flags |= USSize; 758 szHint.flags |= USSize;
533 } 759 }
760
534 if (flags & HeightValue) { 761 if (flags & HeightValue)
535 R->TermWin.nrow = BOUND_POSITIVE_INT16(h); 762 {
763 nrow = clamp (h, 0, std::numeric_limits<int16_t>::max ());
536 R->szHint.flags |= USSize; 764 szHint.flags |= USSize;
537 } 765 }
766
538 if (flags & XValue) { 767 if (flags & XValue)
768 {
539 R->szHint.x = x; 769 szHint.x = x;
540 R->szHint.flags |= USPosition; 770 szHint.flags |= USPosition;
771
541 if (flags & XNegative) { 772 if (flags & XNegative)
773 {
542 recalc_x = 1; 774 recalc_x = 1;
543 R->szHint.win_gravity = NorthEastGravity; 775 szHint.win_gravity = NorthEastGravity;
544 } 776 }
545 } 777 }
778
546 if (flags & YValue) { 779 if (flags & YValue)
780 {
547 R->szHint.y = y; 781 szHint.y = y;
548 R->szHint.flags |= USPosition; 782 szHint.flags |= USPosition;
783
549 if (flags & YNegative) { 784 if (flags & YNegative)
785 {
550 recalc_y = 1; 786 recalc_y = 1;
787
551 if (R->szHint.win_gravity == NorthEastGravity) 788 if (szHint.win_gravity == NorthEastGravity)
552 R->szHint.win_gravity = SouthEastGravity; 789 szHint.win_gravity = SouthEastGravity;
553 else 790 else
554 R->szHint.win_gravity = SouthWestGravity; 791 szHint.win_gravity = SouthWestGravity;
555 } 792 }
556 } 793 }
557 } 794 }
795
558/* TODO: BOUNDS */ 796 /* TODO: BOUNDS */
559 R->TermWin.width = R->TermWin.ncol * R->TermWin.fwidth; 797 width = ncol * fwidth;
560 R->TermWin.height = R->TermWin.nrow * R->TermWin.fheight; 798 height = nrow * fheight;
561 max_width = MAX_COLS * R->TermWin.fwidth; 799 max_width = MAX_COLS * fwidth;
562 max_height = MAX_ROWS * R->TermWin.fheight; 800 max_height = MAX_ROWS * fheight;
563 801
564 R->szHint.base_width = R->szHint.base_height = 2 * R->TermWin.int_bwidth; 802 szHint.base_width = szHint.base_height = 2 * int_bwidth;
565 803
566 sb_w = mb_h = 0; 804 sb_w = mb_h = 0;
567 R->window_vt_x = R->window_vt_y = 0; 805 window_vt_x = window_vt_y = int_bwidth;
806
568 if (scrollbar_visible(R)) { 807 if (scrollbar_visible ())
808 {
569 sb_w = scrollbar_TotalWidth(); 809 sb_w = scrollbar_TotalWidth ();
570 R->szHint.base_width += sb_w; 810 szHint.base_width += sb_w;
571 if (!(R->Options & Opt_scrollBar_right)) 811 if (!OPTION (Opt_scrollBar_right))
572 R->window_vt_x = sb_w; 812 window_vt_x += sb_w;
573 } 813 }
814
574 if (menubar_visible(R)) { 815 if (menubar_visible ())
816 {
575 mb_h = menuBar_TotalHeight(); 817 mb_h = menuBar_TotalHeight ();
576 R->szHint.base_height += mb_h; 818 szHint.base_height += mb_h;
577 R->window_vt_y = mb_h; 819 window_vt_y += mb_h;
578 } 820 }
821
579 R->szHint.width_inc = R->TermWin.fwidth; 822 szHint.width_inc = fwidth;
580 R->szHint.height_inc = R->TermWin.fheight; 823 szHint.height_inc = fheight;
581 R->szHint.min_width = R->szHint.base_width + R->szHint.width_inc; 824 szHint.min_width = szHint.base_width + szHint.width_inc;
582 R->szHint.min_height = R->szHint.base_height + R->szHint.height_inc; 825 szHint.min_height = szHint.base_height + szHint.height_inc;
583 826
584 if (width && width - R->szHint.base_width < max_width) { 827 if (newwidth && newwidth - szHint.base_width < max_width)
828 {
585 R->szHint.width = width; 829 szHint.width = newwidth;
586 R->TermWin.width = width - R->szHint.base_width; 830 width = newwidth - szHint.base_width;
587 } else { 831 }
588 MIN_IT(R->TermWin.width, max_width); 832 else
833 {
834 min_it (width, max_width);
589 R->szHint.width = R->szHint.base_width + R->TermWin.width; 835 szHint.width = szHint.base_width + width;
590 } 836 }
837
591 if (height && height - R->szHint.base_height < max_height) { 838 if (newheight && newheight - szHint.base_height < max_height)
839 {
592 R->szHint.height = height; 840 szHint.height = newheight;
593 R->TermWin.height = height - R->szHint.base_height; 841 height = newheight - szHint.base_height;
594 } else { 842 }
595 MIN_IT(R->TermWin.height, max_height); 843 else
844 {
845 min_it (height, max_height);
596 R->szHint.height = R->szHint.base_height + R->TermWin.height; 846 szHint.height = szHint.base_height + height;
597 } 847 }
848
598 if (scrollbar_visible(R) && (R->Options & Opt_scrollBar_right)) 849 if (scrollbar_visible () && OPTION (Opt_scrollBar_right))
599 R->window_sb_x = R->szHint.width - sb_w; 850 window_sb_x = szHint.width - sb_w;
600 851
601 if (recalc_x) 852 if (recalc_x)
602 R->szHint.x += (DisplayWidth(R->Xdisplay, Xscreen) 853 szHint.x += DisplayWidth (disp, display->screen) - szHint.width - 2 * ext_bwidth;
603 - R->szHint.width - 2 * R->TermWin.ext_bwidth);
604 if (recalc_y) 854 if (recalc_y)
605 R->szHint.y += (DisplayHeight(R->Xdisplay, Xscreen) 855 szHint.y += DisplayHeight (disp, display->screen) - szHint.height - 2 * ext_bwidth;
606 - R->szHint.height - 2 * R->TermWin.ext_bwidth);
607 856
608 R->TermWin.ncol = R->TermWin.width / R->TermWin.fwidth; 857 ncol = width / fwidth;
609 R->TermWin.nrow = R->TermWin.height / R->TermWin.fheight; 858 nrow = height / fheight;
610 D_SIZE((stderr, "> Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d", 859 D_SIZE ((stderr, "> Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
611 R->TermWin.ncol, R->TermWin.nrow, R->szHint.width, 860 ncol, nrow, szHint.width,
612 R->szHint.height)); 861 szHint.height));
613 return; 862 return;
614} 863}
615 864
616/*----------------------------------------------------------------------*/ 865/*----------------------------------------------------------------------*/
617/* 866/*
618 * Tell the teletype handler what size the window is. 867 * Tell the teletype handler what size the window is.
619 * Called after a window size change. 868 * Called after a window size change.
620 */ 869 */
621void 870void
622rxvt_term::tt_winch () 871rxvt_term::tt_winch ()
623{ 872{
624 struct winsize ws; 873 if (pty.pty < 0)
625
626 if (cmd_fd < 0)
627 return; 874 return;
628 875
876 struct winsize ws;
877
629 ws.ws_col = TermWin.ncol; 878 ws.ws_col = ncol;
630 ws.ws_row = TermWin.nrow; 879 ws.ws_row = nrow;
631 ws.ws_xpixel = ws.ws_ypixel = 0; 880 ws.ws_xpixel = width;
632#ifndef DEBUG_SIZE 881 ws.ws_ypixel = height;
633 (void)ioctl (cmd_fd, TIOCSWINSZ, &ws); 882 (void)ioctl (pty.pty, TIOCSWINSZ, &ws);
634#else 883
635 if (ioctl (cmd_fd, TIOCSWINSZ, &ws) < 0) 884#if 0
636 D_SIZE((stderr, "Failed to send TIOCSWINSZ to fd %d", fd)); 885 // TIOCSWINSZ⎈ is supposed to do this automatically and correctly
637# ifdef SIGWINCH
638 else if (cmd_pid) /* force through to the command */ 886 if (cmd_pid) /* force through to the command */
639 kill (cmd_pid, SIGWINCH); 887 kill (-cmd_pid, SIGWINCH);
640# endif
641#endif 888#endif
642} 889}
643 890
644/*----------------------------------------------------------------------*/ 891/*----------------------------------------------------------------------*/
645/* rxvt_change_font() - Switch to a new font */ 892/* set_fonts () - load and set the various fonts
646/* 893 *
647 * init = 1 - initialize 894 * init = 1 - initialize
648 * 895 *
649 * fontname == FONT_UP - switch to bigger font 896 * fontname == FONT_UP - switch to bigger font
650 * fontname == FONT_DN - switch to smaller font 897 * fontname == FONT_DN - switch to smaller font
651 */ 898 */
652/* EXTPROTO */ 899bool
653void 900rxvt_term::set_fonts ()
654rxvt_change_font(pR_ int init, const char *fontname)
655{ 901{
656} 902 rxvt_fontset *fs = new rxvt_fontset (this);
903 rxvt_fontprop prop;
657 904
658/* INTPROTO */ 905 if (!fs
659void 906 || !fs->populate (rs[Rs_font] ? rs[Rs_font] : "fixed")
660rxvt_font_up_down(pR_ int n, int direction) 907 || !fs->realize_font (1))
908 {
909 delete fs;
910 return false;
911 }
912
913#if ENABLE_STYLES
914 for (int i = RS_styleCount; --i; )
915 if (fontset[i] != fontset[0])
916 delete fontset[i];
917#endif
918
919 delete fontset[0];
920 fontset[0] = fs;
921
922 prop = (*fs)[1]->properties ();
923 prop.height += lineSpace;
924 fs->set_prop (prop);
925
926 fwidth = prop.width;
927 fheight = prop.height;
928 fbase = prop.ascent;
929
930 for (int style = 1; style < 4; style++)
931 {
932#if ENABLE_STYLES
933 const char *res = rs[Rs_font + style];
934
935 if (res && !*res)
936 fontset[style] = fontset[0];
937 else
938 {
939 fontset[style] = fs = new rxvt_fontset (this);
940 rxvt_fontprop prop2 = prop;
941
942 if (res)
943 prop2.weight = prop2.slant = rxvt_fontprop::unset;
944 else
945 {
946 res = fontset[0]->fontdesc;
947
948 if (SET_STYLE (0, style) & RS_Bold) prop2.weight = rxvt_fontprop::bold;
949 if (SET_STYLE (0, style) & RS_Italic) prop2.slant = rxvt_fontprop::italic;
950 }
951
952 fs->populate (res);
953 fs->set_prop (prop2);
954 }
955#else
956 fontset[style] = fontset[0];
957#endif
958 }
959
960 if (parent[0])
961 {
962 resize_all_windows (0, 0, 0);
963 scr_remap_chars ();
964 scr_touch (true);
965 }
966
967 return true;
968}
969
970void rxvt_term::set_string_property (Atom prop, const char *str, int len)
661{ 971{
972 XChangeProperty (display->display, parent[0],
973 prop, XA_STRING, 8, PropModeReplace,
974 (const unsigned char *)str, len >= 0 ? len : strlen (str));
975}
976
977void rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
978{
979 wchar_t *ws = rxvt_mbstowcs (str, len);
980 char *s = rxvt_wcstoutf8 (ws);
981
982 XChangeProperty (display->display, parent[0],
983 prop, xa[XA_UTF8_STRING], 8, PropModeReplace,
984 (const unsigned char *)s, strlen (s));
985
986 free (s);
987 free (ws);
662} 988}
663 989
664/*----------------------------------------------------------------------*/ 990/*----------------------------------------------------------------------*/
665/*----------------------------------------------------------------------*/ 991/*----------------------------------------------------------------------*/
666/* xterm sequences - title, iconName, color (exptl) */ 992/* xterm sequences - title, iconName, color (exptl) */
667/* EXTPROTO */
668void 993void
669rxvt_set_title(pR_ const char *str) 994rxvt_term::set_title (const char *str)
670{ 995{
671#ifndef SMART_WINDOW_TITLE 996 set_string_property (XA_WM_NAME, str);
672 XStoreName(R->Xdisplay, R->TermWin.parent[0], str); 997#if ENABLE_EWMH
673#else 998 set_utf8_property (xa[XA_NET_WM_NAME], str);
674 char *name;
675
676 if (XFetchName(R->Xdisplay, R->TermWin.parent[0], &name) == 0)
677 name = NULL;
678 if (name == NULL || STRCMP(name, str))
679 XStoreName(R->Xdisplay, R->TermWin.parent[0], str);
680 if (name)
681 XFree(name);
682#endif 999#endif
683} 1000}
684 1001
685/* EXTPROTO */
686void 1002void
687rxvt_set_iconName(pR_ const char *str) 1003rxvt_term::set_icon_name (const char *str)
688{ 1004{
689#ifndef SMART_WINDOW_TITLE 1005 set_string_property (XA_WM_ICON_NAME, str);
690 XSetIconName(R->Xdisplay, R->TermWin.parent[0], str); 1006#if ENABLE_EWMH
691#else 1007 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str);
692 char *name;
693
694 if (XGetIconName(R->Xdisplay, R->TermWin.parent[0], &name))
695 name = NULL;
696 if (name == NULL || STRCMP(name, str))
697 XSetIconName(R->Xdisplay, R->TermWin.parent[0], str);
698 if (name)
699 XFree(name);
700#endif 1008#endif
701} 1009}
702 1010
703#ifdef XTERM_COLOR_CHANGE 1011#ifdef XTERM_COLOR_CHANGE
704/* EXTPROTO */
705void 1012void
706rxvt_set_window_color(pR_ int idx, const char *color) 1013rxvt_term::set_window_color (int idx, const char *color)
707{ 1014{
708 rxvt_color xcol; 1015 rxvt_color xcol;
709 int i; 1016 int i;
710 1017
711 if (color == NULL || *color == '\0') 1018 if (color == NULL || *color == '\0')
712 return; 1019 return;
713 1020
714/* handle color aliases */ 1021 /* handle color aliases */
715 if (isdigit(*color)) { 1022 if (isdigit (*color))
1023 {
716 i = atoi(color); 1024 i = atoi (color);
1025
1026 if (i >= 8 && i <= 15)
717 if (i >= 8 && i <= 15) { /* bright colors */ 1027 { /* bright colors */
718 i -= 8; 1028 i -= 8;
719# ifndef NO_BRIGHTCOLOR 1029# ifndef NO_BRIGHTCOLOR
720 R->PixColors[idx] = R->PixColors[minBrightCOLOR + i]; 1030 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i];
721 SET_PIXCOLOR(R, idx); 1031 SET_PIXCOLOR (idx);
722 goto Done; 1032 goto done;
723# endif 1033# endif
724 } 1034 }
725 if (i >= 0 && i <= 7) { /* normal colors */ 1035
726 R->PixColors[idx] = R->PixColors[minCOLOR + i]; 1036 if (i >= 0 && i <= 7)
1037 { /* normal colors */
1038 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];
727 SET_PIXCOLOR(R, idx); 1039 SET_PIXCOLOR (idx);
728 goto Done; 1040 goto done;
729 } 1041 }
730 } 1042 }
1043
731 if (!rxvt_rXParseAllocColor(aR_ & xcol, color)) 1044 if (!rXParseAllocColor (&xcol, color))
732 return; 1045 return;
733/* XStoreColor (R->Xdisplay, XCMAP, XColor*); */
734 1046
735/* 1047 /* XStoreColor (display->display, display->cmap, XColor*); */
1048
1049 /*
736 * FIXME: should free colors here, but no idea how to do it so instead, 1050 * FIXME: should free colors here, but no idea how to do it so instead,
737 * so just keep gobbling up the colormap 1051 * so just keep gobbling up the colormap
738 */ 1052 */
739# if 0 1053# if 0
740 for (i = Color_Black; i <= Color_White; i++) 1054 for (i = Color_Black; i <= Color_White; i++)
741 if (R->PixColors[idx] == R->PixColors[i]) 1055 if (pix_colors[idx] == pix_colors[i])
742 break; 1056 break;
743 if (i > Color_White) { 1057 if (i > Color_White)
1058 {
744 /* fprintf (stderr, "XFreeColors: R->PixColors [%d] = %lu\n", idx, R->PixColors [idx]); */ 1059 /* fprintf (stderr, "XFreeColors: pix_colors [%d] = %lu\n", idx, pix_colors [idx]); */
745 XFreeColors(R->Xdisplay, XCMAP, (R->PixColors + idx), 1, 1060 XFreeColors (display->display, display->cmap, (pix_colors + idx), 1,
746 DisplayPlanes(R->Xdisplay, Xscreen)); 1061 DisplayPlanes (display->display, display->screen));
747 } 1062 }
748# endif 1063# endif
749 1064
750 R->PixColors[idx] = xcol; 1065 pix_colors_focused[idx] = xcol;
751 SET_PIXCOLOR(R, idx); 1066 SET_PIXCOLOR (idx);
752 1067
753/* XSetWindowAttributes attr; */ 1068 /* XSetWindowAttributes attr; */
754/* Cursor cursor; */ 1069 /* Cursor cursor; */
755 Done: 1070done:
756 if (idx == Color_bg && !(R->Options & Opt_transparent))
757 XSetWindowBackground(R->Xdisplay, R->TermWin.vt,
758 R->PixColors[Color_bg]);
759 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
760/* handle Color_BD, scrollbar background, etc. */ 1077 /*TODO: handle Color_BD, scrollbar background, etc. */
761 1078
762 rxvt_set_colorfgbg(aR);
763 rxvt_recolour_cursor(aR); 1079 recolour_cursor ();
764/* the only reasonable way to enforce a clean update */ 1080 scr_recolour ();
765 rxvt_scr_poweron(aR);
766} 1081}
767 1082
768#else 1083#else
769# define rxvt_set_window_color(aR_ idx,color) ((void)0) 1084# define set_window_color (idx,color) ((void)0)
770#endif /* XTERM_COLOR_CHANGE */ 1085#endif /* XTERM_COLOR_CHANGE */
771 1086
772/* EXTPROTO */
773void 1087void
774rxvt_recolour_cursor(pR) 1088rxvt_term::recolour_cursor ()
775{ 1089{
776 rxvt_color xcol[2]; 1090 XColor xcol[2];
777 1091
778#if TODO 1092 xcol[0].pixel = ISSET_PIXCOLOR (Color_pointer_fg)
779 xcol[0] = R->PixColors[Color_pointer]; 1093 ? pix_colors_focused[Color_pointer_fg]
780 xcol[1] = R->PixColors[Color_bg]; 1094 : pix_colors_focused[Color_fg];
781 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);
782 XRecolorCursor(R->Xdisplay, R->TermWin_cursor, &(xcol[0]), &(xcol[1])); 1100 XRecolorCursor (display->display, TermWin_cursor, xcol + 0, xcol + 1);
783#endif
784} 1101}
785 1102
786/*----------------------------------------------------------------------*/ 1103/*----------------------------------------------------------------------*/
787/* 1104/*
788 * 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
789 */ 1106 */
790/* INTPROTO */
791void 1107void
792rxvt_set_colorfgbg(pR) 1108rxvt_term::set_colorfgbg ()
793{ 1109{
794 unsigned int i; 1110 unsigned int i;
795 const char *xpmb = "\0"; 1111 const char *xpmb = "\0";
796 char fstr[sizeof("default") + 1], bstr[sizeof("default") + 1]; 1112 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1];
797 1113
798 R->env_colorfgbg =
799 (char *)rxvt_malloc(sizeof("COLORFGBG=default;default;bg") + 1); 1114 env_colorfgbg = (char *)rxvt_malloc (sizeof ("COLORFGBG=default;default;bg") + 1);
800 STRCPY(fstr, "default"); 1115 strcpy (fstr, "default");
801 STRCPY(bstr, "default"); 1116 strcpy (bstr, "default");
802 for (i = Color_Black; i <= Color_White; i++) 1117 for (i = Color_Black; i <= Color_White; i++)
803 if (R->PixColors[Color_fg] == R->PixColors[i]) { 1118 if (pix_colors[Color_fg] == pix_colors[i])
1119 {
804 sprintf(fstr, "%d", (i - Color_Black)); 1120 sprintf (fstr, "%d", (i - Color_Black));
805 break; 1121 break;
806 } 1122 }
1123
807 for (i = Color_Black; i <= Color_White; i++) 1124 for (i = Color_Black; i <= Color_White; i++)
808 if (R->PixColors[Color_bg] == R->PixColors[i]) { 1125 if (pix_colors[Color_bg] == pix_colors[i])
1126 {
809 sprintf(bstr, "%d", (i - Color_Black)); 1127 sprintf (bstr, "%d", (i - Color_Black));
810#ifdef XPM_BACKGROUND 1128#ifdef XPM_BACKGROUND
811 xpmb = "default;"; 1129 xpmb = "default;";
812#endif 1130#endif
813 break; 1131 break;
814 } 1132 }
1133
815 sprintf(R->env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr); 1134 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr);
816 putenv(R->env_colorfgbg);
817
818#ifndef NO_BRIGHTCOLOR
819 R->colorfgbg = DEFAULT_RSTYLE;
820 for (i = minCOLOR; i <= maxCOLOR; i++) {
821 if (R->PixColors[Color_fg] == R->PixColors[i])
822 R->colorfgbg = SET_FGCOLOR(R->colorfgbg, i);
823 if (R->PixColors[Color_bg] == R->PixColors[i])
824 R->colorfgbg = SET_BGCOLOR(R->colorfgbg, i);
825 }
826#endif
827} 1135}
828 1136
829/*----------------------------------------------------------------------*/ 1137/*----------------------------------------------------------------------*/
830/*
831 * Colour determination for low colour displays, routine from
832 * Hans de Goede <hans@highrise.nl>
833 */
834 1138
835/* EXTPROTO */
836int 1139int
837rxvt_rXParseAllocColor(pR_ rxvt_color * screen_in_out, const char *colour) 1140rxvt_term::rXParseAllocColor (rxvt_color *screen_in_out, const char *colour)
838{ 1141{
839 screen_in_out->set(aR_ colour);
840
841 if (!screen_in_out->set(aR_ colour)) { 1142 if (!screen_in_out->set (display, colour))
842 rxvt_print_error("can't allocate colour: %s", colour); 1143 {
1144 rxvt_warn ("can't get colour '%s', continuing without.\n", colour);
843 return false; 1145 return false;
844 } 1146 }
845 1147
846 return true; 1148 return true;
847} 1149}
848 1150
849/* -------------------------------------------------------------------- * 1151/* -------------------------------------------------------------------- *
850 * - WINDOW RESIZING - * 1152 * - WINDOW RESIZING - *
851 * -------------------------------------------------------------------- */ 1153 * -------------------------------------------------------------------- */
852/* EXTPROTO */
853void 1154void
854rxvt_resize_all_windows(pR_ unsigned int width, unsigned int height, 1155rxvt_term::resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent)
855 int ignoreparent)
856{ 1156{
857 int fix_screen; 1157 int fix_screen;
1158 int old_width = szHint.width, old_height = szHint.height;
1159 dDisp;
858 1160
1161 window_calc (newwidth, newheight);
1162 XSetWMNormalHints (disp, parent[0], &szHint);
1163
1164 if (!ignoreparent)
1165 {
859#ifdef SMART_RESIZE 1166#ifdef SMART_RESIZE
860 int old_width = R->szHint.width, old_height = R->szHint.height; 1167 /*
861#endif
862
863 rxvt_window_calc(aR_ width, height);
864 XSetWMNormalHints(R->Xdisplay, R->TermWin.parent[0], &R->szHint);
865 if (!ignoreparent) {
866#ifdef SMART_RESIZE
867/*
868 * resize by Marius Gedminas <marius.gedminas@uosis.mif.vu.lt> 1168 * resize by Marius Gedminas <marius.gedminas@uosis.mif.vu.lt>
869 * reposition window on resize depending on placement on screen 1169 * reposition window on resize depending on placement on screen
870 */ 1170 */
871 int x, y, x1, y1; 1171 int x, y, x1, y1;
872 int dx, dy; 1172 int dx, dy;
873 unsigned int unused_w1, unused_h1, unused_b1, unused_d1; 1173 unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
874 Window unused_cr; 1174 Window unused_cr;
875 1175
876 XTranslateCoordinates(R->Xdisplay, R->TermWin.parent[0], Xroot, 1176 XTranslateCoordinates (disp, parent[0], display->root,
877 0, 0, &x, &y, &unused_cr); 1177 0, 0, &x, &y, &unused_cr);
878 XGetGeometry(R->Xdisplay, R->TermWin.parent[0], &unused_cr, &x1, &y1, 1178 XGetGeometry (disp, parent[0], &unused_cr, &x1, &y1,
879 &unused_w1, &unused_h1, &unused_b1, &unused_d1); 1179 &unused_w1, &unused_h1, &unused_b1, &unused_d1);
880 /* 1180 /*
881 * 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
882 * our position for handles and decorations. Counter it 1182 * our position for handles and decorations. Counter it
883 */ 1183 */
884 if (x1 != x || y1 != y) { 1184 if (x1 != x || y1 != y)
1185 {
885 x -= x1; 1186 x -= x1;
886 y -= y1; 1187 y -= y1;
887 } 1188 }
888 1189
889 x1 = (DisplayWidth(R->Xdisplay, Xscreen) - old_width) / 2; 1190 x1 = (DisplayWidth (disp, display->screen) - old_width) / 2;
890 y1 = (DisplayHeight(R->Xdisplay, Xscreen) - old_height) / 2; 1191 y1 = (DisplayHeight (disp, display->screen) - old_height) / 2;
891 dx = old_width - R->szHint.width; 1192 dx = old_width - szHint.width;
892 dy = old_height - R->szHint.height; 1193 dy = old_height - szHint.height;
893 1194
894 /* Check position of the center of the window */ 1195 /* Check position of the center of the window */
895 if (x < x1) /* left half */ 1196 if (x < x1) /* left half */
896 dx = 0; 1197 dx = 0;
897 else if (x == x1) /* exact center */ 1198 else if (x == x1) /* exact center */
898 dx /= 2; 1199 dx /= 2;
899 if (y < y1) /* top half */ 1200 if (y < y1) /* top half */
900 dy = 0; 1201 dy = 0;
901 else if (y == y1) /* exact center */ 1202 else if (y == y1) /* exact center */
902 dy /= 2; 1203 dy /= 2;
903 1204
904 XMoveResizeWindow(R->Xdisplay, R->TermWin.parent[0], x + dx, y + dy, 1205 XMoveResizeWindow (disp, parent[0], x + dx, y + dy,
905 R->szHint.width, R->szHint.height); 1206 szHint.width, szHint.height);
906#else 1207#else
907 XResizeWindow(R->Xdisplay, R->TermWin.parent[0], R->szHint.width, 1208 XResizeWindow (disp, parent[0], szHint.width, szHint.height);
908 R->szHint.height);
909#endif 1209#endif
910 } 1210 }
911 1211
912 fix_screen = (R->TermWin.ncol != R->prev_ncol 1212 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
913 || R->TermWin.nrow != R->prev_nrow); 1213
914 if (fix_screen || width != R->old_width || height != R->old_height) { 1214 if (fix_screen || newwidth != old_width || newheight != old_height)
1215 {
915 if (scrollbar_visible(R)) { 1216 if (scrollbar_visible ())
1217 {
916 XMoveResizeWindow(R->Xdisplay, R->scrollBar.win, R->window_sb_x, 1218 XMoveResizeWindow (disp, scrollBar.win,
1219 window_sb_x, 0,
917 0, scrollbar_TotalWidth(), R->szHint.height); 1220 scrollbar_TotalWidth (), szHint.height);
918 rxvt_Resize_scrollBar(aR); 1221 resize_scrollbar ();
919 } 1222 }
1223
920 if (menubar_visible(R)) 1224 if (menubar_visible ())
921 XMoveResizeWindow(R->Xdisplay, R->menuBar.win, R->window_vt_x, 1225 XMoveResizeWindow (disp, menuBar.win,
1226 window_vt_x, 0,
922 0, TermWin_TotalWidth(), menuBar_TotalHeight()); 1227 TermWin_TotalWidth (), menuBar_TotalHeight ());
923 XMoveResizeWindow(R->Xdisplay, R->TermWin.vt, R->window_vt_x, 1228
924 R->window_vt_y, TermWin_TotalWidth(), 1229 XMoveResizeWindow (disp, vt,
1230 window_vt_x, window_vt_y,
925 TermWin_TotalHeight()); 1231 TermWin_TotalWidth (), TermWin_TotalHeight ());
926#ifdef RXVT_GRAPHICS 1232
927 if (R->old_height)
928 rxvt_Gr_Resize(aR_ R->old_width - R->szHint.base_width,
929 R->old_height - R->szHint.base_height);
930#endif
931 rxvt_scr_clear(aR); 1233 scr_clear ();
932#ifdef XPM_BACKGROUND 1234#ifdef XPM_BACKGROUND
933 rxvt_resize_pixmap(aR); 1235 resize_pixmap ();
934#endif 1236#endif
935 } 1237 }
936 1238
937 if (fix_screen || R->old_height == 0) { 1239 if (fix_screen || old_height == 0)
1240 {
938 int curr_screen = -1; 1241 int curr_screen = -1;
939 uint16_t old_ncol = R->prev_ncol; 1242 int old_ncol = prev_ncol;
940 1243
941 /* scr_reset only works on the primary screen */ 1244 /* scr_reset only works on the primary screen */
942 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
943 curr_screen = rxvt_scr_change_screen(aR_ PRIMARY); 1249 curr_screen = scr_change_screen (PRIMARY);
944 rxvt_scr_reset(aR); 1250 ncol = ocol;
945 if (curr_screen >= 0) { /* this is not the first time through */
946 rxvt_scr_change_screen(aR_ curr_screen);
947 rxvt_selection_check(aR_(old_ncol != R->TermWin.ncol ? 4 : 0));
948 } 1251 }
949 }
950 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
951 R->old_width = R->szHint.width; 1262 old_width = szHint.width;
952 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
953 1269
954#ifdef USE_XIM 1270#ifdef USE_XIM
955 rxvt_IMSetStatusPosition(aR); 1271 IMSetStatusPosition ();
956#endif 1272#endif
957} 1273}
958 1274
959/* 1275/*
960 * 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.
961 * good for toggling 80/132 columns 1277 * good for toggling 80/132 columns
962 */ 1278 */
963/* EXTPROTO */
964void 1279void
965rxvt_set_widthheight(pR_ unsigned int width, unsigned int height) 1280rxvt_term::set_widthheight (unsigned int newwidth, unsigned int newheight)
966{ 1281{
967 XWindowAttributes wattr; 1282 XWindowAttributes wattr;
968 1283
969 if (width == 0 || height == 0) { 1284 if (newwidth == 0 || newheight == 0)
1285 {
970 XGetWindowAttributes(R->Xdisplay, Xroot, &wattr); 1286 XGetWindowAttributes (display->display, display->root, &wattr);
1287
971 if (width == 0) 1288 if (newwidth == 0)
972 width = wattr.width - R->szHint.base_width; 1289 newwidth = wattr.width - szHint.base_width;
973 if (height == 0) 1290 if (newheight == 0)
974 height = wattr.height - R->szHint.base_height; 1291 newheight = wattr.height - szHint.base_height;
1292 }
1293
1294 if (newwidth != width || newheight != height)
975 } 1295 {
976 if (width != R->TermWin.width || height != R->TermWin.height) {
977 width += R->szHint.base_width; 1296 newwidth += szHint.base_width;
978 height += R->szHint.base_height; 1297 newheight += szHint.base_height;
979 rxvt_resize_all_windows(aR_ width, height, 0); 1298 resize_all_windows (newwidth, newheight, 0);
980 } 1299 }
981} 1300}
982 1301
983/* -------------------------------------------------------------------- * 1302/* -------------------------------------------------------------------- *
984 * - X INPUT METHOD ROUTINES - * 1303 * - X INPUT METHOD ROUTINES - *
985 * -------------------------------------------------------------------- */ 1304 * -------------------------------------------------------------------- */
986#ifdef USE_XIM 1305#ifdef USE_XIM
987/* INTPROTO */
988void
989rxvt_setSize(pR_ XRectangle * size)
990{
991 size->x = R->TermWin.int_bwidth;
992 size->y = R->TermWin.int_bwidth;
993 size->width = Width2Pixel(R->TermWin.ncol);
994 size->height = Height2Pixel(R->TermWin.nrow);
995}
996 1306
997/* INTPROTO */
998void 1307void
999rxvt_setColor(pR_ unsigned long *fg, unsigned long *bg) 1308rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg)
1000{ 1309{
1001 *fg = R->PixColors[Color_fg]; 1310 fg = pix_colors[Color_fg];
1002 *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;
1003} 1338}
1004 1339
1005/* Checking whether input method is running. */ 1340/* Checking whether input method is running. */
1006/* INTPROTO */
1007Bool 1341bool
1008rxvt_IMisRunning(pR) 1342rxvt_term::IMisRunning ()
1009{ 1343{
1010 char *p; 1344 char *p;
1011 Atom atom; 1345 Atom atom;
1012 Window win; 1346 Window win;
1013 char server[IMBUFSIZ]; 1347 char server[IMBUFSIZ];
1014 1348
1015/* get current locale modifier */ 1349 /* get current locale modifier */
1016 if ((p = XSetLocaleModifiers(NULL)) != NULL) { 1350 if ((p = XSetLocaleModifiers (NULL)) != NULL)
1351 {
1017 STRCPY(server, "@server="); 1352 strcpy (server, "@server=");
1018 STRNCAT(server, &(p[4]), IMBUFSIZ - 9); /* skip "@im=" */ 1353 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */
1354
1019 if ((p = STRCHR(server + 1, '@')) != NULL) /* first one only */ 1355 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */
1020 *p = '\0'; 1356 *p = '\0';
1021 1357
1022 atom = XInternAtom(R->Xdisplay, server, False); 1358 atom = XInternAtom (display->display, server, False);
1023 win = XGetSelectionOwner(R->Xdisplay, atom); 1359 win = XGetSelectionOwner (display->display, atom);
1360
1024 if (win != None) 1361 if (win != None)
1025 return True; 1362 return True;
1026 } 1363 }
1364
1027 return False; 1365 return False;
1028} 1366}
1029 1367
1030/* EXTPROTO */
1031void 1368void
1032rxvt_IMSendSpot(pR) 1369rxvt_term::IMSendSpot ()
1033{ 1370{
1034 XPoint spot; 1371 XPoint nspot;
1035 XVaNestedList preedit_attr; 1372 XVaNestedList preedit_attr;
1036 1373
1037 if (R->Input_Context == NULL 1374 if (!Input_Context
1375 || !focus
1038 || !R->TermWin.focus || !(R->input_style & XIMPreeditPosition) 1376 || !(input_style & XIMPreeditPosition))
1039 || !(R->event_type == KeyPress
1040 || R->event_type == Expose
1041 || R->event_type == NoExpose
1042 || R->event_type == SelectionNotify
1043 || R->event_type == ButtonRelease || R->event_type == FocusIn)
1044 || !rxvt_IMisRunning(aR))
1045 return; 1377 return;
1046 1378
1047 rxvt_setPosition(aR_ & spot); 1379 im_set_position (nspot);
1048 1380
1381 if (nspot.x == spot.x && nspot.y == spot.y)
1382 return;
1383
1384 spot = nspot;
1385
1049 preedit_attr = XVaCreateNestedList(0, XNSpotLocation, &spot, NULL); 1386 preedit_attr = XVaCreateNestedList (0, XNSpotLocation, &spot, NULL);
1050 XSetICValues(R->Input_Context, XNPreeditAttributes, preedit_attr, NULL); 1387 XSetICValues (Input_Context, XNPreeditAttributes, preedit_attr, NULL);
1051 XFree(preedit_attr); 1388 XFree (preedit_attr);
1052} 1389}
1053 1390
1054/* EXTPROTO */
1055void 1391void
1056rxvt_setTermFontSet(pR_ int idx) 1392rxvt_term::im_destroy ()
1057{ 1393{
1058 char *string; 1394 if (input_method)
1059 long length; 1395 {
1060 int success = 0; 1396 if (Input_Context && input_method->xim)
1397 XDestroyIC (Input_Context);
1061 1398
1062 if (idx < 0 || idx >= MAX_NFONTS) 1399 display->put_xim (input_method);
1063 return; 1400 input_method = 0;
1064} 1401 }
1065 1402
1066/* INTPROTO */
1067void
1068rxvt_setPreeditArea (pR_ XRectangle * preedit_rect, XRectangle * status_rect,
1069 XRectangle * needed_rect)
1070{
1071 int mbh, vtx = 0;
1072
1073 if (scrollbar_visible(R) && !(R->Options & Opt_scrollBar_right))
1074 vtx = scrollbar_TotalWidth();
1075 mbh = menubar_visible(R) ? menuBar_TotalHeight() : 0;
1076 mbh -= R->TermWin.lineSpace;
1077
1078 preedit_rect->x = needed_rect->width + vtx;
1079 preedit_rect->y = Height2Pixel(R->TermWin.nrow - 1) + mbh;
1080
1081 preedit_rect->width = Width2Pixel(R->TermWin.ncol + 1) - needed_rect->width
1082 + vtx;
1083 preedit_rect->height = Height2Pixel(1);
1084
1085 status_rect->x = vtx;
1086 status_rect->y = Height2Pixel(R->TermWin.nrow - 1) + mbh;
1087
1088 status_rect->width = needed_rect->width ? needed_rect->width
1089 : Width2Pixel(R->TermWin.ncol + 1);
1090 status_rect->height = Height2Pixel(1);
1091}
1092
1093/* ARGSUSED */
1094/* INTPROTO */
1095void
1096rxvt_IMDestroyCallback(XIM xim __attribute__ ((unused)), XPointer client_data
1097 __attribute__ ((unused)), XPointer call_data
1098 __attribute__ ((unused)))
1099{
1100 dR;
1101
1102 R->Input_Context = NULL; 1403 Input_Context = 0;
1103/* To avoid Segmentation Fault in C locale: Solaris only? */
1104 if (STRCMP(R->locale, "C"))
1105 XRegisterIMInstantiateCallback(R->Xdisplay, NULL, NULL, NULL,
1106 rxvt_IMInstantiateCallback, NULL);
1107} 1404}
1108 1405
1109/* 1406/*
1110 * X manual pages and include files don't match on some systems: 1407 * Try to open a XIM with the current modifiers, then see if we can
1111 * some think this is an XIDProc and others an XIMProc so we can't 1408 * open a suitable preedit type
1112 * use the first argument - need to update this to be nice for
1113 * both types via some sort of configure detection
1114 */ 1409 */
1115/* ARGSUSED */ 1410bool
1116/* EXTPROTO */ 1411rxvt_term::IM_get_IC (const char *modifiers)
1117void
1118rxvt_IMInstantiateCallback(Display * unused
1119 __attribute__ ((unused)), XPointer client_data
1120 __attribute__ ((unused)), XPointer call_data
1121 __attribute__ ((unused)))
1122{ 1412{
1123 dR; 1413 int i, j, found;
1124 int i, found, had_im; 1414 XIM xim;
1415 XPoint spot;
1416 XRectangle rect, status_rect, needed_rect;
1417 unsigned long fg, bg;
1418 const char *p;
1419 char **s;
1420 XIMStyles *xim_styles;
1421
1422 if (! ((p = XSetLocaleModifiers (modifiers)) && *p))
1423 return false;
1424
1425 D_MAIN ((stderr, "rxvt_IM_get_IC ()"));
1426 input_method = display->get_xim (locale, modifiers);
1427 if (input_method == NULL)
1428 return false;
1429
1430 xim = input_method->xim;
1431 spot.x = spot.y = -1;
1432
1433 xim_styles = NULL;
1434 if (XGetIMValues (xim, XNQueryInputStyle, &xim_styles, NULL)
1435 || !xim_styles || !xim_styles->count_styles)
1436 {
1437 im_destroy ();
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++)
1444 {
1445 p = pet[pi];
1446
1447 if (!p)
1448 continue;
1449
1450 s = rxvt_splitcommastring (p);
1451
1452 for (i = found = 0; !found && s[i]; i++)
1453 {
1454 if (!strcmp (s[i], "OverTheSpot"))
1455 input_style = (XIMPreeditPosition | XIMStatusNothing);
1456 else if (!strcmp (s[i], "OffTheSpot"))
1457 input_style = (XIMPreeditArea | XIMStatusArea);
1458 else if (!strcmp (s[i], "Root"))
1459 input_style = (XIMPreeditNothing | XIMStatusNothing);
1460 else if (!strcmp (s[i], "None"))
1461 input_style = (XIMPreeditNone | XIMStatusNone);
1462
1463 for (j = 0; j < xim_styles->count_styles; j++)
1464 if (input_style == xim_styles->supported_styles[j])
1465 {
1466 rxvt_freecommastring (s);
1467
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;
1125 const char *p; 1592 const char *p;
1126 char **s; 1593 char **s;
1127 char buf[IMBUFSIZ]; 1594 char buf[IMBUFSIZ];
1128 1595
1596 SET_R (this);
1597
1598 im_destroy ();
1599
1129 D_MAIN((stderr, "rxvt_IMInstantiateCallback()")); 1600 D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()"));
1130 if (R->Input_Context) 1601 if (Input_Context)
1131 return; 1602 return;
1132 1603
1604#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1605 if (rs[Rs_imLocale])
1606 SET_LOCALE (rs[Rs_imLocale]);
1607#endif
1608
1133 p = R->rs[Rs_inputMethod]; 1609 p = rs[Rs_inputMethod];
1134 if (p && *p) 1610 if (p && *p)
1135 { 1611 {
1136 bool found = false; 1612 bool found = false;
1137 1613
1138 s = rxvt_splitcommastring (p); 1614 s = rxvt_splitcommastring (p);
1615
1139 for (i = 0; s[i]; i++) 1616 for (i = 0; s[i]; i++)
1140 { 1617 {
1141 if (*s[i]) 1618 if (*s[i])
1142 { 1619 {
1143 STRCPY (buf, "@im="); 1620 strcpy (buf, "@im=");
1144 STRNCAT (buf, s[i], IMBUFSIZ - 5); 1621 strncat (buf, s[i], IMBUFSIZ - 5);
1145 if ((p = XSetLocaleModifiers (buf)) && *p 1622 if (IM_get_IC (buf))
1146 && rxvt_IM_get_IC (aR))
1147 { 1623 {
1148 found = true; 1624 found = true;
1149 break; 1625 break;
1150 } 1626 }
1151 } 1627 }
1152 } 1628 }
1153 for (i = 0; s[i]; i++) 1629
1154 free(s[i]); 1630 rxvt_freecommastring (s);
1155 free(s);
1156 1631
1157 if (found) 1632 if (found)
1158 return; 1633 goto done;
1159 } 1634 }
1160 1635
1161/* try with XMODIFIERS env. var. */ 1636 /* try with XMODIFIERS env. var. */
1162 if ((p = XSetLocaleModifiers ("")) && *p 1637 if (IM_get_IC (""))
1163 && rxvt_IM_get_IC (aR)) 1638 goto done;
1639
1640 /* try with no modifiers base IF the user didn't specify an IM */
1641 if (IM_get_IC ("@im=none"))
1642 goto done;
1643
1644done:
1645#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1646 if (rs[Rs_imLocale])
1647 SET_LOCALE (locale);
1648#endif
1649}
1650
1651void
1652rxvt_term::IMSetStatusPosition ()
1653{
1654 XRectangle preedit_rect, status_rect, *needed_rect;
1655 XVaNestedList preedit_attr, status_attr;
1656
1657 if (!Input_Context
1658 || !focus
1659 || !(input_style & XIMPreeditArea)
1660 || !IMisRunning ())
1164 return; 1661 return;
1165 1662
1166/* try with no modifiers base IF the user didn't specify an IM */
1167 if ((p = XSetLocaleModifiers ("@im=none")) && *p
1168 && rxvt_IM_get_IC (aR) == True)
1169 return;
1170}
1171
1172/*
1173 * Try to open a XIM with the current modifiers, then see if we can
1174 * open a suitable preedit type
1175 */
1176/* INTPROTO */
1177Bool
1178rxvt_IM_get_IC(pR)
1179{
1180 int i, j, found;
1181 XIM xim;
1182 XPoint spot;
1183 XRectangle rect, status_rect, needed_rect;
1184 unsigned long fg, bg;
1185 const char *p;
1186 char **s;
1187 XIMStyles *xim_styles;
1188 XVaNestedList preedit_attr, status_attr;
1189 XIMCallback ximcallback;
1190
1191 D_MAIN((stderr, "rxvt_IM_get_IC()"));
1192 xim = XOpenIM(R->Xdisplay, NULL, NULL, NULL);
1193 if (xim == NULL)
1194 return False;
1195
1196 xim_styles = NULL;
1197 if (XGetIMValues(xim, XNQueryInputStyle, &xim_styles, NULL)
1198 || !xim_styles || !xim_styles->count_styles) {
1199 XCloseIM(xim);
1200 return False;
1201 }
1202
1203 p = R->rs[Rs_preeditType] ? R->rs[Rs_preeditType]
1204 : "OverTheSpot,OffTheSpot,Root";
1205 s = rxvt_splitcommastring(p);
1206 for (i = found = 0; !found && s[i]; i++) {
1207 if (!STRCMP(s[i], "OverTheSpot"))
1208 R->input_style = (XIMPreeditPosition | XIMStatusNothing);
1209 else if (!STRCMP(s[i], "OffTheSpot"))
1210 R->input_style = (XIMPreeditArea | XIMStatusArea);
1211 else if (!STRCMP(s[i], "Root"))
1212 R->input_style = (XIMPreeditNothing | XIMStatusNothing);
1213
1214 for (j = 0; j < xim_styles->count_styles; j++)
1215 if (R->input_style == xim_styles->supported_styles[j]) {
1216 found = 1;
1217 break;
1218 }
1219 }
1220 for (i = 0; s[i]; i++)
1221 free(s[i]);
1222 free(s);
1223 XFree(xim_styles);
1224
1225 if (!found) {
1226 XCloseIM(xim);
1227 return False;
1228 }
1229
1230 ximcallback.callback = rxvt_IMDestroyCallback;
1231
1232/* XXX: not sure why we need this (as well as IC one below) */
1233 XSetIMValues(xim, XNDestroyCallback, &ximcallback, NULL);
1234
1235 preedit_attr = status_attr = NULL;
1236
1237 if (R->input_style & XIMPreeditPosition) {
1238 rxvt_setSize(aR_ & rect);
1239 rxvt_setPosition(aR_ & spot);
1240 rxvt_setColor(aR_ & fg, &bg);
1241
1242 preedit_attr = XVaCreateNestedList(0, XNArea, &rect,
1243 XNSpotLocation, &spot,
1244 XNForeground, fg, XNBackground, bg,
1245 //XNFontSet, R->TermWin.fontset,
1246 NULL);
1247 } else if (R->input_style & XIMPreeditArea) {
1248 rxvt_setColor(aR_ & fg, &bg);
1249
1250 /*
1251 * The necessary width of preedit area is unknown
1252 * until create input context.
1253 */
1254 needed_rect.width = 0;
1255
1256 rxvt_setPreeditArea(aR_ & rect, &status_rect, &needed_rect);
1257
1258 preedit_attr = XVaCreateNestedList(0, XNArea, &rect,
1259 XNForeground, fg, XNBackground, bg,
1260 //XNFontSet, R->TermWin.fontset,
1261 NULL);
1262 status_attr = XVaCreateNestedList(0, XNArea, &status_rect,
1263 XNForeground, fg, XNBackground, bg,
1264 //XNFontSet, R->TermWin.fontset,
1265 NULL);
1266 }
1267 R->Input_Context = XCreateIC(xim, XNInputStyle, R->input_style,
1268 XNClientWindow, R->TermWin.parent[0],
1269 XNFocusWindow, R->TermWin.parent[0],
1270 XNDestroyCallback, &ximcallback,
1271 preedit_attr ? XNPreeditAttributes : NULL,
1272 preedit_attr,
1273 status_attr ? XNStatusAttributes : NULL,
1274 status_attr, NULL);
1275 if (preedit_attr)
1276 XFree(preedit_attr);
1277 if (status_attr)
1278 XFree(status_attr);
1279 if (R->Input_Context == NULL) {
1280 rxvt_print_error("failed to create input context");
1281 XCloseIM(xim);
1282 return False;
1283 }
1284 if (R->input_style & XIMPreeditArea)
1285 rxvt_IMSetStatusPosition(aR);
1286 D_MAIN((stderr, "rxvt_IM_get_IC() - successful connection"));
1287 return True;
1288}
1289
1290/* EXTPROTO */
1291void
1292rxvt_IMSetStatusPosition(pR)
1293{
1294 XRectangle preedit_rect, status_rect, *needed_rect;
1295 XVaNestedList preedit_attr, status_attr;
1296
1297 if (R->Input_Context == NULL
1298 || !R->TermWin.focus || !(R->input_style & XIMPreeditArea)
1299 || !rxvt_IMisRunning(aR))
1300 return;
1301
1302/* Getting the necessary width of preedit area */ 1663 /* Getting the necessary width of preedit area */
1303 status_attr = XVaCreateNestedList(0, XNAreaNeeded, &needed_rect, NULL); 1664 status_attr = XVaCreateNestedList (0, XNAreaNeeded, &needed_rect, NULL);
1304 XGetICValues(R->Input_Context, XNStatusAttributes, status_attr, NULL); 1665 XGetICValues (Input_Context, XNStatusAttributes, status_attr, NULL);
1305 XFree(status_attr); 1666 XFree (status_attr);
1306 1667
1307 rxvt_setPreeditArea(aR_ & preedit_rect, &status_rect, needed_rect); 1668 im_set_preedit_area (preedit_rect, status_rect, *needed_rect);
1669 XFree (needed_rect);
1308 1670
1309 preedit_attr = XVaCreateNestedList(0, XNArea, &preedit_rect, NULL); 1671 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);
1310 status_attr = XVaCreateNestedList(0, XNArea, &status_rect, NULL); 1672 status_attr = XVaCreateNestedList (0, XNArea, &status_rect, NULL);
1311 1673
1312 XSetICValues(R->Input_Context, 1674 XSetICValues (Input_Context,
1313 XNPreeditAttributes, preedit_attr, 1675 XNPreeditAttributes, preedit_attr,
1314 XNStatusAttributes, status_attr, NULL); 1676 XNStatusAttributes, status_attr, NULL);
1315 1677
1316 XFree(preedit_attr); 1678 XFree (preedit_attr);
1317 XFree(status_attr); 1679 XFree (status_attr);
1318} 1680}
1319#endif /* USE_XIM */ 1681#endif /* USE_XIM */
1320 1682
1321/*----------------------------------------------------------------------*/ 1683/*----------------------------------------------------------------------*/
1322rxvt_t rxvt_current_term; 1684rxvt_t rxvt_current_term;

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines