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

Diff Legend

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