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.19 by pcg, Wed Dec 24 09:22:29 2003 UTC vs.
Revision 1.302 by root, Fri Jan 25 16:04:57 2008 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines