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.185 by root, Tue Jan 17 15:17:39 2006 UTC vs.
Revision 1.309 by root, Wed Feb 27 01:02:33 2008 UTC

1/*--------------------------------*-C-*---------------------------------* 1/*----------------------------------------------------------------------*
2 * File: main.C 2 * File: main.C
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * 4 *
5 * All portions of code are copyright by their respective author/s. 5 * All portions of code are copyright by their respective author/s.
6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk> 6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk>
… …
11 * Copyright (c) 1997 mj olesen <olesen@me.QueensU.CA> 11 * Copyright (c) 1997 mj olesen <olesen@me.QueensU.CA>
12 * - extensive modifications 12 * - extensive modifications
13 * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de> 13 * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de>
14 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com> 14 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com>
15 * - extensive modifications 15 * - extensive modifications
16 * Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com> 16 * Copyright (c) 2003-2008 Marc Lehmann <pcg@goof.com>
17 * 17 *
18 * This program is free software; you can redistribute it and/or modify 18 * This program is free software; you can redistribute it and/or modify
19 * it under the terms of the GNU General Public License as published by 19 * it under the terms of the GNU General Public License as published by
20 * the Free Software Foundation; either version 2 of the License, or 20 * the Free Software Foundation; either version 2 of the License, or
21 * (at your option) any later version. 21 * (at your option) any later version.
… …
38#include <limits> 38#include <limits>
39 39
40#include <csignal> 40#include <csignal>
41#include <cstring> 41#include <cstring>
42 42
43#ifdef TTY_GID_SUPPORT
44# include <grp.h>
45#endif
46
47#ifdef HAVE_TERMIOS_H
48# include <termios.h> 43#include <termios.h>
44
45#ifdef HAVE_XSETLOCALE
46# define X_LOCALE
47# include <X11/Xlocale.h>
48#else
49# ifdef HAVE_SETLOCALE
50# include <clocale>
49#endif 51# endif
50
51#if (defined(HAVE_SETEUID) || defined(HAVE_SETREUID)) && !defined(__CYGWIN32__)
52static uid_t saved_euid;
53static gid_t saved_egid;
54#endif 52#endif
53
54vector<rxvt_term *> rxvt_term::termlist;
55
56// used to tell global functions which terminal instance is "active"
57rxvt_t rxvt_current_term;
58
59static char curlocale[128], savelocale[128];
55 60
56bool 61bool
57rxvt_tainted ()
58{
59#if (defined(HAVE_SETEUID) || defined(HAVE_SETREUID)) && !defined(__CYGWIN32__)
60 return getuid () != saved_euid || getgid () != saved_egid;
61#else
62 return false;
63#endif
64}
65
66vector<rxvt_term *> rxvt_term::termlist;
67
68static char curlocale[128], savelocale[128];
69
70bool
71rxvt_set_locale (const char *locale) 62rxvt_set_locale (const char *locale) NOTHROW
72{ 63{
64 int size = strlen (locale) + 1;
65
66 if (size > sizeof (curlocale))
67 rxvt_fatal ("locale string too long, aborting.\n");
68
73 if (!locale || !strncmp (locale, curlocale, 128)) 69 if (!locale || !memcmp (locale, curlocale, size))
74 return false; 70 return false;
75 71
76 strncpy (curlocale, locale, 128); 72 memcpy (curlocale, locale, size);
77 setlocale (LC_CTYPE, curlocale); 73 setlocale (LC_CTYPE, curlocale);
78 return true; 74 return true;
79} 75}
80 76
81void 77void
82rxvt_push_locale (const char *locale) 78rxvt_push_locale (const char *locale) NOTHROW
83{ 79{
84 strcpy (savelocale, curlocale); 80 strcpy (savelocale, curlocale);
85 rxvt_set_locale (locale); 81 rxvt_set_locale (locale);
86} 82}
87 83
88void 84void
89rxvt_pop_locale () 85rxvt_pop_locale () NOTHROW
90{ 86{
91 rxvt_set_locale (savelocale); 87 rxvt_set_locale (savelocale);
92} 88}
93 89
94#if ENABLE_COMBINING 90#if ENABLE_COMBINING
95class rxvt_composite_vec rxvt_composite; 91class rxvt_composite_vec rxvt_composite;
96 92
97text_t rxvt_composite_vec::compose (unicode_t c1, unicode_t c2) 93text_t rxvt_composite_vec::compose (unicode_t c1, unicode_t c2)
98{ 94{
99 compose_char *cc; 95 compose_char *cc;
100 96
101 // break compose chains, as stupid readline really likes to duplicate 97 // break compose chains, as stupid readline really likes to duplicate
102 // composing characters for some reason near the end of a line. 98 // composing characters for some reason near the end of a line.
103 cc = (*this)[c1]; 99 cc = (*this)[c1];
104 while (cc) 100 while (cc)
105 { 101 {
… …
154 150
155} 151}
156#endif 152#endif
157 153
158rxvt_term::rxvt_term () 154rxvt_term::rxvt_term ()
159 : 155{
160#if TRANSPARENT 156#if HAVE_BG_PIXMAP
161 rootwin_ev (this, &rxvt_term::rootwin_cb), 157 update_background_ev.set<rxvt_term, &rxvt_term::update_background_cb> (this);
162#endif
163#ifdef HAVE_SCROLLBARS
164 scrollbar_ev (this, &rxvt_term::x_cb),
165#endif 158#endif
166#ifdef CURSOR_BLINK 159#ifdef CURSOR_BLINK
167 cursor_blink_ev (this, &rxvt_term::cursor_blink_cb), 160 cursor_blink_ev.set <rxvt_term, &rxvt_term::cursor_blink_cb> (this); cursor_blink_ev.set (0., CURSOR_BLINK_INTERVAL);
168#endif 161#endif
169#ifdef TEXT_BLINK 162#ifdef TEXT_BLINK
170 text_blink_ev (this, &rxvt_term::text_blink_cb), 163 text_blink_ev.set <rxvt_term, &rxvt_term::text_blink_cb> (this); text_blink_ev.set (0., TEXT_BLINK_INTERVAL);
171#endif 164#endif
172#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 165#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
173 cont_scroll_ev (this, &rxvt_term::cont_scroll_cb), 166 cont_scroll_ev.set <rxvt_term, &rxvt_term::cont_scroll_cb> (this);
174#endif 167#endif
175#ifdef SELECTION_SCROLLING 168#ifdef SELECTION_SCROLLING
176 sel_scroll_ev (this, &rxvt_term::sel_scroll_cb), 169 sel_scroll_ev.set <rxvt_term, &rxvt_term::sel_scroll_cb> (this);
177#endif 170#endif
178#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 171#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
179 slip_wheel_ev (this, &rxvt_term::slip_wheel_cb), 172 slip_wheel_ev.set <rxvt_term, &rxvt_term::slip_wheel_cb> (this);
173#endif
174#if ENABLE_TRANSPARENCY || ENABLE_PERL
175 rootwin_ev.set <rxvt_term, &rxvt_term::rootwin_cb> (this),
176#endif
177 scrollbar_ev.set <rxvt_term, &rxvt_term::x_cb> (this),
178#ifdef USE_XIM
179 im_ev.set <rxvt_term, &rxvt_term::im_cb> (this),
180#endif 180#endif
181#ifdef POINTER_BLANK 181#ifdef POINTER_BLANK
182 pointer_ev (this, &rxvt_term::pointer_cb), 182 pointer_ev.set <rxvt_term, &rxvt_term::pointer_cb> (this);
183#endif 183#endif
184#ifdef USE_XIM 184#ifndef NO_BELL
185 im_ev (this, &rxvt_term::im_cb), 185 bell_ev.set <rxvt_term, &rxvt_term::bell_cb> (this);
186#endif 186#endif
187 termwin_ev (this, &rxvt_term::x_cb), 187 child_ev.set <rxvt_term, &rxvt_term::child_cb> (this);
188 vt_ev (this, &rxvt_term::x_cb), 188 flush_ev.set <rxvt_term, &rxvt_term::flush_cb> (this);
189 check_ev (this, &rxvt_term::check_cb), 189 destroy_ev.set <rxvt_term, &rxvt_term::destroy_cb> (this);
190 flush_ev (this, &rxvt_term::flush_cb), 190 pty_ev.set <rxvt_term, &rxvt_term::pty_cb> (this);
191 destroy_ev (this, &rxvt_term::destroy_cb), 191 incr_ev.set <rxvt_term, &rxvt_term::incr_cb> (this);
192 pty_ev (this, &rxvt_term::pty_cb), 192 termwin_ev.set <rxvt_term, &rxvt_term::x_cb> (this);
193 incr_ev (this, &rxvt_term::incr_cb) 193 vt_ev.set <rxvt_term, &rxvt_term::x_cb> (this);
194{ 194
195 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base; 195 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base;
196 196
197 termlist.push_back (this); 197 termlist.push_back (this);
198 198
199#ifdef KEYSYM_RESOURCE 199#ifdef KEYSYM_RESOURCE
200 keyboard = new keyboard_manager; 200 keyboard = new keyboard_manager;
201
202 if (!keyboard)
203 rxvt_fatal ("out of memory, aborting.\n");
204#endif 201#endif
205} 202}
206 203
207// 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.
208// for use before an emergency exit 205// for use before an emergency exit
206void
209void rxvt_term::emergency_cleanup () 207rxvt_term::emergency_cleanup ()
210{ 208{
211 if (cmd_pid) 209 if (cmd_pid)
212 kill (-cmd_pid, SIGHUP); 210 kill (-cmd_pid, SIGHUP);
213 211
214#ifdef UTMP_SUPPORT 212 pty_ev.stop ();
215 privileged_utmp (RESTORE);
216#endif
217
218 delete pty; pty = 0; 213 delete pty; pty = 0;
219} 214}
220 215
221rxvt_term::~rxvt_term () 216rxvt_term::~rxvt_term ()
222{ 217{
223 HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));
224
225 termlist.erase (find (termlist.begin (), termlist.end(), this)); 218 termlist.erase (find (termlist.begin (), termlist.end(), this));
226 219
227 emergency_cleanup (); 220 emergency_cleanup ();
228 221
229#if ENABLE_STYLES 222#if ENABLE_STYLES
… …
231 if (fontset[i] != fontset[0]) 224 if (fontset[i] != fontset[0])
232 delete fontset[i]; 225 delete fontset[i];
233#endif 226#endif
234 delete fontset[0]; 227 delete fontset[0];
235 228
229#ifdef HAVE_BG_PIXMAP
230 bgPixmap.destroy ();
231#endif
232
236 if (display) 233 if (display)
237 { 234 {
238 dDisp;
239
240 selection_clear (); 235 selection_clear ();
241 236
242#ifdef USE_XIM 237#ifdef USE_XIM
243 im_destroy (); 238 im_destroy ();
244#endif 239#endif
245#ifdef XTERM_SCROLLBAR 240 scrollBar.destroy ();
246 if (xscrollbarGC) XFreeGC (disp, xscrollbarGC);
247 if (ShadowGC) XFreeGC (disp, ShadowGC);
248#endif
249#ifdef PLAIN_SCROLLBAR
250 if (pscrollbarGC) XFreeGC (disp, pscrollbarGC);
251#endif
252#ifdef NEXT_SCROLLBAR
253 if (blackGC) XFreeGC (disp, blackGC);
254 if (whiteGC) XFreeGC (disp, whiteGC);
255 if (grayGC) XFreeGC (disp, grayGC);
256 if (darkGC) XFreeGC (disp, darkGC);
257 if (stippleGC) XFreeGC (disp, stippleGC);
258 if (dimple) XFreePixmap (disp, dimple);
259 if (upArrow) XFreePixmap (disp, upArrow);
260 if (downArrow) XFreePixmap (disp, downArrow);
261 if (upArrowHi) XFreePixmap (disp, upArrowHi);
262 if (downArrowHi) XFreePixmap (disp, downArrowHi);
263#endif
264#ifdef RXVT_SCROLLBAR
265 if (topShadowGC) XFreeGC (disp, topShadowGC);
266 if (botShadowGC) XFreeGC (disp, botShadowGC);
267 if (scrollbarGC) XFreeGC (disp, scrollbarGC);
268#endif
269 if (gc) XFreeGC (disp, gc); 241 if (gc) XFreeGC (dpy, gc);
270 242
271 delete drawable; 243 delete drawable;
272 // destroy all windows 244 // destroy all windows
273 if (parent[0]) 245 if (parent[0])
274 XDestroyWindow (disp, parent[0]); 246 XDestroyWindow (dpy, parent[0]);
275 }
276 247
277 // TODO: free pixcolours, colours should become part of rxvt_display 248 for (int i = 0; i < TOTAL_COLORS; i++)
278 delete pix_colors_focused; 249 if (ISSET_PIXCOLOR (i))
250 {
251 pix_colors_focused [i].free (this);
279#if OFF_FOCUS_FADING 252#if OFF_FOCUS_FADING
280 delete pix_colors_unfocused; 253 pix_colors_unfocused [i].free (this);
281#endif 254#endif
255 }
282 256
257 clear ();
258
259 display->flush (); /* ideally .put should do this */
283 displays.put (display); 260 displays.put (display);
261 }
284 262
285 scr_release (); 263 scr_release ();
286 264
287 /* clear all resources */ 265 /* clear all resources */
288 for (int i = 0; i < allocated.size (); i++) 266 for (int i = 0; i < allocated.size (); i++)
289 free (allocated [i]); 267 free (allocated [i]);
290 268
291 free (selection.text); 269 free (selection.text);
292 // TODO: manage env vars in child only(!) 270 // TODO: manage env vars in child only(!)
293 free (env_windowid);
294 free (env_display); 271 free (env_display);
295 free (env_term); 272 free (env_term);
296 free (env_colorfgbg);
297 free (locale); 273 free (locale);
298 free (v_buffer); 274 free (v_buffer);
299 free (incr_buf); 275 free (incr_buf);
300 276
301 delete envv; 277 delete envv;
302 delete argv; 278 delete argv;
303 279
304#ifdef KEYSYM_RESOURCE 280#ifdef KEYSYM_RESOURCE
305 delete keyboard; 281 delete keyboard;
306#endif 282#endif
283#ifndef NO_RESOURCES
284 XrmDestroyDatabase (option_db);
285#endif
307} 286}
308 287
288// child has exited, usually destroys
309void 289void
310rxvt_term::child_exit () 290rxvt_term::child_cb (ev::child &w, int status)
311{ 291{
292 HOOK_INVOKE ((this, HOOK_CHILD_EXIT, DT_INT, status, DT_END));
293
312 cmd_pid = 0; 294 cmd_pid = 0;
313 295
314 if (!OPTION (Opt_hold)) 296 if (!option (Opt_hold))
315 destroy (); 297 destroy ();
316} 298}
317 299
318void 300void
319rxvt_term::destroy () 301rxvt_term::destroy ()
320{ 302{
321 if (destroy_ev.active) 303 if (destroy_ev.is_active ())
322 return; 304 return;
305
306 HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));
323 307
324#if ENABLE_OVERLAY 308#if ENABLE_OVERLAY
325 scr_overlay_off (); 309 scr_overlay_off ();
326#endif 310#endif
327 311
328 if (display) 312 if (display)
329 { 313 {
330#if USE_XIM 314#if USE_XIM
331 im_ev.stop (display); 315 im_ev.stop (display);
332#endif 316#endif
333#if HAVE_SCROLLBARS
334 scrollbar_ev.stop (display); 317 scrollbar_ev.stop (display);
335#endif 318#if ENABLE_TRANSPARENCY || ENABLE_PERL
336#if TRANSPARENT
337 rootwin_ev.stop (display); 319 rootwin_ev.stop (display);
338#endif 320#endif
339 incr_ev.stop (); 321 incr_ev.stop ();
340 termwin_ev.stop (display); 322 termwin_ev.stop (display);
341 vt_ev.stop (display); 323 vt_ev.stop (display);
342 } 324 }
343 325
344 check_ev.stop (); 326 flush_ev.stop ();
345 pty_ev.stop (); 327 pty_ev.stop ();
346#ifdef CURSOR_BLINK 328#ifdef CURSOR_BLINK
347 cursor_blink_ev.stop (); 329 cursor_blink_ev.stop ();
348#endif 330#endif
349#ifdef TEXT_BLINK 331#ifdef TEXT_BLINK
… …
357#endif 339#endif
358#ifdef POINTER_BLANK 340#ifdef POINTER_BLANK
359 pointer_ev.stop (); 341 pointer_ev.stop ();
360#endif 342#endif
361 343
362 destroy_ev.start (0); 344 destroy_ev.start ();
363} 345}
364 346
365void 347void
366rxvt_term::destroy_cb (time_watcher &w) 348rxvt_term::destroy_cb (ev::idle &w, int revents)
367{ 349{
368 make_current (); 350 make_current ();
369 351
370 delete this; 352 delete this;
371} 353}
… …
382{ 364{
383 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++) 365 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)
384 (*t)->emergency_cleanup (); 366 (*t)->emergency_cleanup ();
385} 367}
386 368
387#if ENABLE_FRILLS 369#if !ENABLE_MINIMAL
388static void 370static void
389print_x_error (Display *dpy, XErrorEvent *event) 371print_x_error (Display *dpy, XErrorEvent *event)
390{ 372{
391 char buffer[BUFSIZ]; 373 char buffer[BUFSIZ];
392 char mesg[BUFSIZ]; 374 char mesg[BUFSIZ];
… …
425 else 407 else
426 XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x", 408 XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x",
427 mesg, BUFSIZ); 409 mesg, BUFSIZ);
428 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid); 410 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid);
429 } 411 }
430 XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d", 412 XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d",
431 mesg, BUFSIZ); 413 mesg, BUFSIZ);
432 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial); 414 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial);
433} 415}
434#endif 416#endif
435 417
… …
440 GET_R->allowedxerror = event->error_code; 422 GET_R->allowedxerror = event->error_code;
441 else 423 else
442 { 424 {
443 // GET_R is most likely not the terminal which caused the error, 425 // GET_R is most likely not the terminal which caused the error,
444 // so just output the error and continue 426 // so just output the error and continue
445#if ENABLE_FRILLS 427#if ENABLE_MINIMAL
428 old_xerror_handler (display, event);
429#else
446 print_x_error (display, event); 430 print_x_error (display, event);
447#else
448 old_xerror_handler (display, event);
449#endif 431#endif
450 } 432 }
451 433
452 return 0; 434 return 0;
453} 435}
… …
459 DisplayString (display)); 441 DisplayString (display));
460 rxvt_emergency_cleanup (); 442 rxvt_emergency_cleanup ();
461 _exit (EXIT_FAILURE); 443 _exit (EXIT_FAILURE);
462} 444}
463 445
464/*----------------------------------------------------------------------*/
465bool
466rxvt_term::init (int argc, const char *const *argv)
467{
468 SET_R (this);
469 set_locale ("");
470 set_environ (envv); // few things in X do not call setlocale :(
471
472 if (!init_vars ())
473 return false;
474
475 init_secondary ();
476
477 const char **cmd_argv = init_resources (argc, argv);
478
479#ifdef KEYSYM_RESOURCE
480 keyboard->register_done ();
481#endif
482
483#ifdef HAVE_SCROLLBARS
484 if (OPTION (Opt_scrollBar))
485 scrollBar.setIdle (); /* set existence for size calculations */
486#endif
487
488#if ENABLE_PERL
489 if (!rs[Rs_perl_ext_1])
490 rs[Rs_perl_ext_1] = "default";
491
492 if ((rs[Rs_perl_ext_1] && *rs[Rs_perl_ext_1])
493 || (rs[Rs_perl_ext_2] && *rs[Rs_perl_ext_2])
494 || (rs[Rs_perl_eval] && *rs[Rs_perl_eval]))
495 {
496#if (defined(HAVE_SETEUID) || defined(HAVE_SETREUID)) && !defined(__CYGWIN32__)
497 // ignore some perl-related arguments if some bozo installed us set[ug]id
498 if (rxvt_tainted ())
499 {
500 if ((rs[Rs_perl_lib] && *rs[Rs_perl_lib])
501 || (rs[Rs_perl_eval] && *rs[Rs_perl_eval]))
502 {
503 rxvt_warn ("running with elevated privileges: ignoring perl-lib and perl-eval.\n");
504 rs[Rs_perl_lib] = 0;
505 rs[Rs_perl_eval] = 0;
506 }
507 }
508#endif
509 rxvt_perl.init (this);
510 HOOK_INVOKE ((this, HOOK_INIT, DT_END));
511 }
512#endif
513
514 pty = rxvt_new_ptytty ();
515
516 create_windows (argc, argv);
517
518 dDisp;
519
520 init_xlocale ();
521
522 scr_reset (); // initialize screen
523
524#if 0
525 XSynchronize (disp, True);
526#endif
527
528#ifdef HAVE_SCROLLBARS
529 if (OPTION (Opt_scrollBar))
530 resize_scrollbar (); /* create and map scrollbar */
531#endif
532#ifdef TRANSPARENT
533 if (OPTION (Opt_transparent))
534 {
535 XSelectInput (disp, display->root, PropertyChangeMask);
536 check_our_parents ();
537 rootwin_ev.start (display, display->root);
538 }
539#endif
540
541 XMapWindow (disp, vt);
542 XMapWindow (disp, parent[0]);
543
544 set_colorfgbg ();
545
546 init_command (cmd_argv);
547
548 free (cmd_argv);
549
550 if (pty->pty >= 0)
551 pty_ev.start (pty->pty, EVENT_READ);
552
553 check_ev.start ();
554
555 HOOK_INVOKE ((this, HOOK_START, DT_END));
556
557 return true;
558}
559
560static struct sig_handlers 446static struct sig_handlers
561{ 447{
562 sig_watcher sw_chld, sw_term, sw_int; 448 ev::sig sw_term, sw_int;
563
564 void sig_chld (sig_watcher &w)
565 {
566 // we are being called for every SIGCHLD, find the corresponding term
567 int pid;
568
569 while ((pid = waitpid (-1, NULL, WNOHANG)) > 0)
570 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)
571 if (pid == (*t)->cmd_pid)
572 {
573 (*t)->child_exit ();
574 break;
575 }
576 }
577 449
578 /* 450 /*
579 * Catch a fatal signal and tidy up before quitting 451 * Catch a fatal signal and tidy up before quitting
580 */ 452 */
581 void 453 void sig_term (ev::sig &w, int revents);
582 sig_term (sig_watcher &w) 454
455 sig_handlers ()
583 { 456 {
584#ifdef DEBUG_CMD
585 rxvt_warn ("caught signal %d, exiting.\n", w.signum);
586#endif
587 rxvt_emergency_cleanup ();
588 signal (w.signum, SIG_DFL);
589 kill (getpid (), w.signum);
590 }
591
592 sig_handlers ()
593 : sw_chld (this, &sig_handlers::sig_chld),
594 sw_term (this, &sig_handlers::sig_term), 457 sw_term.set<sig_handlers, &sig_handlers::sig_term> (this);
595 sw_int (this, &sig_handlers::sig_term) 458 sw_int .set<sig_handlers, &sig_handlers::sig_term> (this);
596 {
597 } 459 }
598} sig_handlers; 460} sig_handlers;
599 461
462void
463sig_handlers::sig_term (ev::sig &w, int revents)
464{
465 rxvt_emergency_cleanup ();
466 w.stop ();
467 kill (getpid (), w.signum);
468}
469
600char **rxvt_environ; // startup environment 470char **rxvt_environ; // startup environment
601 471
602void 472void
603rxvt_init () 473rxvt_init ()
604{ 474{
475 ptytty::init ();
476
477 if (!ev_default_loop (0))
478 rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n");
479
605 rxvt_environ = environ; 480 rxvt_environ = environ;
606
607 /*
608 * Save and then give up any super-user privileges
609 * If we need privileges in any area then we must specifically request it.
610 * We should only need to be root in these cases:
611 * 1. write utmp entries on some systems
612 * 2. chown tty on some systems
613 */
614 rxvt_privileges (SAVE);
615 rxvt_privileges (IGNORE);
616 481
617 signal (SIGHUP, SIG_IGN); 482 signal (SIGHUP, SIG_IGN);
618 signal (SIGPIPE, SIG_IGN); 483 signal (SIGPIPE, SIG_IGN);
619 484
620 sig_handlers.sw_chld.start (SIGCHLD);
621 sig_handlers.sw_term.start (SIGTERM); 485 sig_handlers.sw_term.start (SIGTERM); ev_unref ();
622 sig_handlers.sw_int.start (SIGINT); 486 sig_handlers.sw_int.start (SIGINT); ev_unref ();
623 487
624 /* need to trap SIGURG for SVR4 (Unixware) rlogin */ 488 /* need to trap SIGURG for SVR4 (Unixware) rlogin */
625 /* signal (SIGURG, SIG_DFL); */ 489 /* signal (SIGURG, SIG_DFL); */
626 490
627 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); 491 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
… …
629 XSetIOErrorHandler (rxvt_xioerror_handler); 493 XSetIOErrorHandler (rxvt_xioerror_handler);
630 494
631 XrmInitialize (); 495 XrmInitialize ();
632} 496}
633 497
634/* ------------------------------------------------------------------------- *
635 * MEMORY ALLOCATION WRAPPERS *
636 * ------------------------------------------------------------------------- */
637void *
638rxvt_malloc (size_t size)
639{
640 void *p = malloc (size);
641
642 if (!p)
643 rxvt_fatal ("memory allocation failure. aborting.\n");
644
645 return p;
646}
647
648void *
649rxvt_calloc (size_t number, size_t size)
650{
651 void *p = calloc (number, size);
652
653 if (!p)
654 rxvt_fatal ("memory allocation failure. aborting.\n");
655
656 return p;
657}
658
659void *
660rxvt_realloc (void *ptr, size_t size)
661{
662 void *p = realloc (ptr, size);
663
664 if (!p)
665 rxvt_fatal ("memory allocation failure. aborting.\n");
666
667 return p;
668}
669
670/* ------------------------------------------------------------------------- *
671 * PRIVILEGED OPERATIONS *
672 * ------------------------------------------------------------------------- */
673/* take care of suid/sgid super-user (root) privileges */
674void
675rxvt_privileges (rxvt_privaction action)
676{
677#if ! defined(__CYGWIN32__)
678# if !defined(HAVE_SETEUID) && defined(HAVE_SETREUID)
679 /* setreuid () is the poor man's setuid (), seteuid () */
680# define seteuid(a) setreuid(-1, (a))
681# define setegid(a) setregid(-1, (a))
682# define HAVE_SETEUID
683# endif
684# ifdef HAVE_SETEUID
685 switch (action)
686 {
687 case IGNORE:
688 /*
689 * change effective uid/gid - not real uid/gid - so we can switch
690 * back to root later, as required
691 */
692 setegid (getgid ());
693 seteuid (getuid ());
694 break;
695 case SAVE:
696 saved_egid = getegid ();
697 saved_euid = geteuid ();
698 break;
699 case RESTORE:
700 setegid (saved_egid);
701 seteuid (saved_euid);
702 break;
703 }
704# else
705 switch (action)
706 {
707 case IGNORE:
708 setgid (getgid ());
709 setuid (getuid ());
710 /* FALLTHROUGH */
711 case SAVE:
712 /* FALLTHROUGH */
713 case RESTORE:
714 break;
715 }
716# endif
717#endif
718}
719
720/*----------------------------------------------------------------------*/ 498/*----------------------------------------------------------------------*/
721/* 499/*
722 * window size/position calculcations for XSizeHint and other storage. 500 * window size/position calculations for XSizeHint and other storage.
723 * if width/height are non-zero then override calculated width/height 501 * if width/height are non-zero then override calculated width/height
724 */ 502 */
725void 503void
726rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight) 504rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
727{ 505{
728 short recalc_x, recalc_y; 506 short recalc_x, recalc_y;
729 int x, y, sb_w, flags; 507 int x, y, flags;
730 unsigned int w, h; 508 unsigned int w, h;
731 unsigned int max_width, max_height; 509 unsigned int max_width, max_height;
732 dDisp;
733
734 D_SIZE ((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
735 ncol, nrow, szHint.width, szHint.height));
736 510
737 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity; 511 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity;
738 szHint.win_gravity = NorthWestGravity; 512 szHint.win_gravity = NorthWestGravity;
739 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */ 513 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */
740 514
… …
785 szHint.win_gravity = SouthEastGravity; 559 szHint.win_gravity = SouthEastGravity;
786 else 560 else
787 szHint.win_gravity = SouthWestGravity; 561 szHint.win_gravity = SouthWestGravity;
788 } 562 }
789 } 563 }
564
565 if (!szHint.width || !szHint.height)
566 rxvt_fatal ("window width or height must not be zero, aborting.\n");
790 } 567 }
791 568
792 /* TODO: BOUNDS */ 569 /* TODO: BOUNDS */
793 width = ncol * fwidth; 570 width = ncol * fwidth;
794 height = nrow * fheight; 571 height = nrow * fheight;
795 max_width = MAX_COLS * fwidth; 572 max_width = MAX_COLS * fwidth;
796 max_height = MAX_ROWS * fheight; 573 max_height = MAX_ROWS * fheight;
797 574
798 szHint.base_width = szHint.base_height = 2 * int_bwidth; 575 szHint.base_width = szHint.base_height = 2 * int_bwidth;
799 576
800 sb_w = 0;
801 window_vt_x = window_vt_y = int_bwidth; 577 window_vt_x = window_vt_y = int_bwidth;
802 578
803 if (scrollBar.state) 579 if (scrollBar.state)
804 { 580 {
805 sb_w = scrollbar_TotalWidth (); 581 int sb_w = scrollBar.total_width ();
806 szHint.base_width += sb_w; 582 szHint.base_width += sb_w;
583
807 if (!OPTION (Opt_scrollBar_right)) 584 if (!option (Opt_scrollBar_right))
808 window_vt_x += sb_w; 585 window_vt_x += sb_w;
809 } 586 }
810 587
811 szHint.width_inc = fwidth; 588 szHint.width_inc = fwidth;
812 szHint.height_inc = fheight; 589 szHint.height_inc = fheight;
813 szHint.min_width = szHint.base_width + szHint.width_inc; 590 szHint.min_width = szHint.base_width + szHint.width_inc;
814 szHint.min_height = szHint.base_height + szHint.height_inc; 591 szHint.min_height = szHint.base_height + szHint.height_inc;
815 592
816 if (newwidth && newwidth - szHint.base_width < max_width) 593 if (newwidth && newwidth - szHint.base_width < max_width)
817 { 594 {
818 szHint.width = newwidth; 595 szHint.width = newwidth;
… …
833 { 610 {
834 min_it (height, max_height); 611 min_it (height, max_height);
835 szHint.height = szHint.base_height + height; 612 szHint.height = szHint.base_height + height;
836 } 613 }
837 614
838 if (scrollBar.state && OPTION (Opt_scrollBar_right))
839 window_sb_x = szHint.width - sb_w;
840
841 if (recalc_x) 615 if (recalc_x)
842 szHint.x += DisplayWidth (disp, display->screen) - szHint.width - 2 * ext_bwidth; 616 szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth;
617
843 if (recalc_y) 618 if (recalc_y)
844 szHint.y += DisplayHeight (disp, display->screen) - szHint.height - 2 * ext_bwidth; 619 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth;
845 620
846 ncol = width / fwidth; 621 ncol = width / fwidth;
847 nrow = height / fheight; 622 nrow = height / fheight;
848 D_SIZE ((stderr, "> Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
849 ncol, nrow, szHint.width,
850 szHint.height));
851 return;
852} 623}
853 624
854/*----------------------------------------------------------------------*/ 625/*----------------------------------------------------------------------*/
855/* 626/*
856 * Tell the teletype handler what size the window is. 627 * Tell the teletype handler what size the window is.
… …
869 ws.ws_xpixel = width; 640 ws.ws_xpixel = width;
870 ws.ws_ypixel = height; 641 ws.ws_ypixel = height;
871 (void)ioctl (pty->pty, TIOCSWINSZ, &ws); 642 (void)ioctl (pty->pty, TIOCSWINSZ, &ws);
872 643
873#if 0 644#if 0
874 // TIOCSWINSZ⎈ is supposed to do this automatically and correctly 645 // TIOCSWINSZ is supposed to do this automatically and correctly
875 if (cmd_pid) /* force through to the command */ 646 if (cmd_pid) /* force through to the command */
876 kill (-cmd_pid, SIGWINCH); 647 kill (-cmd_pid, SIGWINCH);
877#endif 648#endif
878} 649}
879 650
… …
908 delete fontset[0]; 679 delete fontset[0];
909 fontset[0] = fs; 680 fontset[0] = fs;
910 681
911 prop = (*fs)[1]->properties (); 682 prop = (*fs)[1]->properties ();
912 prop.height += lineSpace; 683 prop.height += lineSpace;
684
913 fs->set_prop (prop); 685 fs->set_prop (prop, false);
914 686
915 fwidth = prop.width; 687 fwidth = prop.width;
916 fheight = prop.height; 688 fheight = prop.height;
917 fbase = prop.ascent; 689 fbase = prop.ascent;
918 690
… …
927 { 699 {
928 fontset[style] = fs = new rxvt_fontset (this); 700 fontset[style] = fs = new rxvt_fontset (this);
929 rxvt_fontprop prop2 = prop; 701 rxvt_fontprop prop2 = prop;
930 702
931 if (res) 703 if (res)
932 prop2.weight = prop2.slant = rxvt_fontprop::unset; 704 {
705 fs->populate (res);
706 fs->set_prop (prop2, false);
707 }
933 else 708 else
934 { 709 {
935 res = fontset[0]->fontdesc; 710 fs->populate (fontset[0]->fontdesc);
936 711
937 if (SET_STYLE (0, style) & RS_Bold) prop2.weight = rxvt_fontprop::bold; 712 if (SET_STYLE (0, style) & RS_Bold) prop2.weight = rxvt_fontprop::bold;
938 if (SET_STYLE (0, style) & RS_Italic) prop2.slant = rxvt_fontprop::italic; 713 if (SET_STYLE (0, style) & RS_Italic) prop2.slant = rxvt_fontprop::italic;
714
715 fs->set_prop (prop2, true);
939 } 716 }
940 717
941 fs->populate (res);
942 fs->set_prop (prop2);
943 } 718 }
944#else 719#else
945 fontset[style] = fontset[0]; 720 fontset[style] = fontset[0];
946#endif 721#endif
947 } 722 }
… …
949 if (parent[0]) 724 if (parent[0])
950 { 725 {
951 resize_all_windows (0, 0, 0); 726 resize_all_windows (0, 0, 0);
952 scr_remap_chars (); 727 scr_remap_chars ();
953 scr_touch (true); 728 scr_touch (true);
954 } 729 }
955 730
956 return true; 731 return true;
957} 732}
958 733
734void
959void rxvt_term::set_string_property (Atom prop, const char *str, int len) 735rxvt_term::set_string_property (Atom prop, const char *str, int len)
960{ 736{
961 XChangeProperty (display->display, parent[0], 737 XChangeProperty (dpy, parent[0],
962 prop, XA_STRING, 8, PropModeReplace, 738 prop, XA_STRING, 8, PropModeReplace,
963 (const unsigned char *)str, len >= 0 ? len : strlen (str)); 739 (const unsigned char *)str, len >= 0 ? len : strlen (str));
964} 740}
965 741
742void
966void rxvt_term::set_utf8_property (Atom prop, const char *str, int len) 743rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
967{ 744{
968 wchar_t *ws = rxvt_mbstowcs (str, len); 745 wchar_t *ws = rxvt_mbstowcs (str, len);
969 char *s = rxvt_wcstoutf8 (ws); 746 char *s = rxvt_wcstoutf8 (ws);
970 747
971 XChangeProperty (display->display, parent[0], 748 XChangeProperty (dpy, parent[0],
972 prop, xa[XA_UTF8_STRING], 8, PropModeReplace, 749 prop, xa[XA_UTF8_STRING], 8, PropModeReplace,
973 (const unsigned char *)s, strlen (s)); 750 (const unsigned char *)s, strlen (s));
974 751
975 free (s); 752 free (s);
976 free (ws); 753 free (ws);
… …
995#if ENABLE_EWMH 772#if ENABLE_EWMH
996 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str); 773 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str);
997#endif 774#endif
998} 775}
999 776
777void
778rxvt_term::set_window_color (int idx, const char *color)
779{
1000#ifdef XTERM_COLOR_CHANGE 780#ifdef XTERM_COLOR_CHANGE
1001void
1002rxvt_term::set_window_color (int idx, const char *color)
1003{
1004 rxvt_color xcol; 781 rxvt_color xcol;
1005 int i;
1006 782
1007 if (color == NULL || *color == '\0') 783 if (color == NULL || *color == '\0')
1008 return; 784 return;
1009 785
786 color = strdup (color);
787 allocated.push_back ((void *)color);
788 rs[Rs_color + idx] = color;
789
1010 /* handle color aliases */ 790 /* handle color aliases */
1011 if (isdigit (*color)) 791 if (isdigit (*color))
1012 { 792 {
1013 i = atoi (color); 793 int i = atoi (color);
1014 794
1015 if (i >= 8 && i <= 15) 795 if (i >= 8 && i <= 15)
796 {
1016 { /* bright colors */ 797 /* bright colors */
1017 i -= 8;
1018 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i]; 798 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i - 8];
1019 SET_PIXCOLOR (idx);
1020 goto done; 799 goto done;
1021 } 800 }
1022 801
1023 if (i >= 0 && i <= 7) 802 if (i >= 0 && i <= 7)
803 {
1024 { /* normal colors */ 804 /* normal colors */
1025 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i]; 805 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];
1026 SET_PIXCOLOR (idx);
1027 goto done; 806 goto done;
1028 } 807 }
1029 } 808 }
1030 809
1031 if (!rXParseAllocColor (&xcol, color)) 810 set_color (xcol, color);
1032 return;
1033
1034 /* XStoreColor (display->display, display->cmap, XColor*); */
1035 811
1036 /* 812 /*
1037 * FIXME: should free colors here, but no idea how to do it so instead, 813 * FIXME: should free colors here, but no idea how to do it so instead,
1038 * so just keep gobbling up the colormap 814 * so just keep gobbling up the colormap
1039 */ 815 */
1040# if 0
1041 for (i = Color_Black; i <= Color_White; i++)
1042 if (pix_colors[idx] == pix_colors[i])
1043 break;
1044 if (i > Color_White)
1045 {
1046 /* fprintf (stderr, "XFreeColors: pix_colors [%d] = %lu\n", idx, pix_colors [idx]); */
1047 XFreeColors (display->display, display->cmap, (pix_colors + idx), 1,
1048 DisplayPlanes (display->display, display->screen));
1049 }
1050# endif
1051 816
1052 pix_colors_focused[idx] = xcol; 817 pix_colors_focused[idx] = xcol;
1053 SET_PIXCOLOR (idx);
1054 818
1055 /* XSetWindowAttributes attr; */
1056 /* Cursor cursor; */
1057done: 819done:
1058
1059#if OFF_FOCUS_FADING
1060 if (rs[Rs_fade])
1061 pix_colors_unfocused[idx] = pix_colors_focused[idx].fade (display, atoi (rs[Rs_fade]), pix_colors[Color_fade]);
1062#endif
1063
1064 /*TODO: handle Color_BD, scrollbar background, etc. */ 820 /*TODO: handle Color_BD, scrollbar background, etc. */
1065 821
822 update_fade_color (idx);
1066 recolour_cursor (); 823 recolour_cursor ();
1067 scr_recolour (); 824 scr_recolour ();
825#endif /* XTERM_COLOR_CHANGE */
1068} 826}
1069
1070#else
1071# define set_window_color (idx,color) ((void)0)
1072#endif /* XTERM_COLOR_CHANGE */
1073 827
1074void 828void
1075rxvt_term::recolour_cursor () 829rxvt_term::recolour_cursor ()
1076{ 830{
1077 XColor xcol[2]; 831 XColor fg, bg;
1078 832
1079 xcol[0].pixel = ISSET_PIXCOLOR (Color_pointer_fg) 833 (ISSET_PIXCOLOR (Color_pointer_fg)
1080 ? pix_colors_focused[Color_pointer_fg] 834 ? pix_colors_focused[Color_pointer_fg]
1081 : pix_colors_focused[Color_fg]; 835 : pix_colors_focused[Color_fg]).get (fg);
836
1082 xcol[1].pixel = ISSET_PIXCOLOR (Color_pointer_bg) 837 (ISSET_PIXCOLOR (Color_pointer_bg)
1083 ? pix_colors_focused[Color_pointer_bg] 838 ? pix_colors_focused[Color_pointer_bg]
1084 : pix_colors_focused[Color_bg]; 839 : pix_colors_focused[Color_bg]).get (bg);
1085 840
1086 XQueryColors (display->display, display->cmap, xcol, 2); 841 XRecolorCursor (dpy, TermWin_cursor, &fg, &bg);
1087 XRecolorCursor (display->display, TermWin_cursor, xcol + 0, xcol + 1);
1088} 842}
1089 843
1090/*----------------------------------------------------------------------*/ 844/*----------------------------------------------------------------------*/
1091/* 845/*
1092 * find if fg/bg matches any of the normal (low-intensity) colors 846 * find if fg/bg matches any of the normal (low-intensity) colors
1093 */ 847 */
1094void 848void
1095rxvt_term::set_colorfgbg () 849rxvt_term::set_colorfgbg ()
1096{ 850{
1097 unsigned int i; 851 unsigned int i;
1098 const char *xpmb = "\0"; 852 const char *xpmb = "";
1099 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1]; 853 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1];
1100 854
1101 env_colorfgbg = (char *)rxvt_malloc (sizeof ("COLORFGBG=default;default;bg") + 1);
1102 strcpy (fstr, "default"); 855 strcpy (fstr, "default");
1103 strcpy (bstr, "default"); 856 strcpy (bstr, "default");
1104 for (i = Color_Black; i <= Color_White; i++) 857 for (i = Color_Black; i <= Color_White; i++)
1105 if (pix_colors[Color_fg] == pix_colors[i]) 858 if (pix_colors[Color_fg] == pix_colors[i])
1106 { 859 {
… …
1110 863
1111 for (i = Color_Black; i <= Color_White; i++) 864 for (i = Color_Black; i <= Color_White; i++)
1112 if (pix_colors[Color_bg] == pix_colors[i]) 865 if (pix_colors[Color_bg] == pix_colors[i])
1113 { 866 {
1114 sprintf (bstr, "%d", (i - Color_Black)); 867 sprintf (bstr, "%d", (i - Color_Black));
1115#ifdef XPM_BACKGROUND 868#ifdef BG_IMAGE_FROM_FILE
1116 xpmb = "default;"; 869 xpmb = "default;";
1117#endif 870#endif
1118 break; 871 break;
1119 } 872 }
1120 873
1121 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr); 874 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr);
1122} 875}
1123 876
1124/*----------------------------------------------------------------------*/ 877/*----------------------------------------------------------------------*/
1125 878
1126int 879bool
1127rxvt_term::rXParseAllocColor (rxvt_color *screen_in_out, const char *colour) 880rxvt_term::set_color (rxvt_color &color, const char *name)
1128{ 881{
1129 if (!screen_in_out->set (display, colour)) 882 if (color.set (this, name))
1130 {
1131 rxvt_warn ("can't get colour '%s', continuing without.\n", colour);
1132 return false;
1133 }
1134
1135 return true; 883 return true;
884
885 rxvt_warn ("can't get colour '%s', continuing without.\n", name);
886 return false;
887}
888
889void
890rxvt_term::alias_color (int dst, int src)
891{
892 pix_colors[dst].set (this, rs[Rs_color + dst] = rs[Rs_color + src]);
1136} 893}
1137 894
1138/* -------------------------------------------------------------------- * 895/* -------------------------------------------------------------------- *
1139 * - WINDOW RESIZING - * 896 * - WINDOW RESIZING - *
1140 * -------------------------------------------------------------------- */ 897 * -------------------------------------------------------------------- */
1141void 898void
1142rxvt_term::resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent) 899rxvt_term::resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent)
1143{ 900{
1144 int fix_screen; 901 int fix_screen;
1145 int old_width = szHint.width, old_height = szHint.height; 902 int old_width = szHint.width;
1146 dDisp; 903 int old_height = szHint.height;
1147 904
1148 window_calc (newwidth, newheight); 905 window_calc (newwidth, newheight);
906
907 if (!HOOK_INVOKE ((this, HOOK_RESIZE_ALL_WINDOWS, DT_INT, newwidth, DT_INT, newheight, DT_END)))
1149 XSetWMNormalHints (disp, parent[0], &szHint); 908 XSetWMNormalHints (dpy, parent[0], &szHint);
1150 909
1151 if (!ignoreparent) 910 if (!ignoreparent)
1152 { 911 {
1153#ifdef SMART_RESIZE 912#ifdef SMART_RESIZE
1154 /* 913 /*
… …
1158 int x, y, x1, y1; 917 int x, y, x1, y1;
1159 int dx, dy; 918 int dx, dy;
1160 unsigned int unused_w1, unused_h1, unused_b1, unused_d1; 919 unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
1161 Window unused_cr; 920 Window unused_cr;
1162 921
1163 XTranslateCoordinates (disp, parent[0], display->root, 922 XTranslateCoordinates (dpy, parent[0], display->root,
1164 0, 0, &x, &y, &unused_cr); 923 0, 0, &x, &y, &unused_cr);
1165 XGetGeometry (disp, parent[0], &unused_cr, &x1, &y1, 924 XGetGeometry (dpy, parent[0], &unused_cr, &x1, &y1,
1166 &unused_w1, &unused_h1, &unused_b1, &unused_d1); 925 &unused_w1, &unused_h1, &unused_b1, &unused_d1);
1167 /* 926 /*
1168 * if display->root isn't the parent window, a WM will probably have offset 927 * if display->root isn't the parent window, a WM will probably have offset
1169 * our position for handles and decorations. Counter it 928 * our position for handles and decorations. Counter it
1170 */ 929 */
… …
1172 { 931 {
1173 x -= x1; 932 x -= x1;
1174 y -= y1; 933 y -= y1;
1175 } 934 }
1176 935
1177 x1 = (DisplayWidth (disp, display->screen) - old_width) / 2; 936 x1 = (DisplayWidth (dpy, display->screen) - old_width ) / 2;
1178 y1 = (DisplayHeight (disp, display->screen) - old_height) / 2; 937 y1 = (DisplayHeight (dpy, display->screen) - old_height) / 2;
1179 dx = old_width - szHint.width; 938 dx = old_width - szHint.width;
1180 dy = old_height - szHint.height; 939 dy = old_height - szHint.height;
1181 940
1182 /* Check position of the center of the window */ 941 /* Check position of the center of the window */
1183 if (x < x1) /* left half */ 942 if (x < x1) /* left half */
1184 dx = 0; 943 dx = 0;
… …
1187 if (y < y1) /* top half */ 946 if (y < y1) /* top half */
1188 dy = 0; 947 dy = 0;
1189 else if (y == y1) /* exact center */ 948 else if (y == y1) /* exact center */
1190 dy /= 2; 949 dy /= 2;
1191 950
1192 XMoveResizeWindow (disp, parent[0], x + dx, y + dy, 951 XMoveResizeWindow (dpy, parent[0], x + dx, y + dy,
1193 szHint.width, szHint.height); 952 szHint.width, szHint.height);
1194#else 953#else
1195 XResizeWindow (disp, parent[0], szHint.width, szHint.height); 954 XResizeWindow (dpy, parent[0], szHint.width, szHint.height);
1196#endif 955#endif
1197 } 956 }
1198 957
1199 fix_screen = ncol != prev_ncol || nrow != prev_nrow; 958 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
1200 959
1201 if (fix_screen || newwidth != old_width || newheight != old_height) 960 if (fix_screen || newwidth != old_width || newheight != old_height)
1202 { 961 {
1203 if (scrollBar.state) 962 if (scrollBar.state)
1204 { 963 scrollBar.resize ();
1205 XMoveResizeWindow (disp, scrollBar.win,
1206 window_sb_x, 0,
1207 scrollbar_TotalWidth (), szHint.height);
1208 resize_scrollbar ();
1209 }
1210 964
1211 XMoveResizeWindow (disp, vt, 965 XMoveResizeWindow (dpy, vt,
1212 window_vt_x, window_vt_y, 966 window_vt_x, window_vt_y,
1213 width, height); 967 width, height);
1214 968
969#ifdef HAVE_BG_PIXMAP
970 if (bgPixmap.window_size_sensitive ())
971 update_background ();
972#endif
973
1215 scr_clear (); 974 scr_clear ();
1216#ifdef XPM_BACKGROUND
1217 resize_pixmap ();
1218#endif
1219 } 975 }
1220 976
1221 if (fix_screen || old_height == 0) 977 if (fix_screen || old_height == 0)
1222 {
1223 int curr_screen = -1;
1224 int old_ncol = prev_ncol;
1225
1226 /* scr_reset only works on the primary screen */
1227 if (old_height) /* this is not the first time through */
1228 {
1229 unsigned int ocol = ncol;
1230 ncol = prev_ncol; // save b/c scr_blank_screen_mem uses this
1231 curr_screen = scr_change_screen (PRIMARY);
1232 ncol = ocol;
1233 }
1234
1235 scr_reset (); 978 scr_reset ();
1236 979
1237 if (curr_screen >= 0) /* this is not the first time through */ 980 // TODO, with nvidia-8178, resizes kill the alpha channel, report if not fixed in newer version
1238 { 981 //scr_touch (false);
1239 scr_change_screen (curr_screen);
1240 selection_check (old_ncol != ncol ? 4 : 0);
1241 }
1242 }
1243 982
1244 old_width = szHint.width; 983#ifdef HAVE_BG_PIXMAP
1245 old_height = szHint.height; 984// TODO: this don't seem to have any effect - do we still need it ? If so - in which case exactly ?
1246 985// if (bgPixmap.pixmap)
1247#ifdef XPM_BACKGROUND
1248 if (pixmap)
1249 scr_touch (false); 986// scr_touch (false);
1250#endif 987#endif
1251 988
1252#ifdef USE_XIM 989#ifdef USE_XIM
1253 IMSetStatusPosition (); 990 IMSetPosition ();
1254#endif 991#endif
1255} 992}
1256 993
1257/* 994/*
1258 * Set the width/height of the vt window in characters. Units are pixels. 995 * Set the width/height of the vt window in characters. Units are pixels.
… …
1263{ 1000{
1264 XWindowAttributes wattr; 1001 XWindowAttributes wattr;
1265 1002
1266 if (newwidth == 0 || newheight == 0) 1003 if (newwidth == 0 || newheight == 0)
1267 { 1004 {
1268 XGetWindowAttributes (display->display, display->root, &wattr); 1005 XGetWindowAttributes (dpy, display->root, &wattr);
1269 1006
1270 if (newwidth == 0) 1007 if (newwidth == 0)
1271 newwidth = wattr.width - szHint.base_width; 1008 newwidth = wattr.width - szHint.base_width;
1272 if (newheight == 0) 1009 if (newheight == 0)
1273 newheight = wattr.height - szHint.base_height; 1010 newheight = wattr.height - szHint.base_height;
… …
1287#ifdef USE_XIM 1024#ifdef USE_XIM
1288 1025
1289void 1026void
1290rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg) 1027rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg)
1291{ 1028{
1292 fg = pix_colors[Color_fg]; 1029 fg = pix_colors [Color_fg];
1293 bg = pix_colors[Color_bg]; 1030 bg = pix_colors [Color_bg];
1294} 1031}
1295 1032
1296void 1033void
1297rxvt_term::im_set_size (XRectangle &size) 1034rxvt_term::im_set_size (XRectangle &size)
1298{ 1035{
… …
1335 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */ 1072 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */
1336 1073
1337 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */ 1074 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */
1338 *p = '\0'; 1075 *p = '\0';
1339 1076
1340 atom = XInternAtom (display->display, server, False); 1077 atom = XInternAtom (dpy, server, False);
1341 win = XGetSelectionOwner (display->display, atom); 1078 win = XGetSelectionOwner (dpy, atom);
1342 1079
1343 if (win != None) 1080 if (win != None)
1344 return True; 1081 return True;
1345 } 1082 }
1346 1083
… …
1353 XPoint nspot; 1090 XPoint nspot;
1354 XVaNestedList preedit_attr; 1091 XVaNestedList preedit_attr;
1355 1092
1356 if (!Input_Context 1093 if (!Input_Context
1357 || !focus 1094 || !focus
1358 || !(input_style & XIMPreeditPosition)) 1095 || !(input_style & (XIMPreeditPosition | XIMPreeditCallbacks)))
1359 return; 1096 return;
1360 1097
1361 im_set_position (nspot); 1098 im_set_position (nspot);
1362 1099
1363 if (nspot.x == spot.x && nspot.y == spot.y) 1100 if (nspot.x == spot.x && nspot.y == spot.y)
… …
1382 input_method = 0; 1119 input_method = 0;
1383 } 1120 }
1384 1121
1385 Input_Context = 0; 1122 Input_Context = 0;
1386} 1123}
1124
1125#ifdef ENABLE_XIM_ONTHESPOT
1126
1127static void
1128xim_preedit_start (XIC ic, XPointer client_data, XPointer call_data)
1129{
1130 ((rxvt_term *)client_data)->make_current ();
1131 HOOK_INVOKE (((rxvt_term *)client_data, HOOK_XIM_PREEDIT_START, DT_END));
1132}
1133
1134static void
1135xim_preedit_done (XIC ic, XPointer client_data, XPointer call_data)
1136{
1137 ((rxvt_term *)client_data)->make_current ();
1138 HOOK_INVOKE (((rxvt_term *)client_data, HOOK_XIM_PREEDIT_DONE, DT_END));
1139}
1140
1141static void
1142xim_preedit_draw (XIC ic, XPointer client_data, XIMPreeditDrawCallbackStruct *call_data)
1143{
1144 rxvt_term *term = (rxvt_term *)client_data;
1145 XIMText *text = call_data->text;
1146
1147 term->make_current ();
1148
1149 if (text)
1150 {
1151 void *str;
1152
1153 if (!text->encoding_is_wchar && text->string.multi_byte)
1154 {
1155 // of course, X makes it ugly again
1156 if (term->rs[Rs_imLocale])
1157 SET_LOCALE (term->rs[Rs_imLocale]);
1158
1159 str = rxvt_temp_buf ((text->length + 1) * sizeof (wchar_t));
1160 mbstowcs ((wchar_t *)str, text->string.multi_byte, text->length + 1);
1161
1162 if (term->rs[Rs_imLocale])
1163 SET_LOCALE (term->locale);
1164 }
1165 else
1166 str = (void *)text->string.wide_char;
1167
1168 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
1169 DT_INT, call_data->caret,
1170 DT_INT, call_data->chg_first,
1171 DT_INT, call_data->chg_length,
1172 DT_LCS_LEN, (void *)text->feedback, text->feedback ? (int)text->length : 0,
1173 DT_WCS_LEN, str, str ? (int)text->length : 0,
1174 DT_END));
1175 }
1176 else
1177 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
1178 DT_INT, call_data->caret,
1179 DT_INT, call_data->chg_first,
1180 DT_INT, call_data->chg_length,
1181 DT_END));
1182}
1183
1184#if 0
1185static void
1186xim_preedit_caret (XIC ic, XPointer client_data, XIMPreeditCaretCallbackStruct *call_data)
1187{
1188 ((rxvt_term *)client_data)->make_current ();
1189 HOOK_INVOKE (((rxvt_term *)client_data, HOOK_XIM_PREEDIT_CARET,
1190 DT_INT, call_data->position,
1191 DT_INT, call_data->direction,
1192 DT_INT, call_data->style,
1193 DT_END));
1194}
1195#endif
1196
1197#endif
1387 1198
1388/* 1199/*
1389 * Try to open a XIM with the current modifiers, then see if we can 1200 * Try to open a XIM with the current modifiers, then see if we can
1390 * open a suitable preedit type 1201 * open a suitable preedit type
1391 */ 1202 */
… …
1398 XRectangle rect, status_rect, needed_rect; 1209 XRectangle rect, status_rect, needed_rect;
1399 unsigned long fg, bg; 1210 unsigned long fg, bg;
1400 const char *p; 1211 const char *p;
1401 char **s; 1212 char **s;
1402 XIMStyles *xim_styles; 1213 XIMStyles *xim_styles;
1214#ifdef ENABLE_XIM_ONTHESPOT
1215 XIMCallback xcb[4];
1216#endif
1403 1217
1404 set_environ (envv); 1218 set_environ (envv);
1405 1219
1406 if (! ((p = XSetLocaleModifiers (modifiers)) && *p)) 1220 if (! ((p = XSetLocaleModifiers (modifiers)) && *p))
1407 return false; 1221 return false;
1408 1222
1409 D_MAIN ((stderr, "rxvt_IM_get_IC ()"));
1410 input_method = display->get_xim (locale, modifiers); 1223 input_method = display->get_xim (locale, modifiers);
1411 if (input_method == NULL) 1224 if (input_method == NULL)
1412 return false; 1225 return false;
1413 1226
1414 xim = input_method->xim; 1227 xim = input_method->xim;
… …
1434 s = rxvt_splitcommastring (p); 1247 s = rxvt_splitcommastring (p);
1435 1248
1436 for (i = found = 0; !found && s[i]; i++) 1249 for (i = found = 0; !found && s[i]; i++)
1437 { 1250 {
1438 if (!strcmp (s[i], "OverTheSpot")) 1251 if (!strcmp (s[i], "OverTheSpot"))
1439 input_style = (XIMPreeditPosition | XIMStatusNothing); 1252 input_style = XIMPreeditPosition | XIMStatusNothing;
1440 else if (!strcmp (s[i], "OffTheSpot")) 1253 else if (!strcmp (s[i], "OffTheSpot"))
1441 input_style = (XIMPreeditArea | XIMStatusArea); 1254 input_style = XIMPreeditArea | XIMStatusArea;
1442 else if (!strcmp (s[i], "Root")) 1255 else if (!strcmp (s[i], "Root"))
1443 input_style = (XIMPreeditNothing | XIMStatusNothing); 1256 input_style = XIMPreeditNothing | XIMStatusNothing;
1444 else if (!strcmp (s[i], "None")) 1257 else if (!strcmp (s[i], "None"))
1445 input_style = (XIMPreeditNone | XIMStatusNone); 1258 input_style = XIMPreeditNone | XIMStatusNone;
1259#ifdef ENABLE_XIM_ONTHESPOT
1260 else if (SHOULD_INVOKE (HOOK_XIM_PREEDIT_START) && !strcmp (s[i], "OnTheSpot"))
1261 input_style = XIMPreeditCallbacks | XIMStatusNothing;
1262#endif
1263 else
1264 input_style = XIMPreeditNothing | XIMStatusNothing;
1446 1265
1447 for (j = 0; j < xim_styles->count_styles; j++) 1266 for (j = 0; j < xim_styles->count_styles; j++)
1448 if (input_style == xim_styles->supported_styles[j]) 1267 if (input_style == xim_styles->supported_styles[j])
1449 { 1268 {
1450 rxvt_freecommastring (s); 1269 rxvt_freecommastring (s);
… …
1488 "*", 1307 "*",
1489 fheight, 1308 fheight,
1490 fheight + 1, fheight - 1, 1309 fheight + 1, fheight - 1,
1491 fheight - 2, fheight + 2); 1310 fheight - 2, fheight + 2);
1492 1311
1493 fs = XCreateFontSet (display->display, rs[Rs_imFont] ? rs[Rs_imFont] : pat, 1312 fs = XCreateFontSet (dpy, rs[Rs_imFont] ? rs[Rs_imFont] : pat,
1494 &missing_charset_list, &missing_charset_count, &def_string); 1313 &missing_charset_list, &missing_charset_count, &def_string);
1495 1314
1496 if (missing_charset_list) 1315 if (missing_charset_list)
1497 XFreeStringList (missing_charset_list); 1316 XFreeStringList (missing_charset_list);
1498 1317
… …
1539 XNBackground, bg, 1358 XNBackground, bg,
1540 XNArea, &status_rect, 1359 XNArea, &status_rect,
1541 XNFontSet, fs, 1360 XNFontSet, fs,
1542 NULL); 1361 NULL);
1543 } 1362 }
1363#if ENABLE_XIM_ONTHESPOT
1364 else if (input_style & XIMPreeditCallbacks)
1365 {
1366 im_set_position (spot);
1367
1368 xcb[0].client_data = (XPointer)this; xcb[0].callback = (XIMProc)xim_preedit_start;
1369 xcb[1].client_data = (XPointer)this; xcb[1].callback = (XIMProc)xim_preedit_done;
1370 xcb[2].client_data = (XPointer)this; xcb[2].callback = (XIMProc)xim_preedit_draw;
1371# if 0
1372 xcb[3].client_data = (XPointer)this; xcb[3].callback = (XIMProc)xim_preedit_caret;
1373# endif
1374
1375 preedit_attr = XVaCreateNestedList (0,
1376 XNSpotLocation, &spot,
1377 XNPreeditStartCallback, &xcb[0],
1378 XNPreeditDoneCallback , &xcb[1],
1379 XNPreeditDrawCallback , &xcb[2],
1380# if 0
1381 XNPreeditCaretCallback, &xcb[3],
1382# endif
1383 NULL);
1384 }
1385#endif
1544 1386
1545 Input_Context = XCreateIC (xim, 1387 Input_Context = XCreateIC (xim,
1546 XNInputStyle, input_style, 1388 XNInputStyle, input_style,
1547 XNClientWindow, vt, 1389 XNClientWindow, vt,
1548 XNFocusWindow, parent[0], 1390 XNFocusWindow, parent[0],
… …
1550 preedit_attr, 1392 preedit_attr,
1551 status_attr ? XNStatusAttributes : NULL, 1393 status_attr ? XNStatusAttributes : NULL,
1552 status_attr, NULL); 1394 status_attr, NULL);
1553 1395
1554 if (preedit_attr) XFree (preedit_attr); 1396 if (preedit_attr) XFree (preedit_attr);
1555 if (status_attr) XFree (status_attr); 1397 if (status_attr) XFree (status_attr);
1556 if (fs) XFreeFontSet (display->display, fs); 1398 if (fs) XFreeFontSet (dpy, fs);
1557 1399
1558 if (Input_Context == NULL) 1400 if (Input_Context == NULL)
1559 { 1401 {
1560 rxvt_warn ("failed to create input context, continuing without XIM.\n"); 1402 rxvt_warn ("failed to create input context, continuing without XIM.\n");
1561 im_destroy (); 1403 im_destroy ();
1562 return false; 1404 return false;
1563 } 1405 }
1564 1406
1565 if (input_style & XIMPreeditArea) 1407#if 0
1408 // unfortunately, only the focus window is used by XIM, hard to fix
1409 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL))
1410 vt_select_input ();
1411#endif
1412
1566 IMSetStatusPosition (); 1413 IMSetPosition ();
1567 1414
1568 D_MAIN ((stderr, "rxvt_IM_get_IC () - successful connection"));
1569 return true; 1415 return true;
1570} 1416}
1571 1417
1572void 1418void
1573rxvt_term::im_cb () 1419rxvt_term::im_cb ()
… …
1579 1425
1580 make_current (); 1426 make_current ();
1581 1427
1582 im_destroy (); 1428 im_destroy ();
1583 1429
1584 D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()"));
1585 if (Input_Context) 1430 if (Input_Context)
1586 return; 1431 return;
1587 1432
1588#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE) 1433#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1589 if (rs[Rs_imLocale]) 1434 if (rs[Rs_imLocale])
… …
1631 SET_LOCALE (locale); 1476 SET_LOCALE (locale);
1632#endif 1477#endif
1633} 1478}
1634 1479
1635void 1480void
1636rxvt_term::IMSetStatusPosition () 1481rxvt_term::IMSetPosition ()
1637{ 1482{
1638 XRectangle preedit_rect, status_rect, *needed_rect; 1483 XRectangle preedit_rect, status_rect, *needed_rect;
1639 XVaNestedList preedit_attr, status_attr; 1484 XVaNestedList preedit_attr, status_attr;
1640 1485
1641 if (!Input_Context 1486 if (!Input_Context
1642 || !focus 1487 || !focus
1643 || !(input_style & XIMPreeditArea) 1488 || !(input_style & (XIMPreeditArea | XIMPreeditPosition))
1644 || !IMisRunning ()) 1489 || !IMisRunning ())
1645 return; 1490 return;
1646 1491
1492 if (input_style & XIMPreeditPosition)
1493 {
1494 im_set_size (preedit_rect);
1495 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);
1496
1497 XSetICValues (Input_Context,
1498 XNPreeditAttributes, preedit_attr, NULL);
1499 }
1500 else
1501 {
1647 /* Getting the necessary width of preedit area */ 1502 /* Getting the necessary width of preedit area */
1648 status_attr = XVaCreateNestedList (0, XNAreaNeeded, &needed_rect, NULL); 1503 status_attr = XVaCreateNestedList (0, XNAreaNeeded, &needed_rect, NULL);
1649 XGetICValues (Input_Context, XNStatusAttributes, status_attr, NULL); 1504 XGetICValues (Input_Context, XNStatusAttributes, status_attr, NULL);
1650 XFree (status_attr); 1505 XFree (status_attr);
1651 1506
1652 im_set_preedit_area (preedit_rect, status_rect, *needed_rect); 1507 im_set_preedit_area (preedit_rect, status_rect, *needed_rect);
1653 XFree (needed_rect); 1508 XFree (needed_rect);
1654 1509
1655 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL); 1510 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);
1656 status_attr = XVaCreateNestedList (0, XNArea, &status_rect, NULL); 1511 status_attr = XVaCreateNestedList (0, XNArea, &status_rect, NULL);
1657 1512
1658 XSetICValues (Input_Context, 1513 XSetICValues (Input_Context,
1659 XNPreeditAttributes, preedit_attr, 1514 XNPreeditAttributes, preedit_attr,
1660 XNStatusAttributes, status_attr, NULL); 1515 XNStatusAttributes, status_attr,
1516 NULL);
1661 1517
1518 XFree (status_attr);
1519 }
1520
1662 XFree (preedit_attr); 1521 XFree (preedit_attr);
1663 XFree (status_attr);
1664} 1522}
1665#endif /* USE_XIM */ 1523#endif /* USE_XIM */
1666 1524
1667/*----------------------------------------------------------------------*/ 1525void
1668rxvt_t rxvt_current_term; 1526rxvt_term::get_window_origin (int &x, int &y)
1527{
1528 Window cr;
1529 XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr);
1530/* fprintf (stderr, "origin is %+d%+d\n", x, y);*/
1531}
1532
1533Pixmap
1534rxvt_term::get_pixmap_property (int prop_id)
1535{
1536 if (prop_id > 0 && prop_id < NUM_XA)
1537 if (xa[prop_id])
1538 {
1539 int aformat;
1540 unsigned long nitems, bytes_after;
1541 Atom atype;
1542 unsigned char *prop = NULL;
1543 int result = XGetWindowProperty (dpy, display->root, xa[prop_id],
1544 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1545 &nitems, &bytes_after, &prop);
1546 if (result == Success && prop && atype == XA_PIXMAP)
1547 return *(Pixmap *)prop;
1548 }
1549
1550 return None;
1551}
1552
1553#ifdef HAVE_BG_PIXMAP
1554# if TRACE_PIXMAPS
1555# undef update_background
1556void
1557rxvt_term::trace_update_background (const char *file, int line)
1558{
1559 fprintf (stderr, "%s:%d:update_background()\n", file, line);
1560 update_background ();
1561}
1562# endif
1563
1564void
1565rxvt_term::update_background ()
1566{
1567 if (update_background_ev.is_active ())
1568 return;
1569
1570 bgPixmap.invalidate ();
1571
1572 ev_tstamp to_wait = 0.5 - (ev::now () - bgPixmap.valid_since);
1573
1574 if (to_wait <= 0.)
1575 bgPixmap.render ();
1576 else
1577 update_background_ev.start (to_wait);
1578}
1579
1580void
1581rxvt_term::update_background_cb (ev::timer &w, int revents)
1582{
1583 make_current ();
1584
1585 update_background_ev.stop ();
1586 bgPixmap.render ();
1587 refresh_check ();
1588}
1589
1590#endif /* HAVE_BG_PIXMAP */
1669 1591
1670/*----------------------- end-of-file (C source) -----------------------*/ 1592/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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