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.26 by pcg, Sun Feb 1 01:34:41 2004 UTC vs.
Revision 1.175 by root, Thu Jan 12 00:35:39 2006 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines