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.272 by root, Tue Dec 11 03:30:49 2007 UTC vs.
Revision 1.394 by root, Sat Dec 13 10:07:30 2014 UTC

… …
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-2014 Marc Lehmann <schmorp@schmorp.de>
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 3 of the License, or
21 * (at your option) any later version. 21 * (at your option) any later version.
22 * 22 *
23 * This program is distributed in the hope that it will be useful, 23 * This program is distributed in the hope that it will be useful,
24 * but WITHOUT ANY WARRANTY; without even the implied warranty of 24 * but WITHOUT ANY WARRANTY; without even the implied warranty of
25 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 25 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
… …
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 "init.h"
35#include "keyboard.h" 36#include "keyboard.h"
36#include "rxvtperl.h" 37#include "rxvtperl.h"
37 38
38#include <limits> 39#include <limits>
39 40
41#include <assert.h>
40#include <csignal> 42#include <signal.h>
41#include <cstring> 43#include <string.h>
42 44
43#ifdef HAVE_TERMIOS_H
44# include <termios.h> 45#include <termios.h>
45#endif
46 46
47#ifdef HAVE_XSETLOCALE 47#ifdef HAVE_XSETLOCALE
48# define X_LOCALE 48# define X_LOCALE
49# include <X11/Xlocale.h> 49# include <X11/Xlocale.h>
50#else 50#else
51# ifdef HAVE_SETLOCALE
52# include <clocale> 51# include <locale.h>
53# endif 52#endif
54#endif
55 53
54struct termios rxvt_term::def_tio;
56vector<rxvt_term *> rxvt_term::termlist; 55vector<rxvt_term *> rxvt_term::termlist;
57 56
58// used to tell global functions which terminal instance is "active" 57// used to tell global functions which terminal instance is "active"
59rxvt_t rxvt_current_term; 58rxvt_t rxvt_current_term;
60 59
… …
95text_t rxvt_composite_vec::compose (unicode_t c1, unicode_t c2) 94text_t rxvt_composite_vec::compose (unicode_t c1, unicode_t c2)
96{ 95{
97 compose_char *cc; 96 compose_char *cc;
98 97
99 // break compose chains, as stupid readline really likes to duplicate 98 // break compose chains, as stupid readline really likes to duplicate
100 // composing characters for some reason near the end of a line. 99 // composing characters for some reason, near the end of a line.
101 cc = (*this)[c1]; 100 cc = (*this)[c1];
102 while (cc) 101 while (cc)
103 { 102 {
104 if (cc->c2 == c2) return c1; 103 if (cc->c2 == c2) return c1;
105 cc = (*this)[cc->c1]; 104 cc = (*this)[cc->c1];
106 } 105 }
107 106
108 // check to see wether this combination already exists otherwise 107 // check to see whether this combination already exists otherwise
109 for (cc = v.end (); cc-- > v.begin (); ) 108 for (cc = v.begin (); cc < v.end (); cc++)
110 {
111 if (cc->c1 == c1 && cc->c2 == c2) 109 if (cc->c1 == c1 && cc->c2 == c2)
112 return COMPOSE_LO + (cc - v.begin ()); 110 return COMPOSE_LO + (cc - v.begin ());
113 }
114 111
115 // allocate a new combination 112 // allocate a new combination
116 if (v.size () == COMPOSE_HI - COMPOSE_LO + 1) 113 if (v.size () == COMPOSE_HI - COMPOSE_LO + 1)
117 { 114 {
118 static int seen; 115 static int seen;
119 116
120 if (!seen++) 117 if (!seen++)
121 fprintf (stderr, "too many unrepresentable composite characters, try --enable-unicode3\n"); 118 rxvt_warn ("too many unrepresentable composite characters, try --enable-unicode3\n");
122 119
123 return REPLACEMENT_CHAR; 120 return REPLACEMENT_CHAR;
124 } 121 }
125 122
126 v.push_back (compose_char (c1, c2)); 123 v.push_back (compose_char (c1, c2));
… …
157{ 154{
158#if HAVE_BG_PIXMAP 155#if HAVE_BG_PIXMAP
159 update_background_ev.set<rxvt_term, &rxvt_term::update_background_cb> (this); 156 update_background_ev.set<rxvt_term, &rxvt_term::update_background_cb> (this);
160#endif 157#endif
161#ifdef CURSOR_BLINK 158#ifdef CURSOR_BLINK
162 cursor_blink_ev.set <rxvt_term, &rxvt_term::cursor_blink_cb> (this); 159 cursor_blink_ev.set <rxvt_term, &rxvt_term::cursor_blink_cb> (this); cursor_blink_ev.set (0., CURSOR_BLINK_INTERVAL);
163#endif 160#endif
164#ifdef TEXT_BLINK 161#ifdef TEXT_BLINK
165 text_blink_ev.set <rxvt_term, &rxvt_term::text_blink_cb> (this); 162 text_blink_ev.set <rxvt_term, &rxvt_term::text_blink_cb> (this); text_blink_ev.set (0., TEXT_BLINK_INTERVAL);
166#endif 163#endif
167#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 164#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
168 cont_scroll_ev.set <rxvt_term, &rxvt_term::cont_scroll_cb> (this); 165 cont_scroll_ev.set <rxvt_term, &rxvt_term::cont_scroll_cb> (this);
169#endif 166#endif
170#ifdef SELECTION_SCROLLING 167#ifdef SELECTION_SCROLLING
171 sel_scroll_ev.set <rxvt_term, &rxvt_term::sel_scroll_cb> (this); 168 sel_scroll_ev.set <rxvt_term, &rxvt_term::sel_scroll_cb> (this);
172#endif 169#endif
173#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 170#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
174 slip_wheel_ev.set <rxvt_term, &rxvt_term::slip_wheel_cb> (this); 171 slip_wheel_ev.set <rxvt_term, &rxvt_term::slip_wheel_cb> (this);
175#endif 172#endif
176#if ENABLE_TRANSPARENCY || ENABLE_PERL 173#if BG_IMAGE_FROM_ROOT || ENABLE_PERL
177 rootwin_ev.set <rxvt_term, &rxvt_term::x_cb> (this), 174 rootwin_ev.set <rxvt_term, &rxvt_term::rootwin_cb> (this),
178#endif 175#endif
179#ifdef HAVE_SCROLLBARS
180 scrollbar_ev.set <rxvt_term, &rxvt_term::x_cb> (this), 176 scrollbar_ev.set <rxvt_term, &rxvt_term::x_cb> (this),
181#endif
182#ifdef USE_XIM 177#if USE_XIM
183 im_ev.set <rxvt_term, &rxvt_term::im_cb> (this), 178 im_ev.set <rxvt_term, &rxvt_term::im_cb> (this),
184#endif 179#endif
185#ifdef POINTER_BLANK 180#ifdef POINTER_BLANK
186 pointer_ev.set <rxvt_term, &rxvt_term::pointer_cb> (this); 181 pointer_ev.set <rxvt_term, &rxvt_term::pointer_cb> (this);
187#endif 182#endif
188#ifndef NO_BELL 183#ifndef NO_BELL
189 bell_ev.set <rxvt_term, &rxvt_term::bell_cb> (this); 184 bell_ev.set <rxvt_term, &rxvt_term::bell_cb> (this);
190#endif 185#endif
191 child_ev.set <rxvt_term, &rxvt_term::child_cb> (this); 186 child_ev.set <rxvt_term, &rxvt_term::child_cb> (this);
192 prepare_ev.set <rxvt_term, &rxvt_term::prepare_cb> (this);
193 flush_ev.set <rxvt_term, &rxvt_term::flush_cb> (this); 187 flush_ev.set <rxvt_term, &rxvt_term::flush_cb> (this);
194 destroy_ev.set <rxvt_term, &rxvt_term::destroy_cb> (this); 188 destroy_ev.set <rxvt_term, &rxvt_term::destroy_cb> (this);
195 pty_ev.set <rxvt_term, &rxvt_term::pty_cb> (this); 189 pty_ev.set <rxvt_term, &rxvt_term::pty_cb> (this);
196 incr_ev.set <rxvt_term, &rxvt_term::incr_cb> (this);
197 termwin_ev.set <rxvt_term, &rxvt_term::x_cb> (this); 190 termwin_ev.set <rxvt_term, &rxvt_term::x_cb> (this);
198 vt_ev.set <rxvt_term, &rxvt_term::x_cb> (this); 191 vt_ev.set <rxvt_term, &rxvt_term::x_cb> (this);
199 192
200 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base; 193 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base;
201 194
… …
229 if (fontset[i] != fontset[0]) 222 if (fontset[i] != fontset[0])
230 delete fontset[i]; 223 delete fontset[i];
231#endif 224#endif
232 delete fontset[0]; 225 delete fontset[0];
233 226
227#ifdef HAVE_BG_PIXMAP
228 bg_destroy ();
229#endif
230
231#if HAVE_IMG
232 delete bg_img;
233#endif
234
234 if (display) 235 if (display)
235 { 236 {
236 selection_clear (); 237 selection_clear ();
238 selection_clear (true);
237 239
238#ifdef USE_XIM 240#if USE_XIM
239 im_destroy (); 241 im_destroy ();
240#endif 242#endif
241#ifdef XTERM_SCROLLBAR 243 scrollBar.destroy ();
242 if (xscrollbarGC) XFreeGC (dpy, xscrollbarGC); 244
243 if (ShadowGC) XFreeGC (dpy, ShadowGC); 245 if (gc)
244#endif
245#ifdef PLAIN_SCROLLBAR
246 if (pscrollbarGC) XFreeGC (dpy, pscrollbarGC);
247#endif
248#ifdef NEXT_SCROLLBAR
249 if (blackGC) XFreeGC (dpy, blackGC);
250 if (whiteGC) XFreeGC (dpy, whiteGC);
251 if (grayGC) XFreeGC (dpy, grayGC);
252 if (darkGC) XFreeGC (dpy, darkGC);
253 if (stippleGC) XFreeGC (dpy, stippleGC);
254 if (dimple) XFreePixmap (dpy, dimple);
255 if (upArrow) XFreePixmap (dpy, upArrow);
256 if (downArrow) XFreePixmap (dpy, downArrow);
257 if (upArrowHi) XFreePixmap (dpy, upArrowHi);
258 if (downArrowHi) XFreePixmap (dpy, downArrowHi);
259#endif
260#ifdef RXVT_SCROLLBAR
261 if (topShadowGC) XFreeGC (dpy, topShadowGC);
262 if (botShadowGC) XFreeGC (dpy, botShadowGC);
263 if (scrollbarGC) XFreeGC (dpy, scrollbarGC);
264#endif
265 if (gc) XFreeGC (dpy, gc); 246 XFreeGC (dpy, gc);
266 247
267 delete drawable; 248 delete drawable;
249
268 // destroy all windows 250 // destroy all windows
269 if (parent[0]) 251 if (parent)
270 XDestroyWindow (dpy, parent[0]); 252 XDestroyWindow (dpy, parent);
271 253
272 for (int i = 0; i < TOTAL_COLORS; i++) 254 for (int i = 0; i < TOTAL_COLORS; i++)
273 if (ISSET_PIXCOLOR (i)) 255 if (ISSET_PIXCOLOR (i))
274 { 256 {
275 pix_colors_focused [i].free (this); 257 pix_colors_focused [i].free (this);
… …
277 pix_colors_unfocused [i].free (this); 259 pix_colors_unfocused [i].free (this);
278#endif 260#endif
279 } 261 }
280 262
281 clear (); 263 clear ();
282 }
283 264
284 delete [] pix_colors_focused; 265 display->flush (); /* ideally .put should do this */
285#if OFF_FOCUS_FADING
286 delete [] pix_colors_unfocused;
287#endif
288
289#ifdef HAVE_BG_PIXMAP
290 bgPixmap.destroy ();
291#endif
292 displays.put (display); 266 displays.put (display);
267 }
293 268
294 scr_release (); 269 scr_release ();
295 270
296 /* clear all resources */ 271 /* clear all resources */
297 for (int i = 0; i < allocated.size (); i++) 272 for (int i = 0; i < allocated.size (); i++)
298 free (allocated [i]); 273 free (allocated [i]);
299 274
300 free (selection.text); 275 free (selection.text);
301 // TODO: manage env vars in child only(!) 276 free (selection.clip_text);
302 free (env_display);
303 free (env_term);
304 free (locale); 277 free (locale);
305 free (v_buffer); 278 free (v_buffer);
306 free (incr_buf); 279
280 delete selection_req;
281
282 if (env && memcmp (env, envv->begin (), envv->size () * sizeof (char *)))
283 rxvt_warn ("env has been modified, probably as a result of a lib calling setenv.\n");
284
285 delete env;
307 286
308 delete envv; 287 delete envv;
309 delete argv; 288 delete argv;
310 289
311#ifdef KEYSYM_RESOURCE 290#ifdef KEYSYM_RESOURCE
312 delete keyboard; 291 delete keyboard;
313#endif 292#endif
314#ifndef NO_RESOURCES 293#ifndef NO_RESOURCES
315 XrmDestroyDatabase (option_db); 294 XrmDestroyDatabase (option_db);
316#endif 295#endif
296
297 SET_R ((rxvt_term *)0);
317} 298}
318 299
319// child has exited, usually destroys 300// child has exited, usually destroys
320void 301void
321rxvt_term::child_cb (ev::child &w, int status) 302rxvt_term::child_cb (ev::child &w, int status)
… …
329} 310}
330 311
331void 312void
332rxvt_term::destroy () 313rxvt_term::destroy ()
333{ 314{
334 if (ev_is_active (&destroy_ev)) 315 if (destroy_ev.is_active ())
335 return; 316 return;
336 317
337 HOOK_INVOKE ((this, HOOK_DESTROY, DT_END)); 318 HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));
338 319
339#if ENABLE_OVERLAY 320#if ENABLE_OVERLAY
… …
343 if (display) 324 if (display)
344 { 325 {
345#if USE_XIM 326#if USE_XIM
346 im_ev.stop (display); 327 im_ev.stop (display);
347#endif 328#endif
348#if HAVE_SCROLLBARS
349 scrollbar_ev.stop (display); 329 scrollbar_ev.stop (display);
350#endif 330#if BG_IMAGE_FROM_ROOT || ENABLE_PERL
351#if ENABLE_TRANSPARENCY || ENABLE_PERL
352 rootwin_ev.stop (display); 331 rootwin_ev.stop (display);
353#endif 332#endif
354 incr_ev.stop ();
355 termwin_ev.stop (display); 333 termwin_ev.stop (display);
356 vt_ev.stop (display); 334 vt_ev.stop (display);
357 } 335 }
358 336
359 prepare_ev.stop (); 337 flush_ev.stop ();
360 pty_ev.stop (); 338 pty_ev.stop ();
361#ifdef CURSOR_BLINK 339#ifdef CURSOR_BLINK
362 cursor_blink_ev.stop (); 340 cursor_blink_ev.stop ();
363#endif 341#endif
364#ifdef TEXT_BLINK 342#ifdef TEXT_BLINK
… …
383 make_current (); 361 make_current ();
384 362
385 delete this; 363 delete this;
386} 364}
387 365
366void
367rxvt_term::set_option (uint8_t opt, bool set) NOTHROW
368{
369 if (!opt)
370 return;
371
372 uint8_t mask = 1 << (opt & 7);
373 uint8_t &val = options [opt >> 3];
374
375 val = val & ~mask | (set ? mask : 0);
376}
377
388/*----------------------------------------------------------------------*/ 378/*----------------------------------------------------------------------*/
389/* 379/*
390 * Exit gracefully, clearing the utmp entry and restoring tty attributes 380 * Exit gracefully, clearing the utmp entry and restoring tty attributes
391 * TODO: if debugging, this should free up any known resources if we can
392 */ 381 */
393static XErrorHandler old_xerror_handler; 382static XErrorHandler old_xerror_handler;
394 383
395static void 384static void
396rxvt_emergency_cleanup () 385rxvt_emergency_cleanup ()
… …
398 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++) 387 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)
399 (*t)->emergency_cleanup (); 388 (*t)->emergency_cleanup ();
400} 389}
401 390
402#if !ENABLE_MINIMAL 391#if !ENABLE_MINIMAL
403static void 392static void ecb_cold
404print_x_error (Display *dpy, XErrorEvent *event) 393print_x_error (Display *dpy, XErrorEvent *event)
405{ 394{
406 char buffer[BUFSIZ]; 395 char buffer[BUFSIZ];
407 char mesg[BUFSIZ]; 396 char mesg[BUFSIZ];
408 char number[32]; 397 char number[32];
409 char *mtype = "XlibMessage"; 398
410 XGetErrorText(dpy, event->error_code, buffer, BUFSIZ);
411 XGetErrorDatabaseText(dpy, mtype, "XError", "X Error", mesg, BUFSIZ);
412 rxvt_warn ("An X Error occured, trying to continue after report.\n"); 399 rxvt_warn ("An X Error occurred, trying to continue after report.\n");
400
401 XGetErrorDatabaseText (dpy, "XlibMessage", "ErrorSerial", "Error Serial #%d", mesg, BUFSIZ);
402 snprintf (buffer, BUFSIZ, "+ %s\n", mesg); rxvt_warn (buffer, event->serial);
403
404 XGetErrorText (dpy, event->error_code, buffer, BUFSIZ);
405 XGetErrorDatabaseText (dpy, "XlibMessage", "XError", "X Error", mesg, BUFSIZ);
413 rxvt_warn ("%s: %s\n", mesg, buffer); 406 rxvt_warn ("+ %s: %s\n", mesg, buffer);
407
414 XGetErrorDatabaseText(dpy, mtype, "MajorCode", "Request Major code %d", mesg, BUFSIZ); 408 XGetErrorDatabaseText (dpy, "XlibMessage", "MajorCode", "Request Major code %d", mesg, BUFSIZ);
415 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->request_code); 409 snprintf (buffer, BUFSIZ, "+ %s\n", mesg); rxvt_warn (buffer, event->request_code);
410
411 if (event->request_code >= 128)
412 {
413#if 0
414 /* XListExtensions and probably query extensions hangs when there are multiple queues errors */
415 int nexts;
416 char **exts = XListExtensions (dpy, &nexts);
417
418 while (nexts)
419 {
420 char *extname = exts [nexts - 1];
421 int major, first_event, first_error;
422
423 if (XQueryExtension (dpy, extname, &major, &first_event, &first_error) && major == event->request_code)
424 {
425 XGetErrorDatabaseText (dpy, "XlibMessage", "MinorCode", "Request Minor code %d", mesg, BUFSIZ);
426 rxvt_warn ("+ (which is extension %s minor code %d)\n", extname, event->minor_code);
427
428 snprintf (buffer, BUFSIZ, "%s.%d", extname, event->minor_code);
429 XGetErrorDatabaseText (dpy, "XRequest", buffer, "an unregistered minor code", buffer, BUFSIZ);
430 rxvt_warn ("+ (which is %s)\n", buffer);
431
432 break;
433 }
434
435 printf ("nextss %d %s\n", nexts, extname);//D
436 --nexts;
437 ++exts;
438 }
439#else
440 int nexts = 0;
441 char **exts = 0;
442#endif
443
444 if (!nexts)
445 {
446 rxvt_warn ("+ (which is an unknown extension)\n", buffer);
447
448 XGetErrorDatabaseText (dpy, "XlibMessage", "MinorCode", "Request Minor code %d", mesg, BUFSIZ);
449 snprintf (buffer, BUFSIZ, "+ %s\n", mesg); rxvt_warn (buffer, event->minor_code);
450
451#if 0
452 sprintf (number, "RENDER.%d", event->minor_code);
453 XGetErrorDatabaseText (dpy, "XRequest", number, "", buffer, BUFSIZ);
454 rxvt_warn ("+ (which is %s)\n", buffer);
455#endif
456 }
457
458 XFreeExtensionList (exts);
459 }
460 else
461 {
416 sprintf(number, "%d", event->request_code); 462 sprintf (number, "%d", event->request_code);
417 XGetErrorDatabaseText(dpy, "XRequest", number, "", buffer, BUFSIZ); 463 XGetErrorDatabaseText (dpy, "XRequest", number, "", buffer, BUFSIZ);
418 rxvt_warn ("(which is %s)\n", buffer); 464 rxvt_warn ("+ (which is %s)\n", buffer);
419 if (event->request_code >= 128) {
420 XGetErrorDatabaseText(dpy, mtype, "MinorCode", "Request Minor code %d",
421 mesg, BUFSIZ);
422 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->minor_code);
423 } 465 }
466
424 if ((event->error_code == BadWindow) || 467 if (event->error_code == BadWindow
425 (event->error_code == BadPixmap) || 468 || event->error_code == BadPixmap
426 (event->error_code == BadCursor) || 469 || event->error_code == BadCursor
427 (event->error_code == BadFont) || 470 || event->error_code == BadFont
428 (event->error_code == BadDrawable) || 471 || event->error_code == BadDrawable
429 (event->error_code == BadColor) || 472 || event->error_code == BadColor
430 (event->error_code == BadGC) || 473 || event->error_code == BadGC
431 (event->error_code == BadIDChoice) || 474 || event->error_code == BadIDChoice
432 (event->error_code == BadValue) || 475 || event->error_code == BadValue
433 (event->error_code == BadAtom)) { 476 || event->error_code == BadAtom)
477 {
434 if (event->error_code == BadValue) 478 if (event->error_code == BadValue)
435 XGetErrorDatabaseText(dpy, mtype, "Value", "Value 0x%x", 479 XGetErrorDatabaseText (dpy, "XlibMessage", "Value", "Value 0x%x", mesg, BUFSIZ);
436 mesg, BUFSIZ);
437 else if (event->error_code == BadAtom) 480 else if (event->error_code == BadAtom)
438 XGetErrorDatabaseText(dpy, mtype, "AtomID", "AtomID 0x%x", 481 XGetErrorDatabaseText (dpy, "XlibMessage", "AtomID", "AtomID 0x%x", mesg, BUFSIZ);
439 mesg, BUFSIZ); 482 else
440 else
441 XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x", 483 XGetErrorDatabaseText (dpy, "XlibMessage", "ResourceID", "ResourceID 0x%x", mesg, BUFSIZ);
442 mesg, BUFSIZ);
443 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid);
444 }
445 XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d",
446 mesg, BUFSIZ);
447 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial);
448}
449#endif
450 484
451int 485 snprintf (buffer, BUFSIZ, "+ %s\n", mesg); rxvt_warn (buffer, event->resourceid);
486 }
487}
488#endif
489
490int ecb_cold
452rxvt_xerror_handler (Display *display, XErrorEvent *event) 491rxvt_xerror_handler (Display *display, XErrorEvent *event)
453{ 492{
454 if (GET_R->allowedxerror == -1) 493 if (GET_R && GET_R->allowedxerror == -1)
455 GET_R->allowedxerror = event->error_code; 494 GET_R->allowedxerror = event->error_code;
456 else 495 else
457 { 496 {
458 // GET_R is most likely not the terminal which caused the error, 497 // GET_R is most likely not the terminal which caused the error,
459 // so just output the error and continue 498 // so just output the error and continue
… …
465 } 504 }
466 505
467 return 0; 506 return 0;
468} 507}
469 508
470int 509int ecb_cold
471rxvt_xioerror_handler (Display *display) 510rxvt_xioerror_handler (Display *display)
472{ 511{
473 rxvt_warn ("X connection to '%s' broken, unable to recover, exiting.\n", 512 rxvt_warn ("X connection to '%s' broken, unable to recover, exiting.\n",
474 DisplayString (display)); 513 DisplayString (display));
475 rxvt_emergency_cleanup (); 514 rxvt_emergency_cleanup ();
476 _exit (EXIT_FAILURE); 515 _exit (EXIT_FAILURE);
477}
478
479/*----------------------------------------------------------------------*/
480bool
481rxvt_term::init (int argc, const char *const *argv, stringvec *envv)
482{
483 this->envv = envv;
484
485 SET_R (this);
486 set_locale ("");
487 set_environ (envv); // few things in X do not call setlocale :(
488
489 if (!init_vars ())
490 return false;
491
492 init_secondary ();
493
494 const char **cmd_argv = init_resources (argc, argv);
495
496#ifdef KEYSYM_RESOURCE
497 keyboard->register_done ();
498#endif
499
500#ifdef HAVE_SCROLLBARS
501 if (option (Opt_scrollBar))
502 scrollBar.setIdle (); /* set existence for size calculations */
503#endif
504
505 pty = ptytty::create ();
506
507 create_windows (argc, argv);
508
509 init_xlocale ();
510
511 scr_reset (); // initialize screen
512
513#if 0
514 XSynchronize (dpy, True);
515#endif
516
517#ifdef HAVE_SCROLLBARS
518 if (option (Opt_scrollBar))
519 resize_scrollbar (); /* create and map scrollbar */
520#endif
521#ifdef HAVE_BG_PIXMAP
522 {
523 bgPixmap.set_target (this);
524
525#ifdef ENABLE_TRANSPARENCY
526 if (option (Opt_transparent))
527 {
528 bgPixmap.set_transparent ();
529#ifdef HAVE_AFTERIMAGE
530 if (rs [Rs_blurradius])
531 bgPixmap.set_blur_radius (rs [Rs_blurradius]);
532#endif
533 if (ISSET_PIXCOLOR (Color_tint))
534 bgPixmap.set_tint (pix_colors_focused [Color_tint]);
535 if (rs [Rs_shade])
536 bgPixmap.set_shade (rs [Rs_shade]);
537
538 bgPixmap.set_root_pixmap ();
539 XSelectInput (dpy, display->root, PropertyChangeMask);
540 rootwin_ev.start (display, display->root);
541 }
542#endif
543
544#ifdef BG_IMAGE_FROM_FILE
545 if (rs[Rs_backgroundPixmap] != NULL)
546 {
547 const char *p = rs[Rs_backgroundPixmap];
548
549 if ((p = strchr (p, ';')) != NULL)
550 {
551 p++;
552 bgPixmap.set_geometry (p);
553 }
554 else
555 bgPixmap.set_defaultGeometry ();
556
557 if (bgPixmap.set_file (rs[Rs_backgroundPixmap]))
558 if (!bgPixmap.window_position_sensitive ())
559 update_background ();
560 }
561#endif
562 }
563#endif
564
565#if ENABLE_PERL
566 rootwin_ev.start (display, display->root);
567#endif
568
569 set_colorfgbg ();
570
571 init_command (cmd_argv);
572
573 free (cmd_argv);
574
575 if (pty->pty >= 0)
576 pty_ev.start (pty->pty, ev::READ);
577
578 prepare_ev.start ();
579
580 HOOK_INVOKE ((this, HOOK_START, DT_END));
581
582#if ENABLE_XEMBED
583 if (rs[Rs_embed])
584 {
585 long info[2] = { 0, XEMBED_MAPPED };
586
587 XChangeProperty (dpy, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
588 32, PropModeReplace, (unsigned char *)&info, 2);
589 }
590#endif
591
592 XMapWindow (dpy, vt);
593 XMapWindow (dpy, parent[0]);
594
595 return true;
596} 516}
597 517
598static struct sig_handlers 518static struct sig_handlers
599{ 519{
600 ev::sig sw_term, sw_int; 520 ev::sig sw_term, sw_int;
… …
617 rxvt_emergency_cleanup (); 537 rxvt_emergency_cleanup ();
618 w.stop (); 538 w.stop ();
619 kill (getpid (), w.signum); 539 kill (getpid (), w.signum);
620} 540}
621 541
542static void
543rxvt_get_ttymode (struct termios *tio)
544{
545 if (tcgetattr (STDIN_FILENO, tio) < 0)
546 memset (tio, 0, sizeof (struct termios));
547
548 for (int i = 0; i < NCCS; i++)
549 tio->c_cc[i] = VDISABLE;
550
551 tio->c_cc[VINTR] = CINTR;
552 tio->c_cc[VQUIT] = CQUIT;
553 tio->c_cc[VERASE] = CERASE;
554#ifdef VERASE2
555 tio->c_cc[VERASE2] = CERASE2;
556#endif
557 tio->c_cc[VKILL] = CKILL;
558 tio->c_cc[VEOF] = CEOF;
559 tio->c_cc[VSTART] = CSTART;
560 tio->c_cc[VSTOP] = CSTOP;
561 tio->c_cc[VSUSP] = CSUSP;
562# ifdef VDSUSP
563 tio->c_cc[VDSUSP] = CDSUSP;
564# endif
565# ifdef VREPRINT
566 tio->c_cc[VREPRINT] = CRPRNT;
567# endif
568# ifdef VDISCRD
569 tio->c_cc[VDISCRD] = CFLUSH;
570# endif
571# ifdef VWERSE
572 tio->c_cc[VWERSE] = CWERASE;
573# endif
574# ifdef VLNEXT
575 tio->c_cc[VLNEXT] = CLNEXT;
576# endif
577# ifdef VSTATUS
578 tio->c_cc[VSTATUS] = CSTATUS;
579# endif
580
581# if VMIN != VEOF
582 tio->c_cc[VMIN] = 1;
583# endif
584# if VTIME != VEOL
585 tio->c_cc[VTIME] = 0;
586# endif
587
588 /* input modes */
589 tio->c_iflag = (BRKINT | IGNPAR | ICRNL
590# ifdef IMAXBEL
591 | IMAXBEL
592# endif
593 | IXON);
594
595 /* output modes */
596 tio->c_oflag = (OPOST | ONLCR);
597
598 /* control modes */
599 tio->c_cflag = (CS8 | CREAD);
600
601 /* local modes */
602 tio->c_lflag = (ISIG | ICANON | IEXTEN | ECHO
603# if defined (ECHOCTL) && defined (ECHOKE)
604 | ECHOCTL | ECHOKE
605# endif
606 | ECHOE | ECHOK);
607}
608
622char **rxvt_environ; // startup environment 609char **rxvt_environ; // startup environment
623 610
624void 611void
625rxvt_init () 612rxvt_init ()
626{ 613{
627 ptytty::init (); 614 assert (("fontMask must not overlap other RS masks",
615 0 == (RS_fontMask & (RS_Sel | RS_baseattrMask | RS_customMask | RS_bgMask | RS_fgMask))));
628 616
617 rxvt_get_ttymode (&rxvt_term::def_tio);
618
619 // get rid of stdin/stdout as we don't need them, to free resources
620 dup2 (STDERR_FILENO, STDIN_FILENO);
621 dup2 (STDERR_FILENO, STDOUT_FILENO);
622
629 if (!ev_default_loop (0)) 623 if (!ev_default_loop ())
630 rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n"); 624 rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n");
631 625
632 rxvt_environ = environ; 626 rxvt_environ = environ;
633 627
634 signal (SIGHUP, SIG_IGN); 628 signal (SIGHUP, SIG_IGN);
635 signal (SIGPIPE, SIG_IGN); 629 signal (SIGPIPE, SIG_IGN);
636 630
637 sig_handlers.sw_term.start (SIGTERM); ev_unref (); 631 sig_handlers.sw_term.start (SIGTERM); ev_unref ();
638 sig_handlers.sw_int.start (SIGINT); ev_unref (); 632 sig_handlers.sw_int.start (SIGINT); ev_unref ();
639
640 /* need to trap SIGURG for SVR4 (Unixware) rlogin */
641 /* signal (SIGURG, SIG_DFL); */
642 633
643 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); 634 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
644 // TODO: handle this with exceptions and tolerate the memory loss 635 // TODO: handle this with exceptions and tolerate the memory loss
645 XSetIOErrorHandler (rxvt_xioerror_handler); 636 XSetIOErrorHandler (rxvt_xioerror_handler);
646 637
647 XrmInitialize (); 638 XrmInitialize ();
648}
649 639
650/* ------------------------------------------------------------------------- * 640#if HAVE_PIXBUF
651 * MEMORY ALLOCATION WRAPPERS * 641 g_type_init ();
652 * ------------------------------------------------------------------------- */ 642#endif
653void *
654rxvt_malloc (size_t size)
655{
656 void *p = malloc (size);
657
658 if (!p)
659 rxvt_fatal ("memory allocation failure. aborting.\n");
660
661 return p;
662}
663
664void *
665rxvt_calloc (size_t number, size_t size)
666{
667 void *p = calloc (number, size);
668
669 if (!p)
670 rxvt_fatal ("memory allocation failure. aborting.\n");
671
672 return p;
673}
674
675void *
676rxvt_realloc (void *ptr, size_t size)
677{
678 void *p = realloc (ptr, size);
679
680 if (!p)
681 rxvt_fatal ("memory allocation failure. aborting.\n");
682
683 return p;
684} 643}
685 644
686/*----------------------------------------------------------------------*/ 645/*----------------------------------------------------------------------*/
687/* 646/*
688 * window size/position calculations for XSizeHint and other storage. 647 * window size/position calculations for XSizeHint and other storage.
… …
690 */ 649 */
691void 650void
692rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight) 651rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
693{ 652{
694 short recalc_x, recalc_y; 653 short recalc_x, recalc_y;
695 int x, y, sb_w, flags; 654 int x, y, flags;
696 unsigned int w, h; 655 unsigned int w, h;
697 unsigned int max_width, max_height; 656 unsigned int max_width, max_height;
698 657
699 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity; 658 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity;
700 szHint.win_gravity = NorthWestGravity; 659 szHint.win_gravity = NorthWestGravity;
… …
710 if (rs[Rs_geometry]) 669 if (rs[Rs_geometry])
711 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h); 670 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h);
712 671
713 if (flags & WidthValue) 672 if (flags & WidthValue)
714 { 673 {
674 if (!w)
675 rxvt_fatal ("illegal window geometry (width and height must be non-zero), aborting.\n");
676
715 ncol = clamp (w, 0, std::numeric_limits<int16_t>::max ()); 677 ncol = clamp (w, 1, std::numeric_limits<int16_t>::max ());
716 szHint.flags |= USSize; 678 szHint.flags |= USSize;
717 } 679 }
718 680
719 if (flags & HeightValue) 681 if (flags & HeightValue)
720 { 682 {
683 if (!h)
684 rxvt_fatal ("illegal window geometry (width and height must be non-zero), aborting.\n");
685
721 nrow = clamp (h, 0, std::numeric_limits<int16_t>::max ()); 686 nrow = clamp (h, 1, std::numeric_limits<int16_t>::max ());
722 szHint.flags |= USSize; 687 szHint.flags |= USSize;
723 } 688 }
724 689
725 if (flags & XValue) 690 if (flags & XValue)
726 { 691 {
… …
757 max_width = MAX_COLS * fwidth; 722 max_width = MAX_COLS * fwidth;
758 max_height = MAX_ROWS * fheight; 723 max_height = MAX_ROWS * fheight;
759 724
760 szHint.base_width = szHint.base_height = 2 * int_bwidth; 725 szHint.base_width = szHint.base_height = 2 * int_bwidth;
761 726
762 sb_w = 0;
763 window_vt_x = window_vt_y = int_bwidth; 727 window_vt_x = window_vt_y = int_bwidth;
764 728
765 if (scrollBar.state) 729 if (scrollBar.state)
766 { 730 {
767 sb_w = scrollbar_TotalWidth (); 731 int sb_w = scrollBar.total_width ();
768 szHint.base_width += sb_w; 732 szHint.base_width += sb_w;
769 733
770 if (!option (Opt_scrollBar_right)) 734 if (!option (Opt_scrollBar_right))
771 window_vt_x += sb_w; 735 window_vt_x += sb_w;
772 } 736 }
… …
796 { 760 {
797 min_it (height, max_height); 761 min_it (height, max_height);
798 szHint.height = szHint.base_height + height; 762 szHint.height = szHint.base_height + height;
799 } 763 }
800 764
801 if (scrollBar.state && option (Opt_scrollBar_right))
802 window_sb_x = szHint.width - sb_w;
803
804 if (recalc_x) 765 if (recalc_x)
805 szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth; 766 szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth;
806 767
807 if (recalc_y) 768 if (recalc_y)
808 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth; 769 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth;
809 770
810 ncol = width / fwidth; 771 ncol = width / fwidth;
811 nrow = height / fheight; 772 nrow = height / fheight;
773
774 // When the size of the vt window is not a multiple of the cell
775 // size, i.e., when the wm does not honour our size hints, there are
776 // extra areas not covered by the terminal screen. Such gaps, when a
777 // bg pixmap is set, would have to be cleared manually to properly
778 // refresh the background. We take the simpler route and shrink the
779 // vt window so as to avoid creating gaps.
780 vt_width = ncol * fwidth;
781 vt_height = nrow * fheight;
812} 782}
813 783
814/*----------------------------------------------------------------------*/ 784/*----------------------------------------------------------------------*/
815/* 785/*
816 * Tell the teletype handler what size the window is. 786 * Tell the teletype handler what size the window is.
… …
824 794
825 struct winsize ws; 795 struct winsize ws;
826 796
827 ws.ws_col = ncol; 797 ws.ws_col = ncol;
828 ws.ws_row = nrow; 798 ws.ws_row = nrow;
829 ws.ws_xpixel = width; 799 ws.ws_xpixel = vt_width;
830 ws.ws_ypixel = height; 800 ws.ws_ypixel = vt_height;
831 (void)ioctl (pty->pty, TIOCSWINSZ, &ws); 801 ioctl (pty->pty, TIOCSWINSZ, &ws);
832 802
833#if 0 803#if 0
834 // TIOCSWINSZ⎈ is supposed to do this automatically and correctly 804 // TIOCSWINSZ is supposed to do this automatically and correctly
835 if (cmd_pid) /* force through to the command */ 805 if (cmd_pid) /* force through to the command */
836 kill (-cmd_pid, SIGWINCH); 806 kill (-cmd_pid, SIGWINCH);
837#endif 807#endif
838} 808}
839 809
840/*----------------------------------------------------------------------*/ 810/*----------------------------------------------------------------------*/
841/* set_fonts () - load and set the various fonts 811/* load and set the various fonts */
842 *
843 * init = 1 - initialize
844 *
845 * fontname == FONT_UP - switch to bigger font
846 * fontname == FONT_DN - switch to smaller font
847 */
848bool 812bool
849rxvt_term::set_fonts () 813rxvt_term::set_fonts ()
850{ 814{
851 rxvt_fontset *fs = new rxvt_fontset (this); 815 rxvt_fontset *fs = new rxvt_fontset (this);
852 rxvt_fontprop prop; 816 rxvt_fontprop prop;
… …
866#endif 830#endif
867 831
868 delete fontset[0]; 832 delete fontset[0];
869 fontset[0] = fs; 833 fontset[0] = fs;
870 834
871 prop = (*fs)[1]->properties (); 835 prop = (*fs)[rxvt_fontset::firstFont]->properties ();
872 prop.height += lineSpace; 836 prop.width = max (prop.width + letterSpace, 1);
873 837
874 fs->set_prop (prop, false); 838 fs->set_prop (prop, false);
875 839
876 fwidth = prop.width; 840 fwidth = prop.width;
877 fheight = prop.height; 841 fheight = prop.height + lineSpace;
878 fbase = prop.ascent; 842 fbase = prop.ascent;
879 843
880 for (int style = 1; style < 4; style++) 844 for (int style = 1; style < 4; style++)
881 { 845 {
882#if ENABLE_STYLES 846#if ENABLE_STYLES
… …
908#else 872#else
909 fontset[style] = fontset[0]; 873 fontset[style] = fontset[0];
910#endif 874#endif
911 } 875 }
912 876
913 if (parent[0]) 877 if (parent)
914 { 878 {
915 resize_all_windows (0, 0, 0); 879 resize_all_windows (0, 0, 0);
916 scr_remap_chars (); 880 scr_remap_chars ();
917 scr_touch (true); 881 scr_touch (true);
918 } 882 }
… …
921} 885}
922 886
923void 887void
924rxvt_term::set_string_property (Atom prop, const char *str, int len) 888rxvt_term::set_string_property (Atom prop, const char *str, int len)
925{ 889{
926 XChangeProperty (dpy, parent[0], 890 XChangeProperty (dpy, parent,
927 prop, XA_STRING, 8, PropModeReplace, 891 prop, XA_STRING, 8, PropModeReplace,
928 (const unsigned char *)str, len >= 0 ? len : strlen (str)); 892 (const unsigned char *)str, len >= 0 ? len : strlen (str));
929} 893}
930 894
931void 895void
896rxvt_term::set_mbstring_property (Atom prop, const char *str, int len)
897{
898 XTextProperty ct;
899
900 if (XmbTextListToTextProperty (dpy, (char **)&str, 1, XStdICCTextStyle, &ct) >= 0)
901 {
902 XSetTextProperty (dpy, parent, &ct, prop);
903 XFree (ct.value);
904 }
905}
906
907void
932rxvt_term::set_utf8_property (Atom prop, const char *str, int len) 908rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
933{ 909{
934 wchar_t *ws = rxvt_mbstowcs (str, len); 910 wchar_t *ws = rxvt_mbstowcs (str, len);
935 char *s = rxvt_wcstoutf8 (ws); 911 char *s = rxvt_wcstoutf8 (ws);
936 912
937 XChangeProperty (dpy, parent[0], 913 XChangeProperty (dpy, parent,
938 prop, xa[XA_UTF8_STRING], 8, PropModeReplace, 914 prop, xa[XA_UTF8_STRING], 8, PropModeReplace,
939 (const unsigned char *)s, strlen (s)); 915 (const unsigned char *)s, strlen (s));
940 916
941 free (s); 917 free (s);
942 free (ws); 918 free (ws);
… …
946/*----------------------------------------------------------------------*/ 922/*----------------------------------------------------------------------*/
947/* xterm sequences - title, iconName, color (exptl) */ 923/* xterm sequences - title, iconName, color (exptl) */
948void 924void
949rxvt_term::set_title (const char *str) 925rxvt_term::set_title (const char *str)
950{ 926{
951 set_string_property (XA_WM_NAME, str); 927 set_mbstring_property (XA_WM_NAME, str);
952#if ENABLE_EWMH 928#if ENABLE_EWMH
953 set_utf8_property (xa[XA_NET_WM_NAME], str); 929 set_utf8_property (xa[XA_NET_WM_NAME], str);
954#endif 930#endif
955} 931}
956 932
957void 933void
958rxvt_term::set_icon_name (const char *str) 934rxvt_term::set_icon_name (const char *str)
959{ 935{
960 set_string_property (XA_WM_ICON_NAME, str); 936 set_mbstring_property (XA_WM_ICON_NAME, str);
961#if ENABLE_EWMH 937#if ENABLE_EWMH
962 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str); 938 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str);
963#endif 939#endif
964} 940}
965 941
966void 942void
967rxvt_term::set_window_color (int idx, const char *color) 943rxvt_term::set_window_color (int idx, const char *color)
968{ 944{
969#ifdef XTERM_COLOR_CHANGE 945#ifdef XTERM_COLOR_CHANGE
970 rxvt_color xcol; 946 rxvt_color xcol;
971 int i;
972 947
973 if (color == NULL || *color == '\0') 948 if (color == NULL || *color == '\0')
974 return; 949 return;
975 950
976 color = strdup (color); 951 color = strdup (color);
… …
978 rs[Rs_color + idx] = color; 953 rs[Rs_color + idx] = color;
979 954
980 /* handle color aliases */ 955 /* handle color aliases */
981 if (isdigit (*color)) 956 if (isdigit (*color))
982 { 957 {
983 i = atoi (color); 958 int i = atoi (color);
984 959
985 if (i >= 8 && i <= 15) 960 if (i >= 8 && i <= 15)
986 { 961 {
987 /* bright colors */ 962 /* bright colors */
988 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i - 8]; 963 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i - 8];
… …
1033 1008
1034/*----------------------------------------------------------------------*/ 1009/*----------------------------------------------------------------------*/
1035/* 1010/*
1036 * find if fg/bg matches any of the normal (low-intensity) colors 1011 * find if fg/bg matches any of the normal (low-intensity) colors
1037 */ 1012 */
1038void 1013char *
1039rxvt_term::set_colorfgbg () 1014rxvt_term::get_colorfgbg ()
1040{ 1015{
1041 unsigned int i; 1016 unsigned int i;
1042 const char *xpmb = ""; 1017 const char *xpmb = "";
1043 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1]; 1018 char fstr[] = "default";
1019 char bstr[] = "default";
1020 char *env_colorfgbg;
1044 1021
1045 strcpy (fstr, "default");
1046 strcpy (bstr, "default");
1047 for (i = Color_Black; i <= Color_White; i++) 1022 for (i = Color_Black; i <= Color_White; i++)
1048 if (pix_colors[Color_fg] == pix_colors[i]) 1023 if (pix_colors[Color_fg] == pix_colors[i])
1049 { 1024 {
1050 sprintf (fstr, "%d", (i - Color_Black)); 1025 sprintf (fstr, "%d", i - Color_Black);
1051 break; 1026 break;
1052 } 1027 }
1053 1028
1054 for (i = Color_Black; i <= Color_White; i++) 1029 for (i = Color_Black; i <= Color_White; i++)
1055 if (pix_colors[Color_bg] == pix_colors[i]) 1030 if (pix_colors[Color_bg] == pix_colors[i])
1056 { 1031 {
1057 sprintf (bstr, "%d", (i - Color_Black)); 1032 sprintf (bstr, "%d", i - Color_Black);
1058#ifdef BG_IMAGE_FROM_FILE 1033#if BG_IMAGE_FROM_FILE
1059 xpmb = "default;"; 1034 xpmb = "default;";
1060#endif 1035#endif
1061 break; 1036 break;
1062 } 1037 }
1063 1038
1039 env_colorfgbg = (char *)rxvt_malloc (sizeof ("COLORFGBG=default;default;bg"));
1064 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr); 1040 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr);
1041 return env_colorfgbg;
1065} 1042}
1066 1043
1067/*----------------------------------------------------------------------*/ 1044/*----------------------------------------------------------------------*/
1068 1045
1069bool 1046bool
… …
1092 int old_width = szHint.width; 1069 int old_width = szHint.width;
1093 int old_height = szHint.height; 1070 int old_height = szHint.height;
1094 1071
1095 window_calc (newwidth, newheight); 1072 window_calc (newwidth, newheight);
1096 1073
1097 if (!HOOK_INVOKE ((this, HOOK_RESIZE_ALL_WINDOWS, DT_INT, newwidth, DT_INT, newheight, DT_END))) 1074 bool set_hint = !HOOK_INVOKE ((this, HOOK_RESIZE_ALL_WINDOWS, DT_INT, newwidth, DT_INT, newheight, DT_END));
1075
1076 // to avoid races between us and the wm, we clear the incremental size hints around the xresizewindow
1077 if (set_hint)
1078 {
1079 szHint.flags &= ~(PBaseSize | PResizeInc);
1098 XSetWMNormalHints (dpy, parent[0], &szHint); 1080 XSetWMNormalHints (dpy, parent, &szHint);
1081 szHint.flags |= PBaseSize | PResizeInc;
1082 }
1099 1083
1100 if (!ignoreparent) 1084 if (!ignoreparent)
1101 { 1085 {
1102#ifdef SMART_RESIZE 1086#ifdef SMART_RESIZE
1103 /* 1087 /*
… …
1107 int x, y, x1, y1; 1091 int x, y, x1, y1;
1108 int dx, dy; 1092 int dx, dy;
1109 unsigned int unused_w1, unused_h1, unused_b1, unused_d1; 1093 unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
1110 Window unused_cr; 1094 Window unused_cr;
1111 1095
1112 XTranslateCoordinates (dpy, parent[0], display->root, 1096 XTranslateCoordinates (dpy, parent, display->root,
1113 0, 0, &x, &y, &unused_cr); 1097 0, 0, &x, &y, &unused_cr);
1114 XGetGeometry (dpy, parent[0], &unused_cr, &x1, &y1, 1098 XGetGeometry (dpy, parent, &unused_cr, &x1, &y1,
1115 &unused_w1, &unused_h1, &unused_b1, &unused_d1); 1099 &unused_w1, &unused_h1, &unused_b1, &unused_d1);
1116 /* 1100 /*
1117 * if display->root isn't the parent window, a WM will probably have offset 1101 * if display->root isn't the parent window, a WM will probably have offset
1118 * our position for handles and decorations. Counter it 1102 * our position for handles and decorations. Counter it
1119 */ 1103 */
… …
1136 if (y < y1) /* top half */ 1120 if (y < y1) /* top half */
1137 dy = 0; 1121 dy = 0;
1138 else if (y == y1) /* exact center */ 1122 else if (y == y1) /* exact center */
1139 dy /= 2; 1123 dy /= 2;
1140 1124
1141 XMoveResizeWindow (dpy, parent[0], x + dx, y + dy, 1125 XMoveResizeWindow (dpy, parent, x + dx, y + dy,
1142 szHint.width, szHint.height); 1126 szHint.width, szHint.height);
1143#else 1127#else
1144 XResizeWindow (dpy, parent[0], szHint.width, szHint.height); 1128 XResizeWindow (dpy, parent, szHint.width, szHint.height);
1145#endif 1129#endif
1146 } 1130 }
1131
1132 if (set_hint)
1133 XSetWMNormalHints (dpy, parent, &szHint);
1147 1134
1148 fix_screen = ncol != prev_ncol || nrow != prev_nrow; 1135 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
1149 1136
1150 if (fix_screen || newwidth != old_width || newheight != old_height) 1137 if (fix_screen || newwidth != old_width || newheight != old_height)
1151 { 1138 {
1152 if (scrollBar.state) 1139 if (scrollBar.state)
1153 { 1140 scrollBar.resize ();
1154 XMoveResizeWindow (dpy, scrollBar.win,
1155 window_sb_x, 0,
1156 scrollbar_TotalWidth (), szHint.height);
1157 resize_scrollbar ();
1158 }
1159 1141
1160 XMoveResizeWindow (dpy, vt, 1142 XMoveResizeWindow (dpy, vt,
1161 window_vt_x, window_vt_y, 1143 window_vt_x, window_vt_y,
1162 width, height); 1144 vt_width, vt_height);
1145
1146 HOOK_INVOKE ((this, HOOK_SIZE_CHANGE, DT_INT, newwidth, DT_INT, newheight, DT_END));
1163 1147
1164#ifdef HAVE_BG_PIXMAP 1148#ifdef HAVE_BG_PIXMAP
1165 if (bgPixmap.window_size_sensitive ()) 1149 if (bg_window_size_sensitive ())
1166 update_background (); 1150 update_background ();
1167#endif 1151#endif
1168
1169 scr_clear ();
1170 } 1152 }
1171 1153
1172 if (fix_screen || old_height == 0) 1154 if (fix_screen || old_height == 0)
1173 scr_reset (); 1155 scr_reset ();
1174 1156
1175 // TODO, with nvidia-8178, resizes kill the alpha channel, report if not fixed in newer version
1176 //scr_touch (false);
1177
1178#ifdef HAVE_BG_PIXMAP
1179// TODO: this don't seem to have any effect - do we still need it ? If so - in which case exactly ?
1180// if (bgPixmap.pixmap)
1181// scr_touch (false);
1182#endif
1183
1184#ifdef USE_XIM 1157#if USE_XIM
1185 IMSetPosition (); 1158 im_set_position ();
1186#endif 1159#endif
1187} 1160}
1188 1161
1189/* 1162/*
1190 * Set the width/height of the vt window in characters. Units are pixels. 1163 * Set the width/height of the vt window in characters. Units are pixels.
… …
1203 newwidth = wattr.width - szHint.base_width; 1176 newwidth = wattr.width - szHint.base_width;
1204 if (newheight == 0) 1177 if (newheight == 0)
1205 newheight = wattr.height - szHint.base_height; 1178 newheight = wattr.height - szHint.base_height;
1206 } 1179 }
1207 1180
1208 if (newwidth != width || newheight != height) 1181 if (newwidth != vt_width || newheight != vt_height)
1209 { 1182 {
1210 newwidth += szHint.base_width; 1183 newwidth += szHint.base_width;
1211 newheight += szHint.base_height; 1184 newheight += szHint.base_height;
1212 resize_all_windows (newwidth, newheight, 0); 1185 resize_all_windows (newwidth, newheight, 0);
1213 } 1186 }
1214} 1187}
1215 1188
1216/* -------------------------------------------------------------------- * 1189/* -------------------------------------------------------------------- *
1217 * - X INPUT METHOD ROUTINES - * 1190 * - X INPUT METHOD ROUTINES - *
1218 * -------------------------------------------------------------------- */ 1191 * -------------------------------------------------------------------- */
1219#ifdef USE_XIM 1192#if USE_XIM
1220 1193
1221void 1194void
1222rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg) 1195rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg)
1223{ 1196{
1224 fg = pix_colors [Color_fg]; 1197 fg = pix_colors [Color_fg];
… …
1251 status_rect.height = fheight; 1224 status_rect.height = fheight;
1252} 1225}
1253 1226
1254/* Checking whether input method is running. */ 1227/* Checking whether input method is running. */
1255bool 1228bool
1256rxvt_term::IMisRunning () 1229rxvt_term::im_is_running ()
1257{ 1230{
1258 char *p;
1259 Atom atom; 1231 Atom atom;
1260 Window win; 1232 Window win;
1261 char server[IMBUFSIZ]; 1233 char server[IMBUFSIZ];
1262 1234
1263 /* get current locale modifier */ 1235 /* get current locale modifier */
1264 if ((p = XSetLocaleModifiers (NULL)) != NULL) 1236 if (char *p = XSetLocaleModifiers (0))
1265 { 1237 {
1266 strcpy (server, "@server="); 1238 strcpy (server, "@server=");
1267 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */ 1239 strncat (server, p + 4, IMBUFSIZ - 9); /* skip "@im=" */
1268 1240
1269 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */ 1241 if (p = strchr (server + 1, '@')) /* first one only */
1270 *p = '\0'; 1242 *p = '\0';
1271 1243
1272 atom = XInternAtom (dpy, server, False); 1244 atom = XInternAtom (dpy, server, False);
1273 win = XGetSelectionOwner (dpy, atom); 1245 win = XGetSelectionOwner (dpy, atom);
1274 1246
1275 if (win != None) 1247 if (win != None)
1276 return True; 1248 return true;
1277 } 1249 }
1278 1250
1279 return False; 1251 return false;
1280} 1252}
1281 1253
1282void 1254void
1283rxvt_term::IMSendSpot () 1255rxvt_term::im_send_spot ()
1284{ 1256{
1285 XPoint nspot; 1257 XPoint nspot;
1286 XVaNestedList preedit_attr; 1258 XVaNestedList preedit_attr;
1287 1259
1288 if (!Input_Context 1260 if (!Input_Context
… …
1341 1313
1342 term->make_current (); 1314 term->make_current ();
1343 1315
1344 if (text) 1316 if (text)
1345 { 1317 {
1346 void *str; 1318 wchar_t *str;
1347 1319
1348 if (!text->encoding_is_wchar && text->string.multi_byte) 1320 if (!text->encoding_is_wchar && text->string.multi_byte)
1349 { 1321 {
1350 // of course, X makes it ugly again 1322 // of course, X makes it ugly again
1351 if (term->rs[Rs_imLocale]) 1323 if (term->rs[Rs_imLocale])
1352 SET_LOCALE (term->rs[Rs_imLocale]); 1324 SET_LOCALE (term->rs[Rs_imLocale]);
1353 1325
1354 str = rxvt_temp_buf ((text->length + 1) * sizeof (wchar_t)); 1326 str = rxvt_temp_buf<wchar_t> (text->length + 1);
1355 mbstowcs ((wchar_t *)str, text->string.multi_byte, text->length + 1); 1327 mbstowcs (str, text->string.multi_byte, text->length + 1);
1356 1328
1357 if (term->rs[Rs_imLocale]) 1329 if (term->rs[Rs_imLocale])
1358 SET_LOCALE (term->locale); 1330 SET_LOCALE (term->locale);
1359 } 1331 }
1360 else 1332 else
1361 str = (void *)text->string.wide_char; 1333 str = text->string.wide_char;
1362 1334
1363 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW, 1335 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
1364 DT_INT, call_data->caret, 1336 DT_INT, call_data->caret,
1365 DT_INT, call_data->chg_first, 1337 DT_INT, call_data->chg_first,
1366 DT_INT, call_data->chg_length, 1338 DT_INT, call_data->chg_length,
… …
1394/* 1366/*
1395 * Try to open a XIM with the current modifiers, then see if we can 1367 * Try to open a XIM with the current modifiers, then see if we can
1396 * open a suitable preedit type 1368 * open a suitable preedit type
1397 */ 1369 */
1398bool 1370bool
1399rxvt_term::IM_get_IC (const char *modifiers) 1371rxvt_term::im_get_ic (const char *modifiers)
1400{ 1372{
1401 int i, j, found; 1373 int i, j, found;
1402 XIM xim; 1374 XIM xim;
1403 XPoint spot; 1375 XPoint spot;
1404 XRectangle rect, status_rect, needed_rect; 1376 XRectangle rect, status_rect, needed_rect;
1405 unsigned long fg, bg; 1377 unsigned long fg, bg;
1406 const char *p; 1378 const char *p;
1407 char **s; 1379 char **s;
1408 XIMStyles *xim_styles; 1380 XIMStyles *xim_styles;
1409#ifdef ENABLE_XIM_ONTHESPOT
1410 XIMCallback xcb[4];
1411#endif
1412 1381
1413 set_environ (envv); 1382 set_environ (env);
1414 1383
1415 if (! ((p = XSetLocaleModifiers (modifiers)) && *p)) 1384 if (!((p = XSetLocaleModifiers (modifiers)) && *p))
1416 return false; 1385 return false;
1417 1386
1418 input_method = display->get_xim (locale, modifiers); 1387 input_method = display->get_xim (locale, modifiers);
1419 if (input_method == NULL) 1388 if (input_method == NULL)
1420 return false; 1389 return false;
… …
1437 p = pet[pi]; 1406 p = pet[pi];
1438 1407
1439 if (!p) 1408 if (!p)
1440 continue; 1409 continue;
1441 1410
1442 s = rxvt_splitcommastring (p); 1411 s = rxvt_strsplit (',', p);
1443 1412
1444 for (i = found = 0; !found && s[i]; i++) 1413 for (i = found = 0; !found && s[i]; i++)
1445 { 1414 {
1446 if (!strcmp (s[i], "OverTheSpot")) 1415 if (!strcmp (s[i], "OverTheSpot"))
1447 input_style = XIMPreeditPosition | XIMStatusNothing; 1416 input_style = XIMPreeditPosition | XIMStatusNothing;
… …
1459 input_style = XIMPreeditNothing | XIMStatusNothing; 1428 input_style = XIMPreeditNothing | XIMStatusNothing;
1460 1429
1461 for (j = 0; j < xim_styles->count_styles; j++) 1430 for (j = 0; j < xim_styles->count_styles; j++)
1462 if (input_style == xim_styles->supported_styles[j]) 1431 if (input_style == xim_styles->supported_styles[j])
1463 { 1432 {
1464 rxvt_freecommastring (s); 1433 rxvt_free_strsplit (s);
1465 1434
1466 found = 1; 1435 found = 1;
1467 goto foundpet; 1436 goto foundpet;
1468 } 1437 }
1469 1438
1470 } 1439 }
1471 1440
1472 rxvt_freecommastring (s); 1441 rxvt_free_strsplit (s);
1473 } 1442 }
1474 1443
1475foundpet: 1444foundpet:
1476 1445
1477 XFree (xim_styles); 1446 XFree (xim_styles);
… …
1556 NULL); 1525 NULL);
1557 } 1526 }
1558#if ENABLE_XIM_ONTHESPOT 1527#if ENABLE_XIM_ONTHESPOT
1559 else if (input_style & XIMPreeditCallbacks) 1528 else if (input_style & XIMPreeditCallbacks)
1560 { 1529 {
1530 XIMCallback xcb[4];
1531
1561 im_set_position (spot); 1532 im_set_position (spot);
1562 1533
1563 xcb[0].client_data = (XPointer)this; xcb[0].callback = (XIMProc)xim_preedit_start; 1534 xcb[0].client_data = (XPointer)this; xcb[0].callback = (XIMProc)xim_preedit_start;
1564 xcb[1].client_data = (XPointer)this; xcb[1].callback = (XIMProc)xim_preedit_done; 1535 xcb[1].client_data = (XPointer)this; xcb[1].callback = (XIMProc)xim_preedit_done;
1565 xcb[2].client_data = (XPointer)this; xcb[2].callback = (XIMProc)xim_preedit_draw; 1536 xcb[2].client_data = (XPointer)this; xcb[2].callback = (XIMProc)xim_preedit_draw;
… …
1580#endif 1551#endif
1581 1552
1582 Input_Context = XCreateIC (xim, 1553 Input_Context = XCreateIC (xim,
1583 XNInputStyle, input_style, 1554 XNInputStyle, input_style,
1584 XNClientWindow, vt, 1555 XNClientWindow, vt,
1585 XNFocusWindow, parent[0], 1556 XNFocusWindow, parent,
1586 preedit_attr ? XNPreeditAttributes : NULL, 1557 preedit_attr ? XNPreeditAttributes : NULL,
1587 preedit_attr, 1558 preedit_attr,
1588 status_attr ? XNStatusAttributes : NULL, 1559 status_attr ? XNStatusAttributes : NULL,
1589 status_attr, NULL); 1560 status_attr, NULL);
1590 1561
… …
1603 // unfortunately, only the focus window is used by XIM, hard to fix 1574 // unfortunately, only the focus window is used by XIM, hard to fix
1604 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL)) 1575 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL))
1605 vt_select_input (); 1576 vt_select_input ();
1606#endif 1577#endif
1607 1578
1608 IMSetPosition (); 1579 im_set_position ();
1609 1580
1610 return true; 1581 return true;
1611} 1582}
1612 1583
1613void 1584void
… …
1623 im_destroy (); 1594 im_destroy ();
1624 1595
1625 if (Input_Context) 1596 if (Input_Context)
1626 return; 1597 return;
1627 1598
1628#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1629 if (rs[Rs_imLocale]) 1599 if (rs[Rs_imLocale])
1630 SET_LOCALE (rs[Rs_imLocale]); 1600 SET_LOCALE (rs[Rs_imLocale]);
1631#endif
1632 1601
1633 p = rs[Rs_inputMethod]; 1602 p = rs[Rs_inputMethod];
1634 if (p && *p) 1603 if (p && *p)
1635 { 1604 {
1636 bool found = false; 1605 bool found = false;
1637 1606
1638 s = rxvt_splitcommastring (p); 1607 s = rxvt_strsplit (',', p);
1639 1608
1640 for (i = 0; s[i]; i++) 1609 for (i = 0; s[i]; i++)
1641 { 1610 {
1642 if (*s[i]) 1611 if (*s[i])
1643 { 1612 {
1644 strcpy (buf, "@im="); 1613 strcpy (buf, "@im=");
1645 strncat (buf, s[i], IMBUFSIZ - 5); 1614 strncat (buf, s[i], IMBUFSIZ - 5);
1646 if (IM_get_IC (buf)) 1615 if (im_get_ic (buf))
1647 { 1616 {
1648 found = true; 1617 found = true;
1649 break; 1618 break;
1650 } 1619 }
1651 } 1620 }
1652 } 1621 }
1653 1622
1654 rxvt_freecommastring (s); 1623 rxvt_free_strsplit (s);
1655 1624
1656 if (found) 1625 if (found)
1657 goto done; 1626 goto done;
1658 } 1627 }
1659 1628
1660 /* try with XMODIFIERS env. var. */ 1629 /* try with XMODIFIERS env. var. */
1661 if (IM_get_IC ("")) 1630 if (im_get_ic (""))
1662 goto done; 1631 goto done;
1663 1632
1664 /* try with no modifiers base IF the user didn't specify an IM */ 1633 /* try with no modifiers base IF the user didn't specify an IM */
1665 if (IM_get_IC ("@im=none")) 1634 if (im_get_ic ("@im=none"))
1666 goto done; 1635 goto done;
1667 1636
1668done: 1637done:
1669#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1670 if (rs[Rs_imLocale]) 1638 if (rs[Rs_imLocale])
1671 SET_LOCALE (locale); 1639 SET_LOCALE (locale);
1672#endif
1673} 1640}
1674 1641
1675void 1642void
1676rxvt_term::IMSetPosition () 1643rxvt_term::im_set_position ()
1677{ 1644{
1678 XRectangle preedit_rect, status_rect, *needed_rect; 1645 XRectangle preedit_rect, status_rect, *needed_rect;
1679 XVaNestedList preedit_attr, status_attr; 1646 XVaNestedList preedit_attr, status_attr;
1680 1647
1681 if (!Input_Context 1648 if (!Input_Context
1682 || !focus 1649 || !focus
1683 || !(input_style & (XIMPreeditArea | XIMPreeditPosition)) 1650 || !(input_style & (XIMPreeditArea | XIMPreeditPosition))
1684 || !IMisRunning ()) 1651 || !im_is_running ())
1685 return; 1652 return;
1686 1653
1687 if (input_style & XIMPreeditPosition) 1654 if (input_style & XIMPreeditPosition)
1688 { 1655 {
1689 im_set_size (preedit_rect); 1656 im_set_size (preedit_rect);
… …
1719 1686
1720void 1687void
1721rxvt_term::get_window_origin (int &x, int &y) 1688rxvt_term::get_window_origin (int &x, int &y)
1722{ 1689{
1723 Window cr; 1690 Window cr;
1724 XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr); 1691 XTranslateCoordinates (dpy, parent, display->root, 0, 0, &x, &y, &cr);
1725/* fprintf( stderr, "origin is %+d%+d\n", x, y);*/
1726}
1727
1728Pixmap
1729rxvt_term::get_pixmap_property (int prop_id)
1730{
1731 if (prop_id > 0 && prop_id < NUM_XA)
1732 if (xa[prop_id])
1733 {
1734 int aformat;
1735 unsigned long nitems, bytes_after;
1736 Atom atype;
1737 unsigned char *prop = NULL;
1738 int result = XGetWindowProperty (dpy, display->root, xa[prop_id],
1739 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1740 &nitems, &bytes_after, &prop);
1741 if (result == Success && prop && atype == XA_PIXMAP)
1742 {
1743 return *(Pixmap *)prop;
1744 }
1745 }
1746 return None;
1747} 1692}
1748 1693
1749#ifdef HAVE_BG_PIXMAP 1694#ifdef HAVE_BG_PIXMAP
1750# if TRACE_PIXMAPS
1751# undef update_background
1752int rxvt_term::trace_update_background (const char *file, int line)
1753{
1754 fprintf (stderr, "%s:%d:update_background()\n", file, line);
1755 update_background ();
1756}
1757# endif
1758 1695
1759int 1696void
1760rxvt_term::update_background () 1697rxvt_term::update_background ()
1761{ 1698{
1762 bgPixmap.invalidate (); 1699 if (update_background_ev.is_active ())
1700 return;
1763 1701
1764 /* no chance of real time refresh if we are blurring! */ 1702 ev_tstamp to_wait = 0.5 - (ev::now () - bg_valid_since);
1765 if (bgPixmap.invalid_since + 0.5 < ev::now () && !(bgPixmap.flags & bgPixmap_t::blurNeeded)) 1703
1704 if (to_wait <= 0.)
1766 bgPixmap.render (); 1705 bg_render ();
1767 else 1706 else
1768 {
1769 update_background_ev.stop ();
1770
1771 if (!bgPixmap.need_client_side_rendering())
1772 update_background_ev.start (.05); 1707 update_background_ev.start (to_wait);
1773 else if (bgPixmap.flags & bgPixmap_t::blurNeeded)
1774 update_background_ev.start (.20); /* very slow !!! */
1775 else
1776 update_background_ev.start (.07);
1777 }
1778
1779 return 0;
1780} 1708}
1781 1709
1782void 1710void
1783rxvt_term::update_background_cb (ev::timer &w, int revents) 1711rxvt_term::update_background_cb (ev::timer &w, int revents)
1784{ 1712{
1713 make_current ();
1714
1715 update_background_ev.stop ();
1785 bgPixmap.render (); 1716 bg_render ();
1717 refresh_check ();
1786} 1718}
1787 1719
1788#endif /* HAVE_BG_PIXMAP */ 1720#endif /* HAVE_BG_PIXMAP */
1789 1721
1790/*----------------------- end-of-file (C source) -----------------------*/ 1722/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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