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.195 by root, Sun Jan 22 00:48:13 2006 UTC vs.
Revision 1.298 by root, Sat Jan 12 22:13:46 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-2007 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
53// used to tell global functions which terminal instance is "active" 56// used to tell global functions which terminal instance is "active"
… …
56static char curlocale[128], savelocale[128]; 59static char curlocale[128], savelocale[128];
57 60
58bool 61bool
59rxvt_set_locale (const char *locale) NOTHROW 62rxvt_set_locale (const char *locale) NOTHROW
60{ 63{
64 int size = strlen (locale) + 1;
65
66 if (size > sizeof (curlocale))
67 rxvt_fatal ("locale string too long, aborting.\n");
68
61 if (!locale || !strncmp (locale, curlocale, 128)) 69 if (!locale || !memcmp (locale, curlocale, size))
62 return false; 70 return false;
63 71
64 strncpy (curlocale, locale, 128); 72 memcpy (curlocale, locale, size);
65 setlocale (LC_CTYPE, curlocale); 73 setlocale (LC_CTYPE, curlocale);
66 return true; 74 return true;
67} 75}
68 76
69void 77void
… …
83class rxvt_composite_vec rxvt_composite; 91class rxvt_composite_vec rxvt_composite;
84 92
85text_t rxvt_composite_vec::compose (unicode_t c1, unicode_t c2) 93text_t rxvt_composite_vec::compose (unicode_t c1, unicode_t c2)
86{ 94{
87 compose_char *cc; 95 compose_char *cc;
88 96
89 // break compose chains, as stupid readline really likes to duplicate 97 // break compose chains, as stupid readline really likes to duplicate
90 // composing characters for some reason near the end of a line. 98 // composing characters for some reason near the end of a line.
91 cc = (*this)[c1]; 99 cc = (*this)[c1];
92 while (cc) 100 while (cc)
93 { 101 {
… …
142 150
143} 151}
144#endif 152#endif
145 153
146rxvt_term::rxvt_term () 154rxvt_term::rxvt_term ()
147 : 155{
148#if TRANSPARENT 156#if HAVE_BG_PIXMAP
149 rootwin_ev (this, &rxvt_term::rootwin_cb), 157 update_background_ev.set<rxvt_term, &rxvt_term::update_background_cb> (this);
158#endif
159#ifdef CURSOR_BLINK
160 cursor_blink_ev.set <rxvt_term, &rxvt_term::cursor_blink_cb> (this); cursor_blink_ev.set (0., CURSOR_BLINK_INTERVAL);
161#endif
162#ifdef TEXT_BLINK
163 text_blink_ev.set <rxvt_term, &rxvt_term::text_blink_cb> (this); text_blink_ev.set (0., TEXT_BLINK_INTERVAL);
164#endif
165#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
166 cont_scroll_ev.set <rxvt_term, &rxvt_term::cont_scroll_cb> (this);
167#endif
168#ifdef SELECTION_SCROLLING
169 sel_scroll_ev.set <rxvt_term, &rxvt_term::sel_scroll_cb> (this);
170#endif
171#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
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),
150#endif 176#endif
151#ifdef HAVE_SCROLLBARS 177#ifdef HAVE_SCROLLBARS
152 scrollbar_ev (this, &rxvt_term::x_cb), 178 scrollbar_ev.set <rxvt_term, &rxvt_term::x_cb> (this),
153#endif 179#endif
154#ifdef CURSOR_BLINK 180#ifdef USE_XIM
155 cursor_blink_ev (this, &rxvt_term::cursor_blink_cb), 181 im_ev.set <rxvt_term, &rxvt_term::im_cb> (this),
156#endif
157#ifdef TEXT_BLINK
158 text_blink_ev (this, &rxvt_term::text_blink_cb),
159#endif
160#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
161 cont_scroll_ev (this, &rxvt_term::cont_scroll_cb),
162#endif
163#ifdef SELECTION_SCROLLING
164 sel_scroll_ev (this, &rxvt_term::sel_scroll_cb),
165#endif
166#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
167 slip_wheel_ev (this, &rxvt_term::slip_wheel_cb),
168#endif 182#endif
169#ifdef POINTER_BLANK 183#ifdef POINTER_BLANK
170 pointer_ev (this, &rxvt_term::pointer_cb), 184 pointer_ev.set <rxvt_term, &rxvt_term::pointer_cb> (this);
171#endif 185#endif
172#ifdef USE_XIM
173 im_ev (this, &rxvt_term::im_cb),
174#endif
175#ifndef NO_BELL 186#ifndef NO_BELL
176 bell_ev (this, &rxvt_term::bell_cb), 187 bell_ev.set <rxvt_term, &rxvt_term::bell_cb> (this);
177#endif 188#endif
178 termwin_ev (this, &rxvt_term::x_cb), 189 child_ev.set <rxvt_term, &rxvt_term::child_cb> (this);
179 vt_ev (this, &rxvt_term::x_cb), 190 flush_ev.set <rxvt_term, &rxvt_term::flush_cb> (this);
180 child_ev (this, &rxvt_term::child_cb), 191 destroy_ev.set <rxvt_term, &rxvt_term::destroy_cb> (this);
181 check_ev (this, &rxvt_term::check_cb), 192 pty_ev.set <rxvt_term, &rxvt_term::pty_cb> (this);
182 flush_ev (this, &rxvt_term::flush_cb), 193 incr_ev.set <rxvt_term, &rxvt_term::incr_cb> (this);
183 destroy_ev (this, &rxvt_term::destroy_cb), 194 termwin_ev.set <rxvt_term, &rxvt_term::x_cb> (this);
184 pty_ev (this, &rxvt_term::pty_cb), 195 vt_ev.set <rxvt_term, &rxvt_term::x_cb> (this);
185 incr_ev (this, &rxvt_term::incr_cb) 196
186{
187 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base; 197 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base;
188 198
189 termlist.push_back (this); 199 termlist.push_back (this);
190 200
191#ifdef KEYSYM_RESOURCE 201#ifdef KEYSYM_RESOURCE
… …
193#endif 203#endif
194} 204}
195 205
196// clean up the most important stuff, do *not* call x or free mem etc. 206// clean up the most important stuff, do *not* call x or free mem etc.
197// for use before an emergency exit 207// for use before an emergency exit
208void
198void rxvt_term::emergency_cleanup () 209rxvt_term::emergency_cleanup ()
199{ 210{
200 if (cmd_pid) 211 if (cmd_pid)
201 kill (-cmd_pid, SIGHUP); 212 kill (-cmd_pid, SIGHUP);
202 213
214 pty_ev.stop ();
203 delete pty; pty = 0; 215 delete pty; pty = 0;
204} 216}
205 217
206rxvt_term::~rxvt_term () 218rxvt_term::~rxvt_term ()
207{ 219{
… …
216#endif 228#endif
217 delete fontset[0]; 229 delete fontset[0];
218 230
219 if (display) 231 if (display)
220 { 232 {
221 dDisp;
222
223 selection_clear (); 233 selection_clear ();
224 234
225#ifdef USE_XIM 235#ifdef USE_XIM
226 im_destroy (); 236 im_destroy ();
227#endif 237#endif
228#ifdef XTERM_SCROLLBAR 238#ifdef XTERM_SCROLLBAR
229 if (xscrollbarGC) XFreeGC (disp, xscrollbarGC); 239 if (xscrollbarGC) XFreeGC (dpy, xscrollbarGC);
230 if (ShadowGC) XFreeGC (disp, ShadowGC); 240 if (ShadowGC) XFreeGC (dpy, ShadowGC);
231#endif 241#endif
232#ifdef PLAIN_SCROLLBAR 242#ifdef PLAIN_SCROLLBAR
233 if (pscrollbarGC) XFreeGC (disp, pscrollbarGC); 243 if (pscrollbarGC) XFreeGC (dpy, pscrollbarGC);
234#endif 244#endif
235#ifdef NEXT_SCROLLBAR 245#ifdef NEXT_SCROLLBAR
236 if (blackGC) XFreeGC (disp, blackGC); 246 if (blackGC) XFreeGC (dpy, blackGC);
237 if (whiteGC) XFreeGC (disp, whiteGC); 247 if (whiteGC) XFreeGC (dpy, whiteGC);
238 if (grayGC) XFreeGC (disp, grayGC); 248 if (grayGC) XFreeGC (dpy, grayGC);
239 if (darkGC) XFreeGC (disp, darkGC); 249 if (darkGC) XFreeGC (dpy, darkGC);
240 if (stippleGC) XFreeGC (disp, stippleGC); 250 if (stippleGC) XFreeGC (dpy, stippleGC);
241 if (dimple) XFreePixmap (disp, dimple); 251 if (dimple) XFreePixmap (dpy, dimple);
242 if (upArrow) XFreePixmap (disp, upArrow); 252 if (upArrow) XFreePixmap (dpy, upArrow);
243 if (downArrow) XFreePixmap (disp, downArrow); 253 if (downArrow) XFreePixmap (dpy, downArrow);
244 if (upArrowHi) XFreePixmap (disp, upArrowHi); 254 if (upArrowHi) XFreePixmap (dpy, upArrowHi);
245 if (downArrowHi) XFreePixmap (disp, downArrowHi); 255 if (downArrowHi) XFreePixmap (dpy, downArrowHi);
246#endif 256#endif
247#ifdef RXVT_SCROLLBAR 257#ifdef RXVT_SCROLLBAR
248 if (topShadowGC) XFreeGC (disp, topShadowGC); 258 if (topShadowGC) XFreeGC (dpy, topShadowGC);
249 if (botShadowGC) XFreeGC (disp, botShadowGC); 259 if (botShadowGC) XFreeGC (dpy, botShadowGC);
250 if (scrollbarGC) XFreeGC (disp, scrollbarGC); 260 if (scrollbarGC) XFreeGC (dpy, scrollbarGC);
251#endif 261#endif
252 if (gc) XFreeGC (disp, gc); 262 if (gc) XFreeGC (dpy, gc);
253 263
254 delete drawable; 264 delete drawable;
255 // destroy all windows 265 // destroy all windows
256 if (parent[0]) 266 if (parent[0])
257 XDestroyWindow (disp, parent[0]); 267 XDestroyWindow (dpy, parent[0]);
258 }
259 268
260 // TODO: free pixcolours, colours should become part of rxvt_display 269 for (int i = 0; i < TOTAL_COLORS; i++)
261 delete pix_colors_focused; 270 if (ISSET_PIXCOLOR (i))
271 {
272 pix_colors_focused [i].free (this);
262#if OFF_FOCUS_FADING 273#if OFF_FOCUS_FADING
263 delete pix_colors_unfocused; 274 pix_colors_unfocused [i].free (this);
264#endif 275#endif
276 }
265 277
278 clear ();
279 }
280
281#ifdef HAVE_BG_PIXMAP
282 bgPixmap.destroy ();
283#endif
284 display->flush (); /* ideally .put should do this */
266 displays.put (display); 285 displays.put (display);
267 286
268 scr_release (); 287 scr_release ();
269 288
270 /* clear all resources */ 289 /* clear all resources */
271 for (int i = 0; i < allocated.size (); i++) 290 for (int i = 0; i < allocated.size (); i++)
272 free (allocated [i]); 291 free (allocated [i]);
273 292
274 free (selection.text); 293 free (selection.text);
275 // TODO: manage env vars in child only(!) 294 // TODO: manage env vars in child only(!)
276 free (env_windowid);
277 free (env_display); 295 free (env_display);
278 free (env_term); 296 free (env_term);
279 free (env_colorfgbg);
280 free (locale); 297 free (locale);
281 free (v_buffer); 298 free (v_buffer);
282 free (incr_buf); 299 free (incr_buf);
283 300
284 delete envv; 301 delete envv;
285 delete argv; 302 delete argv;
286 303
287#ifdef KEYSYM_RESOURCE 304#ifdef KEYSYM_RESOURCE
288 delete keyboard; 305 delete keyboard;
289#endif 306#endif
307#ifndef NO_RESOURCES
308 XrmDestroyDatabase (option_db);
309#endif
290} 310}
291 311
292// child has exited, usually destroys 312// child has exited, usually destroys
293void 313void
294rxvt_term::child_cb (child_watcher &w, int status) 314rxvt_term::child_cb (ev::child &w, int status)
295{ 315{
296 HOOK_INVOKE ((this, HOOK_CHILD_EXIT, DT_INT, status, DT_END)); 316 HOOK_INVOKE ((this, HOOK_CHILD_EXIT, DT_INT, status, DT_END));
297 317
298 cmd_pid = 0; 318 cmd_pid = 0;
299 319
300 if (!OPTION (Opt_hold)) 320 if (!option (Opt_hold))
301 destroy (); 321 destroy ();
302} 322}
303 323
304void 324void
305rxvt_term::destroy () 325rxvt_term::destroy ()
306{ 326{
307 if (destroy_ev.active) 327 if (destroy_ev.is_active ())
308 return; 328 return;
309 329
310 if (HOOK_INVOKE ((this, HOOK_DESTROY, DT_END))) 330 HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));
311 return;
312 331
313#if ENABLE_OVERLAY 332#if ENABLE_OVERLAY
314 scr_overlay_off (); 333 scr_overlay_off ();
315#endif 334#endif
316 335
… …
320 im_ev.stop (display); 339 im_ev.stop (display);
321#endif 340#endif
322#if HAVE_SCROLLBARS 341#if HAVE_SCROLLBARS
323 scrollbar_ev.stop (display); 342 scrollbar_ev.stop (display);
324#endif 343#endif
325#if TRANSPARENT 344#if ENABLE_TRANSPARENCY || ENABLE_PERL
326 rootwin_ev.stop (display); 345 rootwin_ev.stop (display);
327#endif 346#endif
328 incr_ev.stop (); 347 incr_ev.stop ();
329 termwin_ev.stop (display); 348 termwin_ev.stop (display);
330 vt_ev.stop (display); 349 vt_ev.stop (display);
331 } 350 }
332 351
333 check_ev.stop (); 352 flush_ev.stop ();
334 pty_ev.stop (); 353 pty_ev.stop ();
335#ifdef CURSOR_BLINK 354#ifdef CURSOR_BLINK
336 cursor_blink_ev.stop (); 355 cursor_blink_ev.stop ();
337#endif 356#endif
338#ifdef TEXT_BLINK 357#ifdef TEXT_BLINK
… …
346#endif 365#endif
347#ifdef POINTER_BLANK 366#ifdef POINTER_BLANK
348 pointer_ev.stop (); 367 pointer_ev.stop ();
349#endif 368#endif
350 369
351 destroy_ev.start (0); 370 destroy_ev.start ();
352} 371}
353 372
354void 373void
355rxvt_term::destroy_cb (time_watcher &w) 374rxvt_term::destroy_cb (ev::idle &w, int revents)
356{ 375{
357 make_current (); 376 make_current ();
358 377
359 delete this; 378 delete this;
360} 379}
… …
371{ 390{
372 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++) 391 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)
373 (*t)->emergency_cleanup (); 392 (*t)->emergency_cleanup ();
374} 393}
375 394
376#if ENABLE_FRILLS 395#if !ENABLE_MINIMAL
377static void 396static void
378print_x_error (Display *dpy, XErrorEvent *event) 397print_x_error (Display *dpy, XErrorEvent *event)
379{ 398{
380 char buffer[BUFSIZ]; 399 char buffer[BUFSIZ];
381 char mesg[BUFSIZ]; 400 char mesg[BUFSIZ];
… …
414 else 433 else
415 XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x", 434 XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x",
416 mesg, BUFSIZ); 435 mesg, BUFSIZ);
417 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid); 436 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid);
418 } 437 }
419 XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d", 438 XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d",
420 mesg, BUFSIZ); 439 mesg, BUFSIZ);
421 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial); 440 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial);
422} 441}
423#endif 442#endif
424 443
… …
429 GET_R->allowedxerror = event->error_code; 448 GET_R->allowedxerror = event->error_code;
430 else 449 else
431 { 450 {
432 // GET_R is most likely not the terminal which caused the error, 451 // GET_R is most likely not the terminal which caused the error,
433 // so just output the error and continue 452 // so just output the error and continue
434#if ENABLE_FRILLS 453#if ENABLE_MINIMAL
454 old_xerror_handler (display, event);
455#else
435 print_x_error (display, event); 456 print_x_error (display, event);
436#else
437 old_xerror_handler (display, event);
438#endif 457#endif
439 } 458 }
440 459
441 return 0; 460 return 0;
442} 461}
… …
449 rxvt_emergency_cleanup (); 468 rxvt_emergency_cleanup ();
450 _exit (EXIT_FAILURE); 469 _exit (EXIT_FAILURE);
451} 470}
452 471
453/*----------------------------------------------------------------------*/ 472/*----------------------------------------------------------------------*/
454bool 473void
455rxvt_term::init (int argc, const char *const *argv, stringvec *envv) 474rxvt_term::init (int argc, const char *const *argv, stringvec *envv)
456{ 475{
457 this->envv = envv; 476 this->envv = envv;
458 477
459 SET_R (this); 478 SET_R (this);
460 set_locale (""); 479 set_locale ("");
461 set_environ (envv); // few things in X do not call setlocale :( 480 set_environ (envv); // few things in X do not call setlocale :(
462 481
463 if (!init_vars ()) 482 init_vars ();
464 return false;
465 483
466 init_secondary (); 484 init_secondary ();
467 485
468 const char **cmd_argv = init_resources (argc, argv); 486 const char **cmd_argv = init_resources (argc, argv);
469 487
470#ifdef KEYSYM_RESOURCE 488#ifdef KEYSYM_RESOURCE
471 keyboard->register_done (); 489 keyboard->register_done ();
472#endif 490#endif
473 491
474#ifdef HAVE_SCROLLBARS 492#ifdef HAVE_SCROLLBARS
475 if (OPTION (Opt_scrollBar)) 493 if (option (Opt_scrollBar))
476 scrollBar.setIdle (); /* set existence for size calculations */ 494 scrollBar.setIdle (); /* set existence for size calculations */
477#endif 495#endif
478 496
479 pty = ptytty_new (); 497 pty = ptytty::create ();
480 498
481 create_windows (argc, argv); 499 create_windows (argc, argv);
482 500
483 dDisp;
484
485 init_xlocale (); 501 init_xlocale ();
486 502
487 scr_reset (); // initialize screen 503 scr_reset (); // initialize screen
488 504
489#if 0 505#if 0
490 XSynchronize (disp, True); 506 XSynchronize (dpy, True);
491#endif 507#endif
492 508
493#ifdef HAVE_SCROLLBARS 509#ifdef HAVE_SCROLLBARS
494 if (OPTION (Opt_scrollBar)) 510 if (option (Opt_scrollBar))
495 resize_scrollbar (); /* create and map scrollbar */ 511 resize_scrollbar (); /* create and map scrollbar */
496#endif 512#endif
513#ifdef HAVE_BG_PIXMAP
514 {
515 bgPixmap.set_target (this);
516
497#ifdef TRANSPARENT 517#ifdef ENABLE_TRANSPARENCY
498 if (OPTION (Opt_transparent)) 518 if (option (Opt_transparent))
499 { 519 {
520 bgPixmap.set_transparent ();
521
522#ifdef HAVE_AFTERIMAGE
523 if (rs [Rs_blurradius])
524 bgPixmap.set_blur_radius (rs [Rs_blurradius]);
525#endif
526 if (ISSET_PIXCOLOR (Color_tint))
527 bgPixmap.set_tint (pix_colors_focused [Color_tint]);
528
529 if (rs [Rs_shade])
530 bgPixmap.set_shade (rs [Rs_shade]);
531
532 bgPixmap.set_root_pixmap ();
500 XSelectInput (disp, display->root, PropertyChangeMask); 533 XSelectInput (dpy, display->root, PropertyChangeMask);
501 check_our_parents ();
502 rootwin_ev.start (display, display->root); 534 rootwin_ev.start (display, display->root);
503 } 535 }
536#endif
537
538#ifdef BG_IMAGE_FROM_FILE
539 if (rs[Rs_backgroundPixmap])
540 {
541 const char *p = rs[Rs_backgroundPixmap];
542
543 if ((p = strchr (p, ';')) != 0)
544 {
545 p++;
546 bgPixmap.set_geometry (p);
547 }
548 else
549 bgPixmap.set_defaultGeometry ();
550
551 if (bgPixmap.set_file (rs[Rs_backgroundPixmap]))
552 if (!bgPixmap.window_position_sensitive ())
553 update_background ();
554 }
555#endif
556 }
557#endif
558
559#if ENABLE_PERL
560 rootwin_ev.start (display, display->root);
504#endif 561#endif
505 562
506 set_colorfgbg (); 563 set_colorfgbg ();
507 564
508 init_command (cmd_argv); 565 init_command (cmd_argv);
509 566
510 free (cmd_argv); 567 free (cmd_argv);
511 568
512 if (pty->pty >= 0) 569 if (pty->pty >= 0)
513 pty_ev.start (pty->pty, EVENT_READ); 570 pty_ev.start (pty->pty, ev::READ);
514
515 check_ev.start ();
516 571
517 HOOK_INVOKE ((this, HOOK_START, DT_END)); 572 HOOK_INVOKE ((this, HOOK_START, DT_END));
518 573
574#if ENABLE_XEMBED
575 if (rs[Rs_embed])
576 {
577 long info[2] = { 0, XEMBED_MAPPED };
578
579 XChangeProperty (dpy, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
580 32, PropModeReplace, (unsigned char *)&info, 2);
581 }
582#endif
583
519 XMapWindow (disp, vt); 584 XMapWindow (dpy, vt);
520 XMapWindow (disp, parent[0]); 585 XMapWindow (dpy, parent[0]);
521 586
522 return true; 587 refresh_check ();
523} 588}
524 589
525static struct sig_handlers 590static struct sig_handlers
526{ 591{
527 sig_watcher sw_term, sw_int; 592 ev::sig sw_term, sw_int;
528 593
529 /* 594 /*
530 * Catch a fatal signal and tidy up before quitting 595 * Catch a fatal signal and tidy up before quitting
531 */ 596 */
532 void 597 void sig_term (ev::sig &w, int revents);
533 sig_term (sig_watcher &w) 598
599 sig_handlers ()
534 { 600 {
535#ifdef DEBUG_CMD 601 sw_term.set<sig_handlers, &sig_handlers::sig_term> (this);
536 rxvt_warn ("caught signal %d, exiting.\n", w.signum);
537#endif
538 rxvt_emergency_cleanup ();
539 signal (w.signum, SIG_DFL);
540 kill (getpid (), w.signum);
541 }
542
543 sig_handlers ()
544 : sw_term (this, &sig_handlers::sig_term),
545 sw_int (this, &sig_handlers::sig_term) 602 sw_int .set<sig_handlers, &sig_handlers::sig_term> (this);
546 {
547 } 603 }
548} sig_handlers; 604} sig_handlers;
549 605
606void
607sig_handlers::sig_term (ev::sig &w, int revents)
608{
609 rxvt_emergency_cleanup ();
610 w.stop ();
611 kill (getpid (), w.signum);
612}
613
550char **rxvt_environ; // startup environment 614char **rxvt_environ; // startup environment
551 615
552void 616void
553rxvt_init () 617rxvt_init ()
554{ 618{
555 uid_t uid = getuid (); 619 ptytty::init ();
556 gid_t gid = getgid ();
557
558 // before doing anything else, check for setuid/setgid operation,
559 // start the helper process and drop privileges
560 if (uid != geteuid ()
561 || gid != getegid ())
562 {
563#if PTYTTY_HELPER
564 ptytty_server ();
565#else
566 rxvt_warn ("running setuid/setgid without pty helper compiled in, continuing unprivileged.\n");
567#endif
568 620
569 // drop privileges 621 if (!ev_default_loop (0))
570#if HAVE_SETRESUID 622 rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n");
571 setresgid (gid, gid, gid);
572 setresuid (uid, uid, uid);
573#elif HAVE_SETREUID
574 setregid (gid, gid);
575 setreuid (uid, uid);
576#elif HAVE_SETUID
577 setgid (gid);
578 setuid (uid);
579#endif
580
581 if (uid != geteuid ()
582 || gid != getegid ())
583 rxvt_fatal ("unable to drop privileges, aborting.\n");
584 }
585 623
586 rxvt_environ = environ; 624 rxvt_environ = environ;
587 625
588 signal (SIGHUP, SIG_IGN); 626 signal (SIGHUP, SIG_IGN);
589 signal (SIGPIPE, SIG_IGN); 627 signal (SIGPIPE, SIG_IGN);
590 628
591 sig_handlers.sw_term.start (SIGTERM); 629 sig_handlers.sw_term.start (SIGTERM); ev_unref ();
592 sig_handlers.sw_int.start (SIGINT); 630 sig_handlers.sw_int.start (SIGINT); ev_unref ();
593 631
594 /* need to trap SIGURG for SVR4 (Unixware) rlogin */ 632 /* need to trap SIGURG for SVR4 (Unixware) rlogin */
595 /* signal (SIGURG, SIG_DFL); */ 633 /* signal (SIGURG, SIG_DFL); */
596 634
597 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); 635 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
… …
599 XSetIOErrorHandler (rxvt_xioerror_handler); 637 XSetIOErrorHandler (rxvt_xioerror_handler);
600 638
601 XrmInitialize (); 639 XrmInitialize ();
602} 640}
603 641
604/* ------------------------------------------------------------------------- *
605 * MEMORY ALLOCATION WRAPPERS *
606 * ------------------------------------------------------------------------- */
607void *
608rxvt_malloc (size_t size)
609{
610 void *p = malloc (size);
611
612 if (!p)
613 rxvt_fatal ("memory allocation failure. aborting.\n");
614
615 return p;
616}
617
618void *
619rxvt_calloc (size_t number, size_t size)
620{
621 void *p = calloc (number, size);
622
623 if (!p)
624 rxvt_fatal ("memory allocation failure. aborting.\n");
625
626 return p;
627}
628
629void *
630rxvt_realloc (void *ptr, size_t size)
631{
632 void *p = realloc (ptr, size);
633
634 if (!p)
635 rxvt_fatal ("memory allocation failure. aborting.\n");
636
637 return p;
638}
639
640/*----------------------------------------------------------------------*/ 642/*----------------------------------------------------------------------*/
641/* 643/*
642 * window size/position calculcations for XSizeHint and other storage. 644 * window size/position calculations for XSizeHint and other storage.
643 * if width/height are non-zero then override calculated width/height 645 * if width/height are non-zero then override calculated width/height
644 */ 646 */
645void 647void
646rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight) 648rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
647{ 649{
648 short recalc_x, recalc_y; 650 short recalc_x, recalc_y;
649 int x, y, sb_w, flags; 651 int x, y, sb_w, flags;
650 unsigned int w, h; 652 unsigned int w, h;
651 unsigned int max_width, max_height; 653 unsigned int max_width, max_height;
652 dDisp;
653
654 D_SIZE ((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
655 ncol, nrow, szHint.width, szHint.height));
656 654
657 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity; 655 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity;
658 szHint.win_gravity = NorthWestGravity; 656 szHint.win_gravity = NorthWestGravity;
659 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */ 657 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */
660 658
… …
722 720
723 if (scrollBar.state) 721 if (scrollBar.state)
724 { 722 {
725 sb_w = scrollbar_TotalWidth (); 723 sb_w = scrollbar_TotalWidth ();
726 szHint.base_width += sb_w; 724 szHint.base_width += sb_w;
725
727 if (!OPTION (Opt_scrollBar_right)) 726 if (!option (Opt_scrollBar_right))
728 window_vt_x += sb_w; 727 window_vt_x += sb_w;
729 } 728 }
730 729
731 szHint.width_inc = fwidth; 730 szHint.width_inc = fwidth;
732 szHint.height_inc = fheight; 731 szHint.height_inc = fheight;
733 szHint.min_width = szHint.base_width + szHint.width_inc; 732 szHint.min_width = szHint.base_width + szHint.width_inc;
734 szHint.min_height = szHint.base_height + szHint.height_inc; 733 szHint.min_height = szHint.base_height + szHint.height_inc;
735 734
736 if (newwidth && newwidth - szHint.base_width < max_width) 735 if (newwidth && newwidth - szHint.base_width < max_width)
737 { 736 {
738 szHint.width = newwidth; 737 szHint.width = newwidth;
… …
753 { 752 {
754 min_it (height, max_height); 753 min_it (height, max_height);
755 szHint.height = szHint.base_height + height; 754 szHint.height = szHint.base_height + height;
756 } 755 }
757 756
758 if (scrollBar.state && OPTION (Opt_scrollBar_right)) 757 if (scrollBar.state && option (Opt_scrollBar_right))
759 window_sb_x = szHint.width - sb_w; 758 window_sb_x = szHint.width - sb_w;
760 759
761 if (recalc_x) 760 if (recalc_x)
762 szHint.x += DisplayWidth (disp, display->screen) - szHint.width - 2 * ext_bwidth; 761 szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth;
762
763 if (recalc_y) 763 if (recalc_y)
764 szHint.y += DisplayHeight (disp, display->screen) - szHint.height - 2 * ext_bwidth; 764 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth;
765 765
766 ncol = width / fwidth; 766 ncol = width / fwidth;
767 nrow = height / fheight; 767 nrow = height / fheight;
768 D_SIZE ((stderr, "> Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
769 ncol, nrow, szHint.width,
770 szHint.height));
771 return;
772} 768}
773 769
774/*----------------------------------------------------------------------*/ 770/*----------------------------------------------------------------------*/
775/* 771/*
776 * Tell the teletype handler what size the window is. 772 * Tell the teletype handler what size the window is.
… …
789 ws.ws_xpixel = width; 785 ws.ws_xpixel = width;
790 ws.ws_ypixel = height; 786 ws.ws_ypixel = height;
791 (void)ioctl (pty->pty, TIOCSWINSZ, &ws); 787 (void)ioctl (pty->pty, TIOCSWINSZ, &ws);
792 788
793#if 0 789#if 0
794 // TIOCSWINSZ⎈ is supposed to do this automatically and correctly 790 // TIOCSWINSZ is supposed to do this automatically and correctly
795 if (cmd_pid) /* force through to the command */ 791 if (cmd_pid) /* force through to the command */
796 kill (-cmd_pid, SIGWINCH); 792 kill (-cmd_pid, SIGWINCH);
797#endif 793#endif
798} 794}
799 795
… …
828 delete fontset[0]; 824 delete fontset[0];
829 fontset[0] = fs; 825 fontset[0] = fs;
830 826
831 prop = (*fs)[1]->properties (); 827 prop = (*fs)[1]->properties ();
832 prop.height += lineSpace; 828 prop.height += lineSpace;
829
833 fs->set_prop (prop); 830 fs->set_prop (prop, false);
834 831
835 fwidth = prop.width; 832 fwidth = prop.width;
836 fheight = prop.height; 833 fheight = prop.height;
837 fbase = prop.ascent; 834 fbase = prop.ascent;
838 835
… …
847 { 844 {
848 fontset[style] = fs = new rxvt_fontset (this); 845 fontset[style] = fs = new rxvt_fontset (this);
849 rxvt_fontprop prop2 = prop; 846 rxvt_fontprop prop2 = prop;
850 847
851 if (res) 848 if (res)
852 prop2.weight = prop2.slant = rxvt_fontprop::unset; 849 {
850 fs->populate (res);
851 fs->set_prop (prop2, false);
852 }
853 else 853 else
854 { 854 {
855 res = fontset[0]->fontdesc; 855 fs->populate (fontset[0]->fontdesc);
856 856
857 if (SET_STYLE (0, style) & RS_Bold) prop2.weight = rxvt_fontprop::bold; 857 if (SET_STYLE (0, style) & RS_Bold) prop2.weight = rxvt_fontprop::bold;
858 if (SET_STYLE (0, style) & RS_Italic) prop2.slant = rxvt_fontprop::italic; 858 if (SET_STYLE (0, style) & RS_Italic) prop2.slant = rxvt_fontprop::italic;
859
860 fs->set_prop (prop2, true);
859 } 861 }
860 862
861 fs->populate (res);
862 fs->set_prop (prop2);
863 } 863 }
864#else 864#else
865 fontset[style] = fontset[0]; 865 fontset[style] = fontset[0];
866#endif 866#endif
867 } 867 }
… …
869 if (parent[0]) 869 if (parent[0])
870 { 870 {
871 resize_all_windows (0, 0, 0); 871 resize_all_windows (0, 0, 0);
872 scr_remap_chars (); 872 scr_remap_chars ();
873 scr_touch (true); 873 scr_touch (true);
874 } 874 }
875 875
876 return true; 876 return true;
877} 877}
878 878
879void
879void rxvt_term::set_string_property (Atom prop, const char *str, int len) 880rxvt_term::set_string_property (Atom prop, const char *str, int len)
880{ 881{
881 XChangeProperty (display->display, parent[0], 882 XChangeProperty (dpy, parent[0],
882 prop, XA_STRING, 8, PropModeReplace, 883 prop, XA_STRING, 8, PropModeReplace,
883 (const unsigned char *)str, len >= 0 ? len : strlen (str)); 884 (const unsigned char *)str, len >= 0 ? len : strlen (str));
884} 885}
885 886
887void
886void rxvt_term::set_utf8_property (Atom prop, const char *str, int len) 888rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
887{ 889{
888 wchar_t *ws = rxvt_mbstowcs (str, len); 890 wchar_t *ws = rxvt_mbstowcs (str, len);
889 char *s = rxvt_wcstoutf8 (ws); 891 char *s = rxvt_wcstoutf8 (ws);
890 892
891 XChangeProperty (display->display, parent[0], 893 XChangeProperty (dpy, parent[0],
892 prop, xa[XA_UTF8_STRING], 8, PropModeReplace, 894 prop, xa[XA_UTF8_STRING], 8, PropModeReplace,
893 (const unsigned char *)s, strlen (s)); 895 (const unsigned char *)s, strlen (s));
894 896
895 free (s); 897 free (s);
896 free (ws); 898 free (ws);
… …
915#if ENABLE_EWMH 917#if ENABLE_EWMH
916 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str); 918 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str);
917#endif 919#endif
918} 920}
919 921
922void
923rxvt_term::set_window_color (int idx, const char *color)
924{
920#ifdef XTERM_COLOR_CHANGE 925#ifdef XTERM_COLOR_CHANGE
921void
922rxvt_term::set_window_color (int idx, const char *color)
923{
924 rxvt_color xcol; 926 rxvt_color xcol;
925 int i; 927 int i;
926 928
927 if (color == NULL || *color == '\0') 929 if (color == NULL || *color == '\0')
928 return; 930 return;
929 931
932 color = strdup (color);
933 allocated.push_back ((void *)color);
934 rs[Rs_color + idx] = color;
935
930 /* handle color aliases */ 936 /* handle color aliases */
931 if (isdigit (*color)) 937 if (isdigit (*color))
932 { 938 {
933 i = atoi (color); 939 i = atoi (color);
934 940
935 if (i >= 8 && i <= 15) 941 if (i >= 8 && i <= 15)
942 {
936 { /* bright colors */ 943 /* bright colors */
937 i -= 8;
938 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i]; 944 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i - 8];
939 SET_PIXCOLOR (idx);
940 goto done; 945 goto done;
941 } 946 }
942 947
943 if (i >= 0 && i <= 7) 948 if (i >= 0 && i <= 7)
949 {
944 { /* normal colors */ 950 /* normal colors */
945 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i]; 951 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];
946 SET_PIXCOLOR (idx);
947 goto done; 952 goto done;
948 } 953 }
949 } 954 }
950 955
951 if (!rXParseAllocColor (&xcol, color)) 956 set_color (xcol, color);
952 return;
953
954 /* XStoreColor (display->display, display->cmap, XColor*); */
955 957
956 /* 958 /*
957 * FIXME: should free colors here, but no idea how to do it so instead, 959 * FIXME: should free colors here, but no idea how to do it so instead,
958 * so just keep gobbling up the colormap 960 * so just keep gobbling up the colormap
959 */ 961 */
960# if 0
961 for (i = Color_Black; i <= Color_White; i++)
962 if (pix_colors[idx] == pix_colors[i])
963 break;
964 if (i > Color_White)
965 {
966 /* fprintf (stderr, "XFreeColors: pix_colors [%d] = %lu\n", idx, pix_colors [idx]); */
967 XFreeColors (display->display, display->cmap, (pix_colors + idx), 1,
968 DisplayPlanes (display->display, display->screen));
969 }
970# endif
971 962
972 pix_colors_focused[idx] = xcol; 963 pix_colors_focused[idx] = xcol;
973 SET_PIXCOLOR (idx);
974 964
975 /* XSetWindowAttributes attr; */
976 /* Cursor cursor; */
977done: 965done:
978
979#if OFF_FOCUS_FADING
980 if (rs[Rs_fade])
981 pix_colors_unfocused[idx] = pix_colors_focused[idx].fade (display, atoi (rs[Rs_fade]), pix_colors[Color_fade]);
982#endif
983
984 /*TODO: handle Color_BD, scrollbar background, etc. */ 966 /*TODO: handle Color_BD, scrollbar background, etc. */
985 967
968 update_fade_color (idx);
986 recolour_cursor (); 969 recolour_cursor ();
987 scr_recolour (); 970 scr_recolour ();
971#endif /* XTERM_COLOR_CHANGE */
988} 972}
989
990#else
991# define set_window_color (idx,color) ((void)0)
992#endif /* XTERM_COLOR_CHANGE */
993 973
994void 974void
995rxvt_term::recolour_cursor () 975rxvt_term::recolour_cursor ()
996{ 976{
997 XColor xcol[2]; 977 XColor fg, bg;
998 978
999 xcol[0].pixel = ISSET_PIXCOLOR (Color_pointer_fg) 979 (ISSET_PIXCOLOR (Color_pointer_fg)
1000 ? pix_colors_focused[Color_pointer_fg] 980 ? pix_colors_focused[Color_pointer_fg]
1001 : pix_colors_focused[Color_fg]; 981 : pix_colors_focused[Color_fg]).get (fg);
982
1002 xcol[1].pixel = ISSET_PIXCOLOR (Color_pointer_bg) 983 (ISSET_PIXCOLOR (Color_pointer_bg)
1003 ? pix_colors_focused[Color_pointer_bg] 984 ? pix_colors_focused[Color_pointer_bg]
1004 : pix_colors_focused[Color_bg]; 985 : pix_colors_focused[Color_bg]).get (bg);
1005 986
1006 XQueryColors (display->display, display->cmap, xcol, 2); 987 XRecolorCursor (dpy, TermWin_cursor, &fg, &bg);
1007 XRecolorCursor (display->display, TermWin_cursor, xcol + 0, xcol + 1);
1008} 988}
1009 989
1010/*----------------------------------------------------------------------*/ 990/*----------------------------------------------------------------------*/
1011/* 991/*
1012 * find if fg/bg matches any of the normal (low-intensity) colors 992 * find if fg/bg matches any of the normal (low-intensity) colors
1013 */ 993 */
1014void 994void
1015rxvt_term::set_colorfgbg () 995rxvt_term::set_colorfgbg ()
1016{ 996{
1017 unsigned int i; 997 unsigned int i;
1018 const char *xpmb = "\0"; 998 const char *xpmb = "";
1019 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1]; 999 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1];
1020 1000
1021 env_colorfgbg = (char *)rxvt_malloc (sizeof ("COLORFGBG=default;default;bg") + 1);
1022 strcpy (fstr, "default"); 1001 strcpy (fstr, "default");
1023 strcpy (bstr, "default"); 1002 strcpy (bstr, "default");
1024 for (i = Color_Black; i <= Color_White; i++) 1003 for (i = Color_Black; i <= Color_White; i++)
1025 if (pix_colors[Color_fg] == pix_colors[i]) 1004 if (pix_colors[Color_fg] == pix_colors[i])
1026 { 1005 {
… …
1030 1009
1031 for (i = Color_Black; i <= Color_White; i++) 1010 for (i = Color_Black; i <= Color_White; i++)
1032 if (pix_colors[Color_bg] == pix_colors[i]) 1011 if (pix_colors[Color_bg] == pix_colors[i])
1033 { 1012 {
1034 sprintf (bstr, "%d", (i - Color_Black)); 1013 sprintf (bstr, "%d", (i - Color_Black));
1035#ifdef XPM_BACKGROUND 1014#ifdef BG_IMAGE_FROM_FILE
1036 xpmb = "default;"; 1015 xpmb = "default;";
1037#endif 1016#endif
1038 break; 1017 break;
1039 } 1018 }
1040 1019
1041 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr); 1020 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr);
1042} 1021}
1043 1022
1044/*----------------------------------------------------------------------*/ 1023/*----------------------------------------------------------------------*/
1045 1024
1046int 1025bool
1047rxvt_term::rXParseAllocColor (rxvt_color *screen_in_out, const char *colour) 1026rxvt_term::set_color (rxvt_color &color, const char *name)
1048{ 1027{
1049 if (!screen_in_out->set (display, colour)) 1028 if (color.set (this, name))
1050 {
1051 rxvt_warn ("can't get colour '%s', continuing without.\n", colour);
1052 return false;
1053 }
1054
1055 return true; 1029 return true;
1030
1031 rxvt_warn ("can't get colour '%s', continuing without.\n", name);
1032 return false;
1033}
1034
1035void
1036rxvt_term::alias_color (int dst, int src)
1037{
1038 pix_colors[dst].set (this, rs[Rs_color + dst] = rs[Rs_color + src]);
1056} 1039}
1057 1040
1058/* -------------------------------------------------------------------- * 1041/* -------------------------------------------------------------------- *
1059 * - WINDOW RESIZING - * 1042 * - WINDOW RESIZING - *
1060 * -------------------------------------------------------------------- */ 1043 * -------------------------------------------------------------------- */
1061void 1044void
1062rxvt_term::resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent) 1045rxvt_term::resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent)
1063{ 1046{
1064 int fix_screen; 1047 int fix_screen;
1065 int old_width = szHint.width, old_height = szHint.height; 1048 int old_width = szHint.width;
1066 dDisp; 1049 int old_height = szHint.height;
1067 1050
1068 window_calc (newwidth, newheight); 1051 window_calc (newwidth, newheight);
1052
1053 if (!HOOK_INVOKE ((this, HOOK_RESIZE_ALL_WINDOWS, DT_INT, newwidth, DT_INT, newheight, DT_END)))
1069 XSetWMNormalHints (disp, parent[0], &szHint); 1054 XSetWMNormalHints (dpy, parent[0], &szHint);
1070 1055
1071 if (!ignoreparent) 1056 if (!ignoreparent)
1072 { 1057 {
1073#ifdef SMART_RESIZE 1058#ifdef SMART_RESIZE
1074 /* 1059 /*
… …
1078 int x, y, x1, y1; 1063 int x, y, x1, y1;
1079 int dx, dy; 1064 int dx, dy;
1080 unsigned int unused_w1, unused_h1, unused_b1, unused_d1; 1065 unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
1081 Window unused_cr; 1066 Window unused_cr;
1082 1067
1083 XTranslateCoordinates (disp, parent[0], display->root, 1068 XTranslateCoordinates (dpy, parent[0], display->root,
1084 0, 0, &x, &y, &unused_cr); 1069 0, 0, &x, &y, &unused_cr);
1085 XGetGeometry (disp, parent[0], &unused_cr, &x1, &y1, 1070 XGetGeometry (dpy, parent[0], &unused_cr, &x1, &y1,
1086 &unused_w1, &unused_h1, &unused_b1, &unused_d1); 1071 &unused_w1, &unused_h1, &unused_b1, &unused_d1);
1087 /* 1072 /*
1088 * if display->root isn't the parent window, a WM will probably have offset 1073 * if display->root isn't the parent window, a WM will probably have offset
1089 * our position for handles and decorations. Counter it 1074 * our position for handles and decorations. Counter it
1090 */ 1075 */
… …
1092 { 1077 {
1093 x -= x1; 1078 x -= x1;
1094 y -= y1; 1079 y -= y1;
1095 } 1080 }
1096 1081
1097 x1 = (DisplayWidth (disp, display->screen) - old_width) / 2; 1082 x1 = (DisplayWidth (dpy, display->screen) - old_width ) / 2;
1098 y1 = (DisplayHeight (disp, display->screen) - old_height) / 2; 1083 y1 = (DisplayHeight (dpy, display->screen) - old_height) / 2;
1099 dx = old_width - szHint.width; 1084 dx = old_width - szHint.width;
1100 dy = old_height - szHint.height; 1085 dy = old_height - szHint.height;
1101 1086
1102 /* Check position of the center of the window */ 1087 /* Check position of the center of the window */
1103 if (x < x1) /* left half */ 1088 if (x < x1) /* left half */
1104 dx = 0; 1089 dx = 0;
… …
1107 if (y < y1) /* top half */ 1092 if (y < y1) /* top half */
1108 dy = 0; 1093 dy = 0;
1109 else if (y == y1) /* exact center */ 1094 else if (y == y1) /* exact center */
1110 dy /= 2; 1095 dy /= 2;
1111 1096
1112 XMoveResizeWindow (disp, parent[0], x + dx, y + dy, 1097 XMoveResizeWindow (dpy, parent[0], x + dx, y + dy,
1113 szHint.width, szHint.height); 1098 szHint.width, szHint.height);
1114#else 1099#else
1115 XResizeWindow (disp, parent[0], szHint.width, szHint.height); 1100 XResizeWindow (dpy, parent[0], szHint.width, szHint.height);
1116#endif 1101#endif
1117 } 1102 }
1118 1103
1119 fix_screen = ncol != prev_ncol || nrow != prev_nrow; 1104 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
1120 1105
1121 if (fix_screen || newwidth != old_width || newheight != old_height) 1106 if (fix_screen || newwidth != old_width || newheight != old_height)
1122 { 1107 {
1123 if (scrollBar.state) 1108 if (scrollBar.state)
1124 { 1109 {
1125 XMoveResizeWindow (disp, scrollBar.win, 1110 XMoveResizeWindow (dpy, scrollBar.win,
1126 window_sb_x, 0, 1111 window_sb_x, 0,
1127 scrollbar_TotalWidth (), szHint.height); 1112 scrollbar_TotalWidth (), szHint.height);
1128 resize_scrollbar (); 1113 resize_scrollbar ();
1129 } 1114 }
1130 1115
1131 XMoveResizeWindow (disp, vt, 1116 XMoveResizeWindow (dpy, vt,
1132 window_vt_x, window_vt_y, 1117 window_vt_x, window_vt_y,
1133 width, height); 1118 width, height);
1134 1119
1120#ifdef HAVE_BG_PIXMAP
1121 if (bgPixmap.window_size_sensitive ())
1122 update_background ();
1123#endif
1124
1135 scr_clear (); 1125 scr_clear ();
1136#ifdef XPM_BACKGROUND
1137 resize_pixmap ();
1138#endif
1139 } 1126 }
1140 1127
1141 if (fix_screen || old_height == 0) 1128 if (fix_screen || old_height == 0)
1142 {
1143 int curr_screen = -1;
1144 int old_ncol = prev_ncol;
1145
1146 /* scr_reset only works on the primary screen */
1147 if (old_height) /* this is not the first time through */
1148 {
1149 unsigned int ocol = ncol;
1150 ncol = prev_ncol; // save b/c scr_blank_screen_mem uses this
1151 curr_screen = scr_change_screen (PRIMARY);
1152 ncol = ocol;
1153 }
1154
1155 scr_reset (); 1129 scr_reset ();
1156 1130
1157 if (curr_screen >= 0) /* this is not the first time through */ 1131 // TODO, with nvidia-8178, resizes kill the alpha channel, report if not fixed in newer version
1158 { 1132 //scr_touch (false);
1159 scr_change_screen (curr_screen);
1160 selection_check (old_ncol != ncol ? 4 : 0);
1161 }
1162 }
1163 1133
1164 old_width = szHint.width; 1134#ifdef HAVE_BG_PIXMAP
1165 old_height = szHint.height; 1135// TODO: this don't seem to have any effect - do we still need it ? If so - in which case exactly ?
1166 1136// if (bgPixmap.pixmap)
1167#ifdef XPM_BACKGROUND
1168 if (pixmap)
1169 scr_touch (false); 1137// scr_touch (false);
1170#endif 1138#endif
1171 1139
1172#ifdef USE_XIM 1140#ifdef USE_XIM
1173 IMSetStatusPosition (); 1141 IMSetPosition ();
1174#endif 1142#endif
1175} 1143}
1176 1144
1177/* 1145/*
1178 * Set the width/height of the vt window in characters. Units are pixels. 1146 * Set the width/height of the vt window in characters. Units are pixels.
… …
1183{ 1151{
1184 XWindowAttributes wattr; 1152 XWindowAttributes wattr;
1185 1153
1186 if (newwidth == 0 || newheight == 0) 1154 if (newwidth == 0 || newheight == 0)
1187 { 1155 {
1188 XGetWindowAttributes (display->display, display->root, &wattr); 1156 XGetWindowAttributes (dpy, display->root, &wattr);
1189 1157
1190 if (newwidth == 0) 1158 if (newwidth == 0)
1191 newwidth = wattr.width - szHint.base_width; 1159 newwidth = wattr.width - szHint.base_width;
1192 if (newheight == 0) 1160 if (newheight == 0)
1193 newheight = wattr.height - szHint.base_height; 1161 newheight = wattr.height - szHint.base_height;
… …
1207#ifdef USE_XIM 1175#ifdef USE_XIM
1208 1176
1209void 1177void
1210rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg) 1178rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg)
1211{ 1179{
1212 fg = pix_colors[Color_fg]; 1180 fg = pix_colors [Color_fg];
1213 bg = pix_colors[Color_bg]; 1181 bg = pix_colors [Color_bg];
1214} 1182}
1215 1183
1216void 1184void
1217rxvt_term::im_set_size (XRectangle &size) 1185rxvt_term::im_set_size (XRectangle &size)
1218{ 1186{
… …
1255 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */ 1223 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */
1256 1224
1257 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */ 1225 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */
1258 *p = '\0'; 1226 *p = '\0';
1259 1227
1260 atom = XInternAtom (display->display, server, False); 1228 atom = XInternAtom (dpy, server, False);
1261 win = XGetSelectionOwner (display->display, atom); 1229 win = XGetSelectionOwner (dpy, atom);
1262 1230
1263 if (win != None) 1231 if (win != None)
1264 return True; 1232 return True;
1265 } 1233 }
1266 1234
… …
1273 XPoint nspot; 1241 XPoint nspot;
1274 XVaNestedList preedit_attr; 1242 XVaNestedList preedit_attr;
1275 1243
1276 if (!Input_Context 1244 if (!Input_Context
1277 || !focus 1245 || !focus
1278 || !(input_style & XIMPreeditPosition)) 1246 || !(input_style & (XIMPreeditPosition | XIMPreeditCallbacks)))
1279 return; 1247 return;
1280 1248
1281 im_set_position (nspot); 1249 im_set_position (nspot);
1282 1250
1283 if (nspot.x == spot.x && nspot.y == spot.y) 1251 if (nspot.x == spot.x && nspot.y == spot.y)
… …
1302 input_method = 0; 1270 input_method = 0;
1303 } 1271 }
1304 1272
1305 Input_Context = 0; 1273 Input_Context = 0;
1306} 1274}
1275
1276#ifdef ENABLE_XIM_ONTHESPOT
1277
1278static void
1279xim_preedit_start (XIC ic, XPointer client_data, XPointer call_data)
1280{
1281 ((rxvt_term *)client_data)->make_current ();
1282 HOOK_INVOKE (((rxvt_term *)client_data, HOOK_XIM_PREEDIT_START, DT_END));
1283}
1284
1285static void
1286xim_preedit_done (XIC ic, XPointer client_data, XPointer call_data)
1287{
1288 ((rxvt_term *)client_data)->make_current ();
1289 HOOK_INVOKE (((rxvt_term *)client_data, HOOK_XIM_PREEDIT_DONE, DT_END));
1290}
1291
1292static void
1293xim_preedit_draw (XIC ic, XPointer client_data, XIMPreeditDrawCallbackStruct *call_data)
1294{
1295 rxvt_term *term = (rxvt_term *)client_data;
1296 XIMText *text = call_data->text;
1297
1298 term->make_current ();
1299
1300 if (text)
1301 {
1302 void *str;
1303
1304 if (!text->encoding_is_wchar && text->string.multi_byte)
1305 {
1306 // of course, X makes it ugly again
1307 if (term->rs[Rs_imLocale])
1308 SET_LOCALE (term->rs[Rs_imLocale]);
1309
1310 str = rxvt_temp_buf ((text->length + 1) * sizeof (wchar_t));
1311 mbstowcs ((wchar_t *)str, text->string.multi_byte, text->length + 1);
1312
1313 if (term->rs[Rs_imLocale])
1314 SET_LOCALE (term->locale);
1315 }
1316 else
1317 str = (void *)text->string.wide_char;
1318
1319 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
1320 DT_INT, call_data->caret,
1321 DT_INT, call_data->chg_first,
1322 DT_INT, call_data->chg_length,
1323 DT_LCS_LEN, (void *)text->feedback, text->feedback ? (int)text->length : 0,
1324 DT_WCS_LEN, str, str ? (int)text->length : 0,
1325 DT_END));
1326 }
1327 else
1328 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
1329 DT_INT, call_data->caret,
1330 DT_INT, call_data->chg_first,
1331 DT_INT, call_data->chg_length,
1332 DT_END));
1333}
1334
1335#if 0
1336static void
1337xim_preedit_caret (XIC ic, XPointer client_data, XIMPreeditCaretCallbackStruct *call_data)
1338{
1339 ((rxvt_term *)client_data)->make_current ();
1340 HOOK_INVOKE (((rxvt_term *)client_data, HOOK_XIM_PREEDIT_CARET,
1341 DT_INT, call_data->position,
1342 DT_INT, call_data->direction,
1343 DT_INT, call_data->style,
1344 DT_END));
1345}
1346#endif
1347
1348#endif
1307 1349
1308/* 1350/*
1309 * Try to open a XIM with the current modifiers, then see if we can 1351 * Try to open a XIM with the current modifiers, then see if we can
1310 * open a suitable preedit type 1352 * open a suitable preedit type
1311 */ 1353 */
… …
1318 XRectangle rect, status_rect, needed_rect; 1360 XRectangle rect, status_rect, needed_rect;
1319 unsigned long fg, bg; 1361 unsigned long fg, bg;
1320 const char *p; 1362 const char *p;
1321 char **s; 1363 char **s;
1322 XIMStyles *xim_styles; 1364 XIMStyles *xim_styles;
1365#ifdef ENABLE_XIM_ONTHESPOT
1366 XIMCallback xcb[4];
1367#endif
1323 1368
1324 set_environ (envv); 1369 set_environ (envv);
1325 1370
1326 if (! ((p = XSetLocaleModifiers (modifiers)) && *p)) 1371 if (! ((p = XSetLocaleModifiers (modifiers)) && *p))
1327 return false; 1372 return false;
1328 1373
1329 D_MAIN ((stderr, "rxvt_IM_get_IC ()"));
1330 input_method = display->get_xim (locale, modifiers); 1374 input_method = display->get_xim (locale, modifiers);
1331 if (input_method == NULL) 1375 if (input_method == NULL)
1332 return false; 1376 return false;
1333 1377
1334 xim = input_method->xim; 1378 xim = input_method->xim;
… …
1354 s = rxvt_splitcommastring (p); 1398 s = rxvt_splitcommastring (p);
1355 1399
1356 for (i = found = 0; !found && s[i]; i++) 1400 for (i = found = 0; !found && s[i]; i++)
1357 { 1401 {
1358 if (!strcmp (s[i], "OverTheSpot")) 1402 if (!strcmp (s[i], "OverTheSpot"))
1359 input_style = (XIMPreeditPosition | XIMStatusNothing); 1403 input_style = XIMPreeditPosition | XIMStatusNothing;
1360 else if (!strcmp (s[i], "OffTheSpot")) 1404 else if (!strcmp (s[i], "OffTheSpot"))
1361 input_style = (XIMPreeditArea | XIMStatusArea); 1405 input_style = XIMPreeditArea | XIMStatusArea;
1362 else if (!strcmp (s[i], "Root")) 1406 else if (!strcmp (s[i], "Root"))
1363 input_style = (XIMPreeditNothing | XIMStatusNothing); 1407 input_style = XIMPreeditNothing | XIMStatusNothing;
1364 else if (!strcmp (s[i], "None")) 1408 else if (!strcmp (s[i], "None"))
1365 input_style = (XIMPreeditNone | XIMStatusNone); 1409 input_style = XIMPreeditNone | XIMStatusNone;
1410#ifdef ENABLE_XIM_ONTHESPOT
1411 else if (SHOULD_INVOKE (HOOK_XIM_PREEDIT_START) && !strcmp (s[i], "OnTheSpot"))
1412 input_style = XIMPreeditCallbacks | XIMStatusNothing;
1413#endif
1414 else
1415 input_style = XIMPreeditNothing | XIMStatusNothing;
1366 1416
1367 for (j = 0; j < xim_styles->count_styles; j++) 1417 for (j = 0; j < xim_styles->count_styles; j++)
1368 if (input_style == xim_styles->supported_styles[j]) 1418 if (input_style == xim_styles->supported_styles[j])
1369 { 1419 {
1370 rxvt_freecommastring (s); 1420 rxvt_freecommastring (s);
… …
1408 "*", 1458 "*",
1409 fheight, 1459 fheight,
1410 fheight + 1, fheight - 1, 1460 fheight + 1, fheight - 1,
1411 fheight - 2, fheight + 2); 1461 fheight - 2, fheight + 2);
1412 1462
1413 fs = XCreateFontSet (display->display, rs[Rs_imFont] ? rs[Rs_imFont] : pat, 1463 fs = XCreateFontSet (dpy, rs[Rs_imFont] ? rs[Rs_imFont] : pat,
1414 &missing_charset_list, &missing_charset_count, &def_string); 1464 &missing_charset_list, &missing_charset_count, &def_string);
1415 1465
1416 if (missing_charset_list) 1466 if (missing_charset_list)
1417 XFreeStringList (missing_charset_list); 1467 XFreeStringList (missing_charset_list);
1418 1468
… …
1459 XNBackground, bg, 1509 XNBackground, bg,
1460 XNArea, &status_rect, 1510 XNArea, &status_rect,
1461 XNFontSet, fs, 1511 XNFontSet, fs,
1462 NULL); 1512 NULL);
1463 } 1513 }
1514#if ENABLE_XIM_ONTHESPOT
1515 else if (input_style & XIMPreeditCallbacks)
1516 {
1517 im_set_position (spot);
1518
1519 xcb[0].client_data = (XPointer)this; xcb[0].callback = (XIMProc)xim_preedit_start;
1520 xcb[1].client_data = (XPointer)this; xcb[1].callback = (XIMProc)xim_preedit_done;
1521 xcb[2].client_data = (XPointer)this; xcb[2].callback = (XIMProc)xim_preedit_draw;
1522# if 0
1523 xcb[3].client_data = (XPointer)this; xcb[3].callback = (XIMProc)xim_preedit_caret;
1524# endif
1525
1526 preedit_attr = XVaCreateNestedList (0,
1527 XNSpotLocation, &spot,
1528 XNPreeditStartCallback, &xcb[0],
1529 XNPreeditDoneCallback , &xcb[1],
1530 XNPreeditDrawCallback , &xcb[2],
1531# if 0
1532 XNPreeditCaretCallback, &xcb[3],
1533# endif
1534 NULL);
1535 }
1536#endif
1464 1537
1465 Input_Context = XCreateIC (xim, 1538 Input_Context = XCreateIC (xim,
1466 XNInputStyle, input_style, 1539 XNInputStyle, input_style,
1467 XNClientWindow, vt, 1540 XNClientWindow, vt,
1468 XNFocusWindow, parent[0], 1541 XNFocusWindow, parent[0],
… …
1470 preedit_attr, 1543 preedit_attr,
1471 status_attr ? XNStatusAttributes : NULL, 1544 status_attr ? XNStatusAttributes : NULL,
1472 status_attr, NULL); 1545 status_attr, NULL);
1473 1546
1474 if (preedit_attr) XFree (preedit_attr); 1547 if (preedit_attr) XFree (preedit_attr);
1475 if (status_attr) XFree (status_attr); 1548 if (status_attr) XFree (status_attr);
1476 if (fs) XFreeFontSet (display->display, fs); 1549 if (fs) XFreeFontSet (dpy, fs);
1477 1550
1478 if (Input_Context == NULL) 1551 if (Input_Context == NULL)
1479 { 1552 {
1480 rxvt_warn ("failed to create input context, continuing without XIM.\n"); 1553 rxvt_warn ("failed to create input context, continuing without XIM.\n");
1481 im_destroy (); 1554 im_destroy ();
1482 return false; 1555 return false;
1483 } 1556 }
1484 1557
1485 if (input_style & XIMPreeditArea) 1558#if 0
1559 // unfortunately, only the focus window is used by XIM, hard to fix
1560 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL))
1561 vt_select_input ();
1562#endif
1563
1486 IMSetStatusPosition (); 1564 IMSetPosition ();
1487 1565
1488 D_MAIN ((stderr, "rxvt_IM_get_IC () - successful connection"));
1489 return true; 1566 return true;
1490} 1567}
1491 1568
1492void 1569void
1493rxvt_term::im_cb () 1570rxvt_term::im_cb ()
… …
1499 1576
1500 make_current (); 1577 make_current ();
1501 1578
1502 im_destroy (); 1579 im_destroy ();
1503 1580
1504 D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()"));
1505 if (Input_Context) 1581 if (Input_Context)
1506 return; 1582 return;
1507 1583
1508#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE) 1584#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1509 if (rs[Rs_imLocale]) 1585 if (rs[Rs_imLocale])
… …
1551 SET_LOCALE (locale); 1627 SET_LOCALE (locale);
1552#endif 1628#endif
1553} 1629}
1554 1630
1555void 1631void
1556rxvt_term::IMSetStatusPosition () 1632rxvt_term::IMSetPosition ()
1557{ 1633{
1558 XRectangle preedit_rect, status_rect, *needed_rect; 1634 XRectangle preedit_rect, status_rect, *needed_rect;
1559 XVaNestedList preedit_attr, status_attr; 1635 XVaNestedList preedit_attr, status_attr;
1560 1636
1561 if (!Input_Context 1637 if (!Input_Context
1562 || !focus 1638 || !focus
1563 || !(input_style & XIMPreeditArea) 1639 || !(input_style & (XIMPreeditArea | XIMPreeditPosition))
1564 || !IMisRunning ()) 1640 || !IMisRunning ())
1565 return; 1641 return;
1566 1642
1643 if (input_style & XIMPreeditPosition)
1644 {
1645 im_set_size (preedit_rect);
1646 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);
1647
1648 XSetICValues (Input_Context,
1649 XNPreeditAttributes, preedit_attr, NULL);
1650 }
1651 else
1652 {
1567 /* Getting the necessary width of preedit area */ 1653 /* Getting the necessary width of preedit area */
1568 status_attr = XVaCreateNestedList (0, XNAreaNeeded, &needed_rect, NULL); 1654 status_attr = XVaCreateNestedList (0, XNAreaNeeded, &needed_rect, NULL);
1569 XGetICValues (Input_Context, XNStatusAttributes, status_attr, NULL); 1655 XGetICValues (Input_Context, XNStatusAttributes, status_attr, NULL);
1570 XFree (status_attr); 1656 XFree (status_attr);
1571 1657
1572 im_set_preedit_area (preedit_rect, status_rect, *needed_rect); 1658 im_set_preedit_area (preedit_rect, status_rect, *needed_rect);
1573 XFree (needed_rect); 1659 XFree (needed_rect);
1574 1660
1575 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL); 1661 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);
1576 status_attr = XVaCreateNestedList (0, XNArea, &status_rect, NULL); 1662 status_attr = XVaCreateNestedList (0, XNArea, &status_rect, NULL);
1577 1663
1578 XSetICValues (Input_Context, 1664 XSetICValues (Input_Context,
1579 XNPreeditAttributes, preedit_attr, 1665 XNPreeditAttributes, preedit_attr,
1580 XNStatusAttributes, status_attr, NULL); 1666 XNStatusAttributes, status_attr,
1667 NULL);
1581 1668
1669 XFree (status_attr);
1670 }
1671
1582 XFree (preedit_attr); 1672 XFree (preedit_attr);
1583 XFree (status_attr);
1584} 1673}
1585#endif /* USE_XIM */ 1674#endif /* USE_XIM */
1675
1676void
1677rxvt_term::get_window_origin (int &x, int &y)
1678{
1679 Window cr;
1680 XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr);
1681/* fprintf (stderr, "origin is %+d%+d\n", x, y);*/
1682}
1683
1684Pixmap
1685rxvt_term::get_pixmap_property (int prop_id)
1686{
1687 if (prop_id > 0 && prop_id < NUM_XA)
1688 if (xa[prop_id])
1689 {
1690 int aformat;
1691 unsigned long nitems, bytes_after;
1692 Atom atype;
1693 unsigned char *prop = NULL;
1694 int result = XGetWindowProperty (dpy, display->root, xa[prop_id],
1695 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1696 &nitems, &bytes_after, &prop);
1697 if (result == Success && prop && atype == XA_PIXMAP)
1698 return *(Pixmap *)prop;
1699 }
1700
1701 return None;
1702}
1703
1704#ifdef HAVE_BG_PIXMAP
1705# if TRACE_PIXMAPS
1706# undef update_background
1707void
1708rxvt_term::trace_update_background (const char *file, int line)
1709{
1710 fprintf (stderr, "%s:%d:update_background()\n", file, line);
1711 update_background ();
1712}
1713# endif
1714
1715void
1716rxvt_term::update_background ()
1717{
1718 if (update_background_ev.is_active ())
1719 return;
1720
1721 bgPixmap.invalidate ();
1722
1723 ev_tstamp to_wait = 0.5 - (ev::now () - bgPixmap.valid_since);
1724
1725 if (to_wait <= 0.)
1726 bgPixmap.render ();
1727 else
1728 update_background_ev.start (to_wait);
1729}
1730
1731void
1732rxvt_term::update_background_cb (ev::timer &w, int revents)
1733{
1734 make_current ();
1735
1736 update_background_ev.stop ();
1737 bgPixmap.render ();
1738 refresh_check ();
1739}
1740
1741#endif /* HAVE_BG_PIXMAP */
1586 1742
1587/*----------------------- end-of-file (C source) -----------------------*/ 1743/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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