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.2 by pcg, Mon Nov 24 17:31:27 2003 UTC vs.
Revision 1.169 by root, Tue Jan 10 18:09:22 2006 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines