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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines