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.193 by root, Sat Jan 21 14:25:05 2006 UTC vs.
Revision 1.297 by sasha, Fri Jan 4 21:31:23 2008 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>
… …
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 * Copyright (c) 2003-2007 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.
… …
38#include <limits> 38#include <limits>
39 39
40#include <csignal> 40#include <csignal>
41#include <cstring> 41#include <cstring>
42 42
43#ifdef TTY_GID_SUPPORT
44# include <grp.h>
45#endif
46
47#ifdef HAVE_TERMIOS_H
48# include <termios.h> 43#include <termios.h>
44
45#ifdef HAVE_XSETLOCALE
46# define X_LOCALE
47# include <X11/Xlocale.h>
48#else
49# ifdef HAVE_SETLOCALE
50# include <clocale>
51# endif
49#endif 52#endif
50 53
51vector<rxvt_term *> rxvt_term::termlist; 54vector<rxvt_term *> rxvt_term::termlist;
52 55
53// used to tell global functions which terminal instance is "active" 56// used to tell global functions which terminal instance is "active"
… …
56static char curlocale[128], savelocale[128]; 59static char curlocale[128], savelocale[128];
57 60
58bool 61bool
59rxvt_set_locale (const char *locale) NOTHROW 62rxvt_set_locale (const char *locale) NOTHROW
60{ 63{
64 int size = strlen (locale) + 1;
65
66 if (size > sizeof (curlocale))
67 rxvt_fatal ("locale string too long, aborting.\n");
68
61 if (!locale || !strncmp (locale, curlocale, 128)) 69 if (!locale || !memcmp (locale, curlocale, size))
62 return false; 70 return false;
63 71
64 strncpy (curlocale, locale, 128); 72 memcpy (curlocale, locale, size);
65 setlocale (LC_CTYPE, curlocale); 73 setlocale (LC_CTYPE, curlocale);
66 return true; 74 return true;
67} 75}
68 76
69void 77void
… …
83class rxvt_composite_vec rxvt_composite; 91class rxvt_composite_vec rxvt_composite;
84 92
85text_t rxvt_composite_vec::compose (unicode_t c1, unicode_t c2) 93text_t rxvt_composite_vec::compose (unicode_t c1, unicode_t c2)
86{ 94{
87 compose_char *cc; 95 compose_char *cc;
88 96
89 // break compose chains, as stupid readline really likes to duplicate 97 // break compose chains, as stupid readline really likes to duplicate
90 // composing characters for some reason near the end of a line. 98 // composing characters for some reason near the end of a line.
91 cc = (*this)[c1]; 99 cc = (*this)[c1];
92 while (cc) 100 while (cc)
93 { 101 {
… …
142 150
143} 151}
144#endif 152#endif
145 153
146rxvt_term::rxvt_term () 154rxvt_term::rxvt_term ()
147 : 155{
148#if TRANSPARENT 156#if HAVE_BG_PIXMAP
149 rootwin_ev (this, &rxvt_term::rootwin_cb), 157 update_background_ev.set<rxvt_term, &rxvt_term::update_background_cb> (this);
158#endif
159#ifdef CURSOR_BLINK
160 cursor_blink_ev.set <rxvt_term, &rxvt_term::cursor_blink_cb> (this); cursor_blink_ev.set (0., CURSOR_BLINK_INTERVAL);
161#endif
162#ifdef TEXT_BLINK
163 text_blink_ev.set <rxvt_term, &rxvt_term::text_blink_cb> (this); text_blink_ev.set (0., TEXT_BLINK_INTERVAL);
164#endif
165#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
166 cont_scroll_ev.set <rxvt_term, &rxvt_term::cont_scroll_cb> (this);
167#endif
168#ifdef SELECTION_SCROLLING
169 sel_scroll_ev.set <rxvt_term, &rxvt_term::sel_scroll_cb> (this);
170#endif
171#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
172 slip_wheel_ev.set <rxvt_term, &rxvt_term::slip_wheel_cb> (this);
173#endif
174#if ENABLE_TRANSPARENCY || ENABLE_PERL
175 rootwin_ev.set <rxvt_term, &rxvt_term::rootwin_cb> (this),
150#endif 176#endif
151#ifdef HAVE_SCROLLBARS 177#ifdef HAVE_SCROLLBARS
152 scrollbar_ev (this, &rxvt_term::x_cb), 178 scrollbar_ev.set <rxvt_term, &rxvt_term::x_cb> (this),
153#endif 179#endif
154#ifdef CURSOR_BLINK 180#ifdef USE_XIM
155 cursor_blink_ev (this, &rxvt_term::cursor_blink_cb), 181 im_ev.set <rxvt_term, &rxvt_term::im_cb> (this),
156#endif
157#ifdef TEXT_BLINK
158 text_blink_ev (this, &rxvt_term::text_blink_cb),
159#endif
160#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
161 cont_scroll_ev (this, &rxvt_term::cont_scroll_cb),
162#endif
163#ifdef SELECTION_SCROLLING
164 sel_scroll_ev (this, &rxvt_term::sel_scroll_cb),
165#endif
166#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
167 slip_wheel_ev (this, &rxvt_term::slip_wheel_cb),
168#endif 182#endif
169#ifdef POINTER_BLANK 183#ifdef POINTER_BLANK
170 pointer_ev (this, &rxvt_term::pointer_cb), 184 pointer_ev.set <rxvt_term, &rxvt_term::pointer_cb> (this);
171#endif 185#endif
172#ifdef USE_XIM
173 im_ev (this, &rxvt_term::im_cb),
174#endif
175#ifndef NO_BELL 186#ifndef NO_BELL
176 bell_ev (this, &rxvt_term::bell_cb), 187 bell_ev.set <rxvt_term, &rxvt_term::bell_cb> (this);
177#endif 188#endif
178 termwin_ev (this, &rxvt_term::x_cb), 189 child_ev.set <rxvt_term, &rxvt_term::child_cb> (this);
179 vt_ev (this, &rxvt_term::x_cb), 190 flush_ev.set <rxvt_term, &rxvt_term::flush_cb> (this);
180 child_ev (this, &rxvt_term::child_cb), 191 destroy_ev.set <rxvt_term, &rxvt_term::destroy_cb> (this);
181 check_ev (this, &rxvt_term::check_cb), 192 pty_ev.set <rxvt_term, &rxvt_term::pty_cb> (this);
182 flush_ev (this, &rxvt_term::flush_cb), 193 incr_ev.set <rxvt_term, &rxvt_term::incr_cb> (this);
183 destroy_ev (this, &rxvt_term::destroy_cb), 194 termwin_ev.set <rxvt_term, &rxvt_term::x_cb> (this);
184 pty_ev (this, &rxvt_term::pty_cb), 195 vt_ev.set <rxvt_term, &rxvt_term::x_cb> (this);
185 incr_ev (this, &rxvt_term::incr_cb) 196
186{
187 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base; 197 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base;
188 198
189 termlist.push_back (this); 199 termlist.push_back (this);
190 200
191#ifdef KEYSYM_RESOURCE 201#ifdef KEYSYM_RESOURCE
… …
193#endif 203#endif
194} 204}
195 205
196// clean up the most important stuff, do *not* call x or free mem etc. 206// clean up the most important stuff, do *not* call x or free mem etc.
197// for use before an emergency exit 207// for use before an emergency exit
208void
198void rxvt_term::emergency_cleanup () 209rxvt_term::emergency_cleanup ()
199{ 210{
200 if (cmd_pid) 211 if (cmd_pid)
201 kill (-cmd_pid, SIGHUP); 212 kill (-cmd_pid, SIGHUP);
202 213
214 pty_ev.stop ();
203 delete pty; pty = 0; 215 delete pty; pty = 0;
204} 216}
205 217
206rxvt_term::~rxvt_term () 218rxvt_term::~rxvt_term ()
207{ 219{
… …
216#endif 228#endif
217 delete fontset[0]; 229 delete fontset[0];
218 230
219 if (display) 231 if (display)
220 { 232 {
221 dDisp;
222
223 selection_clear (); 233 selection_clear ();
224 234
225#ifdef USE_XIM 235#ifdef USE_XIM
226 im_destroy (); 236 im_destroy ();
227#endif 237#endif
228#ifdef XTERM_SCROLLBAR 238#ifdef XTERM_SCROLLBAR
229 if (xscrollbarGC) XFreeGC (disp, xscrollbarGC); 239 if (xscrollbarGC) XFreeGC (dpy, xscrollbarGC);
230 if (ShadowGC) XFreeGC (disp, ShadowGC); 240 if (ShadowGC) XFreeGC (dpy, ShadowGC);
231#endif 241#endif
232#ifdef PLAIN_SCROLLBAR 242#ifdef PLAIN_SCROLLBAR
233 if (pscrollbarGC) XFreeGC (disp, pscrollbarGC); 243 if (pscrollbarGC) XFreeGC (dpy, pscrollbarGC);
234#endif 244#endif
235#ifdef NEXT_SCROLLBAR 245#ifdef NEXT_SCROLLBAR
236 if (blackGC) XFreeGC (disp, blackGC); 246 if (blackGC) XFreeGC (dpy, blackGC);
237 if (whiteGC) XFreeGC (disp, whiteGC); 247 if (whiteGC) XFreeGC (dpy, whiteGC);
238 if (grayGC) XFreeGC (disp, grayGC); 248 if (grayGC) XFreeGC (dpy, grayGC);
239 if (darkGC) XFreeGC (disp, darkGC); 249 if (darkGC) XFreeGC (dpy, darkGC);
240 if (stippleGC) XFreeGC (disp, stippleGC); 250 if (stippleGC) XFreeGC (dpy, stippleGC);
241 if (dimple) XFreePixmap (disp, dimple); 251 if (dimple) XFreePixmap (dpy, dimple);
242 if (upArrow) XFreePixmap (disp, upArrow); 252 if (upArrow) XFreePixmap (dpy, upArrow);
243 if (downArrow) XFreePixmap (disp, downArrow); 253 if (downArrow) XFreePixmap (dpy, downArrow);
244 if (upArrowHi) XFreePixmap (disp, upArrowHi); 254 if (upArrowHi) XFreePixmap (dpy, upArrowHi);
245 if (downArrowHi) XFreePixmap (disp, downArrowHi); 255 if (downArrowHi) XFreePixmap (dpy, downArrowHi);
246#endif 256#endif
247#ifdef RXVT_SCROLLBAR 257#ifdef RXVT_SCROLLBAR
248 if (topShadowGC) XFreeGC (disp, topShadowGC); 258 if (topShadowGC) XFreeGC (dpy, topShadowGC);
249 if (botShadowGC) XFreeGC (disp, botShadowGC); 259 if (botShadowGC) XFreeGC (dpy, botShadowGC);
250 if (scrollbarGC) XFreeGC (disp, scrollbarGC); 260 if (scrollbarGC) XFreeGC (dpy, scrollbarGC);
251#endif 261#endif
252 if (gc) XFreeGC (disp, gc); 262 if (gc) XFreeGC (dpy, gc);
253 263
254 delete drawable; 264 delete drawable;
255 // destroy all windows 265 // destroy all windows
256 if (parent[0]) 266 if (parent[0])
257 XDestroyWindow (disp, parent[0]); 267 XDestroyWindow (dpy, parent[0]);
258 }
259 268
260 // TODO: free pixcolours, colours should become part of rxvt_display 269 for (int i = 0; i < TOTAL_COLORS; i++)
261 delete pix_colors_focused; 270 if (ISSET_PIXCOLOR (i))
271 {
272 pix_colors_focused [i].free (this);
262#if OFF_FOCUS_FADING 273#if OFF_FOCUS_FADING
263 delete pix_colors_unfocused; 274 pix_colors_unfocused [i].free (this);
264#endif 275#endif
276 }
265 277
278 clear ();
279 }
280
281#ifdef HAVE_BG_PIXMAP
282 bgPixmap.destroy ();
283#endif
284 display->flush (); /* ideally .put should do this */
266 displays.put (display); 285 displays.put (display);
267 286
268 scr_release (); 287 scr_release ();
269 288
270 /* clear all resources */ 289 /* clear all resources */
271 for (int i = 0; i < allocated.size (); i++) 290 for (int i = 0; i < allocated.size (); i++)
272 free (allocated [i]); 291 free (allocated [i]);
273 292
274 free (selection.text); 293 free (selection.text);
275 // TODO: manage env vars in child only(!) 294 // TODO: manage env vars in child only(!)
276 free (env_windowid);
277 free (env_display); 295 free (env_display);
278 free (env_term); 296 free (env_term);
279 free (env_colorfgbg);
280 free (locale); 297 free (locale);
281 free (v_buffer); 298 free (v_buffer);
282 free (incr_buf); 299 free (incr_buf);
283 300
284 delete envv; 301 delete envv;
285 delete argv; 302 delete argv;
286 303
287#ifdef KEYSYM_RESOURCE 304#ifdef KEYSYM_RESOURCE
288 delete keyboard; 305 delete keyboard;
289#endif 306#endif
307#ifndef NO_RESOURCES
308 XrmDestroyDatabase (option_db);
309#endif
290} 310}
291 311
292// child has exited, usually destroys 312// child has exited, usually destroys
293void 313void
294rxvt_term::child_cb (child_watcher &w, int status) 314rxvt_term::child_cb (ev::child &w, int status)
295{ 315{
296 HOOK_INVOKE ((this, HOOK_CHILD_EXIT, DT_INT, status, DT_END)); 316 HOOK_INVOKE ((this, HOOK_CHILD_EXIT, DT_INT, status, DT_END));
297 317
298 cmd_pid = 0; 318 cmd_pid = 0;
299 319
300 if (!OPTION (Opt_hold)) 320 if (!option (Opt_hold))
301 destroy (); 321 destroy ();
302} 322}
303 323
304void 324void
305rxvt_term::destroy () 325rxvt_term::destroy ()
306{ 326{
307 if (destroy_ev.active) 327 if (destroy_ev.is_active ())
308 return; 328 return;
309 329
310 if (HOOK_INVOKE ((this, HOOK_DESTROY, DT_END))) 330 HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));
311 return;
312 331
313#if ENABLE_OVERLAY 332#if ENABLE_OVERLAY
314 scr_overlay_off (); 333 scr_overlay_off ();
315#endif 334#endif
316 335
… …
320 im_ev.stop (display); 339 im_ev.stop (display);
321#endif 340#endif
322#if HAVE_SCROLLBARS 341#if HAVE_SCROLLBARS
323 scrollbar_ev.stop (display); 342 scrollbar_ev.stop (display);
324#endif 343#endif
325#if TRANSPARENT 344#if ENABLE_TRANSPARENCY || ENABLE_PERL
326 rootwin_ev.stop (display); 345 rootwin_ev.stop (display);
327#endif 346#endif
328 incr_ev.stop (); 347 incr_ev.stop ();
329 termwin_ev.stop (display); 348 termwin_ev.stop (display);
330 vt_ev.stop (display); 349 vt_ev.stop (display);
331 } 350 }
332 351
333 check_ev.stop (); 352 flush_ev.stop ();
334 pty_ev.stop (); 353 pty_ev.stop ();
335#ifdef CURSOR_BLINK 354#ifdef CURSOR_BLINK
336 cursor_blink_ev.stop (); 355 cursor_blink_ev.stop ();
337#endif 356#endif
338#ifdef TEXT_BLINK 357#ifdef TEXT_BLINK
… …
346#endif 365#endif
347#ifdef POINTER_BLANK 366#ifdef POINTER_BLANK
348 pointer_ev.stop (); 367 pointer_ev.stop ();
349#endif 368#endif
350 369
351 destroy_ev.start (0); 370 destroy_ev.start ();
352} 371}
353 372
354void 373void
355rxvt_term::destroy_cb (time_watcher &w) 374rxvt_term::destroy_cb (ev::idle &w, int revents)
356{ 375{
357 make_current (); 376 make_current ();
358 377
359 delete this; 378 delete this;
360} 379}
… …
371{ 390{
372 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++) 391 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)
373 (*t)->emergency_cleanup (); 392 (*t)->emergency_cleanup ();
374} 393}
375 394
376#if ENABLE_FRILLS 395#if !ENABLE_MINIMAL
377static void 396static void
378print_x_error (Display *dpy, XErrorEvent *event) 397print_x_error (Display *dpy, XErrorEvent *event)
379{ 398{
380 char buffer[BUFSIZ]; 399 char buffer[BUFSIZ];
381 char mesg[BUFSIZ]; 400 char mesg[BUFSIZ];
… …
414 else 433 else
415 XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x", 434 XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x",
416 mesg, BUFSIZ); 435 mesg, BUFSIZ);
417 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid); 436 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid);
418 } 437 }
419 XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d", 438 XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d",
420 mesg, BUFSIZ); 439 mesg, BUFSIZ);
421 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial); 440 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial);
422} 441}
423#endif 442#endif
424 443
… …
429 GET_R->allowedxerror = event->error_code; 448 GET_R->allowedxerror = event->error_code;
430 else 449 else
431 { 450 {
432 // GET_R is most likely not the terminal which caused the error, 451 // GET_R is most likely not the terminal which caused the error,
433 // so just output the error and continue 452 // so just output the error and continue
434#if ENABLE_FRILLS 453#if ENABLE_MINIMAL
454 old_xerror_handler (display, event);
455#else
435 print_x_error (display, event); 456 print_x_error (display, event);
436#else
437 old_xerror_handler (display, event);
438#endif 457#endif
439 } 458 }
440 459
441 return 0; 460 return 0;
442} 461}
… …
449 rxvt_emergency_cleanup (); 468 rxvt_emergency_cleanup ();
450 _exit (EXIT_FAILURE); 469 _exit (EXIT_FAILURE);
451} 470}
452 471
453/*----------------------------------------------------------------------*/ 472/*----------------------------------------------------------------------*/
454bool 473void
455rxvt_term::init (int argc, const char *const *argv) 474rxvt_term::init (int argc, const char *const *argv, stringvec *envv)
456{ 475{
476 this->envv = envv;
477
457 SET_R (this); 478 SET_R (this);
458 set_locale (""); 479 set_locale ("");
459 set_environ (envv); // few things in X do not call setlocale :( 480 set_environ (envv); // few things in X do not call setlocale :(
460 481
461 if (!init_vars ()) 482 init_vars ();
462 return false;
463 483
464 init_secondary (); 484 init_secondary ();
465 485
466 const char **cmd_argv = init_resources (argc, argv); 486 const char **cmd_argv = init_resources (argc, argv);
467 487
468#ifdef KEYSYM_RESOURCE 488#ifdef KEYSYM_RESOURCE
469 keyboard->register_done (); 489 keyboard->register_done ();
470#endif 490#endif
471 491
472#ifdef HAVE_SCROLLBARS 492#ifdef HAVE_SCROLLBARS
473 if (OPTION (Opt_scrollBar)) 493 if (option (Opt_scrollBar))
474 scrollBar.setIdle (); /* set existence for size calculations */ 494 scrollBar.setIdle (); /* set existence for size calculations */
475#endif 495#endif
476 496
477 pty = rxvt_new_ptytty (); 497 pty = ptytty::create ();
478 498
479 create_windows (argc, argv); 499 create_windows (argc, argv);
480 500
481 dDisp;
482
483 init_xlocale (); 501 init_xlocale ();
484 502
485 scr_reset (); // initialize screen 503 scr_reset (); // initialize screen
486 504
487#if 0 505#if 0
488 XSynchronize (disp, True); 506 XSynchronize (dpy, True);
489#endif 507#endif
490 508
491#ifdef HAVE_SCROLLBARS 509#ifdef HAVE_SCROLLBARS
492 if (OPTION (Opt_scrollBar)) 510 if (option (Opt_scrollBar))
493 resize_scrollbar (); /* create and map scrollbar */ 511 resize_scrollbar (); /* create and map scrollbar */
494#endif 512#endif
513#ifdef HAVE_BG_PIXMAP
514 {
515 bgPixmap.set_target (this);
516
495#ifdef TRANSPARENT 517#ifdef ENABLE_TRANSPARENCY
496 if (OPTION (Opt_transparent)) 518 if (option (Opt_transparent))
497 { 519 {
520 bgPixmap.set_transparent ();
521
522#ifdef HAVE_AFTERIMAGE
523 if (rs [Rs_blurradius])
524 bgPixmap.set_blur_radius (rs [Rs_blurradius]);
525#endif
526 if (ISSET_PIXCOLOR (Color_tint))
527 bgPixmap.set_tint (pix_colors_focused [Color_tint]);
528
529 if (rs [Rs_shade])
530 bgPixmap.set_shade (rs [Rs_shade]);
531
532 bgPixmap.set_root_pixmap ();
498 XSelectInput (disp, display->root, PropertyChangeMask); 533 XSelectInput (dpy, display->root, PropertyChangeMask);
499 check_our_parents ();
500 rootwin_ev.start (display, display->root); 534 rootwin_ev.start (display, display->root);
501 } 535 }
536#endif
537
538#ifdef BG_IMAGE_FROM_FILE
539 if (rs[Rs_backgroundPixmap])
540 {
541 const char *p = rs[Rs_backgroundPixmap];
542
543 if ((p = strchr (p, ';')) != 0)
544 {
545 p++;
546 bgPixmap.set_geometry (p);
547 }
548 else
549 bgPixmap.set_defaultGeometry ();
550
551 if (bgPixmap.set_file (rs[Rs_backgroundPixmap]))
552 if (!bgPixmap.window_position_sensitive ())
553 update_background ();
554 }
555#endif
556 }
557#endif
558
559#if ENABLE_PERL
560 rootwin_ev.start (display, display->root);
502#endif 561#endif
503 562
504 set_colorfgbg (); 563 set_colorfgbg ();
505 564
506 init_command (cmd_argv); 565 init_command (cmd_argv);
507 566
508 free (cmd_argv); 567 free (cmd_argv);
509 568
510 if (pty->pty >= 0) 569 if (pty->pty >= 0)
511 pty_ev.start (pty->pty, EVENT_READ); 570 pty_ev.start (pty->pty, ev::READ);
512
513 check_ev.start ();
514 571
515 HOOK_INVOKE ((this, HOOK_START, DT_END)); 572 HOOK_INVOKE ((this, HOOK_START, DT_END));
516 573
574#if ENABLE_XEMBED
575 if (rs[Rs_embed])
576 {
577 long info[2] = { 0, XEMBED_MAPPED };
578
579 XChangeProperty (dpy, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
580 32, PropModeReplace, (unsigned char *)&info, 2);
581 }
582#endif
583
517 XMapWindow (disp, vt); 584 XMapWindow (dpy, vt);
518 XMapWindow (disp, parent[0]); 585 XMapWindow (dpy, parent[0]);
519
520 return true;
521} 586}
522 587
523static struct sig_handlers 588static struct sig_handlers
524{ 589{
525 sig_watcher sw_term, sw_int; 590 ev::sig sw_term, sw_int;
526 591
527 /* 592 /*
528 * Catch a fatal signal and tidy up before quitting 593 * Catch a fatal signal and tidy up before quitting
529 */ 594 */
530 void 595 void sig_term (ev::sig &w, int revents);
531 sig_term (sig_watcher &w) 596
597 sig_handlers ()
532 { 598 {
533#ifdef DEBUG_CMD 599 sw_term.set<sig_handlers, &sig_handlers::sig_term> (this);
534 rxvt_warn ("caught signal %d, exiting.\n", w.signum);
535#endif
536 rxvt_emergency_cleanup ();
537 signal (w.signum, SIG_DFL);
538 kill (getpid (), w.signum);
539 }
540
541 sig_handlers ()
542 : sw_term (this, &sig_handlers::sig_term),
543 sw_int (this, &sig_handlers::sig_term) 600 sw_int .set<sig_handlers, &sig_handlers::sig_term> (this);
544 {
545 } 601 }
546} sig_handlers; 602} sig_handlers;
547 603
604void
605sig_handlers::sig_term (ev::sig &w, int revents)
606{
607 rxvt_emergency_cleanup ();
608 w.stop ();
609 kill (getpid (), w.signum);
610}
611
548char **rxvt_environ; // startup environment 612char **rxvt_environ; // startup environment
549 613
550void 614void
551rxvt_init () 615rxvt_init ()
552{ 616{
553 uid_t uid = getuid (); 617 ptytty::init ();
554 gid_t gid = getgid ();
555
556 // before doing anything else, check for setuid/setgid operation,
557 // start the helper process and drop privileges
558 if (uid != geteuid ()
559 || gid != getegid ())
560 {
561#if PTYTTY_HELPER
562 rxvt_ptytty_server ();
563#else
564 rxvt_warn ("running setuid/setgid without pty helper compiled in, continuing unprivileged.\n");
565#endif
566 618
567 // drop privileges 619 if (!ev_default_loop (0))
568#if HAVE_SETRESUID 620 rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n");
569 setresgid (gid, gid, gid);
570 setresuid (uid, uid, uid);
571#elif HAVE_SETREUID
572 setregid (gid, gid);
573 setreuid (uid, uid);
574#elif HAVE_SETUID
575 setgid (gid);
576 setuid (uid);
577#endif
578
579 if (uid != geteuid ()
580 || gid != getegid ())
581 rxvt_fatal ("unable to drop privileges, aborting.\n");
582 }
583 621
584 rxvt_environ = environ; 622 rxvt_environ = environ;
585 623
586 signal (SIGHUP, SIG_IGN); 624 signal (SIGHUP, SIG_IGN);
587 signal (SIGPIPE, SIG_IGN); 625 signal (SIGPIPE, SIG_IGN);
588 626
589 sig_handlers.sw_term.start (SIGTERM); 627 sig_handlers.sw_term.start (SIGTERM); ev_unref ();
590 sig_handlers.sw_int.start (SIGINT); 628 sig_handlers.sw_int.start (SIGINT); ev_unref ();
591 629
592 /* need to trap SIGURG for SVR4 (Unixware) rlogin */ 630 /* need to trap SIGURG for SVR4 (Unixware) rlogin */
593 /* signal (SIGURG, SIG_DFL); */ 631 /* signal (SIGURG, SIG_DFL); */
594 632
595 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); 633 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
… …
597 XSetIOErrorHandler (rxvt_xioerror_handler); 635 XSetIOErrorHandler (rxvt_xioerror_handler);
598 636
599 XrmInitialize (); 637 XrmInitialize ();
600} 638}
601 639
602/* ------------------------------------------------------------------------- *
603 * MEMORY ALLOCATION WRAPPERS *
604 * ------------------------------------------------------------------------- */
605void *
606rxvt_malloc (size_t size)
607{
608 void *p = malloc (size);
609
610 if (!p)
611 rxvt_fatal ("memory allocation failure. aborting.\n");
612
613 return p;
614}
615
616void *
617rxvt_calloc (size_t number, size_t size)
618{
619 void *p = calloc (number, size);
620
621 if (!p)
622 rxvt_fatal ("memory allocation failure. aborting.\n");
623
624 return p;
625}
626
627void *
628rxvt_realloc (void *ptr, size_t size)
629{
630 void *p = realloc (ptr, size);
631
632 if (!p)
633 rxvt_fatal ("memory allocation failure. aborting.\n");
634
635 return p;
636}
637
638/*----------------------------------------------------------------------*/ 640/*----------------------------------------------------------------------*/
639/* 641/*
640 * window size/position calculcations for XSizeHint and other storage. 642 * window size/position calculations for XSizeHint and other storage.
641 * if width/height are non-zero then override calculated width/height 643 * if width/height are non-zero then override calculated width/height
642 */ 644 */
643void 645void
644rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight) 646rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
645{ 647{
646 short recalc_x, recalc_y; 648 short recalc_x, recalc_y;
647 int x, y, sb_w, flags; 649 int x, y, sb_w, flags;
648 unsigned int w, h; 650 unsigned int w, h;
649 unsigned int max_width, max_height; 651 unsigned int max_width, max_height;
650 dDisp;
651
652 D_SIZE ((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
653 ncol, nrow, szHint.width, szHint.height));
654 652
655 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity; 653 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity;
656 szHint.win_gravity = NorthWestGravity; 654 szHint.win_gravity = NorthWestGravity;
657 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */ 655 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */
658 656
… …
720 718
721 if (scrollBar.state) 719 if (scrollBar.state)
722 { 720 {
723 sb_w = scrollbar_TotalWidth (); 721 sb_w = scrollbar_TotalWidth ();
724 szHint.base_width += sb_w; 722 szHint.base_width += sb_w;
723
725 if (!OPTION (Opt_scrollBar_right)) 724 if (!option (Opt_scrollBar_right))
726 window_vt_x += sb_w; 725 window_vt_x += sb_w;
727 } 726 }
728 727
729 szHint.width_inc = fwidth; 728 szHint.width_inc = fwidth;
730 szHint.height_inc = fheight; 729 szHint.height_inc = fheight;
731 szHint.min_width = szHint.base_width + szHint.width_inc; 730 szHint.min_width = szHint.base_width + szHint.width_inc;
732 szHint.min_height = szHint.base_height + szHint.height_inc; 731 szHint.min_height = szHint.base_height + szHint.height_inc;
733 732
734 if (newwidth && newwidth - szHint.base_width < max_width) 733 if (newwidth && newwidth - szHint.base_width < max_width)
735 { 734 {
736 szHint.width = newwidth; 735 szHint.width = newwidth;
… …
751 { 750 {
752 min_it (height, max_height); 751 min_it (height, max_height);
753 szHint.height = szHint.base_height + height; 752 szHint.height = szHint.base_height + height;
754 } 753 }
755 754
756 if (scrollBar.state && OPTION (Opt_scrollBar_right)) 755 if (scrollBar.state && option (Opt_scrollBar_right))
757 window_sb_x = szHint.width - sb_w; 756 window_sb_x = szHint.width - sb_w;
758 757
759 if (recalc_x) 758 if (recalc_x)
760 szHint.x += DisplayWidth (disp, display->screen) - szHint.width - 2 * ext_bwidth; 759 szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth;
760
761 if (recalc_y) 761 if (recalc_y)
762 szHint.y += DisplayHeight (disp, display->screen) - szHint.height - 2 * ext_bwidth; 762 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth;
763 763
764 ncol = width / fwidth; 764 ncol = width / fwidth;
765 nrow = height / fheight; 765 nrow = height / fheight;
766 D_SIZE ((stderr, "> Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
767 ncol, nrow, szHint.width,
768 szHint.height));
769 return;
770} 766}
771 767
772/*----------------------------------------------------------------------*/ 768/*----------------------------------------------------------------------*/
773/* 769/*
774 * Tell the teletype handler what size the window is. 770 * Tell the teletype handler what size the window is.
… …
787 ws.ws_xpixel = width; 783 ws.ws_xpixel = width;
788 ws.ws_ypixel = height; 784 ws.ws_ypixel = height;
789 (void)ioctl (pty->pty, TIOCSWINSZ, &ws); 785 (void)ioctl (pty->pty, TIOCSWINSZ, &ws);
790 786
791#if 0 787#if 0
792 // TIOCSWINSZ⎈ is supposed to do this automatically and correctly 788 // TIOCSWINSZ is supposed to do this automatically and correctly
793 if (cmd_pid) /* force through to the command */ 789 if (cmd_pid) /* force through to the command */
794 kill (-cmd_pid, SIGWINCH); 790 kill (-cmd_pid, SIGWINCH);
795#endif 791#endif
796} 792}
797 793
… …
826 delete fontset[0]; 822 delete fontset[0];
827 fontset[0] = fs; 823 fontset[0] = fs;
828 824
829 prop = (*fs)[1]->properties (); 825 prop = (*fs)[1]->properties ();
830 prop.height += lineSpace; 826 prop.height += lineSpace;
827
831 fs->set_prop (prop); 828 fs->set_prop (prop, false);
832 829
833 fwidth = prop.width; 830 fwidth = prop.width;
834 fheight = prop.height; 831 fheight = prop.height;
835 fbase = prop.ascent; 832 fbase = prop.ascent;
836 833
… …
845 { 842 {
846 fontset[style] = fs = new rxvt_fontset (this); 843 fontset[style] = fs = new rxvt_fontset (this);
847 rxvt_fontprop prop2 = prop; 844 rxvt_fontprop prop2 = prop;
848 845
849 if (res) 846 if (res)
850 prop2.weight = prop2.slant = rxvt_fontprop::unset; 847 {
848 fs->populate (res);
849 fs->set_prop (prop2, false);
850 }
851 else 851 else
852 { 852 {
853 res = fontset[0]->fontdesc; 853 fs->populate (fontset[0]->fontdesc);
854 854
855 if (SET_STYLE (0, style) & RS_Bold) prop2.weight = rxvt_fontprop::bold; 855 if (SET_STYLE (0, style) & RS_Bold) prop2.weight = rxvt_fontprop::bold;
856 if (SET_STYLE (0, style) & RS_Italic) prop2.slant = rxvt_fontprop::italic; 856 if (SET_STYLE (0, style) & RS_Italic) prop2.slant = rxvt_fontprop::italic;
857
858 fs->set_prop (prop2, true);
857 } 859 }
858 860
859 fs->populate (res);
860 fs->set_prop (prop2);
861 } 861 }
862#else 862#else
863 fontset[style] = fontset[0]; 863 fontset[style] = fontset[0];
864#endif 864#endif
865 } 865 }
… …
867 if (parent[0]) 867 if (parent[0])
868 { 868 {
869 resize_all_windows (0, 0, 0); 869 resize_all_windows (0, 0, 0);
870 scr_remap_chars (); 870 scr_remap_chars ();
871 scr_touch (true); 871 scr_touch (true);
872 } 872 }
873 873
874 return true; 874 return true;
875} 875}
876 876
877void
877void rxvt_term::set_string_property (Atom prop, const char *str, int len) 878rxvt_term::set_string_property (Atom prop, const char *str, int len)
878{ 879{
879 XChangeProperty (display->display, parent[0], 880 XChangeProperty (dpy, parent[0],
880 prop, XA_STRING, 8, PropModeReplace, 881 prop, XA_STRING, 8, PropModeReplace,
881 (const unsigned char *)str, len >= 0 ? len : strlen (str)); 882 (const unsigned char *)str, len >= 0 ? len : strlen (str));
882} 883}
883 884
885void
884void rxvt_term::set_utf8_property (Atom prop, const char *str, int len) 886rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
885{ 887{
886 wchar_t *ws = rxvt_mbstowcs (str, len); 888 wchar_t *ws = rxvt_mbstowcs (str, len);
887 char *s = rxvt_wcstoutf8 (ws); 889 char *s = rxvt_wcstoutf8 (ws);
888 890
889 XChangeProperty (display->display, parent[0], 891 XChangeProperty (dpy, parent[0],
890 prop, xa[XA_UTF8_STRING], 8, PropModeReplace, 892 prop, xa[XA_UTF8_STRING], 8, PropModeReplace,
891 (const unsigned char *)s, strlen (s)); 893 (const unsigned char *)s, strlen (s));
892 894
893 free (s); 895 free (s);
894 free (ws); 896 free (ws);
… …
913#if ENABLE_EWMH 915#if ENABLE_EWMH
914 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str); 916 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str);
915#endif 917#endif
916} 918}
917 919
920void
921rxvt_term::set_window_color (int idx, const char *color)
922{
918#ifdef XTERM_COLOR_CHANGE 923#ifdef XTERM_COLOR_CHANGE
919void
920rxvt_term::set_window_color (int idx, const char *color)
921{
922 rxvt_color xcol; 924 rxvt_color xcol;
923 int i; 925 int i;
924 926
925 if (color == NULL || *color == '\0') 927 if (color == NULL || *color == '\0')
926 return; 928 return;
927 929
930 color = strdup (color);
931 allocated.push_back ((void *)color);
932 rs[Rs_color + idx] = color;
933
928 /* handle color aliases */ 934 /* handle color aliases */
929 if (isdigit (*color)) 935 if (isdigit (*color))
930 { 936 {
931 i = atoi (color); 937 i = atoi (color);
932 938
933 if (i >= 8 && i <= 15) 939 if (i >= 8 && i <= 15)
940 {
934 { /* bright colors */ 941 /* bright colors */
935 i -= 8;
936 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i]; 942 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i - 8];
937 SET_PIXCOLOR (idx);
938 goto done; 943 goto done;
939 } 944 }
940 945
941 if (i >= 0 && i <= 7) 946 if (i >= 0 && i <= 7)
947 {
942 { /* normal colors */ 948 /* normal colors */
943 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i]; 949 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];
944 SET_PIXCOLOR (idx);
945 goto done; 950 goto done;
946 } 951 }
947 } 952 }
948 953
949 if (!rXParseAllocColor (&xcol, color)) 954 set_color (xcol, color);
950 return;
951
952 /* XStoreColor (display->display, display->cmap, XColor*); */
953 955
954 /* 956 /*
955 * FIXME: should free colors here, but no idea how to do it so instead, 957 * FIXME: should free colors here, but no idea how to do it so instead,
956 * so just keep gobbling up the colormap 958 * so just keep gobbling up the colormap
957 */ 959 */
958# if 0
959 for (i = Color_Black; i <= Color_White; i++)
960 if (pix_colors[idx] == pix_colors[i])
961 break;
962 if (i > Color_White)
963 {
964 /* fprintf (stderr, "XFreeColors: pix_colors [%d] = %lu\n", idx, pix_colors [idx]); */
965 XFreeColors (display->display, display->cmap, (pix_colors + idx), 1,
966 DisplayPlanes (display->display, display->screen));
967 }
968# endif
969 960
970 pix_colors_focused[idx] = xcol; 961 pix_colors_focused[idx] = xcol;
971 SET_PIXCOLOR (idx);
972 962
973 /* XSetWindowAttributes attr; */
974 /* Cursor cursor; */
975done: 963done:
976
977#if OFF_FOCUS_FADING
978 if (rs[Rs_fade])
979 pix_colors_unfocused[idx] = pix_colors_focused[idx].fade (display, atoi (rs[Rs_fade]), pix_colors[Color_fade]);
980#endif
981
982 /*TODO: handle Color_BD, scrollbar background, etc. */ 964 /*TODO: handle Color_BD, scrollbar background, etc. */
983 965
966 update_fade_color (idx);
984 recolour_cursor (); 967 recolour_cursor ();
985 scr_recolour (); 968 scr_recolour ();
969#endif /* XTERM_COLOR_CHANGE */
986} 970}
987
988#else
989# define set_window_color (idx,color) ((void)0)
990#endif /* XTERM_COLOR_CHANGE */
991 971
992void 972void
993rxvt_term::recolour_cursor () 973rxvt_term::recolour_cursor ()
994{ 974{
995 XColor xcol[2]; 975 XColor fg, bg;
996 976
997 xcol[0].pixel = ISSET_PIXCOLOR (Color_pointer_fg) 977 (ISSET_PIXCOLOR (Color_pointer_fg)
998 ? pix_colors_focused[Color_pointer_fg] 978 ? pix_colors_focused[Color_pointer_fg]
999 : pix_colors_focused[Color_fg]; 979 : pix_colors_focused[Color_fg]).get (fg);
980
1000 xcol[1].pixel = ISSET_PIXCOLOR (Color_pointer_bg) 981 (ISSET_PIXCOLOR (Color_pointer_bg)
1001 ? pix_colors_focused[Color_pointer_bg] 982 ? pix_colors_focused[Color_pointer_bg]
1002 : pix_colors_focused[Color_bg]; 983 : pix_colors_focused[Color_bg]).get (bg);
1003 984
1004 XQueryColors (display->display, display->cmap, xcol, 2); 985 XRecolorCursor (dpy, TermWin_cursor, &fg, &bg);
1005 XRecolorCursor (display->display, TermWin_cursor, xcol + 0, xcol + 1);
1006} 986}
1007 987
1008/*----------------------------------------------------------------------*/ 988/*----------------------------------------------------------------------*/
1009/* 989/*
1010 * find if fg/bg matches any of the normal (low-intensity) colors 990 * find if fg/bg matches any of the normal (low-intensity) colors
1011 */ 991 */
1012void 992void
1013rxvt_term::set_colorfgbg () 993rxvt_term::set_colorfgbg ()
1014{ 994{
1015 unsigned int i; 995 unsigned int i;
1016 const char *xpmb = "\0"; 996 const char *xpmb = "";
1017 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1]; 997 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1];
1018 998
1019 env_colorfgbg = (char *)rxvt_malloc (sizeof ("COLORFGBG=default;default;bg") + 1);
1020 strcpy (fstr, "default"); 999 strcpy (fstr, "default");
1021 strcpy (bstr, "default"); 1000 strcpy (bstr, "default");
1022 for (i = Color_Black; i <= Color_White; i++) 1001 for (i = Color_Black; i <= Color_White; i++)
1023 if (pix_colors[Color_fg] == pix_colors[i]) 1002 if (pix_colors[Color_fg] == pix_colors[i])
1024 { 1003 {
… …
1028 1007
1029 for (i = Color_Black; i <= Color_White; i++) 1008 for (i = Color_Black; i <= Color_White; i++)
1030 if (pix_colors[Color_bg] == pix_colors[i]) 1009 if (pix_colors[Color_bg] == pix_colors[i])
1031 { 1010 {
1032 sprintf (bstr, "%d", (i - Color_Black)); 1011 sprintf (bstr, "%d", (i - Color_Black));
1033#ifdef XPM_BACKGROUND 1012#ifdef BG_IMAGE_FROM_FILE
1034 xpmb = "default;"; 1013 xpmb = "default;";
1035#endif 1014#endif
1036 break; 1015 break;
1037 } 1016 }
1038 1017
1039 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr); 1018 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr);
1040} 1019}
1041 1020
1042/*----------------------------------------------------------------------*/ 1021/*----------------------------------------------------------------------*/
1043 1022
1044int 1023bool
1045rxvt_term::rXParseAllocColor (rxvt_color *screen_in_out, const char *colour) 1024rxvt_term::set_color (rxvt_color &color, const char *name)
1046{ 1025{
1047 if (!screen_in_out->set (display, colour)) 1026 if (color.set (this, name))
1048 {
1049 rxvt_warn ("can't get colour '%s', continuing without.\n", colour);
1050 return false;
1051 }
1052
1053 return true; 1027 return true;
1028
1029 rxvt_warn ("can't get colour '%s', continuing without.\n", name);
1030 return false;
1031}
1032
1033void
1034rxvt_term::alias_color (int dst, int src)
1035{
1036 pix_colors[dst].set (this, rs[Rs_color + dst] = rs[Rs_color + src]);
1054} 1037}
1055 1038
1056/* -------------------------------------------------------------------- * 1039/* -------------------------------------------------------------------- *
1057 * - WINDOW RESIZING - * 1040 * - WINDOW RESIZING - *
1058 * -------------------------------------------------------------------- */ 1041 * -------------------------------------------------------------------- */
1059void 1042void
1060rxvt_term::resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent) 1043rxvt_term::resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent)
1061{ 1044{
1062 int fix_screen; 1045 int fix_screen;
1063 int old_width = szHint.width, old_height = szHint.height; 1046 int old_width = szHint.width;
1064 dDisp; 1047 int old_height = szHint.height;
1065 1048
1066 window_calc (newwidth, newheight); 1049 window_calc (newwidth, newheight);
1050
1051 if (!HOOK_INVOKE ((this, HOOK_RESIZE_ALL_WINDOWS, DT_INT, newwidth, DT_INT, newheight, DT_END)))
1067 XSetWMNormalHints (disp, parent[0], &szHint); 1052 XSetWMNormalHints (dpy, parent[0], &szHint);
1068 1053
1069 if (!ignoreparent) 1054 if (!ignoreparent)
1070 { 1055 {
1071#ifdef SMART_RESIZE 1056#ifdef SMART_RESIZE
1072 /* 1057 /*
… …
1076 int x, y, x1, y1; 1061 int x, y, x1, y1;
1077 int dx, dy; 1062 int dx, dy;
1078 unsigned int unused_w1, unused_h1, unused_b1, unused_d1; 1063 unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
1079 Window unused_cr; 1064 Window unused_cr;
1080 1065
1081 XTranslateCoordinates (disp, parent[0], display->root, 1066 XTranslateCoordinates (dpy, parent[0], display->root,
1082 0, 0, &x, &y, &unused_cr); 1067 0, 0, &x, &y, &unused_cr);
1083 XGetGeometry (disp, parent[0], &unused_cr, &x1, &y1, 1068 XGetGeometry (dpy, parent[0], &unused_cr, &x1, &y1,
1084 &unused_w1, &unused_h1, &unused_b1, &unused_d1); 1069 &unused_w1, &unused_h1, &unused_b1, &unused_d1);
1085 /* 1070 /*
1086 * if display->root isn't the parent window, a WM will probably have offset 1071 * if display->root isn't the parent window, a WM will probably have offset
1087 * our position for handles and decorations. Counter it 1072 * our position for handles and decorations. Counter it
1088 */ 1073 */
… …
1090 { 1075 {
1091 x -= x1; 1076 x -= x1;
1092 y -= y1; 1077 y -= y1;
1093 } 1078 }
1094 1079
1095 x1 = (DisplayWidth (disp, display->screen) - old_width) / 2; 1080 x1 = (DisplayWidth (dpy, display->screen) - old_width ) / 2;
1096 y1 = (DisplayHeight (disp, display->screen) - old_height) / 2; 1081 y1 = (DisplayHeight (dpy, display->screen) - old_height) / 2;
1097 dx = old_width - szHint.width; 1082 dx = old_width - szHint.width;
1098 dy = old_height - szHint.height; 1083 dy = old_height - szHint.height;
1099 1084
1100 /* Check position of the center of the window */ 1085 /* Check position of the center of the window */
1101 if (x < x1) /* left half */ 1086 if (x < x1) /* left half */
1102 dx = 0; 1087 dx = 0;
… …
1105 if (y < y1) /* top half */ 1090 if (y < y1) /* top half */
1106 dy = 0; 1091 dy = 0;
1107 else if (y == y1) /* exact center */ 1092 else if (y == y1) /* exact center */
1108 dy /= 2; 1093 dy /= 2;
1109 1094
1110 XMoveResizeWindow (disp, parent[0], x + dx, y + dy, 1095 XMoveResizeWindow (dpy, parent[0], x + dx, y + dy,
1111 szHint.width, szHint.height); 1096 szHint.width, szHint.height);
1112#else 1097#else
1113 XResizeWindow (disp, parent[0], szHint.width, szHint.height); 1098 XResizeWindow (dpy, parent[0], szHint.width, szHint.height);
1114#endif 1099#endif
1115 } 1100 }
1116 1101
1117 fix_screen = ncol != prev_ncol || nrow != prev_nrow; 1102 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
1118 1103
1119 if (fix_screen || newwidth != old_width || newheight != old_height) 1104 if (fix_screen || newwidth != old_width || newheight != old_height)
1120 { 1105 {
1121 if (scrollBar.state) 1106 if (scrollBar.state)
1122 { 1107 {
1123 XMoveResizeWindow (disp, scrollBar.win, 1108 XMoveResizeWindow (dpy, scrollBar.win,
1124 window_sb_x, 0, 1109 window_sb_x, 0,
1125 scrollbar_TotalWidth (), szHint.height); 1110 scrollbar_TotalWidth (), szHint.height);
1126 resize_scrollbar (); 1111 resize_scrollbar ();
1127 } 1112 }
1128 1113
1129 XMoveResizeWindow (disp, vt, 1114 XMoveResizeWindow (dpy, vt,
1130 window_vt_x, window_vt_y, 1115 window_vt_x, window_vt_y,
1131 width, height); 1116 width, height);
1132 1117
1118#ifdef HAVE_BG_PIXMAP
1119 if (bgPixmap.window_size_sensitive ())
1120 update_background ();
1121#endif
1122
1133 scr_clear (); 1123 scr_clear ();
1134#ifdef XPM_BACKGROUND
1135 resize_pixmap ();
1136#endif
1137 } 1124 }
1138 1125
1139 if (fix_screen || old_height == 0) 1126 if (fix_screen || old_height == 0)
1140 {
1141 int curr_screen = -1;
1142 int old_ncol = prev_ncol;
1143
1144 /* scr_reset only works on the primary screen */
1145 if (old_height) /* this is not the first time through */
1146 {
1147 unsigned int ocol = ncol;
1148 ncol = prev_ncol; // save b/c scr_blank_screen_mem uses this
1149 curr_screen = scr_change_screen (PRIMARY);
1150 ncol = ocol;
1151 }
1152
1153 scr_reset (); 1127 scr_reset ();
1154 1128
1155 if (curr_screen >= 0) /* this is not the first time through */ 1129 // TODO, with nvidia-8178, resizes kill the alpha channel, report if not fixed in newer version
1156 { 1130 //scr_touch (false);
1157 scr_change_screen (curr_screen);
1158 selection_check (old_ncol != ncol ? 4 : 0);
1159 }
1160 }
1161 1131
1162 old_width = szHint.width; 1132#ifdef HAVE_BG_PIXMAP
1163 old_height = szHint.height; 1133// TODO: this don't seem to have any effect - do we still need it ? If so - in which case exactly ?
1164 1134// if (bgPixmap.pixmap)
1165#ifdef XPM_BACKGROUND
1166 if (pixmap)
1167 scr_touch (false); 1135// scr_touch (false);
1168#endif 1136#endif
1169 1137
1170#ifdef USE_XIM 1138#ifdef USE_XIM
1171 IMSetStatusPosition (); 1139 IMSetPosition ();
1172#endif 1140#endif
1173} 1141}
1174 1142
1175/* 1143/*
1176 * Set the width/height of the vt window in characters. Units are pixels. 1144 * Set the width/height of the vt window in characters. Units are pixels.
… …
1181{ 1149{
1182 XWindowAttributes wattr; 1150 XWindowAttributes wattr;
1183 1151
1184 if (newwidth == 0 || newheight == 0) 1152 if (newwidth == 0 || newheight == 0)
1185 { 1153 {
1186 XGetWindowAttributes (display->display, display->root, &wattr); 1154 XGetWindowAttributes (dpy, display->root, &wattr);
1187 1155
1188 if (newwidth == 0) 1156 if (newwidth == 0)
1189 newwidth = wattr.width - szHint.base_width; 1157 newwidth = wattr.width - szHint.base_width;
1190 if (newheight == 0) 1158 if (newheight == 0)
1191 newheight = wattr.height - szHint.base_height; 1159 newheight = wattr.height - szHint.base_height;
… …
1205#ifdef USE_XIM 1173#ifdef USE_XIM
1206 1174
1207void 1175void
1208rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg) 1176rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg)
1209{ 1177{
1210 fg = pix_colors[Color_fg]; 1178 fg = pix_colors [Color_fg];
1211 bg = pix_colors[Color_bg]; 1179 bg = pix_colors [Color_bg];
1212} 1180}
1213 1181
1214void 1182void
1215rxvt_term::im_set_size (XRectangle &size) 1183rxvt_term::im_set_size (XRectangle &size)
1216{ 1184{
… …
1253 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */ 1221 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */
1254 1222
1255 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */ 1223 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */
1256 *p = '\0'; 1224 *p = '\0';
1257 1225
1258 atom = XInternAtom (display->display, server, False); 1226 atom = XInternAtom (dpy, server, False);
1259 win = XGetSelectionOwner (display->display, atom); 1227 win = XGetSelectionOwner (dpy, atom);
1260 1228
1261 if (win != None) 1229 if (win != None)
1262 return True; 1230 return True;
1263 } 1231 }
1264 1232
… …
1271 XPoint nspot; 1239 XPoint nspot;
1272 XVaNestedList preedit_attr; 1240 XVaNestedList preedit_attr;
1273 1241
1274 if (!Input_Context 1242 if (!Input_Context
1275 || !focus 1243 || !focus
1276 || !(input_style & XIMPreeditPosition)) 1244 || !(input_style & (XIMPreeditPosition | XIMPreeditCallbacks)))
1277 return; 1245 return;
1278 1246
1279 im_set_position (nspot); 1247 im_set_position (nspot);
1280 1248
1281 if (nspot.x == spot.x && nspot.y == spot.y) 1249 if (nspot.x == spot.x && nspot.y == spot.y)
… …
1300 input_method = 0; 1268 input_method = 0;
1301 } 1269 }
1302 1270
1303 Input_Context = 0; 1271 Input_Context = 0;
1304} 1272}
1273
1274#ifdef ENABLE_XIM_ONTHESPOT
1275
1276static void
1277xim_preedit_start (XIC ic, XPointer client_data, XPointer call_data)
1278{
1279 ((rxvt_term *)client_data)->make_current ();
1280 HOOK_INVOKE (((rxvt_term *)client_data, HOOK_XIM_PREEDIT_START, DT_END));
1281}
1282
1283static void
1284xim_preedit_done (XIC ic, XPointer client_data, XPointer call_data)
1285{
1286 ((rxvt_term *)client_data)->make_current ();
1287 HOOK_INVOKE (((rxvt_term *)client_data, HOOK_XIM_PREEDIT_DONE, DT_END));
1288}
1289
1290static void
1291xim_preedit_draw (XIC ic, XPointer client_data, XIMPreeditDrawCallbackStruct *call_data)
1292{
1293 rxvt_term *term = (rxvt_term *)client_data;
1294 XIMText *text = call_data->text;
1295
1296 term->make_current ();
1297
1298 if (text)
1299 {
1300 void *str;
1301
1302 if (!text->encoding_is_wchar && text->string.multi_byte)
1303 {
1304 // of course, X makes it ugly again
1305 if (term->rs[Rs_imLocale])
1306 SET_LOCALE (term->rs[Rs_imLocale]);
1307
1308 str = rxvt_temp_buf ((text->length + 1) * sizeof (wchar_t));
1309 mbstowcs ((wchar_t *)str, text->string.multi_byte, text->length + 1);
1310
1311 if (term->rs[Rs_imLocale])
1312 SET_LOCALE (term->locale);
1313 }
1314 else
1315 str = (void *)text->string.wide_char;
1316
1317 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
1318 DT_INT, call_data->caret,
1319 DT_INT, call_data->chg_first,
1320 DT_INT, call_data->chg_length,
1321 DT_LCS_LEN, (void *)text->feedback, text->feedback ? (int)text->length : 0,
1322 DT_WCS_LEN, str, str ? (int)text->length : 0,
1323 DT_END));
1324 }
1325 else
1326 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
1327 DT_INT, call_data->caret,
1328 DT_INT, call_data->chg_first,
1329 DT_INT, call_data->chg_length,
1330 DT_END));
1331}
1332
1333#if 0
1334static void
1335xim_preedit_caret (XIC ic, XPointer client_data, XIMPreeditCaretCallbackStruct *call_data)
1336{
1337 ((rxvt_term *)client_data)->make_current ();
1338 HOOK_INVOKE (((rxvt_term *)client_data, HOOK_XIM_PREEDIT_CARET,
1339 DT_INT, call_data->position,
1340 DT_INT, call_data->direction,
1341 DT_INT, call_data->style,
1342 DT_END));
1343}
1344#endif
1345
1346#endif
1305 1347
1306/* 1348/*
1307 * Try to open a XIM with the current modifiers, then see if we can 1349 * Try to open a XIM with the current modifiers, then see if we can
1308 * open a suitable preedit type 1350 * open a suitable preedit type
1309 */ 1351 */
… …
1316 XRectangle rect, status_rect, needed_rect; 1358 XRectangle rect, status_rect, needed_rect;
1317 unsigned long fg, bg; 1359 unsigned long fg, bg;
1318 const char *p; 1360 const char *p;
1319 char **s; 1361 char **s;
1320 XIMStyles *xim_styles; 1362 XIMStyles *xim_styles;
1363#ifdef ENABLE_XIM_ONTHESPOT
1364 XIMCallback xcb[4];
1365#endif
1321 1366
1322 set_environ (envv); 1367 set_environ (envv);
1323 1368
1324 if (! ((p = XSetLocaleModifiers (modifiers)) && *p)) 1369 if (! ((p = XSetLocaleModifiers (modifiers)) && *p))
1325 return false; 1370 return false;
1326 1371
1327 D_MAIN ((stderr, "rxvt_IM_get_IC ()"));
1328 input_method = display->get_xim (locale, modifiers); 1372 input_method = display->get_xim (locale, modifiers);
1329 if (input_method == NULL) 1373 if (input_method == NULL)
1330 return false; 1374 return false;
1331 1375
1332 xim = input_method->xim; 1376 xim = input_method->xim;
… …
1352 s = rxvt_splitcommastring (p); 1396 s = rxvt_splitcommastring (p);
1353 1397
1354 for (i = found = 0; !found && s[i]; i++) 1398 for (i = found = 0; !found && s[i]; i++)
1355 { 1399 {
1356 if (!strcmp (s[i], "OverTheSpot")) 1400 if (!strcmp (s[i], "OverTheSpot"))
1357 input_style = (XIMPreeditPosition | XIMStatusNothing); 1401 input_style = XIMPreeditPosition | XIMStatusNothing;
1358 else if (!strcmp (s[i], "OffTheSpot")) 1402 else if (!strcmp (s[i], "OffTheSpot"))
1359 input_style = (XIMPreeditArea | XIMStatusArea); 1403 input_style = XIMPreeditArea | XIMStatusArea;
1360 else if (!strcmp (s[i], "Root")) 1404 else if (!strcmp (s[i], "Root"))
1361 input_style = (XIMPreeditNothing | XIMStatusNothing); 1405 input_style = XIMPreeditNothing | XIMStatusNothing;
1362 else if (!strcmp (s[i], "None")) 1406 else if (!strcmp (s[i], "None"))
1363 input_style = (XIMPreeditNone | XIMStatusNone); 1407 input_style = XIMPreeditNone | XIMStatusNone;
1408#ifdef ENABLE_XIM_ONTHESPOT
1409 else if (SHOULD_INVOKE (HOOK_XIM_PREEDIT_START) && !strcmp (s[i], "OnTheSpot"))
1410 input_style = XIMPreeditCallbacks | XIMStatusNothing;
1411#endif
1412 else
1413 input_style = XIMPreeditNothing | XIMStatusNothing;
1364 1414
1365 for (j = 0; j < xim_styles->count_styles; j++) 1415 for (j = 0; j < xim_styles->count_styles; j++)
1366 if (input_style == xim_styles->supported_styles[j]) 1416 if (input_style == xim_styles->supported_styles[j])
1367 { 1417 {
1368 rxvt_freecommastring (s); 1418 rxvt_freecommastring (s);
… …
1406 "*", 1456 "*",
1407 fheight, 1457 fheight,
1408 fheight + 1, fheight - 1, 1458 fheight + 1, fheight - 1,
1409 fheight - 2, fheight + 2); 1459 fheight - 2, fheight + 2);
1410 1460
1411 fs = XCreateFontSet (display->display, rs[Rs_imFont] ? rs[Rs_imFont] : pat, 1461 fs = XCreateFontSet (dpy, rs[Rs_imFont] ? rs[Rs_imFont] : pat,
1412 &missing_charset_list, &missing_charset_count, &def_string); 1462 &missing_charset_list, &missing_charset_count, &def_string);
1413 1463
1414 if (missing_charset_list) 1464 if (missing_charset_list)
1415 XFreeStringList (missing_charset_list); 1465 XFreeStringList (missing_charset_list);
1416 1466
… …
1457 XNBackground, bg, 1507 XNBackground, bg,
1458 XNArea, &status_rect, 1508 XNArea, &status_rect,
1459 XNFontSet, fs, 1509 XNFontSet, fs,
1460 NULL); 1510 NULL);
1461 } 1511 }
1512#if ENABLE_XIM_ONTHESPOT
1513 else if (input_style & XIMPreeditCallbacks)
1514 {
1515 im_set_position (spot);
1516
1517 xcb[0].client_data = (XPointer)this; xcb[0].callback = (XIMProc)xim_preedit_start;
1518 xcb[1].client_data = (XPointer)this; xcb[1].callback = (XIMProc)xim_preedit_done;
1519 xcb[2].client_data = (XPointer)this; xcb[2].callback = (XIMProc)xim_preedit_draw;
1520# if 0
1521 xcb[3].client_data = (XPointer)this; xcb[3].callback = (XIMProc)xim_preedit_caret;
1522# endif
1523
1524 preedit_attr = XVaCreateNestedList (0,
1525 XNSpotLocation, &spot,
1526 XNPreeditStartCallback, &xcb[0],
1527 XNPreeditDoneCallback , &xcb[1],
1528 XNPreeditDrawCallback , &xcb[2],
1529# if 0
1530 XNPreeditCaretCallback, &xcb[3],
1531# endif
1532 NULL);
1533 }
1534#endif
1462 1535
1463 Input_Context = XCreateIC (xim, 1536 Input_Context = XCreateIC (xim,
1464 XNInputStyle, input_style, 1537 XNInputStyle, input_style,
1465 XNClientWindow, vt, 1538 XNClientWindow, vt,
1466 XNFocusWindow, parent[0], 1539 XNFocusWindow, parent[0],
… …
1468 preedit_attr, 1541 preedit_attr,
1469 status_attr ? XNStatusAttributes : NULL, 1542 status_attr ? XNStatusAttributes : NULL,
1470 status_attr, NULL); 1543 status_attr, NULL);
1471 1544
1472 if (preedit_attr) XFree (preedit_attr); 1545 if (preedit_attr) XFree (preedit_attr);
1473 if (status_attr) XFree (status_attr); 1546 if (status_attr) XFree (status_attr);
1474 if (fs) XFreeFontSet (display->display, fs); 1547 if (fs) XFreeFontSet (dpy, fs);
1475 1548
1476 if (Input_Context == NULL) 1549 if (Input_Context == NULL)
1477 { 1550 {
1478 rxvt_warn ("failed to create input context, continuing without XIM.\n"); 1551 rxvt_warn ("failed to create input context, continuing without XIM.\n");
1479 im_destroy (); 1552 im_destroy ();
1480 return false; 1553 return false;
1481 } 1554 }
1482 1555
1483 if (input_style & XIMPreeditArea) 1556#if 0
1557 // unfortunately, only the focus window is used by XIM, hard to fix
1558 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL))
1559 vt_select_input ();
1560#endif
1561
1484 IMSetStatusPosition (); 1562 IMSetPosition ();
1485 1563
1486 D_MAIN ((stderr, "rxvt_IM_get_IC () - successful connection"));
1487 return true; 1564 return true;
1488} 1565}
1489 1566
1490void 1567void
1491rxvt_term::im_cb () 1568rxvt_term::im_cb ()
… …
1497 1574
1498 make_current (); 1575 make_current ();
1499 1576
1500 im_destroy (); 1577 im_destroy ();
1501 1578
1502 D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()"));
1503 if (Input_Context) 1579 if (Input_Context)
1504 return; 1580 return;
1505 1581
1506#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE) 1582#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1507 if (rs[Rs_imLocale]) 1583 if (rs[Rs_imLocale])
… …
1549 SET_LOCALE (locale); 1625 SET_LOCALE (locale);
1550#endif 1626#endif
1551} 1627}
1552 1628
1553void 1629void
1554rxvt_term::IMSetStatusPosition () 1630rxvt_term::IMSetPosition ()
1555{ 1631{
1556 XRectangle preedit_rect, status_rect, *needed_rect; 1632 XRectangle preedit_rect, status_rect, *needed_rect;
1557 XVaNestedList preedit_attr, status_attr; 1633 XVaNestedList preedit_attr, status_attr;
1558 1634
1559 if (!Input_Context 1635 if (!Input_Context
1560 || !focus 1636 || !focus
1561 || !(input_style & XIMPreeditArea) 1637 || !(input_style & (XIMPreeditArea | XIMPreeditPosition))
1562 || !IMisRunning ()) 1638 || !IMisRunning ())
1563 return; 1639 return;
1564 1640
1641 if (input_style & XIMPreeditPosition)
1642 {
1643 im_set_size (preedit_rect);
1644 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);
1645
1646 XSetICValues (Input_Context,
1647 XNPreeditAttributes, preedit_attr, NULL);
1648 }
1649 else
1650 {
1565 /* Getting the necessary width of preedit area */ 1651 /* Getting the necessary width of preedit area */
1566 status_attr = XVaCreateNestedList (0, XNAreaNeeded, &needed_rect, NULL); 1652 status_attr = XVaCreateNestedList (0, XNAreaNeeded, &needed_rect, NULL);
1567 XGetICValues (Input_Context, XNStatusAttributes, status_attr, NULL); 1653 XGetICValues (Input_Context, XNStatusAttributes, status_attr, NULL);
1568 XFree (status_attr); 1654 XFree (status_attr);
1569 1655
1570 im_set_preedit_area (preedit_rect, status_rect, *needed_rect); 1656 im_set_preedit_area (preedit_rect, status_rect, *needed_rect);
1571 XFree (needed_rect); 1657 XFree (needed_rect);
1572 1658
1573 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL); 1659 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);
1574 status_attr = XVaCreateNestedList (0, XNArea, &status_rect, NULL); 1660 status_attr = XVaCreateNestedList (0, XNArea, &status_rect, NULL);
1575 1661
1576 XSetICValues (Input_Context, 1662 XSetICValues (Input_Context,
1577 XNPreeditAttributes, preedit_attr, 1663 XNPreeditAttributes, preedit_attr,
1578 XNStatusAttributes, status_attr, NULL); 1664 XNStatusAttributes, status_attr,
1665 NULL);
1579 1666
1667 XFree (status_attr);
1668 }
1669
1580 XFree (preedit_attr); 1670 XFree (preedit_attr);
1581 XFree (status_attr);
1582} 1671}
1583#endif /* USE_XIM */ 1672#endif /* USE_XIM */
1673
1674void
1675rxvt_term::get_window_origin (int &x, int &y)
1676{
1677 Window cr;
1678 XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr);
1679/* fprintf (stderr, "origin is %+d%+d\n", x, y);*/
1680}
1681
1682Pixmap
1683rxvt_term::get_pixmap_property (int prop_id)
1684{
1685 if (prop_id > 0 && prop_id < NUM_XA)
1686 if (xa[prop_id])
1687 {
1688 int aformat;
1689 unsigned long nitems, bytes_after;
1690 Atom atype;
1691 unsigned char *prop = NULL;
1692 int result = XGetWindowProperty (dpy, display->root, xa[prop_id],
1693 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1694 &nitems, &bytes_after, &prop);
1695 if (result == Success && prop && atype == XA_PIXMAP)
1696 return *(Pixmap *)prop;
1697 }
1698
1699 return None;
1700}
1701
1702#ifdef HAVE_BG_PIXMAP
1703# if TRACE_PIXMAPS
1704# undef update_background
1705void
1706rxvt_term::trace_update_background (const char *file, int line)
1707{
1708 fprintf (stderr, "%s:%d:update_background()\n", file, line);
1709 update_background ();
1710}
1711# endif
1712
1713void
1714rxvt_term::update_background ()
1715{
1716 if (update_background_ev.is_active ())
1717 return;
1718
1719 bgPixmap.invalidate ();
1720
1721 ev_tstamp to_wait = 0.5 - (ev::now () - bgPixmap.valid_since);
1722
1723 if (to_wait <= 0.)
1724 bgPixmap.render ();
1725 else
1726 update_background_ev.start (to_wait);
1727}
1728
1729void
1730rxvt_term::update_background_cb (ev::timer &w, int revents)
1731{
1732 make_current ();
1733
1734 update_background_ev.stop ();
1735 bgPixmap.render ();
1736 refresh_check ();
1737}
1738
1739#endif /* HAVE_BG_PIXMAP */
1584 1740
1585/*----------------------- end-of-file (C source) -----------------------*/ 1741/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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