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

Diff Legend

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