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.271 by root, Tue Dec 4 16:33:42 2007 UTC vs.
Revision 1.340 by sf-exg, Sun Dec 12 19:30:10 2010 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 <pcg@goof.com>
17 * 17 *
18 * This program is free software; you can redistribute it and/or modify 18 * This program is free software; you can redistribute it and/or modify
19 * it under the terms of the GNU General Public License as published by 19 * it under the terms of the GNU General Public License as published by
20 * the Free Software Foundation; either version 2 of the License, or 20 * the Free Software Foundation; either version 2 of the License, or
21 * (at your option) any later version. 21 * (at your option) any later version.
… …
30 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 30 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
31 *---------------------------------------------------------------------*/ 31 *---------------------------------------------------------------------*/
32 32
33#include "../config.h" /* NECESSARY */ 33#include "../config.h" /* NECESSARY */
34#include "rxvt.h" /* NECESSARY */ 34#include "rxvt.h" /* NECESSARY */
35#include "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 <cassert>
40#include <csignal> 42#include <csignal>
41#include <cstring> 43#include <cstring>
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 51# ifdef HAVE_SETLOCALE
52# include <clocale> 52# include <clocale>
53# endif 53# endif
54#endif 54#endif
55 55
56struct termios rxvt_term::def_tio;
56vector<rxvt_term *> rxvt_term::termlist; 57vector<rxvt_term *> rxvt_term::termlist;
57 58
58// used to tell global functions which terminal instance is "active" 59// used to tell global functions which terminal instance is "active"
59rxvt_t rxvt_current_term; 60rxvt_t rxvt_current_term;
60 61
… …
103 { 104 {
104 if (cc->c2 == c2) return c1; 105 if (cc->c2 == c2) return c1;
105 cc = (*this)[cc->c1]; 106 cc = (*this)[cc->c1];
106 } 107 }
107 108
108 // check to see wether this combination already exists otherwise 109 // check to see whether this combination already exists otherwise
109 for (cc = v.end (); cc-- > v.begin (); ) 110 for (cc = v.end (); cc-- > v.begin (); )
110 { 111 {
111 if (cc->c1 == c1 && cc->c2 == c2) 112 if (cc->c1 == c1 && cc->c2 == c2)
112 return COMPOSE_LO + (cc - v.begin ()); 113 return COMPOSE_LO + (cc - v.begin ());
113 } 114 }
… …
157{ 158{
158#if HAVE_BG_PIXMAP 159#if HAVE_BG_PIXMAP
159 update_background_ev.set<rxvt_term, &rxvt_term::update_background_cb> (this); 160 update_background_ev.set<rxvt_term, &rxvt_term::update_background_cb> (this);
160#endif 161#endif
161#ifdef CURSOR_BLINK 162#ifdef CURSOR_BLINK
162 cursor_blink_ev.set <rxvt_term, &rxvt_term::cursor_blink_cb> (this); 163 cursor_blink_ev.set <rxvt_term, &rxvt_term::cursor_blink_cb> (this); cursor_blink_ev.set (0., CURSOR_BLINK_INTERVAL);
163#endif 164#endif
164#ifdef TEXT_BLINK 165#ifdef TEXT_BLINK
165 text_blink_ev.set <rxvt_term, &rxvt_term::text_blink_cb> (this); 166 text_blink_ev.set <rxvt_term, &rxvt_term::text_blink_cb> (this); text_blink_ev.set (0., TEXT_BLINK_INTERVAL);
166#endif 167#endif
167#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 168#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
168 cont_scroll_ev.set <rxvt_term, &rxvt_term::cont_scroll_cb> (this); 169 cont_scroll_ev.set <rxvt_term, &rxvt_term::cont_scroll_cb> (this);
169#endif 170#endif
170#ifdef SELECTION_SCROLLING 171#ifdef SELECTION_SCROLLING
… …
172#endif 173#endif
173#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 174#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
174 slip_wheel_ev.set <rxvt_term, &rxvt_term::slip_wheel_cb> (this); 175 slip_wheel_ev.set <rxvt_term, &rxvt_term::slip_wheel_cb> (this);
175#endif 176#endif
176#if ENABLE_TRANSPARENCY || ENABLE_PERL 177#if ENABLE_TRANSPARENCY || ENABLE_PERL
177 rootwin_ev.set <rxvt_term, &rxvt_term::x_cb> (this), 178 rootwin_ev.set <rxvt_term, &rxvt_term::rootwin_cb> (this),
178#endif 179#endif
179#ifdef HAVE_SCROLLBARS
180 scrollbar_ev.set <rxvt_term, &rxvt_term::x_cb> (this), 180 scrollbar_ev.set <rxvt_term, &rxvt_term::x_cb> (this),
181#endif
182#ifdef USE_XIM 181#ifdef USE_XIM
183 im_ev.set <rxvt_term, &rxvt_term::im_cb> (this), 182 im_ev.set <rxvt_term, &rxvt_term::im_cb> (this),
184#endif 183#endif
185#ifdef POINTER_BLANK 184#ifdef POINTER_BLANK
186 pointer_ev.set <rxvt_term, &rxvt_term::pointer_cb> (this); 185 pointer_ev.set <rxvt_term, &rxvt_term::pointer_cb> (this);
187#endif 186#endif
188#ifndef NO_BELL 187#ifndef NO_BELL
189 bell_ev.set <rxvt_term, &rxvt_term::bell_cb> (this); 188 bell_ev.set <rxvt_term, &rxvt_term::bell_cb> (this);
190#endif 189#endif
191 child_ev.set <rxvt_term, &rxvt_term::child_cb> (this); 190 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); 191 flush_ev.set <rxvt_term, &rxvt_term::flush_cb> (this);
194 destroy_ev.set <rxvt_term, &rxvt_term::destroy_cb> (this); 192 destroy_ev.set <rxvt_term, &rxvt_term::destroy_cb> (this);
195 pty_ev.set <rxvt_term, &rxvt_term::pty_cb> (this); 193 pty_ev.set <rxvt_term, &rxvt_term::pty_cb> (this);
196 incr_ev.set <rxvt_term, &rxvt_term::incr_cb> (this); 194 incr_ev.set <rxvt_term, &rxvt_term::incr_cb> (this);
197 termwin_ev.set <rxvt_term, &rxvt_term::x_cb> (this); 195 termwin_ev.set <rxvt_term, &rxvt_term::x_cb> (this);
… …
229 if (fontset[i] != fontset[0]) 227 if (fontset[i] != fontset[0])
230 delete fontset[i]; 228 delete fontset[i];
231#endif 229#endif
232 delete fontset[0]; 230 delete fontset[0];
233 231
232#ifdef HAVE_BG_PIXMAP
233 bgPixmap.destroy ();
234#endif
235#ifdef HAVE_AFTERIMAGE
236 if (asv)
237 destroy_asvisual (asv, 0);
238 if (asimman)
239 destroy_image_manager (asimman, 0);
240#endif
241
234 if (display) 242 if (display)
235 { 243 {
236 selection_clear (); 244 selection_clear ();
245 selection_clear (true);
237 246
238#ifdef USE_XIM 247#ifdef USE_XIM
239 im_destroy (); 248 im_destroy ();
240#endif 249#endif
241#ifdef XTERM_SCROLLBAR 250 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); 251 if (gc) XFreeGC (dpy, gc);
266 252
267 delete drawable; 253 delete drawable;
268 // destroy all windows 254 // destroy all windows
269 if (parent[0]) 255 if (parent[0])
… …
277 pix_colors_unfocused [i].free (this); 263 pix_colors_unfocused [i].free (this);
278#endif 264#endif
279 } 265 }
280 266
281 clear (); 267 clear ();
282 }
283 268
284 delete [] pix_colors_focused; 269 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); 270 displays.put (display);
271 }
293 272
294 scr_release (); 273 scr_release ();
295 274
296 /* clear all resources */ 275 /* clear all resources */
297 for (int i = 0; i < allocated.size (); i++) 276 for (int i = 0; i < allocated.size (); i++)
298 free (allocated [i]); 277 free (allocated [i]);
299 278
300 free (selection.text); 279 free (selection.text);
280 free (selection.clip_text);
301 // TODO: manage env vars in child only(!) 281 // TODO: manage env vars in child only(!)
302 free (env_display); 282 free (env_display);
303 free (env_term); 283 free (env_term);
304 free (locale); 284 free (locale);
305 free (v_buffer); 285 free (v_buffer);
… …
329} 309}
330 310
331void 311void
332rxvt_term::destroy () 312rxvt_term::destroy ()
333{ 313{
334 if (destroy_ev.active) 314 if (destroy_ev.is_active ())
335 return; 315 return;
336 316
337 HOOK_INVOKE ((this, HOOK_DESTROY, DT_END)); 317 HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));
338 318
339#if ENABLE_OVERLAY 319#if ENABLE_OVERLAY
… …
343 if (display) 323 if (display)
344 { 324 {
345#if USE_XIM 325#if USE_XIM
346 im_ev.stop (display); 326 im_ev.stop (display);
347#endif 327#endif
348#if HAVE_SCROLLBARS
349 scrollbar_ev.stop (display); 328 scrollbar_ev.stop (display);
350#endif
351#if ENABLE_TRANSPARENCY || ENABLE_PERL 329#if ENABLE_TRANSPARENCY || ENABLE_PERL
352 rootwin_ev.stop (display); 330 rootwin_ev.stop (display);
353#endif 331#endif
354 incr_ev.stop (); 332 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
… …
381rxvt_term::destroy_cb (ev::idle &w, int revents) 359rxvt_term::destroy_cb (ev::idle &w, int revents)
382{ 360{
383 make_current (); 361 make_current ();
384 362
385 delete this; 363 delete this;
364}
365
366void
367rxvt_term::set_option (uint8_t opt, bool set)
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);
386} 376}
387 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
… …
407 char mesg[BUFSIZ]; 397 char mesg[BUFSIZ];
408 char number[32]; 398 char number[32];
409 char *mtype = "XlibMessage"; 399 char *mtype = "XlibMessage";
410 XGetErrorText(dpy, event->error_code, buffer, BUFSIZ); 400 XGetErrorText(dpy, event->error_code, buffer, BUFSIZ);
411 XGetErrorDatabaseText(dpy, mtype, "XError", "X Error", mesg, BUFSIZ); 401 XGetErrorDatabaseText(dpy, mtype, "XError", "X Error", mesg, BUFSIZ);
412 rxvt_warn ("An X Error occured, trying to continue after report.\n"); 402 rxvt_warn ("An X Error occurred, trying to continue after report.\n");
413 rxvt_warn ("%s: %s\n", mesg, buffer); 403 rxvt_warn ("%s: %s\n", mesg, buffer);
414 XGetErrorDatabaseText(dpy, mtype, "MajorCode", "Request Major code %d", mesg, BUFSIZ); 404 XGetErrorDatabaseText(dpy, mtype, "MajorCode", "Request Major code %d", mesg, BUFSIZ);
415 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->request_code); 405 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->request_code);
416 sprintf(number, "%d", event->request_code); 406 sprintf(number, "%d", event->request_code);
417 XGetErrorDatabaseText(dpy, "XRequest", number, "", buffer, BUFSIZ); 407 XGetErrorDatabaseText(dpy, "XRequest", number, "", buffer, BUFSIZ);
418 rxvt_warn ("(which is %s)\n", buffer); 408 rxvt_warn ("(which is %s)\n", buffer);
419 if (event->request_code >= 128) { 409 if (event->request_code >= 128) {
420 XGetErrorDatabaseText(dpy, mtype, "MinorCode", "Request Minor code %d", 410 XGetErrorDatabaseText(dpy, mtype, "MinorCode", "Request Minor code %d",
421 mesg, BUFSIZ); 411 mesg, BUFSIZ);
422 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->minor_code); 412 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->minor_code);
423 } 413 }
424 if ((event->error_code == BadWindow) || 414 if ((event->error_code == BadWindow) ||
425 (event->error_code == BadPixmap) || 415 (event->error_code == BadPixmap) ||
426 (event->error_code == BadCursor) || 416 (event->error_code == BadCursor) ||
427 (event->error_code == BadFont) || 417 (event->error_code == BadFont) ||
428 (event->error_code == BadDrawable) || 418 (event->error_code == BadDrawable) ||
429 (event->error_code == BadColor) || 419 (event->error_code == BadColor) ||
430 (event->error_code == BadGC) || 420 (event->error_code == BadGC) ||
431 (event->error_code == BadIDChoice) || 421 (event->error_code == BadIDChoice) ||
432 (event->error_code == BadValue) || 422 (event->error_code == BadValue) ||
433 (event->error_code == BadAtom)) { 423 (event->error_code == BadAtom)) {
434 if (event->error_code == BadValue) 424 if (event->error_code == BadValue)
435 XGetErrorDatabaseText(dpy, mtype, "Value", "Value 0x%x", 425 XGetErrorDatabaseText(dpy, mtype, "Value", "Value 0x%x",
436 mesg, BUFSIZ); 426 mesg, BUFSIZ);
437 else if (event->error_code == BadAtom) 427 else if (event->error_code == BadAtom)
438 XGetErrorDatabaseText(dpy, mtype, "AtomID", "AtomID 0x%x", 428 XGetErrorDatabaseText(dpy, mtype, "AtomID", "AtomID 0x%x",
439 mesg, BUFSIZ); 429 mesg, BUFSIZ);
440 else 430 else
441 XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x", 431 XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x",
442 mesg, BUFSIZ); 432 mesg, BUFSIZ);
443 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid); 433 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid);
444 } 434 }
445 XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d", 435 XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d",
446 mesg, BUFSIZ); 436 mesg, BUFSIZ);
447 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial); 437 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial);
448} 438}
449#endif 439#endif
450 440
451int 441int
… …
474 DisplayString (display)); 464 DisplayString (display));
475 rxvt_emergency_cleanup (); 465 rxvt_emergency_cleanup ();
476 _exit (EXIT_FAILURE); 466 _exit (EXIT_FAILURE);
477} 467}
478 468
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 469static struct sig_handlers
599{ 470{
600 ev::sig sw_term, sw_int; 471 ev::sig sw_term, sw_int;
601 472
602 /* 473 /*
… …
617 rxvt_emergency_cleanup (); 488 rxvt_emergency_cleanup ();
618 w.stop (); 489 w.stop ();
619 kill (getpid (), w.signum); 490 kill (getpid (), w.signum);
620} 491}
621 492
493static void
494rxvt_get_ttymode (struct termios *tio)
495{
496 if (tcgetattr (STDIN_FILENO, tio) < 0)
497 memset (tio, 0, sizeof (struct termios));
498
499 for (int i = 0; i < NCCS; i++)
500 tio->c_cc[i] = VDISABLE;
501
502 tio->c_cc[VINTR] = CINTR;
503 tio->c_cc[VQUIT] = CQUIT;
504 tio->c_cc[VERASE] = CERASE;
505#ifdef VERASE2
506 tio->c_cc[VERASE2] = CERASE2;
507#endif
508 tio->c_cc[VKILL] = CKILL;
509 tio->c_cc[VEOF] = CEOF;
510 tio->c_cc[VSTART] = CSTART;
511 tio->c_cc[VSTOP] = CSTOP;
512 tio->c_cc[VSUSP] = CSUSP;
513# ifdef VDSUSP
514 tio->c_cc[VDSUSP] = CDSUSP;
515# endif
516# ifdef VREPRINT
517 tio->c_cc[VREPRINT] = CRPRNT;
518# endif
519# ifdef VDISCRD
520 tio->c_cc[VDISCRD] = CFLUSH;
521# endif
522# ifdef VWERSE
523 tio->c_cc[VWERSE] = CWERASE;
524# endif
525# ifdef VLNEXT
526 tio->c_cc[VLNEXT] = CLNEXT;
527# endif
528# ifdef VSTATUS
529 tio->c_cc[VSTATUS] = CSTATUS;
530# endif
531
532# if VMIN != VEOF
533 tio->c_cc[VMIN] = 1;
534# endif
535# if VTIME != VEOL
536 tio->c_cc[VTIME] = 0;
537# endif
538
539 /* input modes */
540 tio->c_iflag = (BRKINT | IGNPAR | ICRNL
541# ifdef IMAXBEL
542 | IMAXBEL
543# endif
544 | IXON);
545
546 /* output modes */
547 tio->c_oflag = (OPOST | ONLCR);
548
549 /* control modes */
550 tio->c_cflag = (CS8 | CREAD);
551
552 /* local modes */
553 tio->c_lflag = (ISIG | ICANON | IEXTEN | ECHO
554# if defined (ECHOCTL) && defined (ECHOKE)
555 | ECHOCTL | ECHOKE
556# endif
557 | ECHOE | ECHOK);
558}
559
622char **rxvt_environ; // startup environment 560char **rxvt_environ; // startup environment
623 561
624void 562void
625rxvt_init () 563rxvt_init ()
626{ 564{
627 ptytty::init (); 565 assert (("fontMask must not overlap other RS masks",
566 0 == (RS_fontMask & (RS_Sel | RS_baseattrMask | RS_customMask | RS_bgMask | RS_fgMask))));
628 567
568 rxvt_get_ttymode (&rxvt_term::def_tio);
569
570 // get rid of stdin/stdout as we don't need them, to free resources
571 dup2 (STDERR_FILENO, STDIN_FILENO);
572 dup2 (STDERR_FILENO, STDOUT_FILENO);
573
629 if (!ev_default_loop (0)) 574 if (!ev_default_loop ())
630 rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n"); 575 rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n");
631 576
632 rxvt_environ = environ; 577 rxvt_environ = environ;
633 578
634 signal (SIGHUP, SIG_IGN); 579 signal (SIGHUP, SIG_IGN);
635 signal (SIGPIPE, SIG_IGN); 580 signal (SIGPIPE, SIG_IGN);
636 581
637 sig_handlers.sw_term.start (SIGTERM); ev_unref (); 582 sig_handlers.sw_term.start (SIGTERM); ev_unref ();
638 sig_handlers.sw_int.start (SIGINT); ev_unref (); 583 sig_handlers.sw_int.start (SIGINT); ev_unref ();
639
640 /* need to trap SIGURG for SVR4 (Unixware) rlogin */
641 /* signal (SIGURG, SIG_DFL); */
642 584
643 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); 585 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
644 // TODO: handle this with exceptions and tolerate the memory loss 586 // TODO: handle this with exceptions and tolerate the memory loss
645 XSetIOErrorHandler (rxvt_xioerror_handler); 587 XSetIOErrorHandler (rxvt_xioerror_handler);
646 588
647 XrmInitialize (); 589 XrmInitialize ();
648}
649
650/* ------------------------------------------------------------------------- *
651 * MEMORY ALLOCATION WRAPPERS *
652 * ------------------------------------------------------------------------- */
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} 590}
685 591
686/*----------------------------------------------------------------------*/ 592/*----------------------------------------------------------------------*/
687/* 593/*
688 * window size/position calculations for XSizeHint and other storage. 594 * window size/position calculations for XSizeHint and other storage.
… …
690 */ 596 */
691void 597void
692rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight) 598rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
693{ 599{
694 short recalc_x, recalc_y; 600 short recalc_x, recalc_y;
695 int x, y, sb_w, flags; 601 int x, y, flags;
696 unsigned int w, h; 602 unsigned int w, h;
697 unsigned int max_width, max_height; 603 unsigned int max_width, max_height;
698 604
699 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity; 605 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity;
700 szHint.win_gravity = NorthWestGravity; 606 szHint.win_gravity = NorthWestGravity;
… …
710 if (rs[Rs_geometry]) 616 if (rs[Rs_geometry])
711 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h); 617 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h);
712 618
713 if (flags & WidthValue) 619 if (flags & WidthValue)
714 { 620 {
621 if (!w)
622 rxvt_fatal ("illegal window geometry (width and height must be non-zero), aborting.\n");
623
715 ncol = clamp (w, 0, std::numeric_limits<int16_t>::max ()); 624 ncol = clamp (w, 1, std::numeric_limits<int16_t>::max ());
716 szHint.flags |= USSize; 625 szHint.flags |= USSize;
717 } 626 }
718 627
719 if (flags & HeightValue) 628 if (flags & HeightValue)
720 { 629 {
630 if (!h)
631 rxvt_fatal ("illegal window geometry (width and height must be non-zero), aborting.\n");
632
721 nrow = clamp (h, 0, std::numeric_limits<int16_t>::max ()); 633 nrow = clamp (h, 1, std::numeric_limits<int16_t>::max ());
722 szHint.flags |= USSize; 634 szHint.flags |= USSize;
723 } 635 }
724 636
725 if (flags & XValue) 637 if (flags & XValue)
726 { 638 {
… …
757 max_width = MAX_COLS * fwidth; 669 max_width = MAX_COLS * fwidth;
758 max_height = MAX_ROWS * fheight; 670 max_height = MAX_ROWS * fheight;
759 671
760 szHint.base_width = szHint.base_height = 2 * int_bwidth; 672 szHint.base_width = szHint.base_height = 2 * int_bwidth;
761 673
762 sb_w = 0;
763 window_vt_x = window_vt_y = int_bwidth; 674 window_vt_x = window_vt_y = int_bwidth;
764 675
765 if (scrollBar.state) 676 if (scrollBar.state)
766 { 677 {
767 sb_w = scrollbar_TotalWidth (); 678 int sb_w = scrollBar.total_width ();
768 szHint.base_width += sb_w; 679 szHint.base_width += sb_w;
769 680
770 if (!option (Opt_scrollBar_right)) 681 if (!option (Opt_scrollBar_right))
771 window_vt_x += sb_w; 682 window_vt_x += sb_w;
772 } 683 }
… …
796 { 707 {
797 min_it (height, max_height); 708 min_it (height, max_height);
798 szHint.height = szHint.base_height + height; 709 szHint.height = szHint.base_height + height;
799 } 710 }
800 711
801 if (scrollBar.state && option (Opt_scrollBar_right))
802 window_sb_x = szHint.width - sb_w;
803
804 if (recalc_x) 712 if (recalc_x)
805 szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth; 713 szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth;
806 714
807 if (recalc_y) 715 if (recalc_y)
808 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth; 716 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth;
809 717
810 ncol = width / fwidth; 718 ncol = width / fwidth;
811 nrow = height / fheight; 719 nrow = height / fheight;
812} 720}
813 721
814/*----------------------------------------------------------------------*/ 722/*----------------------------------------------------------------------*/
815/* 723/*
… …
826 734
827 ws.ws_col = ncol; 735 ws.ws_col = ncol;
828 ws.ws_row = nrow; 736 ws.ws_row = nrow;
829 ws.ws_xpixel = width; 737 ws.ws_xpixel = width;
830 ws.ws_ypixel = height; 738 ws.ws_ypixel = height;
831 (void)ioctl (pty->pty, TIOCSWINSZ, &ws); 739 ioctl (pty->pty, TIOCSWINSZ, &ws);
832 740
833#if 0 741#if 0
834 // TIOCSWINSZ⎈ is supposed to do this automatically and correctly 742 // TIOCSWINSZ is supposed to do this automatically and correctly
835 if (cmd_pid) /* force through to the command */ 743 if (cmd_pid) /* force through to the command */
836 kill (-cmd_pid, SIGWINCH); 744 kill (-cmd_pid, SIGWINCH);
837#endif 745#endif
838} 746}
839 747
… …
866#endif 774#endif
867 775
868 delete fontset[0]; 776 delete fontset[0];
869 fontset[0] = fs; 777 fontset[0] = fs;
870 778
871 prop = (*fs)[1]->properties (); 779 prop = (*fs)[rxvt_fontset::firstFont]->properties ();
872 prop.height += lineSpace; 780 prop.height += lineSpace;
781 prop.width += letterSpace;
873 782
874 fs->set_prop (prop, false); 783 fs->set_prop (prop, false);
875 784
876 fwidth = prop.width; 785 fwidth = prop.width;
877 fheight = prop.height; 786 fheight = prop.height;
… …
927 prop, XA_STRING, 8, PropModeReplace, 836 prop, XA_STRING, 8, PropModeReplace,
928 (const unsigned char *)str, len >= 0 ? len : strlen (str)); 837 (const unsigned char *)str, len >= 0 ? len : strlen (str));
929} 838}
930 839
931void 840void
841rxvt_term::set_mbstring_property (Atom prop, const char *str, int len)
842{
843 XTextProperty ct;
844
845 if (XmbTextListToTextProperty (dpy, (char **)&str, 1, XStdICCTextStyle, &ct) >= 0)
846 {
847 XSetTextProperty (dpy, parent[0], &ct, prop);
848 XFree (ct.value);
849 }
850}
851
852void
932rxvt_term::set_utf8_property (Atom prop, const char *str, int len) 853rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
933{ 854{
934 wchar_t *ws = rxvt_mbstowcs (str, len); 855 wchar_t *ws = rxvt_mbstowcs (str, len);
935 char *s = rxvt_wcstoutf8 (ws); 856 char *s = rxvt_wcstoutf8 (ws);
936 857
… …
946/*----------------------------------------------------------------------*/ 867/*----------------------------------------------------------------------*/
947/* xterm sequences - title, iconName, color (exptl) */ 868/* xterm sequences - title, iconName, color (exptl) */
948void 869void
949rxvt_term::set_title (const char *str) 870rxvt_term::set_title (const char *str)
950{ 871{
951 set_string_property (XA_WM_NAME, str); 872 set_mbstring_property (XA_WM_NAME, str);
952#if ENABLE_EWMH 873#if ENABLE_EWMH
953 set_utf8_property (xa[XA_NET_WM_NAME], str); 874 set_utf8_property (xa[XA_NET_WM_NAME], str);
954#endif 875#endif
955} 876}
956 877
957void 878void
958rxvt_term::set_icon_name (const char *str) 879rxvt_term::set_icon_name (const char *str)
959{ 880{
960 set_string_property (XA_WM_ICON_NAME, str); 881 set_mbstring_property (XA_WM_ICON_NAME, str);
961#if ENABLE_EWMH 882#if ENABLE_EWMH
962 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str); 883 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str);
963#endif 884#endif
964} 885}
965 886
966void 887void
967rxvt_term::set_window_color (int idx, const char *color) 888rxvt_term::set_window_color (int idx, const char *color)
968{ 889{
969#ifdef XTERM_COLOR_CHANGE 890#ifdef XTERM_COLOR_CHANGE
970 rxvt_color xcol; 891 rxvt_color xcol;
971 int i;
972 892
973 if (color == NULL || *color == '\0') 893 if (color == NULL || *color == '\0')
974 return; 894 return;
975 895
976 color = strdup (color); 896 color = strdup (color);
… …
978 rs[Rs_color + idx] = color; 898 rs[Rs_color + idx] = color;
979 899
980 /* handle color aliases */ 900 /* handle color aliases */
981 if (isdigit (*color)) 901 if (isdigit (*color))
982 { 902 {
983 i = atoi (color); 903 int i = atoi (color);
984 904
985 if (i >= 8 && i <= 15) 905 if (i >= 8 && i <= 15)
986 { 906 {
987 /* bright colors */ 907 /* bright colors */
988 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i - 8]; 908 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i - 8];
… …
1092 int old_width = szHint.width; 1012 int old_width = szHint.width;
1093 int old_height = szHint.height; 1013 int old_height = szHint.height;
1094 1014
1095 window_calc (newwidth, newheight); 1015 window_calc (newwidth, newheight);
1096 1016
1097 if (!HOOK_INVOKE ((this, HOOK_RESIZE_ALL_WINDOWS, DT_INT, newwidth, DT_INT, newheight, DT_END))) 1017 bool set_hint = !HOOK_INVOKE ((this, HOOK_RESIZE_ALL_WINDOWS, DT_INT, newwidth, DT_INT, newheight, DT_END));
1018
1019 // to avoid races between us and the wm, we clear the incremental size hints around the xresizewindow
1020 if (set_hint)
1021 {
1022 szHint.flags &= ~(PBaseSize | PResizeInc);
1098 XSetWMNormalHints (dpy, parent[0], &szHint); 1023 XSetWMNormalHints (dpy, parent[0], &szHint);
1024 szHint.flags |= PBaseSize | PResizeInc;
1025 }
1099 1026
1100 if (!ignoreparent) 1027 if (!ignoreparent)
1101 { 1028 {
1102#ifdef SMART_RESIZE 1029#ifdef SMART_RESIZE
1103 /* 1030 /*
… …
1143#else 1070#else
1144 XResizeWindow (dpy, parent[0], szHint.width, szHint.height); 1071 XResizeWindow (dpy, parent[0], szHint.width, szHint.height);
1145#endif 1072#endif
1146 } 1073 }
1147 1074
1075 if (set_hint)
1076 XSetWMNormalHints (dpy, parent[0], &szHint);
1077
1148 fix_screen = ncol != prev_ncol || nrow != prev_nrow; 1078 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
1149 1079
1150 if (fix_screen || newwidth != old_width || newheight != old_height) 1080 if (fix_screen || newwidth != old_width || newheight != old_height)
1151 { 1081 {
1152 if (scrollBar.state) 1082 if (scrollBar.state)
1153 { 1083 scrollBar.resize ();
1154 XMoveResizeWindow (dpy, scrollBar.win,
1155 window_sb_x, 0,
1156 scrollbar_TotalWidth (), szHint.height);
1157 resize_scrollbar ();
1158 }
1159 1084
1160 XMoveResizeWindow (dpy, vt, 1085 XMoveResizeWindow (dpy, vt,
1161 window_vt_x, window_vt_y, 1086 window_vt_x, window_vt_y,
1162 width, height); 1087 width, height);
1163 1088
1164#ifdef HAVE_BG_PIXMAP 1089#ifdef HAVE_BG_PIXMAP
1165 if (bgPixmap.window_size_sensitive ()) 1090 if (bgPixmap.window_size_sensitive ())
1166 update_background (); 1091 update_background ();
1167#endif 1092#endif
1168
1169 scr_clear ();
1170 } 1093 }
1171 1094
1172 if (fix_screen || old_height == 0) 1095 if (fix_screen || old_height == 0)
1173 scr_reset (); 1096 scr_reset ();
1174
1175 // TODO, with nvidia-8178, resizes kill the alpha channel, report if not fixed in newer version
1176 //scr_touch (false);
1177 1097
1178#ifdef HAVE_BG_PIXMAP 1098#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 ? 1099// TODO: this don't seem to have any effect - do we still need it ? If so - in which case exactly ?
1180// if (bgPixmap.pixmap) 1100// if (bgPixmap.pixmap)
1181// scr_touch (false); 1101// scr_touch (false);
… …
1253 1173
1254/* Checking whether input method is running. */ 1174/* Checking whether input method is running. */
1255bool 1175bool
1256rxvt_term::IMisRunning () 1176rxvt_term::IMisRunning ()
1257{ 1177{
1258 char *p;
1259 Atom atom; 1178 Atom atom;
1260 Window win; 1179 Window win;
1261 char server[IMBUFSIZ]; 1180 char server[IMBUFSIZ];
1262 1181
1263 /* get current locale modifier */ 1182 /* get current locale modifier */
1264 if ((p = XSetLocaleModifiers (NULL)) != NULL) 1183 if (char *p = XSetLocaleModifiers (0))
1265 { 1184 {
1266 strcpy (server, "@server="); 1185 strcpy (server, "@server=");
1267 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */ 1186 strncat (server, p + 4, IMBUFSIZ - 9); /* skip "@im=" */
1268 1187
1269 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */ 1188 if (p = strchr (server + 1, '@')) /* first one only */
1270 *p = '\0'; 1189 *p = '\0';
1271 1190
1272 atom = XInternAtom (dpy, server, False); 1191 atom = XInternAtom (dpy, server, False);
1273 win = XGetSelectionOwner (dpy, atom); 1192 win = XGetSelectionOwner (dpy, atom);
1274 1193
… …
1341 1260
1342 term->make_current (); 1261 term->make_current ();
1343 1262
1344 if (text) 1263 if (text)
1345 { 1264 {
1346 void *str; 1265 wchar_t *str;
1347 1266
1348 if (!text->encoding_is_wchar && text->string.multi_byte) 1267 if (!text->encoding_is_wchar && text->string.multi_byte)
1349 { 1268 {
1350 // of course, X makes it ugly again 1269 // of course, X makes it ugly again
1351 if (term->rs[Rs_imLocale]) 1270 if (term->rs[Rs_imLocale])
1352 SET_LOCALE (term->rs[Rs_imLocale]); 1271 SET_LOCALE (term->rs[Rs_imLocale]);
1353 1272
1354 str = rxvt_temp_buf ((text->length + 1) * sizeof (wchar_t)); 1273 str = rxvt_temp_buf<wchar_t> (text->length + 1);
1355 mbstowcs ((wchar_t *)str, text->string.multi_byte, text->length + 1); 1274 mbstowcs (str, text->string.multi_byte, text->length + 1);
1356 1275
1357 if (term->rs[Rs_imLocale]) 1276 if (term->rs[Rs_imLocale])
1358 SET_LOCALE (term->locale); 1277 SET_LOCALE (term->locale);
1359 } 1278 }
1360 else 1279 else
1361 str = (void *)text->string.wide_char; 1280 str = text->string.wide_char;
1362 1281
1363 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW, 1282 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
1364 DT_INT, call_data->caret, 1283 DT_INT, call_data->caret,
1365 DT_INT, call_data->chg_first, 1284 DT_INT, call_data->chg_first,
1366 DT_INT, call_data->chg_length, 1285 DT_INT, call_data->chg_length,
… …
1720void 1639void
1721rxvt_term::get_window_origin (int &x, int &y) 1640rxvt_term::get_window_origin (int &x, int &y)
1722{ 1641{
1723 Window cr; 1642 Window cr;
1724 XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr); 1643 XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr);
1725/* fprintf( stderr, "origin is %+d%+d\n", x, y);*/
1726} 1644}
1727 1645
1728Pixmap 1646Pixmap
1729rxvt_term::get_pixmap_property (int prop_id) 1647rxvt_term::get_pixmap_property (int prop_id)
1730{ 1648{
1649 Pixmap pixmap = None;
1650
1731 if (prop_id > 0 && prop_id < NUM_XA) 1651 if (prop_id > 0 && prop_id < NUM_XA)
1732 if (xa[prop_id]) 1652 if (xa[prop_id])
1733 { 1653 {
1734 int aformat; 1654 int aformat;
1735 unsigned long nitems, bytes_after; 1655 unsigned long nitems, bytes_after;
… …
1737 unsigned char *prop = NULL; 1657 unsigned char *prop = NULL;
1738 int result = XGetWindowProperty (dpy, display->root, xa[prop_id], 1658 int result = XGetWindowProperty (dpy, display->root, xa[prop_id],
1739 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 1659 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1740 &nitems, &bytes_after, &prop); 1660 &nitems, &bytes_after, &prop);
1741 if (result == Success && prop && atype == XA_PIXMAP) 1661 if (result == Success && prop && atype == XA_PIXMAP)
1742 {
1743 return *(Pixmap *)prop; 1662 pixmap = *(Pixmap *)prop;
1744 } 1663 XFree (prop);
1745 } 1664 }
1746 return None; 1665
1666 return pixmap;
1747} 1667}
1748 1668
1749#ifdef HAVE_BG_PIXMAP 1669#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 1670
1759int 1671void
1760rxvt_term::update_background () 1672rxvt_term::update_background ()
1761{ 1673{
1674 if (update_background_ev.is_active ())
1675 return;
1676
1762 bgPixmap.invalidate (); 1677 bgPixmap.invalidate ();
1763 1678
1764 /* no chance of real time refresh if we are blurring! */ 1679 ev_tstamp to_wait = 0.5 - (ev::now () - bgPixmap.valid_since);
1765 if (bgPixmap.invalid_since + 0.5 < ev::now () && !(bgPixmap.flags & bgPixmap_t::blurNeeded)) 1680
1681 if (to_wait <= 0.)
1766 bgPixmap.render (); 1682 bgPixmap.render ();
1767 else 1683 else
1768 {
1769 update_background_ev.stop ();
1770
1771 if (!bgPixmap.need_client_side_rendering())
1772 update_background_ev.start (.05); 1684 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} 1685}
1781 1686
1782void 1687void
1783rxvt_term::update_background_cb (ev::timer &w, int revents) 1688rxvt_term::update_background_cb (ev::timer &w, int revents)
1784{ 1689{
1690 make_current ();
1691
1692 update_background_ev.stop ();
1785 bgPixmap.render (); 1693 bgPixmap.render ();
1694 refresh_check ();
1786} 1695}
1787 1696
1788#endif /* HAVE_BG_PIXMAP */ 1697#endif /* HAVE_BG_PIXMAP */
1789 1698
1790/*----------------------- end-of-file (C source) -----------------------*/ 1699/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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