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.21 by pcg, Thu Jan 29 23:26:01 2004 UTC vs.
Revision 1.136 by root, Mon Feb 14 18:47:54 2005 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines