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.21 by pcg, Thu Jan 29 23:26:01 2004 UTC vs.
Revision 1.155 by root, Mon Jan 2 15:35:43 2006 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines