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

Diff Legend

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