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.154 by root, Sat Dec 31 17:16:17 2005 UTC vs.
Revision 1.250 by sasha, Wed Sep 12 21:06:08 2007 UTC

1/*--------------------------------*-C-*---------------------------------* 1/*----------------------------------------------------------------------*
2 * File: main.C 2 * File: main.C
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * 4 *
5 * All portions of code are copyright by their respective author/s. 5 * All portions of code are copyright by their respective author/s.
6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk> 6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk>
11 * Copyright (c) 1997 mj olesen <olesen@me.QueensU.CA> 11 * Copyright (c) 1997 mj olesen <olesen@me.QueensU.CA>
12 * - extensive modifications 12 * - extensive modifications
13 * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de> 13 * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de>
14 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com> 14 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com>
15 * - extensive modifications 15 * - extensive modifications
16 * Copyright (c) 2003-2004 Marc Lehmann <pcg@goof.com> 16 * Copyright (c) 2003-2006 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 "keyboard.h"
36#include "rxvtperl.h"
35 37
36#include <limits> 38#include <limits>
37 39
38#include <csignal> 40#include <csignal>
39#include <cstring> 41#include <cstring>
44 46
45#ifdef HAVE_TERMIOS_H 47#ifdef HAVE_TERMIOS_H
46# include <termios.h> 48# include <termios.h>
47#endif 49#endif
48 50
49#ifdef KEYSYM_RESOURCE
50# include "keyboard.h"
51#endif
52
53vector<rxvt_term *> rxvt_term::termlist; 51vector<rxvt_term *> rxvt_term::termlist;
54 52
53// used to tell global functions which terminal instance is "active"
54rxvt_t rxvt_current_term;
55
55static char curlocale[128]; 56static char curlocale[128], savelocale[128];
56 57
57bool 58bool
58rxvt_set_locale (const char *locale) 59rxvt_set_locale (const char *locale) NOTHROW
59{ 60{
61 int size = strlen (locale) + 1;
62
63 if (size > sizeof (curlocale))
64 rxvt_fatal ("locale string too long, aborting.\n");
65
60 if (!locale || !strncmp (locale, curlocale, 128)) 66 if (!locale || !memcmp (locale, curlocale, size))
61 return false; 67 return false;
62 68
63 strncpy (curlocale, locale, 128); 69 memcpy (curlocale, locale, size);
64 setlocale (LC_CTYPE, curlocale); 70 setlocale (LC_CTYPE, curlocale);
65 return true; 71 return true;
72}
73
74void
75rxvt_push_locale (const char *locale) NOTHROW
76{
77 strcpy (savelocale, curlocale);
78 rxvt_set_locale (locale);
79}
80
81void
82rxvt_pop_locale () NOTHROW
83{
84 rxvt_set_locale (savelocale);
66} 85}
67 86
68#if ENABLE_COMBINING 87#if ENABLE_COMBINING
69class rxvt_composite_vec rxvt_composite; 88class rxvt_composite_vec rxvt_composite;
70 89
129} 148}
130#endif 149#endif
131 150
132rxvt_term::rxvt_term () 151rxvt_term::rxvt_term ()
133 : 152 :
134#if TRANSPARENT 153#if ENABLE_TRANSPARENCY || ENABLE_PERL
135 rootwin_ev (this, &rxvt_term::rootwin_cb), 154 rootwin_ev (this, &rxvt_term::rootwin_cb),
155#endif
156#if HAVE_BG_PIXMAP
157 update_background_ev(this, &rxvt_term::update_background_cb),
136#endif 158#endif
137#ifdef HAVE_SCROLLBARS 159#ifdef HAVE_SCROLLBARS
138 scrollbar_ev (this, &rxvt_term::x_cb), 160 scrollbar_ev (this, &rxvt_term::x_cb),
139#endif 161#endif
140#ifdef MENUBAR
141 menubar_ev (this, &rxvt_term::x_cb),
142#endif
143#ifdef CURSOR_BLINK 162#ifdef CURSOR_BLINK
144 cursor_blink_ev (this, &rxvt_term::cursor_blink_cb), 163 cursor_blink_ev (this, &rxvt_term::cursor_blink_cb),
145#endif 164#endif
146#ifdef TEXT_BLINK 165#ifdef TEXT_BLINK
147 text_blink_ev (this, &rxvt_term::text_blink_cb), 166 text_blink_ev (this, &rxvt_term::text_blink_cb),
159 pointer_ev (this, &rxvt_term::pointer_cb), 178 pointer_ev (this, &rxvt_term::pointer_cb),
160#endif 179#endif
161#ifdef USE_XIM 180#ifdef USE_XIM
162 im_ev (this, &rxvt_term::im_cb), 181 im_ev (this, &rxvt_term::im_cb),
163#endif 182#endif
183#ifndef NO_BELL
184 bell_ev (this, &rxvt_term::bell_cb),
185#endif
164 termwin_ev (this, &rxvt_term::x_cb), 186 termwin_ev (this, &rxvt_term::x_cb),
165 vt_ev (this, &rxvt_term::x_cb), 187 vt_ev (this, &rxvt_term::x_cb),
188 child_ev (this, &rxvt_term::child_cb),
166 check_ev (this, &rxvt_term::check_cb), 189 check_ev (this, &rxvt_term::check_cb),
167 flush_ev (this, &rxvt_term::flush_cb), 190 flush_ev (this, &rxvt_term::flush_cb),
168 destroy_ev (this, &rxvt_term::destroy_cb), 191 destroy_ev (this, &rxvt_term::destroy_cb),
169 pty_ev (this, &rxvt_term::pty_cb), 192 pty_ev (this, &rxvt_term::pty_cb),
170 incr_ev (this, &rxvt_term::incr_cb) 193 incr_ev (this, &rxvt_term::incr_cb)
173 196
174 termlist.push_back (this); 197 termlist.push_back (this);
175 198
176#ifdef KEYSYM_RESOURCE 199#ifdef KEYSYM_RESOURCE
177 keyboard = new keyboard_manager; 200 keyboard = new keyboard_manager;
178
179 if (!keyboard)
180 rxvt_fatal ("out of memory, aborting.\n");
181#endif 201#endif
182} 202}
183 203
184// clean up the most important stuff, do *not* call x or free mem etc. 204// clean up the most important stuff, do *not* call x or free mem etc.
185// for use before an emergency exit 205// for use before an emergency exit
186void rxvt_term::emergency_cleanup () 206void rxvt_term::emergency_cleanup ()
187{ 207{
188 if (cmd_pid) 208 if (cmd_pid)
189 kill (-cmd_pid, SIGHUP); 209 kill (-cmd_pid, SIGHUP);
190 210
191#ifdef UTMP_SUPPORT 211 pty_ev.stop ();
192 privileged_utmp (RESTORE); 212 delete pty; pty = 0;
193#endif
194
195 pty.put ();
196} 213}
197 214
198rxvt_term::~rxvt_term () 215rxvt_term::~rxvt_term ()
199{ 216{
200 termlist.erase (find (termlist.begin (), termlist.end(), this)); 217 termlist.erase (find (termlist.begin (), termlist.end(), this));
208#endif 225#endif
209 delete fontset[0]; 226 delete fontset[0];
210 227
211 if (display) 228 if (display)
212 { 229 {
213 dDisp;
214
215 selection_clear (); 230 selection_clear ();
216 231
217#ifdef USE_XIM 232#ifdef USE_XIM
218 im_destroy (); 233 im_destroy ();
219#endif 234#endif
220#ifdef MENUBAR
221 if (menubarGC) XFreeGC (disp, menubarGC);
222#endif
223#ifdef XTERM_SCROLLBAR 235#ifdef XTERM_SCROLLBAR
224 if (xscrollbarGC) XFreeGC (disp, xscrollbarGC); 236 if (xscrollbarGC) XFreeGC (dpy, xscrollbarGC);
225 if (ShadowGC) XFreeGC (disp, ShadowGC); 237 if (ShadowGC) XFreeGC (dpy, ShadowGC);
226#endif 238#endif
227#ifdef PLAIN_SCROLLBAR 239#ifdef PLAIN_SCROLLBAR
228 if (pscrollbarGC) XFreeGC (disp, pscrollbarGC); 240 if (pscrollbarGC) XFreeGC (dpy, pscrollbarGC);
229#endif 241#endif
230#ifdef NEXT_SCROLLBAR 242#ifdef NEXT_SCROLLBAR
231 if (blackGC) XFreeGC (disp, blackGC); 243 if (blackGC) XFreeGC (dpy, blackGC);
232 if (whiteGC) XFreeGC (disp, whiteGC); 244 if (whiteGC) XFreeGC (dpy, whiteGC);
233 if (grayGC) XFreeGC (disp, grayGC); 245 if (grayGC) XFreeGC (dpy, grayGC);
234 if (darkGC) XFreeGC (disp, darkGC); 246 if (darkGC) XFreeGC (dpy, darkGC);
235 if (stippleGC) XFreeGC (disp, stippleGC); 247 if (stippleGC) XFreeGC (dpy, stippleGC);
236 if (dimple) XFreePixmap (disp, dimple); 248 if (dimple) XFreePixmap (dpy, dimple);
237 if (upArrow) XFreePixmap (disp, upArrow); 249 if (upArrow) XFreePixmap (dpy, upArrow);
238 if (downArrow) XFreePixmap (disp, downArrow); 250 if (downArrow) XFreePixmap (dpy, downArrow);
239 if (upArrowHi) XFreePixmap (disp, upArrowHi); 251 if (upArrowHi) XFreePixmap (dpy, upArrowHi);
240 if (downArrowHi) XFreePixmap (disp, downArrowHi); 252 if (downArrowHi) XFreePixmap (dpy, downArrowHi);
241#endif 253#endif
242#if defined(MENUBAR) || defined(RXVT_SCROLLBAR) 254#ifdef RXVT_SCROLLBAR
243 if (topShadowGC) XFreeGC (disp, topShadowGC); 255 if (topShadowGC) XFreeGC (dpy, topShadowGC);
244 if (botShadowGC) XFreeGC (disp, botShadowGC); 256 if (botShadowGC) XFreeGC (dpy, botShadowGC);
245 if (scrollbarGC) XFreeGC (disp, scrollbarGC); 257 if (scrollbarGC) XFreeGC (dpy, scrollbarGC);
246#endif 258#endif
247 if (gc) XFreeGC (disp, gc); 259 if (gc) XFreeGC (dpy, gc);
248 260
249#if defined(MENUBAR) && (MENUBAR_MAX > 1)
250 delete menuBar.drawable;
251 //if (menuBar.win)
252 // XDestroyWindow (disp, menuBar.win);
253#endif
254 delete drawable; 261 delete drawable;
255 // destroy all windows 262 // destroy all windows
256 if (parent[0]) 263 if (parent[0])
257 XDestroyWindow (disp, parent[0]); 264 XDestroyWindow (dpy, parent[0]);
258 }
259 265
260 // TODO: free pixcolours, colours should become part of rxvt_display 266 for (int i = 0; i < TOTAL_COLORS; i++)
261 267 if (ISSET_PIXCOLOR (i))
262 delete pix_colors_focused; 268 {
269 pix_colors_focused [i].free (this);
263#if OFF_FOCUS_FADING 270#if OFF_FOCUS_FADING
271 pix_colors_unfocused [i].free (this);
272#endif
273 }
274
275 clear ();
276 }
277
278 delete [] pix_colors_focused;
279#if OFF_FOCUS_FADING
264 delete pix_colors_unfocused; 280 delete [] pix_colors_unfocused;
265#endif 281#endif
266 282
267 displays.put (display); 283 displays.put (display);
268 284
269 scr_release (); 285 scr_release ();
272 for (int i = 0; i < allocated.size (); i++) 288 for (int i = 0; i < allocated.size (); i++)
273 free (allocated [i]); 289 free (allocated [i]);
274 290
275 free (selection.text); 291 free (selection.text);
276 // TODO: manage env vars in child only(!) 292 // TODO: manage env vars in child only(!)
277 free (env_windowid);
278 free (env_display); 293 free (env_display);
279 free (env_term); 294 free (env_term);
280 free (env_colorfgbg);
281 free (locale); 295 free (locale);
282 free (v_buffer); 296 free (v_buffer);
283 free (incr_buf); 297 free (incr_buf);
284 298
285 delete envv; 299 delete envv;
288#ifdef KEYSYM_RESOURCE 302#ifdef KEYSYM_RESOURCE
289 delete keyboard; 303 delete keyboard;
290#endif 304#endif
291} 305}
292 306
307// child has exited, usually destroys
293void 308void
294rxvt_term::child_exit () 309rxvt_term::child_cb (child_watcher &w, int status)
295{ 310{
311 HOOK_INVOKE ((this, HOOK_CHILD_EXIT, DT_INT, status, DT_END));
312
296 cmd_pid = 0; 313 cmd_pid = 0;
297 314
298 if (!OPTION (Opt_hold)) 315 if (!option (Opt_hold))
299 destroy (); 316 destroy ();
300} 317}
301 318
302void 319void
303rxvt_term::destroy () 320rxvt_term::destroy ()
304{ 321{
305 if (destroy_ev.active) 322 if (destroy_ev.active)
306 return; 323 return;
307 324
325 HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));
326
308#if ENABLE_OVERLAY 327#if ENABLE_OVERLAY
309 scr_overlay_off (); 328 scr_overlay_off ();
310#endif 329#endif
311 330
312 if (display) 331 if (display)
315 im_ev.stop (display); 334 im_ev.stop (display);
316#endif 335#endif
317#if HAVE_SCROLLBARS 336#if HAVE_SCROLLBARS
318 scrollbar_ev.stop (display); 337 scrollbar_ev.stop (display);
319#endif 338#endif
320#if MENUBAR 339#if ENABLE_TRANSPARENCY || ENABLE_PERL
321 menubar_ev.stop (display);
322#endif
323#if TRANSPARENT
324 rootwin_ev.stop (display); 340 rootwin_ev.stop (display);
325#endif 341#endif
326 incr_ev.stop (); 342 incr_ev.stop ();
327 termwin_ev.stop (display); 343 termwin_ev.stop (display);
328 vt_ev.stop (display); 344 vt_ev.stop (display);
350} 366}
351 367
352void 368void
353rxvt_term::destroy_cb (time_watcher &w) 369rxvt_term::destroy_cb (time_watcher &w)
354{ 370{
355 SET_R (this); 371 make_current ();
356 372
357 delete this; 373 delete this;
358} 374}
359 375
360/*----------------------------------------------------------------------*/ 376/*----------------------------------------------------------------------*/
369{ 385{
370 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++) 386 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)
371 (*t)->emergency_cleanup (); 387 (*t)->emergency_cleanup ();
372} 388}
373 389
374#if ENABLE_FRILLS 390#if !ENABLE_MINIMAL
375static void 391static void
376print_x_error (Display *dpy, XErrorEvent *event) 392print_x_error (Display *dpy, XErrorEvent *event)
377{ 393{
378 char buffer[BUFSIZ]; 394 char buffer[BUFSIZ];
379 char mesg[BUFSIZ]; 395 char mesg[BUFSIZ];
427 GET_R->allowedxerror = event->error_code; 443 GET_R->allowedxerror = event->error_code;
428 else 444 else
429 { 445 {
430 // GET_R is most likely not the terminal which caused the error, 446 // GET_R is most likely not the terminal which caused the error,
431 // so just output the error and continue 447 // so just output the error and continue
432#if ENABLE_FRILLS 448#if ENABLE_MINIMAL
449 old_xerror_handler (display, event);
450#else
433 print_x_error (display, event); 451 print_x_error (display, event);
434#else
435 old_xerror_handler (display, event);
436#endif 452#endif
437 } 453 }
438 454
439 return 0; 455 return 0;
440} 456}
448 _exit (EXIT_FAILURE); 464 _exit (EXIT_FAILURE);
449} 465}
450 466
451/*----------------------------------------------------------------------*/ 467/*----------------------------------------------------------------------*/
452bool 468bool
453rxvt_term::init (int argc, const char *const *argv) 469rxvt_term::init (int argc, const char *const *argv, stringvec *envv)
454{ 470{
471 this->envv = envv;
472
455 SET_R (this); 473 SET_R (this);
456
457 set_locale (""); 474 set_locale ("");
475 set_environ (envv); // few things in X do not call setlocale :(
458 476
459 if (!init_vars ()) 477 if (!init_vars ())
460 return false; 478 return false;
461 479
462 init_secondary (); 480 init_secondary ();
465 483
466#ifdef KEYSYM_RESOURCE 484#ifdef KEYSYM_RESOURCE
467 keyboard->register_done (); 485 keyboard->register_done ();
468#endif 486#endif
469 487
470#if MENUBAR_MAX
471 menubar_read (rs[Rs_menu]);
472#endif
473#ifdef HAVE_SCROLLBARS 488#ifdef HAVE_SCROLLBARS
474 if (OPTION (Opt_scrollBar)) 489 if (option (Opt_scrollBar))
475 scrollBar.setIdle (); /* set existence for size calculations */ 490 scrollBar.setIdle (); /* set existence for size calculations */
476#endif 491#endif
477 492
493 pty = ptytty::create ();
494
478 create_windows (argc, argv); 495 create_windows (argc, argv);
479 496
480 dDisp;
481
482 init_xlocale (); 497 init_xlocale ();
483 498
484 scr_reset (); /* initialize screen */ 499 scr_reset (); // initialize screen
485 500
486#if 0 501#if 0
487 XSynchronize (disp, True); 502 XSynchronize (dpy, True);
488#endif 503#endif
489 504
490#ifdef HAVE_SCROLLBARS 505#ifdef HAVE_SCROLLBARS
491 if (OPTION (Opt_scrollBar)) 506 if (option (Opt_scrollBar))
492 resize_scrollbar (); /* create and map scrollbar */ 507 resize_scrollbar (); /* create and map scrollbar */
493#endif 508#endif
494#if (MENUBAR_MAX) 509#ifdef HAVE_BG_PIXMAP
495 if (menubar_visible ()) 510 {
496 XMapWindow (disp, menuBar.win); 511 bgPixmap.set_target (this);
497#endif 512
498#ifdef TRANSPARENT 513#ifdef ENABLE_TRANSPARENCY
499 if (OPTION (Opt_transparent)) 514 if (option (Opt_transparent))
500 { 515 {
516 bgPixmap.set_transparent ();
517#ifdef HAVE_AFTERIMAGE
518 if (rs [Rs_blurradius])
519 bgPixmap.set_blur_radius (rs [Rs_blurradius]);
520#endif
521 if (ISSET_PIXCOLOR (Color_tint))
522 bgPixmap.set_tint (pix_colors_focused [Color_tint]);
523 if (rs [Rs_shade])
524 bgPixmap.set_shade (rs [Rs_shade]);
525
526 bgPixmap.set_root_pixmap ();
501 XSelectInput (disp, display->root, PropertyChangeMask); 527 XSelectInput (dpy, display->root, PropertyChangeMask);
502 check_our_parents ();
503 rootwin_ev.start (display, display->root); 528 rootwin_ev.start (display, display->root);
504 } 529 }
505#endif 530#endif
506 531
507 XMapWindow (disp, vt); 532#ifdef BG_IMAGE_FROM_FILE
508 XMapWindow (disp, parent[0]); 533 if (rs[Rs_backgroundPixmap] != NULL)
534 {
535 const char *p = rs[Rs_backgroundPixmap];
536
537 if ((p = strchr (p, ';')) != NULL)
538 {
539 p++;
540 bgPixmap.set_geometry (p);
541 }
542 else
543 bgPixmap.set_defaultGeometry ();
544
545 if (bgPixmap.set_file (rs[Rs_backgroundPixmap]))
546 if (!bgPixmap.window_position_sensitive ())
547 update_background ();
548 }
549#endif
550 }
551#endif
552
553#if ENABLE_PERL
554 rootwin_ev.start (display, display->root);
555#endif
509 556
510 set_colorfgbg (); 557 set_colorfgbg ();
511 558
512 init_command (cmd_argv); 559 init_command (cmd_argv);
513 560
514 free (cmd_argv); 561 free (cmd_argv);
515 562
563 if (pty->pty >= 0)
516 pty_ev.start (pty.pty, EVENT_READ); 564 pty_ev.start (pty->pty, EVENT_READ);
517 565
518 check_ev.start (); 566 check_ev.start ();
519 567
568 HOOK_INVOKE ((this, HOOK_START, DT_END));
569
570#if ENABLE_XEMBED
571 if (rs[Rs_embed])
572 {
573 long info[2] = { 0, XEMBED_MAPPED };
574
575 XChangeProperty (dpy, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
576 32, PropModeReplace, (unsigned char *)&info, 2);
577 }
578#endif
579
580 XMapWindow (dpy, vt);
581 XMapWindow (dpy, parent[0]);
582
520 return true; 583 return true;
521} 584}
522 585
523static struct sig_handlers 586static struct sig_handlers
524{ 587{
525 sig_watcher sw_chld, sw_term, sw_int; 588 sig_watcher sw_term, sw_int;
526 589
527 void sig_chld (sig_watcher &w)
528 {
529 // we are being called for every SIGCHLD, find the corresponding term
530 int pid;
531
532 while ((pid = waitpid (-1, NULL, WNOHANG)) > 0)
533 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)
534 if (pid == (*t)->cmd_pid)
535 {
536 (*t)->child_exit ();
537 break;
538 }
539 }
540
541 /* 590 /*
542 * Catch a fatal signal and tidy up before quitting 591 * Catch a fatal signal and tidy up before quitting
543 */ 592 */
544 void 593 void
545 sig_term (sig_watcher &w) 594 sig_term (sig_watcher &w)
546 { 595 {
547#ifdef DEBUG_CMD
548 rxvt_warn ("caught signal %d, exiting.\n", w.signum);
549#endif
550 rxvt_emergency_cleanup (); 596 rxvt_emergency_cleanup ();
551 signal (w.signum, SIG_DFL); 597 signal (w.signum, SIG_DFL);
552 kill (getpid (), w.signum); 598 kill (getpid (), w.signum);
553 } 599 }
554 600
555 sig_handlers () 601 sig_handlers ()
556 : sw_chld (this, &sig_handlers::sig_chld),
557 sw_term (this, &sig_handlers::sig_term), 602 : sw_term (this, &sig_handlers::sig_term),
558 sw_int (this, &sig_handlers::sig_term) 603 sw_int (this, &sig_handlers::sig_term)
559 { 604 {
560 } 605 }
561} sig_handlers; 606} sig_handlers;
562 607
608char **rxvt_environ; // startup environment
609
563void 610void
564rxvt_init () 611rxvt_init ()
565{ 612{
566 /* 613 ptytty::init ();
567 * Save and then give up any super-user privileges 614
568 * If we need privileges in any area then we must specifically request it. 615 rxvt_environ = environ;
569 * We should only need to be root in these cases:
570 * 1. write utmp entries on some systems
571 * 2. chown tty on some systems
572 */
573 rxvt_privileges (SAVE);
574 rxvt_privileges (IGNORE);
575 616
576 signal (SIGHUP, SIG_IGN); 617 signal (SIGHUP, SIG_IGN);
577 signal (SIGPIPE, SIG_IGN); 618 signal (SIGPIPE, SIG_IGN);
578 619
579 sig_handlers.sw_chld.start (SIGCHLD);
580 sig_handlers.sw_term.start (SIGTERM); 620 sig_handlers.sw_term.start (SIGTERM);
581 sig_handlers.sw_int.start (SIGINT); 621 sig_handlers.sw_int.start (SIGINT);
582 622
583 /* need to trap SIGURG for SVR4 (Unixware) rlogin */ 623 /* need to trap SIGURG for SVR4 (Unixware) rlogin */
584 /* signal (SIGURG, SIG_DFL); */ 624 /* signal (SIGURG, SIG_DFL); */
585 625
586 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); 626 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
587 // TODO: handle this with exceptions and tolerate the memory loss 627 // TODO: handle this with exceptions and tolerate the memory loss
588 XSetIOErrorHandler (rxvt_xioerror_handler); 628 XSetIOErrorHandler (rxvt_xioerror_handler);
629
630 XrmInitialize ();
589} 631}
590 632
591/* ------------------------------------------------------------------------- * 633/* ------------------------------------------------------------------------- *
592 * MEMORY ALLOCATION WRAPPERS * 634 * MEMORY ALLOCATION WRAPPERS *
593 * ------------------------------------------------------------------------- */ 635 * ------------------------------------------------------------------------- */
611 rxvt_fatal ("memory allocation failure. aborting.\n"); 653 rxvt_fatal ("memory allocation failure. aborting.\n");
612 654
613 return p; 655 return p;
614} 656}
615 657
616void * 658void *
617rxvt_realloc (void *ptr, size_t size) 659rxvt_realloc (void *ptr, size_t size)
618{ 660{
619 void *p = realloc (ptr, size); 661 void *p = realloc (ptr, size);
620 662
621 if (!p) 663 if (!p)
622 rxvt_fatal ("memory allocation failure. aborting.\n"); 664 rxvt_fatal ("memory allocation failure. aborting.\n");
623 665
624 return p; 666 return p;
625} 667}
626 668
627/* ------------------------------------------------------------------------- *
628 * PRIVILEGED OPERATIONS *
629 * ------------------------------------------------------------------------- */
630/* take care of suid/sgid super-user (root) privileges */
631void
632rxvt_privileges (rxvt_privaction action)
633{
634#if (defined(HAVE_SETEUID) || defined(HAVE_SETREUID)) && !defined(__CYGWIN32__)
635 static uid_t euid;
636 static gid_t egid;
637#endif
638
639#if ! defined(__CYGWIN32__)
640# if !defined(HAVE_SETEUID) && defined(HAVE_SETREUID)
641 /* setreuid () is the poor man's setuid (), seteuid () */
642# define seteuid(a) setreuid(-1, (a))
643# define setegid(a) setregid(-1, (a))
644# define HAVE_SETEUID
645# endif
646# ifdef HAVE_SETEUID
647 switch (action)
648 {
649 case IGNORE:
650 /*
651 * change effective uid/gid - not real uid/gid - so we can switch
652 * back to root later, as required
653 */
654 seteuid (getuid ());
655 setegid (getgid ());
656 break;
657 case SAVE:
658 euid = geteuid ();
659 egid = getegid ();
660 break;
661 case RESTORE:
662 seteuid (euid);
663 setegid (egid);
664 break;
665 }
666# else
667 switch (action)
668 {
669 case IGNORE:
670 setuid (getuid ());
671 setgid (getgid ());
672 /* FALLTHROUGH */
673 case SAVE:
674 /* FALLTHROUGH */
675 case RESTORE:
676 break;
677 }
678# endif
679#endif
680}
681
682#ifdef UTMP_SUPPORT
683void
684rxvt_term::privileged_utmp (rxvt_privaction action)
685{
686 if (OPTION (Opt_utmpInhibit)
687 || !pty.name || !*pty.name)
688 return;
689
690 rxvt_privileges (RESTORE);
691
692 if (action == SAVE)
693 makeutent (pty.name, rs[Rs_display_name]);
694 else
695 cleanutent ();
696
697 rxvt_privileges (IGNORE);
698}
699#endif
700
701/*----------------------------------------------------------------------*/ 669/*----------------------------------------------------------------------*/
702/* 670/*
703 * window size/position calculcations for XSizeHint and other storage. 671 * window size/position calculations for XSizeHint and other storage.
704 * if width/height are non-zero then override calculated width/height 672 * if width/height are non-zero then override calculated width/height
705 */ 673 */
706void 674void
707rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight) 675rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
708{ 676{
709 short recalc_x, recalc_y; 677 short recalc_x, recalc_y;
710 int x, y, sb_w, mb_h, flags; 678 int x, y, sb_w, flags;
711 unsigned int w, h; 679 unsigned int w, h;
712 unsigned int max_width, max_height; 680 unsigned int max_width, max_height;
713 dDisp;
714
715 D_SIZE ((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
716 ncol, nrow, szHint.width, szHint.height));
717 681
718 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity; 682 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity;
719 szHint.win_gravity = NorthWestGravity; 683 szHint.win_gravity = NorthWestGravity;
720 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */ 684 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */
721 685
776 max_width = MAX_COLS * fwidth; 740 max_width = MAX_COLS * fwidth;
777 max_height = MAX_ROWS * fheight; 741 max_height = MAX_ROWS * fheight;
778 742
779 szHint.base_width = szHint.base_height = 2 * int_bwidth; 743 szHint.base_width = szHint.base_height = 2 * int_bwidth;
780 744
781 sb_w = mb_h = 0; 745 sb_w = 0;
782 window_vt_x = window_vt_y = int_bwidth; 746 window_vt_x = window_vt_y = int_bwidth;
783 747
784 if (scrollbar_visible ()) 748 if (scrollBar.state)
785 { 749 {
786 sb_w = scrollbar_TotalWidth (); 750 sb_w = scrollbar_TotalWidth ();
787 szHint.base_width += sb_w; 751 szHint.base_width += sb_w;
752
788 if (!OPTION (Opt_scrollBar_right)) 753 if (!option (Opt_scrollBar_right))
789 window_vt_x += sb_w; 754 window_vt_x += sb_w;
790 } 755 }
791 756
792 if (menubar_visible ())
793 {
794 mb_h = menuBar_TotalHeight ();
795 szHint.base_height += mb_h;
796 window_vt_y += mb_h;
797 }
798
799 szHint.width_inc = fwidth; 757 szHint.width_inc = fwidth;
800 szHint.height_inc = fheight; 758 szHint.height_inc = fheight;
801 szHint.min_width = szHint.base_width + szHint.width_inc; 759 szHint.min_width = szHint.base_width + szHint.width_inc;
802 szHint.min_height = szHint.base_height + szHint.height_inc; 760 szHint.min_height = szHint.base_height + szHint.height_inc;
803 761
804 if (newwidth && newwidth - szHint.base_width < max_width) 762 if (newwidth && newwidth - szHint.base_width < max_width)
805 { 763 {
806 szHint.width = newwidth; 764 szHint.width = newwidth;
821 { 779 {
822 min_it (height, max_height); 780 min_it (height, max_height);
823 szHint.height = szHint.base_height + height; 781 szHint.height = szHint.base_height + height;
824 } 782 }
825 783
826 if (scrollbar_visible () && OPTION (Opt_scrollBar_right)) 784 if (scrollBar.state && option (Opt_scrollBar_right))
827 window_sb_x = szHint.width - sb_w; 785 window_sb_x = szHint.width - sb_w;
828 786
829 if (recalc_x) 787 if (recalc_x)
830 szHint.x += DisplayWidth (disp, display->screen) - szHint.width - 2 * ext_bwidth; 788 szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth;
789
831 if (recalc_y) 790 if (recalc_y)
832 szHint.y += DisplayHeight (disp, display->screen) - szHint.height - 2 * ext_bwidth; 791 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth;
833 792
834 ncol = width / fwidth; 793 ncol = width / fwidth;
835 nrow = height / fheight; 794 nrow = height / fheight;
836 D_SIZE ((stderr, "> Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
837 ncol, nrow, szHint.width,
838 szHint.height));
839 return;
840} 795}
841 796
842/*----------------------------------------------------------------------*/ 797/*----------------------------------------------------------------------*/
843/* 798/*
844 * Tell the teletype handler what size the window is. 799 * Tell the teletype handler what size the window is.
845 * Called after a window size change. 800 * Called after a window size change.
846 */ 801 */
847void 802void
848rxvt_term::tt_winch () 803rxvt_term::tt_winch ()
849{ 804{
850 if (pty.pty < 0) 805 if (pty->pty < 0)
851 return; 806 return;
852 807
853 struct winsize ws; 808 struct winsize ws;
854 809
855 ws.ws_col = ncol; 810 ws.ws_col = ncol;
856 ws.ws_row = nrow; 811 ws.ws_row = nrow;
857 ws.ws_xpixel = width; 812 ws.ws_xpixel = width;
858 ws.ws_ypixel = height; 813 ws.ws_ypixel = height;
859 (void)ioctl (pty.pty, TIOCSWINSZ, &ws); 814 (void)ioctl (pty->pty, TIOCSWINSZ, &ws);
860 815
861#if 0 816#if 0
862 // TIOCSWINSZ⎈ is supposed to do this automatically and correctly 817 // TIOCSWINSZ⎈ is supposed to do this automatically and correctly
863 if (cmd_pid) /* force through to the command */ 818 if (cmd_pid) /* force through to the command */
864 kill (-cmd_pid, SIGWINCH); 819 kill (-cmd_pid, SIGWINCH);
896 delete fontset[0]; 851 delete fontset[0];
897 fontset[0] = fs; 852 fontset[0] = fs;
898 853
899 prop = (*fs)[1]->properties (); 854 prop = (*fs)[1]->properties ();
900 prop.height += lineSpace; 855 prop.height += lineSpace;
856
901 fs->set_prop (prop); 857 fs->set_prop (prop, false);
902 858
903 fwidth = prop.width; 859 fwidth = prop.width;
904 fheight = prop.height; 860 fheight = prop.height;
905 fbase = (*fs)[1]->ascent; 861 fbase = prop.ascent;
906 862
907 for (int style = 1; style < 4; style++) 863 for (int style = 1; style < 4; style++)
908 { 864 {
909#if ENABLE_STYLES 865#if ENABLE_STYLES
910 const char *res = rs[Rs_font + style]; 866 const char *res = rs[Rs_font + style];
915 { 871 {
916 fontset[style] = fs = new rxvt_fontset (this); 872 fontset[style] = fs = new rxvt_fontset (this);
917 rxvt_fontprop prop2 = prop; 873 rxvt_fontprop prop2 = prop;
918 874
919 if (res) 875 if (res)
920 prop2.weight = prop2.slant = rxvt_fontprop::unset; 876 {
877 fs->populate (res);
878 fs->set_prop (prop2, false);
879 }
921 else 880 else
922 { 881 {
923 res = fontset[0]->fontdesc; 882 fs->populate (fontset[0]->fontdesc);
924 883
925 if (SET_STYLE (0, style) & RS_Bold) prop2.weight = rxvt_fontprop::bold; 884 if (SET_STYLE (0, style) & RS_Bold) prop2.weight = rxvt_fontprop::bold;
926 if (SET_STYLE (0, style) & RS_Italic) prop2.slant = rxvt_fontprop::italic; 885 if (SET_STYLE (0, style) & RS_Italic) prop2.slant = rxvt_fontprop::italic;
886
887 fs->set_prop (prop2, true);
927 } 888 }
928 889
929 fs->populate (res);
930 fs->set_prop (prop2);
931 } 890 }
932#else 891#else
933 fontset[style] = fontset[0]; 892 fontset[style] = fontset[0];
934#endif 893#endif
935 } 894 }
944 return true; 903 return true;
945} 904}
946 905
947void rxvt_term::set_string_property (Atom prop, const char *str, int len) 906void rxvt_term::set_string_property (Atom prop, const char *str, int len)
948{ 907{
949 XChangeProperty (display->display, parent[0], 908 XChangeProperty (dpy, parent[0],
950 prop, XA_STRING, 8, PropModeReplace, 909 prop, XA_STRING, 8, PropModeReplace,
951 (const unsigned char *)str, len >= 0 ? len : strlen (str)); 910 (const unsigned char *)str, len >= 0 ? len : strlen (str));
952} 911}
953 912
954void rxvt_term::set_utf8_property (Atom prop, const char *str, int len) 913void rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
955{ 914{
956 wchar_t *ws = rxvt_mbstowcs (str, len); 915 wchar_t *ws = rxvt_mbstowcs (str, len);
957 char *s = rxvt_wcstoutf8 (ws); 916 char *s = rxvt_wcstoutf8 (ws);
958 917
959 XChangeProperty (display->display, parent[0], 918 XChangeProperty (dpy, parent[0],
960 prop, xa[XA_UTF8_STRING], 8, PropModeReplace, 919 prop, xa[XA_UTF8_STRING], 8, PropModeReplace,
961 (const unsigned char *)s, strlen (s)); 920 (const unsigned char *)s, strlen (s));
962 921
963 free (s); 922 free (s);
964 free (ws); 923 free (ws);
989void 948void
990rxvt_term::set_window_color (int idx, const char *color) 949rxvt_term::set_window_color (int idx, const char *color)
991{ 950{
992 rxvt_color xcol; 951 rxvt_color xcol;
993 int i; 952 int i;
994 953
995 if (color == NULL || *color == '\0') 954 if (color == NULL || *color == '\0')
996 return; 955 return;
956
957 color = strdup (color);
958 allocated.push_back ((void *)color);
959 rs[Rs_color + idx] = color;
997 960
998 /* handle color aliases */ 961 /* handle color aliases */
999 if (isdigit (*color)) 962 if (isdigit (*color))
1000 { 963 {
1001 i = atoi (color); 964 i = atoi (color);
1002 965
1003 if (i >= 8 && i <= 15) 966 if (i >= 8 && i <= 15)
1004 { /* bright colors */ 967 { /* bright colors */
1005 i -= 8; 968 i -= 8;
1006# ifndef NO_BRIGHTCOLOR
1007 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i]; 969 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i];
1008 SET_PIXCOLOR (idx);
1009 goto done; 970 goto done;
1010# endif
1011 } 971 }
1012 972
1013 if (i >= 0 && i <= 7) 973 if (i >= 0 && i <= 7)
1014 { /* normal colors */ 974 { /* normal colors */
1015 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i]; 975 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];
1016 SET_PIXCOLOR (idx);
1017 goto done; 976 goto done;
1018 } 977 }
1019 } 978 }
1020 979
1021 if (!rXParseAllocColor (&xcol, color)) 980 set_color (xcol, color);
1022 return;
1023
1024 /* XStoreColor (display->display, display->cmap, XColor*); */
1025 981
1026 /* 982 /*
1027 * FIXME: should free colors here, but no idea how to do it so instead, 983 * FIXME: should free colors here, but no idea how to do it so instead,
1028 * so just keep gobbling up the colormap 984 * so just keep gobbling up the colormap
1029 */ 985 */
1030# if 0
1031 for (i = Color_Black; i <= Color_White; i++)
1032 if (pix_colors[idx] == pix_colors[i])
1033 break;
1034 if (i > Color_White)
1035 {
1036 /* fprintf (stderr, "XFreeColors: pix_colors [%d] = %lu\n", idx, pix_colors [idx]); */
1037 XFreeColors (display->display, display->cmap, (pix_colors + idx), 1,
1038 DisplayPlanes (display->display, display->screen));
1039 }
1040# endif
1041 986
1042 pix_colors_focused[idx] = xcol; 987 pix_colors_focused[idx] = xcol;
1043 SET_PIXCOLOR (idx);
1044 988
1045 /* XSetWindowAttributes attr; */ 989 /* XSetWindowAttributes attr; */
1046 /* Cursor cursor; */ 990 /* Cursor cursor; */
1047done: 991done:
1048
1049#if OFF_FOCUS_FADING
1050 if (rs[Rs_fade])
1051 pix_colors_unfocused[idx] = pix_colors_focused[idx].fade (display, atoi (rs[Rs_fade]), pix_colors[Color_fade]);
1052#endif
1053
1054 /*TODO: handle Color_BD, scrollbar background, etc. */ 992 /*TODO: handle Color_BD, scrollbar background, etc. */
1055 993
994 update_fade_color (idx);
1056 recolour_cursor (); 995 recolour_cursor ();
1057 scr_recolour (); 996 scr_recolour ();
1058} 997}
1059 998
1060#else 999#else
1062#endif /* XTERM_COLOR_CHANGE */ 1001#endif /* XTERM_COLOR_CHANGE */
1063 1002
1064void 1003void
1065rxvt_term::recolour_cursor () 1004rxvt_term::recolour_cursor ()
1066{ 1005{
1067 XColor xcol[2]; 1006 XColor fg, bg;
1068 1007
1069 xcol[0].pixel = ISSET_PIXCOLOR (Color_pointer_fg) 1008 (ISSET_PIXCOLOR (Color_pointer_fg)
1070 ? pix_colors_focused[Color_pointer_fg] 1009 ? pix_colors_focused[Color_pointer_fg]
1071 : pix_colors_focused[Color_fg]; 1010 : pix_colors_focused[Color_fg]).get (fg);
1011
1072 xcol[1].pixel = ISSET_PIXCOLOR (Color_pointer_bg) 1012 (ISSET_PIXCOLOR (Color_pointer_bg)
1073 ? pix_colors_focused[Color_pointer_bg] 1013 ? pix_colors_focused[Color_pointer_bg]
1074 : pix_colors_focused[Color_bg]; 1014 : pix_colors_focused[Color_bg]).get (bg);
1075 1015
1076 XQueryColors (display->display, display->cmap, xcol, 2); 1016 XRecolorCursor (dpy, TermWin_cursor, &fg, &bg);
1077 XRecolorCursor (display->display, TermWin_cursor, xcol + 0, xcol + 1);
1078} 1017}
1079 1018
1080/*----------------------------------------------------------------------*/ 1019/*----------------------------------------------------------------------*/
1081/* 1020/*
1082 * find if fg/bg matches any of the normal (low-intensity) colors 1021 * find if fg/bg matches any of the normal (low-intensity) colors
1086{ 1025{
1087 unsigned int i; 1026 unsigned int i;
1088 const char *xpmb = "\0"; 1027 const char *xpmb = "\0";
1089 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1]; 1028 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1];
1090 1029
1091 env_colorfgbg = (char *)rxvt_malloc (sizeof ("COLORFGBG=default;default;bg") + 1);
1092 strcpy (fstr, "default"); 1030 strcpy (fstr, "default");
1093 strcpy (bstr, "default"); 1031 strcpy (bstr, "default");
1094 for (i = Color_Black; i <= Color_White; i++) 1032 for (i = Color_Black; i <= Color_White; i++)
1095 if (pix_colors[Color_fg] == pix_colors[i]) 1033 if (pix_colors[Color_fg] == pix_colors[i])
1096 { 1034 {
1100 1038
1101 for (i = Color_Black; i <= Color_White; i++) 1039 for (i = Color_Black; i <= Color_White; i++)
1102 if (pix_colors[Color_bg] == pix_colors[i]) 1040 if (pix_colors[Color_bg] == pix_colors[i])
1103 { 1041 {
1104 sprintf (bstr, "%d", (i - Color_Black)); 1042 sprintf (bstr, "%d", (i - Color_Black));
1105#ifdef XPM_BACKGROUND 1043#ifdef BG_IMAGE_FROM_FILE
1106 xpmb = "default;"; 1044 xpmb = "default;";
1107#endif 1045#endif
1108 break; 1046 break;
1109 } 1047 }
1110 1048
1111 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr); 1049 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr);
1112} 1050}
1113 1051
1114/*----------------------------------------------------------------------*/ 1052/*----------------------------------------------------------------------*/
1115 1053
1116int 1054bool
1117rxvt_term::rXParseAllocColor (rxvt_color *screen_in_out, const char *colour) 1055rxvt_term::set_color (rxvt_color &color, const char *name)
1118{ 1056{
1119 if (!screen_in_out->set (display, colour)) 1057 if (color.set (this, name))
1120 {
1121 rxvt_warn ("can't get colour '%s', continuing without.\n", colour);
1122 return false;
1123 }
1124
1125 return true; 1058 return true;
1059
1060 rxvt_warn ("can't get colour '%s', continuing without.\n", name);
1061 return false;
1062}
1063
1064void
1065rxvt_term::alias_color (int dst, int src)
1066{
1067 pix_colors[dst].set (this, rs[Rs_color + dst] = rs[Rs_color + src]);
1126} 1068}
1127 1069
1128/* -------------------------------------------------------------------- * 1070/* -------------------------------------------------------------------- *
1129 * - WINDOW RESIZING - * 1071 * - WINDOW RESIZING - *
1130 * -------------------------------------------------------------------- */ 1072 * -------------------------------------------------------------------- */
1131void 1073void
1132rxvt_term::resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent) 1074rxvt_term::resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent)
1133{ 1075{
1134 int fix_screen; 1076 int fix_screen;
1135 int old_width = szHint.width, old_height = szHint.height; 1077 int old_width = szHint.width;
1136 dDisp; 1078 int old_height = szHint.height;
1137 1079
1138 window_calc (newwidth, newheight); 1080 window_calc (newwidth, newheight);
1081
1082 if (!HOOK_INVOKE ((this, HOOK_RESIZE_ALL_WINDOWS, DT_INT, newwidth, DT_INT, newheight, DT_END)))
1139 XSetWMNormalHints (disp, parent[0], &szHint); 1083 XSetWMNormalHints (dpy, parent[0], &szHint);
1140 1084
1141 if (!ignoreparent) 1085 if (!ignoreparent)
1142 { 1086 {
1143#ifdef SMART_RESIZE 1087#ifdef SMART_RESIZE
1144 /* 1088 /*
1148 int x, y, x1, y1; 1092 int x, y, x1, y1;
1149 int dx, dy; 1093 int dx, dy;
1150 unsigned int unused_w1, unused_h1, unused_b1, unused_d1; 1094 unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
1151 Window unused_cr; 1095 Window unused_cr;
1152 1096
1153 XTranslateCoordinates (disp, parent[0], display->root, 1097 XTranslateCoordinates (dpy, parent[0], display->root,
1154 0, 0, &x, &y, &unused_cr); 1098 0, 0, &x, &y, &unused_cr);
1155 XGetGeometry (disp, parent[0], &unused_cr, &x1, &y1, 1099 XGetGeometry (dpy, parent[0], &unused_cr, &x1, &y1,
1156 &unused_w1, &unused_h1, &unused_b1, &unused_d1); 1100 &unused_w1, &unused_h1, &unused_b1, &unused_d1);
1157 /* 1101 /*
1158 * if display->root isn't the parent window, a WM will probably have offset 1102 * if display->root isn't the parent window, a WM will probably have offset
1159 * our position for handles and decorations. Counter it 1103 * our position for handles and decorations. Counter it
1160 */ 1104 */
1162 { 1106 {
1163 x -= x1; 1107 x -= x1;
1164 y -= y1; 1108 y -= y1;
1165 } 1109 }
1166 1110
1167 x1 = (DisplayWidth (disp, display->screen) - old_width) / 2; 1111 x1 = (DisplayWidth (dpy, display->screen) - old_width ) / 2;
1168 y1 = (DisplayHeight (disp, display->screen) - old_height) / 2; 1112 y1 = (DisplayHeight (dpy, display->screen) - old_height) / 2;
1169 dx = old_width - szHint.width; 1113 dx = old_width - szHint.width;
1170 dy = old_height - szHint.height; 1114 dy = old_height - szHint.height;
1171 1115
1172 /* Check position of the center of the window */ 1116 /* Check position of the center of the window */
1173 if (x < x1) /* left half */ 1117 if (x < x1) /* left half */
1174 dx = 0; 1118 dx = 0;
1177 if (y < y1) /* top half */ 1121 if (y < y1) /* top half */
1178 dy = 0; 1122 dy = 0;
1179 else if (y == y1) /* exact center */ 1123 else if (y == y1) /* exact center */
1180 dy /= 2; 1124 dy /= 2;
1181 1125
1182 XMoveResizeWindow (disp, parent[0], x + dx, y + dy, 1126 XMoveResizeWindow (dpy, parent[0], x + dx, y + dy,
1183 szHint.width, szHint.height); 1127 szHint.width, szHint.height);
1184#else 1128#else
1185 XResizeWindow (disp, parent[0], szHint.width, szHint.height); 1129 XResizeWindow (dpy, parent[0], szHint.width, szHint.height);
1186#endif 1130#endif
1187 } 1131 }
1188 1132
1189 fix_screen = ncol != prev_ncol || nrow != prev_nrow; 1133 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
1190 1134
1191 if (fix_screen || newwidth != old_width || newheight != old_height) 1135 if (fix_screen || newwidth != old_width || newheight != old_height)
1192 { 1136 {
1193 if (scrollbar_visible ()) 1137 if (scrollBar.state)
1194 { 1138 {
1195 XMoveResizeWindow (disp, scrollBar.win, 1139 XMoveResizeWindow (dpy, scrollBar.win,
1196 window_sb_x, 0, 1140 window_sb_x, 0,
1197 scrollbar_TotalWidth (), szHint.height); 1141 scrollbar_TotalWidth (), szHint.height);
1198 resize_scrollbar (); 1142 resize_scrollbar ();
1199 } 1143 }
1200 1144
1201 if (menubar_visible ())
1202 XMoveResizeWindow (disp, menuBar.win,
1203 window_vt_x, 0,
1204 TermWin_TotalWidth (), menuBar_TotalHeight ());
1205
1206 XMoveResizeWindow (disp, vt, 1145 XMoveResizeWindow (dpy, vt,
1207 window_vt_x, window_vt_y, 1146 window_vt_x, window_vt_y,
1208 TermWin_TotalWidth (), TermWin_TotalHeight ()); 1147 width, height);
1148
1149#ifdef HAVE_BG_PIXMAP
1150 if (bgPixmap.window_size_sensitive ())
1151 update_background ();
1152#endif
1209 1153
1210 scr_clear (); 1154 scr_clear ();
1211#ifdef XPM_BACKGROUND
1212 resize_pixmap ();
1213#endif
1214 } 1155 }
1215 1156
1216 if (fix_screen || old_height == 0) 1157 if (fix_screen || old_height == 0)
1217 {
1218 int curr_screen = -1;
1219 int old_ncol = prev_ncol;
1220
1221 /* scr_reset only works on the primary screen */
1222 if (old_height) /* this is not the first time through */
1223 {
1224 unsigned int ocol = ncol;
1225 ncol = prev_ncol; // save b/c scr_blank_screen_mem uses this
1226 curr_screen = scr_change_screen (PRIMARY);
1227 ncol = ocol;
1228 }
1229
1230 scr_reset (); 1158 scr_reset ();
1231 1159
1232 if (curr_screen >= 0) /* this is not the first time through */ 1160 // TODO, with nvidia-8178, resizes kill the alpha channel, report if not fixed in newer version
1233 { 1161 //scr_touch (false);
1234 scr_change_screen (curr_screen);
1235 selection_check (old_ncol != ncol ? 4 : 0);
1236 }
1237 }
1238 1162
1239 old_width = szHint.width; 1163#ifdef HAVE_BG_PIXMAP
1240 old_height = szHint.height; 1164// TODO: this don't seem to have any effect - do we still need it ? If so - in which case exactly ?
1241 1165// if (bgPixmap.pixmap)
1242#ifdef XPM_BACKGROUND
1243 if (pixmap)
1244 scr_touch (false); 1166// scr_touch (false);
1245#endif 1167#endif
1246 1168
1247#ifdef USE_XIM 1169#ifdef USE_XIM
1248 IMSetStatusPosition (); 1170 IMSetPosition ();
1249#endif 1171#endif
1250} 1172}
1251 1173
1252/* 1174/*
1253 * Set the width/height of the vt window in characters. Units are pixels. 1175 * Set the width/height of the vt window in characters. Units are pixels.
1258{ 1180{
1259 XWindowAttributes wattr; 1181 XWindowAttributes wattr;
1260 1182
1261 if (newwidth == 0 || newheight == 0) 1183 if (newwidth == 0 || newheight == 0)
1262 { 1184 {
1263 XGetWindowAttributes (display->display, display->root, &wattr); 1185 XGetWindowAttributes (dpy, display->root, &wattr);
1264 1186
1265 if (newwidth == 0) 1187 if (newwidth == 0)
1266 newwidth = wattr.width - szHint.base_width; 1188 newwidth = wattr.width - szHint.base_width;
1267 if (newheight == 0) 1189 if (newheight == 0)
1268 newheight = wattr.height - szHint.base_height; 1190 newheight = wattr.height - szHint.base_height;
1282#ifdef USE_XIM 1204#ifdef USE_XIM
1283 1205
1284void 1206void
1285rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg) 1207rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg)
1286{ 1208{
1287 fg = pix_colors[Color_fg]; 1209 fg = pix_colors [Color_fg];
1288 bg = pix_colors[Color_bg]; 1210 bg = pix_colors [Color_bg];
1289} 1211}
1290 1212
1291void 1213void
1292rxvt_term::im_set_size (XRectangle &size) 1214rxvt_term::im_set_size (XRectangle &size)
1293{ 1215{
1330 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */ 1252 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */
1331 1253
1332 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */ 1254 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */
1333 *p = '\0'; 1255 *p = '\0';
1334 1256
1335 atom = XInternAtom (display->display, server, False); 1257 atom = XInternAtom (dpy, server, False);
1336 win = XGetSelectionOwner (display->display, atom); 1258 win = XGetSelectionOwner (dpy, atom);
1337 1259
1338 if (win != None) 1260 if (win != None)
1339 return True; 1261 return True;
1340 } 1262 }
1341 1263
1348 XPoint nspot; 1270 XPoint nspot;
1349 XVaNestedList preedit_attr; 1271 XVaNestedList preedit_attr;
1350 1272
1351 if (!Input_Context 1273 if (!Input_Context
1352 || !focus 1274 || !focus
1353 || !(input_style & XIMPreeditPosition)) 1275 || !(input_style & (XIMPreeditPosition | XIMPreeditCallbacks)))
1354 return; 1276 return;
1355 1277
1356 im_set_position (nspot); 1278 im_set_position (nspot);
1357 1279
1358 if (nspot.x == spot.x && nspot.y == spot.y) 1280 if (nspot.x == spot.x && nspot.y == spot.y)
1377 input_method = 0; 1299 input_method = 0;
1378 } 1300 }
1379 1301
1380 Input_Context = 0; 1302 Input_Context = 0;
1381} 1303}
1304
1305#ifdef ENABLE_XIM_ONTHESPOT
1306
1307static void
1308xim_preedit_start (XIC ic, XPointer client_data, XPointer call_data)
1309{
1310 ((rxvt_term *)client_data)->make_current ();
1311 HOOK_INVOKE (((rxvt_term *)client_data, HOOK_XIM_PREEDIT_START, DT_END));
1312}
1313
1314static void
1315xim_preedit_done (XIC ic, XPointer client_data, XPointer call_data)
1316{
1317 ((rxvt_term *)client_data)->make_current ();
1318 HOOK_INVOKE (((rxvt_term *)client_data, HOOK_XIM_PREEDIT_DONE, DT_END));
1319}
1320
1321static void
1322xim_preedit_draw (XIC ic, XPointer client_data, XIMPreeditDrawCallbackStruct *call_data)
1323{
1324 rxvt_term *term = (rxvt_term *)client_data;
1325 XIMText *text = call_data->text;
1326
1327 term->make_current ();
1328
1329 if (text)
1330 {
1331 void *str;
1332
1333 if (!text->encoding_is_wchar && text->string.multi_byte)
1334 {
1335 // of course, X makes it ugly again
1336 if (term->rs[Rs_imLocale])
1337 SET_LOCALE (term->rs[Rs_imLocale]);
1338
1339 str = rxvt_temp_buf ((text->length + 1) * sizeof (wchar_t));
1340 mbstowcs ((wchar_t *)str, text->string.multi_byte, text->length + 1);
1341
1342 if (term->rs[Rs_imLocale])
1343 SET_LOCALE (term->locale);
1344 }
1345 else
1346 str = (void *)text->string.wide_char;
1347
1348 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
1349 DT_INT, call_data->caret,
1350 DT_INT, call_data->chg_first,
1351 DT_INT, call_data->chg_length,
1352 DT_LCS_LEN, (void *)text->feedback, text->feedback ? (int)text->length : 0,
1353 DT_WCS_LEN, str, str ? (int)text->length : 0,
1354 DT_END));
1355 }
1356 else
1357 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
1358 DT_INT, call_data->caret,
1359 DT_INT, call_data->chg_first,
1360 DT_INT, call_data->chg_length,
1361 DT_END));
1362}
1363
1364#if 0
1365static void
1366xim_preedit_caret (XIC ic, XPointer client_data, XIMPreeditCaretCallbackStruct *call_data)
1367{
1368 ((rxvt_term *)client_data)->make_current ();
1369 HOOK_INVOKE (((rxvt_term *)client_data, HOOK_XIM_PREEDIT_CARET,
1370 DT_INT, call_data->position,
1371 DT_INT, call_data->direction,
1372 DT_INT, call_data->style,
1373 DT_END));
1374}
1375#endif
1376
1377#endif
1382 1378
1383/* 1379/*
1384 * Try to open a XIM with the current modifiers, then see if we can 1380 * Try to open a XIM with the current modifiers, then see if we can
1385 * open a suitable preedit type 1381 * open a suitable preedit type
1386 */ 1382 */
1393 XRectangle rect, status_rect, needed_rect; 1389 XRectangle rect, status_rect, needed_rect;
1394 unsigned long fg, bg; 1390 unsigned long fg, bg;
1395 const char *p; 1391 const char *p;
1396 char **s; 1392 char **s;
1397 XIMStyles *xim_styles; 1393 XIMStyles *xim_styles;
1394#ifdef ENABLE_XIM_ONTHESPOT
1395 XIMCallback xcb[4];
1396#endif
1397
1398 set_environ (envv);
1398 1399
1399 if (! ((p = XSetLocaleModifiers (modifiers)) && *p)) 1400 if (! ((p = XSetLocaleModifiers (modifiers)) && *p))
1400 return false; 1401 return false;
1401 1402
1402 D_MAIN ((stderr, "rxvt_IM_get_IC ()"));
1403 input_method = display->get_xim (locale, modifiers); 1403 input_method = display->get_xim (locale, modifiers);
1404 if (input_method == NULL) 1404 if (input_method == NULL)
1405 return false; 1405 return false;
1406 1406
1407 xim = input_method->xim; 1407 xim = input_method->xim;
1427 s = rxvt_splitcommastring (p); 1427 s = rxvt_splitcommastring (p);
1428 1428
1429 for (i = found = 0; !found && s[i]; i++) 1429 for (i = found = 0; !found && s[i]; i++)
1430 { 1430 {
1431 if (!strcmp (s[i], "OverTheSpot")) 1431 if (!strcmp (s[i], "OverTheSpot"))
1432 input_style = (XIMPreeditPosition | XIMStatusNothing); 1432 input_style = XIMPreeditPosition | XIMStatusNothing;
1433 else if (!strcmp (s[i], "OffTheSpot")) 1433 else if (!strcmp (s[i], "OffTheSpot"))
1434 input_style = (XIMPreeditArea | XIMStatusArea); 1434 input_style = XIMPreeditArea | XIMStatusArea;
1435 else if (!strcmp (s[i], "Root")) 1435 else if (!strcmp (s[i], "Root"))
1436 input_style = (XIMPreeditNothing | XIMStatusNothing); 1436 input_style = XIMPreeditNothing | XIMStatusNothing;
1437 else if (!strcmp (s[i], "None")) 1437 else if (!strcmp (s[i], "None"))
1438 input_style = (XIMPreeditNone | XIMStatusNone); 1438 input_style = XIMPreeditNone | XIMStatusNone;
1439#ifdef ENABLE_XIM_ONTHESPOT
1440 else if (SHOULD_INVOKE (HOOK_XIM_PREEDIT_START) && !strcmp (s[i], "OnTheSpot"))
1441 input_style = XIMPreeditCallbacks | XIMStatusNothing;
1442#endif
1443 else
1444 input_style = XIMPreeditNothing | XIMStatusNothing;
1439 1445
1440 for (j = 0; j < xim_styles->count_styles; j++) 1446 for (j = 0; j < xim_styles->count_styles; j++)
1441 if (input_style == xim_styles->supported_styles[j]) 1447 if (input_style == xim_styles->supported_styles[j])
1442 { 1448 {
1443 rxvt_freecommastring (s); 1449 rxvt_freecommastring (s);
1481 "*", 1487 "*",
1482 fheight, 1488 fheight,
1483 fheight + 1, fheight - 1, 1489 fheight + 1, fheight - 1,
1484 fheight - 2, fheight + 2); 1490 fheight - 2, fheight + 2);
1485 1491
1486 fs = XCreateFontSet (display->display, rs[Rs_imFont] ? rs[Rs_imFont] : pat, 1492 fs = XCreateFontSet (dpy, rs[Rs_imFont] ? rs[Rs_imFont] : pat,
1487 &missing_charset_list, &missing_charset_count, &def_string); 1493 &missing_charset_list, &missing_charset_count, &def_string);
1488 1494
1489 if (missing_charset_list) 1495 if (missing_charset_list)
1490 XFreeStringList (missing_charset_list); 1496 XFreeStringList (missing_charset_list);
1491 1497
1532 XNBackground, bg, 1538 XNBackground, bg,
1533 XNArea, &status_rect, 1539 XNArea, &status_rect,
1534 XNFontSet, fs, 1540 XNFontSet, fs,
1535 NULL); 1541 NULL);
1536 } 1542 }
1543#if ENABLE_XIM_ONTHESPOT
1544 else if (input_style & XIMPreeditCallbacks)
1545 {
1546 im_set_position (spot);
1547
1548 xcb[0].client_data = (XPointer)this; xcb[0].callback = (XIMProc)xim_preedit_start;
1549 xcb[1].client_data = (XPointer)this; xcb[1].callback = (XIMProc)xim_preedit_done;
1550 xcb[2].client_data = (XPointer)this; xcb[2].callback = (XIMProc)xim_preedit_draw;
1551# if 0
1552 xcb[3].client_data = (XPointer)this; xcb[3].callback = (XIMProc)xim_preedit_caret;
1553# endif
1554
1555 preedit_attr = XVaCreateNestedList (0,
1556 XNSpotLocation, &spot,
1557 XNPreeditStartCallback, &xcb[0],
1558 XNPreeditDoneCallback , &xcb[1],
1559 XNPreeditDrawCallback , &xcb[2],
1560# if 0
1561 XNPreeditCaretCallback, &xcb[3],
1562# endif
1563 NULL);
1564 }
1565#endif
1537 1566
1538 Input_Context = XCreateIC (xim, 1567 Input_Context = XCreateIC (xim,
1539 XNInputStyle, input_style, 1568 XNInputStyle, input_style,
1540 XNClientWindow, vt, 1569 XNClientWindow, vt,
1541 XNFocusWindow, parent[0], 1570 XNFocusWindow, parent[0],
1543 preedit_attr, 1572 preedit_attr,
1544 status_attr ? XNStatusAttributes : NULL, 1573 status_attr ? XNStatusAttributes : NULL,
1545 status_attr, NULL); 1574 status_attr, NULL);
1546 1575
1547 if (preedit_attr) XFree (preedit_attr); 1576 if (preedit_attr) XFree (preedit_attr);
1548 if (status_attr) XFree (status_attr); 1577 if (status_attr) XFree (status_attr);
1549 if (fs) XFreeFontSet (display->display, fs); 1578 if (fs) XFreeFontSet (dpy, fs);
1550 1579
1551 if (Input_Context == NULL) 1580 if (Input_Context == NULL)
1552 { 1581 {
1553 rxvt_warn ("failed to create input context, continuing without XIM.\n"); 1582 rxvt_warn ("failed to create input context, continuing without XIM.\n");
1554 im_destroy (); 1583 im_destroy ();
1555 return false; 1584 return false;
1556 } 1585 }
1557 1586
1558 if (input_style & XIMPreeditArea) 1587#if 0
1588 // unfortunately, only the focus window is used by XIM, hard to fix
1589 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL))
1590 vt_select_input ();
1591#endif
1592
1559 IMSetStatusPosition (); 1593 IMSetPosition ();
1560 1594
1561 D_MAIN ((stderr, "rxvt_IM_get_IC () - successful connection"));
1562 return true; 1595 return true;
1563} 1596}
1564 1597
1565void 1598void
1566rxvt_term::im_cb () 1599rxvt_term::im_cb ()
1568 int i; 1601 int i;
1569 const char *p; 1602 const char *p;
1570 char **s; 1603 char **s;
1571 char buf[IMBUFSIZ]; 1604 char buf[IMBUFSIZ];
1572 1605
1573 SET_R (this); 1606 make_current ();
1574 1607
1575 im_destroy (); 1608 im_destroy ();
1576 1609
1577 D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()"));
1578 if (Input_Context) 1610 if (Input_Context)
1579 return; 1611 return;
1580 1612
1581#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE) 1613#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1582 if (rs[Rs_imLocale]) 1614 if (rs[Rs_imLocale])
1624 SET_LOCALE (locale); 1656 SET_LOCALE (locale);
1625#endif 1657#endif
1626} 1658}
1627 1659
1628void 1660void
1629rxvt_term::IMSetStatusPosition () 1661rxvt_term::IMSetPosition ()
1630{ 1662{
1631 XRectangle preedit_rect, status_rect, *needed_rect; 1663 XRectangle preedit_rect, status_rect, *needed_rect;
1632 XVaNestedList preedit_attr, status_attr; 1664 XVaNestedList preedit_attr, status_attr;
1633 1665
1634 if (!Input_Context 1666 if (!Input_Context
1635 || !focus 1667 || !focus
1636 || !(input_style & XIMPreeditArea) 1668 || !(input_style & (XIMPreeditArea | XIMPreeditPosition))
1637 || !IMisRunning ()) 1669 || !IMisRunning ())
1638 return; 1670 return;
1639 1671
1672 if (input_style & XIMPreeditPosition)
1673 {
1674 im_set_size (preedit_rect);
1675 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);
1676
1677 XSetICValues (Input_Context,
1678 XNPreeditAttributes, preedit_attr, NULL);
1679 }
1680 else
1681 {
1640 /* Getting the necessary width of preedit area */ 1682 /* Getting the necessary width of preedit area */
1641 status_attr = XVaCreateNestedList (0, XNAreaNeeded, &needed_rect, NULL); 1683 status_attr = XVaCreateNestedList (0, XNAreaNeeded, &needed_rect, NULL);
1642 XGetICValues (Input_Context, XNStatusAttributes, status_attr, NULL); 1684 XGetICValues (Input_Context, XNStatusAttributes, status_attr, NULL);
1643 XFree (status_attr); 1685 XFree (status_attr);
1644 1686
1645 im_set_preedit_area (preedit_rect, status_rect, *needed_rect); 1687 im_set_preedit_area (preedit_rect, status_rect, *needed_rect);
1646 XFree (needed_rect); 1688 XFree (needed_rect);
1647 1689
1648 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL); 1690 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);
1649 status_attr = XVaCreateNestedList (0, XNArea, &status_rect, NULL); 1691 status_attr = XVaCreateNestedList (0, XNArea, &status_rect, NULL);
1650 1692
1651 XSetICValues (Input_Context, 1693 XSetICValues (Input_Context,
1652 XNPreeditAttributes, preedit_attr, 1694 XNPreeditAttributes, preedit_attr,
1653 XNStatusAttributes, status_attr, NULL); 1695 XNStatusAttributes, status_attr,
1696 NULL);
1654 1697
1698 XFree (status_attr);
1699 }
1700
1655 XFree (preedit_attr); 1701 XFree (preedit_attr);
1656 XFree (status_attr);
1657} 1702}
1658#endif /* USE_XIM */ 1703#endif /* USE_XIM */
1659 1704
1660/*----------------------------------------------------------------------*/ 1705void
1661rxvt_t rxvt_current_term; 1706rxvt_term::get_window_origin (int &x, int &y)
1707{
1708 Window cr;
1709 XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr);
1710/* fprintf( stderr, "origin is %+d%+d\n", x, y);*/
1711}
1712
1713Pixmap
1714rxvt_term::get_pixmap_property (int prop_id)
1715{
1716 if (prop_id > 0 && prop_id < NUM_XA)
1717 if (xa[prop_id])
1718 {
1719 int aformat;
1720 unsigned long nitems, bytes_after;
1721 Atom atype;
1722 unsigned char *prop = NULL;
1723 int result = XGetWindowProperty (dpy, display->root, xa[prop_id],
1724 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1725 &nitems, &bytes_after, &prop);
1726 if (result == Success && prop && atype == XA_PIXMAP)
1727 {
1728 return *(Pixmap *)prop;
1729 }
1730 }
1731 return None;
1732}
1733
1734#ifdef HAVE_BG_PIXMAP
1735int
1736rxvt_term::update_background ()
1737{
1738 bgPixmap.invalidate();
1739
1740 /* no chance of real time refresh if we are blurring ! */
1741 if (bgPixmap.invalid_since + 0.5 < NOW && !(bgPixmap.flags & bgPixmap_t::blurNeeded))
1742 bgPixmap.render();
1743 else
1744 {
1745 update_background_ev.stop ();
1746 if (!bgPixmap.need_client_side_rendering())
1747 update_background_ev.start (NOW + .05);
1748 else if (bgPixmap.flags & bgPixmap_t::blurNeeded)
1749 update_background_ev.start (NOW + .2); /* very slow !!! */
1750 else
1751 update_background_ev.start (NOW + .07);
1752 }
1753 return 0;
1754}
1755
1756void
1757rxvt_term::update_background_cb (time_watcher &w)
1758{
1759 bgPixmap.render ();
1760}
1761
1762#endif /* HAVE_BG_PIXMAP */
1662 1763
1663/*----------------------- end-of-file (C source) -----------------------*/ 1764/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines