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.3 by pcg, Tue Nov 25 11:52:42 2003 UTC vs.
Revision 1.348 by sf-exg, Thu Jan 20 16:41:23 2011 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines