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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines