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.8 by pcg, Thu Nov 27 10:12:10 2003 UTC vs.
Revision 1.155 by root, Mon Jan 2 15:35:43 2006 UTC

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

Diff Legend

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