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.46 by pcg, Tue Feb 24 22:28:42 2004 UTC vs.
Revision 1.380 by root, Tue Jun 5 11:35:58 2012 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines