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

Diff Legend

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