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.11 by pcg, Mon Dec 8 23:14:40 2003 UTC vs.
Revision 1.307 by ayin, Tue Feb 19 10:47:03 2008 UTC

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

Diff Legend

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