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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines