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.4 by pcg, Tue Nov 25 15:25:17 2003 UTC vs.
Revision 1.167 by root, Sun Jan 8 08:43:11 2006 UTC

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

Diff Legend

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