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.9 by pcg, Tue Dec 2 21:49:46 2003 UTC vs.
Revision 1.331 by sf-exg, Mon Jul 26 22:07:38 2010 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines