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.25 by pcg, Sat Jan 31 03:27:45 2004 UTC vs.
Revision 1.243 by sasha, Thu Aug 16 21:26:20 2007 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines