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.22 by pcg, Sat Jan 31 00:20:21 2004 UTC vs.
Revision 1.174 by root, Thu Jan 12 00:11:13 2006 UTC

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

Diff Legend

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