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.123 by root, Mon Dec 20 16:44:31 2004 UTC vs.
Revision 1.203 by root, Wed Jan 25 02:42:06 2006 UTC

… …
11 * Copyright (c) 1997 mj olesen <olesen@me.QueensU.CA> 11 * Copyright (c) 1997 mj olesen <olesen@me.QueensU.CA>
12 * - extensive modifications 12 * - extensive modifications
13 * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de> 13 * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de>
14 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com> 14 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com>
15 * - extensive modifications 15 * - extensive modifications
16 * Copyright (c) 2003-2004 Marc Lehmann <pcg@goof.com> 16 * Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com>
17 * 17 *
18 * This program is free software; you can redistribute it and/or modify 18 * This program is free software; you can redistribute it and/or modify
19 * it under the terms of the GNU General Public License as published by 19 * it under the terms of the GNU General Public License as published by
20 * the Free Software Foundation; either version 2 of the License, or 20 * the Free Software Foundation; either version 2 of the License, or
21 * (at your option) any later version. 21 * (at your option) any later version.
… …
30 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 30 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
31 *---------------------------------------------------------------------*/ 31 *---------------------------------------------------------------------*/
32 32
33#include "../config.h" /* NECESSARY */ 33#include "../config.h" /* NECESSARY */
34#include "rxvt.h" /* NECESSARY */ 34#include "rxvt.h" /* NECESSARY */
35#include "main.intpro" /* PROTOS for internal routines */ 35#include "keyboard.h"
36#include "rxvtperl.h"
37
38#include <limits>
36 39
37#include <csignal> 40#include <csignal>
41#include <cstring>
38 42
39#ifdef TTY_GID_SUPPORT 43#ifdef TTY_GID_SUPPORT
40# include <grp.h> 44# include <grp.h>
41#endif 45#endif
42 46
43#ifdef HAVE_TERMIOS_H 47#ifdef HAVE_TERMIOS_H
44# include <termios.h> 48# include <termios.h>
45#endif 49#endif
46 50
47#include <cstring>
48
49vector<rxvt_term *> rxvt_term::termlist; 51vector<rxvt_term *> rxvt_term::termlist;
50 52
53// used to tell global functions which terminal instance is "active"
54rxvt_t rxvt_current_term;
55
51static char curlocale[128]; 56static char curlocale[128], savelocale[128];
52 57
53bool 58bool
54rxvt_set_locale (const char *locale) 59rxvt_set_locale (const char *locale) NOTHROW
55{ 60{
56 if (!locale || !strncmp (locale, curlocale, 128)) 61 if (!locale || !strncmp (locale, curlocale, 128))
57 return false; 62 return false;
58 63
59 strncpy (curlocale, locale, 128); 64 strncpy (curlocale, locale, 128);
60 setlocale (LC_CTYPE, curlocale); 65 setlocale (LC_CTYPE, curlocale);
61 return true; 66 return true;
67}
68
69void
70rxvt_push_locale (const char *locale) NOTHROW
71{
72 strcpy (savelocale, curlocale);
73 rxvt_set_locale (locale);
74}
75
76void
77rxvt_pop_locale () NOTHROW
78{
79 rxvt_set_locale (savelocale);
62} 80}
63 81
64#if ENABLE_COMBINING 82#if ENABLE_COMBINING
65class rxvt_composite_vec rxvt_composite; 83class rxvt_composite_vec rxvt_composite;
66 84
… …
131 rootwin_ev (this, &rxvt_term::rootwin_cb), 149 rootwin_ev (this, &rxvt_term::rootwin_cb),
132#endif 150#endif
133#ifdef HAVE_SCROLLBARS 151#ifdef HAVE_SCROLLBARS
134 scrollbar_ev (this, &rxvt_term::x_cb), 152 scrollbar_ev (this, &rxvt_term::x_cb),
135#endif 153#endif
136#ifdef MENUBAR
137 menubar_ev (this, &rxvt_term::x_cb),
138#endif
139#ifdef CURSOR_BLINK 154#ifdef CURSOR_BLINK
140 cursor_blink_ev (this, &rxvt_term::cursor_blink_cb), 155 cursor_blink_ev (this, &rxvt_term::cursor_blink_cb),
141#endif 156#endif
142#ifdef TEXT_BLINK 157#ifdef TEXT_BLINK
143 text_blink_ev (this, &rxvt_term::text_blink_cb), 158 text_blink_ev (this, &rxvt_term::text_blink_cb),
… …
155 pointer_ev (this, &rxvt_term::pointer_cb), 170 pointer_ev (this, &rxvt_term::pointer_cb),
156#endif 171#endif
157#ifdef USE_XIM 172#ifdef USE_XIM
158 im_ev (this, &rxvt_term::im_cb), 173 im_ev (this, &rxvt_term::im_cb),
159#endif 174#endif
160 sw_term (this, &rxvt_term::sig_term), 175#ifndef NO_BELL
161 sw_chld (this, &rxvt_term::sig_chld), 176 bell_ev (this, &rxvt_term::bell_cb),
177#endif
162 termwin_ev (this, &rxvt_term::x_cb), 178 termwin_ev (this, &rxvt_term::x_cb),
163 vt_ev (this, &rxvt_term::x_cb), 179 vt_ev (this, &rxvt_term::x_cb),
180 child_ev (this, &rxvt_term::child_cb),
164 check_ev (this, &rxvt_term::check_cb), 181 check_ev (this, &rxvt_term::check_cb),
165 flush_ev (this, &rxvt_term::flush_cb), 182 flush_ev (this, &rxvt_term::flush_cb),
166 destroy_ev (this, &rxvt_term::destroy_cb), 183 destroy_ev (this, &rxvt_term::destroy_cb),
167 pty_ev (this, &rxvt_term::pty_cb), 184 pty_ev (this, &rxvt_term::pty_cb),
168 incr_ev (this, &rxvt_term::incr_cb) 185 incr_ev (this, &rxvt_term::incr_cb)
169{ 186{
170 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base; 187 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base;
171 188
172 termlist.push_back (this); 189 termlist.push_back (this);
173}
174 190
175rxvt_term::~rxvt_term () 191#ifdef KEYSYM_RESOURCE
176{ 192 keyboard = new keyboard_manager;
177 termlist.erase (find (termlist.begin (), termlist.end(), this)); 193#endif
194}
178 195
196// clean up the most important stuff, do *not* call x or free mem etc.
197// for use before an emergency exit
198void rxvt_term::emergency_cleanup ()
199{
179 if (cmd_pid) 200 if (cmd_pid)
180 kill (-cmd_pid, SIGHUP); 201 kill (-cmd_pid, SIGHUP);
181 202
182 pty.put (); 203 delete pty; pty = 0;
204}
183 205
184#ifdef UTMP_SUPPORT 206rxvt_term::~rxvt_term ()
185 privileged_utmp (RESTORE); 207{
186#endif 208 termlist.erase (find (termlist.begin (), termlist.end(), this));
209
210 emergency_cleanup ();
187 211
188#if ENABLE_STYLES 212#if ENABLE_STYLES
189 for (int i = RS_styleCount; --i; ) 213 for (int i = RS_styleCount; --i; )
190 if (TermWin.fontset[i] != TermWin.fontset[0]) 214 if (fontset[i] != fontset[0])
191 delete TermWin.fontset[i]; 215 delete fontset[i];
192#endif 216#endif
193 delete TermWin.fontset[0]; 217 delete fontset[0];
194 218
195 if (display) 219 if (display)
196 { 220 {
221 dDisp;
222
197 selection_clear (); 223 selection_clear ();
198 224
199#ifdef USE_XIM 225#ifdef USE_XIM
200 im_destroy (); 226 im_destroy ();
201#endif 227#endif
202#ifdef MENUBAR
203 if (menubarGC) XFreeGC (display->display, menubarGC);
204#endif
205#ifdef XTERM_SCROLLBAR 228#ifdef XTERM_SCROLLBAR
206 if (xscrollbarGC) XFreeGC (display->display, xscrollbarGC); 229 if (xscrollbarGC) XFreeGC (disp, xscrollbarGC);
207 if (ShadowGC) XFreeGC (display->display, ShadowGC); 230 if (ShadowGC) XFreeGC (disp, ShadowGC);
208#endif 231#endif
209#ifdef PLAIN_SCROLLBAR 232#ifdef PLAIN_SCROLLBAR
210 if (pscrollbarGC) XFreeGC (display->display, pscrollbarGC); 233 if (pscrollbarGC) XFreeGC (disp, pscrollbarGC);
211#endif 234#endif
212#ifdef NEXT_SCROLLBAR 235#ifdef NEXT_SCROLLBAR
213 if (blackGC) XFreeGC (display->display, blackGC); 236 if (blackGC) XFreeGC (disp, blackGC);
214 if (whiteGC) XFreeGC (display->display, whiteGC); 237 if (whiteGC) XFreeGC (disp, whiteGC);
215 if (grayGC) XFreeGC (display->display, grayGC); 238 if (grayGC) XFreeGC (disp, grayGC);
216 if (darkGC) XFreeGC (display->display, darkGC); 239 if (darkGC) XFreeGC (disp, darkGC);
217 if (stippleGC) XFreeGC (display->display, stippleGC); 240 if (stippleGC) XFreeGC (disp, stippleGC);
218 if (dimple) XFreePixmap (display->display, dimple); 241 if (dimple) XFreePixmap (disp, dimple);
219 if (upArrow) XFreePixmap (display->display, upArrow); 242 if (upArrow) XFreePixmap (disp, upArrow);
220 if (downArrow) XFreePixmap (display->display, downArrow); 243 if (downArrow) XFreePixmap (disp, downArrow);
221 if (upArrowHi) XFreePixmap (display->display, upArrowHi); 244 if (upArrowHi) XFreePixmap (disp, upArrowHi);
222 if (downArrowHi) XFreePixmap (display->display, downArrowHi); 245 if (downArrowHi) XFreePixmap (disp, downArrowHi);
223#endif 246#endif
224#if defined(MENUBAR) || defined(RXVT_SCROLLBAR) 247#ifdef RXVT_SCROLLBAR
225 if (topShadowGC) XFreeGC (display->display, topShadowGC); 248 if (topShadowGC) XFreeGC (disp, topShadowGC);
226 if (botShadowGC) XFreeGC (display->display, botShadowGC); 249 if (botShadowGC) XFreeGC (disp, botShadowGC);
227 if (scrollbarGC) XFreeGC (display->display, scrollbarGC); 250 if (scrollbarGC) XFreeGC (disp, scrollbarGC);
228#endif 251#endif
229 if (TermWin.gc) XFreeGC (display->display, TermWin.gc); 252 if (gc) XFreeGC (disp, gc);
230 253
231#if defined(MENUBAR) && (MENUBAR_MAX > 1)
232 delete menuBar.drawable; 254 delete drawable;
233 //if (menuBar.win)
234 // XDestroyWindow (display->display, menuBar.win);
235#endif
236 delete TermWin.drawable;
237 // destroy all windows 255 // destroy all windows
238 if (TermWin.parent[0]) 256 if (parent[0])
239 XDestroyWindow (display->display, TermWin.parent[0]); 257 XDestroyWindow (disp, parent[0]);
240 } 258 }
241 259
242 // TODO: free pixcolours, colours should become part of rxvt_display 260 // TODO: free pixcolours, colours should become part of rxvt_display
243
244 delete pix_colors_focused; 261 delete pix_colors_focused;
245#ifdef OFF_FOCUS_FADING 262#if OFF_FOCUS_FADING
246 delete pix_colors_unfocused; 263 delete pix_colors_unfocused;
247#endif 264#endif
248 265
249 displays.put (display); 266 displays.put (display);
250 267
251 scr_release (); 268 scr_release ();
252 269
253 /* clear all resources */ 270 /* clear all resources */
254 for (int i = 0; i < allocated.size (); i++) 271 for (int i = 0; i < allocated.size (); i++)
255 free (allocated[i]); 272 free (allocated [i]);
256 273
257 free (selection.text); 274 free (selection.text);
258 // TODO: manage env vars in child only(!) 275 // TODO: manage env vars in child only(!)
259 free (env_windowid); 276 free (env_windowid);
260 free (env_display); 277 free (env_display);
… …
264 free (v_buffer); 281 free (v_buffer);
265 free (incr_buf); 282 free (incr_buf);
266 283
267 delete envv; 284 delete envv;
268 delete argv; 285 delete argv;
286
287#ifdef KEYSYM_RESOURCE
288 delete keyboard;
289#endif
290}
291
292// child has exited, usually destroys
293void
294rxvt_term::child_cb (child_watcher &w, int status)
295{
296 HOOK_INVOKE ((this, HOOK_CHILD_EXIT, DT_INT, status, DT_END));
297
298 cmd_pid = 0;
299
300 if (!OPTION (Opt_hold))
301 destroy ();
269} 302}
270 303
271void 304void
272rxvt_term::destroy () 305rxvt_term::destroy ()
273{ 306{
274 if (destroy_ev.active) 307 if (destroy_ev.active)
275 return; 308 return;
276 309
310 HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));
311
277#if ENABLE_OVERLAY 312#if ENABLE_OVERLAY
278 scr_overlay_off (); 313 scr_overlay_off ();
279#endif 314#endif
280 315
281 if (display) 316 if (display)
… …
283#if USE_XIM 318#if USE_XIM
284 im_ev.stop (display); 319 im_ev.stop (display);
285#endif 320#endif
286#if HAVE_SCROLLBARS 321#if HAVE_SCROLLBARS
287 scrollbar_ev.stop (display); 322 scrollbar_ev.stop (display);
288#endif
289#if MENUBAR
290 menubar_ev.stop (display);
291#endif 323#endif
292#if TRANSPARENT 324#if TRANSPARENT
293 rootwin_ev.stop (display); 325 rootwin_ev.stop (display);
294#endif 326#endif
295 incr_ev.stop (); 327 incr_ev.stop ();
… …
319} 351}
320 352
321void 353void
322rxvt_term::destroy_cb (time_watcher &w) 354rxvt_term::destroy_cb (time_watcher &w)
323{ 355{
324 SET_R (this); 356 make_current ();
325 357
326 delete this; 358 delete this;
327}
328
329/*----------------------------------------------------------------------*/
330/* rxvt_init () */
331bool
332rxvt_term::init (int argc, const char *const *argv)
333{
334 SET_R (this);
335
336 if (!init_vars ())
337 return false;
338
339 init_secondary ();
340
341 const char **cmd_argv = init_resources (argc, argv);
342
343 set_locale ("");
344
345#if MENUBAR_MAX
346 menubar_read (rs[Rs_menu]);
347#endif
348#ifdef HAVE_SCROLLBARS
349 if (options & Opt_scrollBar)
350 scrollBar.setIdle (); /* set existence for size calculations */
351#endif
352
353 create_windows (argc, argv);
354
355 init_xlocale ();
356
357 scr_reset (); /* initialize screen */
358
359#if 0
360 XSynchronize (display->display, True);
361#endif
362
363#ifdef HAVE_SCROLLBARS
364 if (options & Opt_scrollBar)
365 resize_scrollbar (); /* create and map scrollbar */
366#endif
367#if (MENUBAR_MAX)
368 if (menubar_visible ())
369 XMapWindow (display->display, menuBar.win);
370#endif
371#ifdef TRANSPARENT
372 if (options & Opt_transparent)
373 {
374 XSelectInput (display->display, display->root, PropertyChangeMask);
375 check_our_parents ();
376 rootwin_ev.start (display, display->root);
377 }
378#endif
379
380 XMapWindow (display->display, TermWin.vt);
381 XMapWindow (display->display, TermWin.parent[0]);
382
383 set_colorfgbg ();
384
385 init_command (cmd_argv);
386
387 pty_ev.start (pty.pty, EVENT_READ);
388
389 check_ev.start ();
390
391 return true;
392}
393
394static int (*old_xerror_handler) (Display *dpy, XErrorEvent *event);
395
396void
397rxvt_init ()
398{
399 /*
400 * Save and then give up any super-user privileges
401 * If we need privileges in any area then we must specifically request it.
402 * We should only need to be root in these cases:
403 * 1. write utmp entries on some systems
404 * 2. chown tty on some systems
405 */
406 rxvt_privileges (SAVE);
407 rxvt_privileges (IGNORE);
408
409 signal (SIGHUP, SIG_IGN);
410 signal (SIGPIPE, SIG_IGN);
411
412 /* need to trap SIGURG for SVR4 (Unixware) rlogin */
413 /* signal (SIGURG, SIG_DFL); */
414
415 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
416 // TODO: handle this with exceptions and tolerate the memory loss
417 //XSetIOErrorHandler ((XErrorHandler) rxvt_xioerror_handler);
418}
419
420/* ------------------------------------------------------------------------- *
421 * SIGNAL HANDLING & EXIT HANDLER *
422 * ------------------------------------------------------------------------- */
423/*
424 * Catch a SIGCHLD signal and exit if the direct child has died
425 */
426
427void
428rxvt_term::sig_chld (sig_watcher &w)
429{
430 // we are being called for every SIGCHLD, not just ours
431 int pid;
432
433 while ((pid = waitpid (-1, NULL, WNOHANG)) > 0)
434 for (rxvt_term **t = termlist.begin (); t < termlist.end (); t++)
435 if (pid == (*t)->cmd_pid)
436 {
437 (*t)->destroy ();
438 break;
439 }
440} 359}
441 360
442/*----------------------------------------------------------------------*/ 361/*----------------------------------------------------------------------*/
443/* 362/*
444 * Exit gracefully, clearing the utmp entry and restoring tty attributes 363 * Exit gracefully, clearing the utmp entry and restoring tty attributes
445 * TODO: if debugging, this should free up any known resources if we can 364 * TODO: if debugging, this should free up any known resources if we can
446 */ 365 */
447void 366static XErrorHandler old_xerror_handler;
448rxvt_destroy_all () 367
368static void
369rxvt_emergency_cleanup ()
449{ 370{
450 // TODO: rxvtd should clean up all ressources
451 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++) 371 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)
452 (*t)->destroy (); 372 (*t)->emergency_cleanup ();
453} 373}
454 374
455/* 375#if ENABLE_FRILLS
456 * Catch a fatal signal and tidy up before quitting 376static void
457 */ 377print_x_error (Display *dpy, XErrorEvent *event)
458void
459rxvt_term::sig_term (sig_watcher &w)
460{ 378{
461#ifdef DEBUG_CMD 379 char buffer[BUFSIZ];
462 rxvt_warn ("caught signal %d, exiting.\n", w.signum); 380 char mesg[BUFSIZ];
463#endif 381 char number[32];
464 rxvt_destroy_all (); 382 char *mtype = "XlibMessage";
465 signal (w.signum, SIG_DFL); 383 XGetErrorText(dpy, event->error_code, buffer, BUFSIZ);
466 kill (getpid (), w.signum); 384 XGetErrorDatabaseText(dpy, mtype, "XError", "X Error", mesg, BUFSIZ);
385 rxvt_warn ("An X Error occured, trying to continue after report.\n");
386 rxvt_warn ("%s: %s\n", mesg, buffer);
387 XGetErrorDatabaseText(dpy, mtype, "MajorCode", "Request Major code %d", mesg, BUFSIZ);
388 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->request_code);
389 sprintf(number, "%d", event->request_code);
390 XGetErrorDatabaseText(dpy, "XRequest", number, "", buffer, BUFSIZ);
391 rxvt_warn ("(which is %s)\n", buffer);
392 if (event->request_code >= 128) {
393 XGetErrorDatabaseText(dpy, mtype, "MinorCode", "Request Minor code %d",
394 mesg, BUFSIZ);
395 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->minor_code);
396 }
397 if ((event->error_code == BadWindow) ||
398 (event->error_code == BadPixmap) ||
399 (event->error_code == BadCursor) ||
400 (event->error_code == BadFont) ||
401 (event->error_code == BadDrawable) ||
402 (event->error_code == BadColor) ||
403 (event->error_code == BadGC) ||
404 (event->error_code == BadIDChoice) ||
405 (event->error_code == BadValue) ||
406 (event->error_code == BadAtom)) {
407 if (event->error_code == BadValue)
408 XGetErrorDatabaseText(dpy, mtype, "Value", "Value 0x%x",
409 mesg, BUFSIZ);
410 else if (event->error_code == BadAtom)
411 XGetErrorDatabaseText(dpy, mtype, "AtomID", "AtomID 0x%x",
412 mesg, BUFSIZ);
413 else
414 XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x",
415 mesg, BUFSIZ);
416 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid);
417 }
418 XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d",
419 mesg, BUFSIZ);
420 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial);
467} 421}
422#endif
468 423
469/* INTPROTO */
470int 424int
471rxvt_xerror_handler (Display *display, XErrorEvent *event) 425rxvt_xerror_handler (Display *display, XErrorEvent *event)
472{ 426{
473 if (GET_R->allowedxerror == -1) 427 if (GET_R->allowedxerror == -1)
474 GET_R->allowedxerror = event->error_code; 428 GET_R->allowedxerror = event->error_code;
475 else 429 else
476 { 430 {
431 // GET_R is most likely not the terminal which caused the error,
432 // so just output the error and continue
433#if ENABLE_FRILLS
434 print_x_error (display, event);
435#else
477 old_xerror_handler (display, event); 436 old_xerror_handler (display, event);
478 GET_R->destroy (); 437#endif
479 } 438 }
480 439
481 return 0; 440 return 0;
441}
442
443int
444rxvt_xioerror_handler (Display *display)
445{
446 rxvt_warn ("X connection to '%s' broken, unable to recover, exiting.\n",
447 DisplayString (display));
448 rxvt_emergency_cleanup ();
449 _exit (EXIT_FAILURE);
450}
451
452/*----------------------------------------------------------------------*/
453bool
454rxvt_term::init (int argc, const char *const *argv, stringvec *envv)
455{
456 this->envv = envv;
457
458 SET_R (this);
459 set_locale ("");
460 set_environ (envv); // few things in X do not call setlocale :(
461
462 if (!init_vars ())
463 return false;
464
465 init_secondary ();
466
467 const char **cmd_argv = init_resources (argc, argv);
468
469#ifdef KEYSYM_RESOURCE
470 keyboard->register_done ();
471#endif
472
473#ifdef HAVE_SCROLLBARS
474 if (OPTION (Opt_scrollBar))
475 scrollBar.setIdle (); /* set existence for size calculations */
476#endif
477
478 pty = ptytty::create ();
479
480 create_windows (argc, argv);
481
482 dDisp;
483
484 init_xlocale ();
485
486 scr_reset (); // initialize screen
487
488#if 0
489 XSynchronize (disp, True);
490#endif
491
492#ifdef HAVE_SCROLLBARS
493 if (OPTION (Opt_scrollBar))
494 resize_scrollbar (); /* create and map scrollbar */
495#endif
496#ifdef TRANSPARENT
497 if (OPTION (Opt_transparent))
498 {
499 XSelectInput (disp, display->root, PropertyChangeMask);
500 check_our_parents ();
501 rootwin_ev.start (display, display->root);
502 }
503#endif
504
505 set_colorfgbg ();
506
507 init_command (cmd_argv);
508
509 free (cmd_argv);
510
511 if (pty->pty >= 0)
512 pty_ev.start (pty->pty, EVENT_READ);
513
514 check_ev.start ();
515
516 HOOK_INVOKE ((this, HOOK_START, DT_END));
517
518#if ENABLE_XEMBED
519 if (rs[Rs_embed])
520 {
521 long info[2] = { 0, XEMBED_MAPPED };
522
523 XChangeProperty (display->display, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
524 32, PropModeReplace, (unsigned char *)&info, 2);
525 }
526#endif
527
528 XMapWindow (disp, vt);
529 XMapWindow (disp, parent[0]);
530
531 return true;
532}
533
534static struct sig_handlers
535{
536 sig_watcher sw_term, sw_int;
537
538 /*
539 * Catch a fatal signal and tidy up before quitting
540 */
541 void
542 sig_term (sig_watcher &w)
543 {
544 rxvt_emergency_cleanup ();
545 signal (w.signum, SIG_DFL);
546 kill (getpid (), w.signum);
547 }
548
549 sig_handlers ()
550 : sw_term (this, &sig_handlers::sig_term),
551 sw_int (this, &sig_handlers::sig_term)
552 {
553 }
554} sig_handlers;
555
556char **rxvt_environ; // startup environment
557
558void
559rxvt_init ()
560{
561 ptytty::init ();
562
563 rxvt_environ = environ;
564
565 signal (SIGHUP, SIG_IGN);
566 signal (SIGPIPE, SIG_IGN);
567
568 sig_handlers.sw_term.start (SIGTERM);
569 sig_handlers.sw_int.start (SIGINT);
570
571 /* need to trap SIGURG for SVR4 (Unixware) rlogin */
572 /* signal (SIGURG, SIG_DFL); */
573
574 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
575 // TODO: handle this with exceptions and tolerate the memory loss
576 XSetIOErrorHandler (rxvt_xioerror_handler);
577
578 XrmInitialize ();
482} 579}
483 580
484/* ------------------------------------------------------------------------- * 581/* ------------------------------------------------------------------------- *
485 * MEMORY ALLOCATION WRAPPERS * 582 * MEMORY ALLOCATION WRAPPERS *
486 * ------------------------------------------------------------------------- */ 583 * ------------------------------------------------------------------------- */
… …
493 rxvt_fatal ("memory allocation failure. aborting.\n"); 590 rxvt_fatal ("memory allocation failure. aborting.\n");
494 591
495 return p; 592 return p;
496} 593}
497 594
498/* INTPROTO */ 595void *
499void *
500rxvt_calloc (size_t number, size_t size) 596rxvt_calloc (size_t number, size_t size)
501{ 597{
502 void *p = calloc (number, size); 598 void *p = calloc (number, size);
503 599
504 if (!p) 600 if (!p)
505 rxvt_fatal ("memory allocation failure. aborting.\n"); 601 rxvt_fatal ("memory allocation failure. aborting.\n");
506 602
507 return p; 603 return p;
508} 604}
509 605
510/* INTPROTO */ 606void *
511void *
512rxvt_realloc (void *ptr, size_t size) 607rxvt_realloc (void *ptr, size_t size)
513{ 608{
514 void *p = realloc (ptr, size); 609 void *p = realloc (ptr, size);
515 610
516 if (!p) 611 if (!p)
517 rxvt_fatal ("memory allocation failure. aborting.\n"); 612 rxvt_fatal ("memory allocation failure. aborting.\n");
518 613
519 return p; 614 return p;
520} 615}
521
522/* ------------------------------------------------------------------------- *
523 * PRIVILEGED OPERATIONS *
524 * ------------------------------------------------------------------------- */
525/* take care of suid/sgid super-user (root) privileges */
526void
527rxvt_privileges (rxvt_privaction action)
528{
529#if (defined(HAVE_SETEUID) || defined(HAVE_SETREUID)) && !defined(__CYGWIN32__)
530 static uid_t euid;
531 static gid_t egid;
532#endif
533
534#if ! defined(__CYGWIN32__)
535# if !defined(HAVE_SETEUID) && defined(HAVE_SETREUID)
536 /* setreuid () is the poor man's setuid (), seteuid () */
537# define seteuid(a) setreuid(-1, (a))
538# define setegid(a) setregid(-1, (a))
539# define HAVE_SETEUID
540# endif
541# ifdef HAVE_SETEUID
542 switch (action)
543 {
544 case IGNORE:
545 /*
546 * change effective uid/gid - not real uid/gid - so we can switch
547 * back to root later, as required
548 */
549 seteuid (getuid ());
550 setegid (getgid ());
551 break;
552 case SAVE:
553 euid = geteuid ();
554 egid = getegid ();
555 break;
556 case RESTORE:
557 seteuid (euid);
558 setegid (egid);
559 break;
560 }
561# else
562 switch (action)
563 {
564 case IGNORE:
565 setuid (getuid ());
566 setgid (getgid ());
567 /* FALLTHROUGH */
568 case SAVE:
569 /* FALLTHROUGH */
570 case RESTORE:
571 break;
572 }
573# endif
574#endif
575}
576
577#ifdef UTMP_SUPPORT
578void
579rxvt_term::privileged_utmp (rxvt_privaction action)
580{
581 if ((options & Opt_utmpInhibit)
582 || !pty.name || !*pty.name)
583 return;
584
585 rxvt_privileges (RESTORE);
586
587 if (action == SAVE)
588 makeutent (pty.name, rs[Rs_display_name]);
589 else
590 cleanutent ();
591
592 rxvt_privileges (IGNORE);
593}
594#endif
595 616
596/*----------------------------------------------------------------------*/ 617/*----------------------------------------------------------------------*/
597/* 618/*
598 * window size/position calculcations for XSizeHint and other storage. 619 * window size/position calculcations for XSizeHint and other storage.
599 * if width/height are non-zero then override calculated width/height 620 * if width/height are non-zero then override calculated width/height
600 */ 621 */
601void 622void
602rxvt_term::window_calc (unsigned int width, unsigned int height) 623rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
603{ 624{
604 short recalc_x, recalc_y; 625 short recalc_x, recalc_y;
605 int x, y, sb_w, mb_h, flags; 626 int x, y, sb_w, flags;
606 unsigned int w, h; 627 unsigned int w, h;
607 unsigned int max_width, max_height; 628 unsigned int max_width, max_height;
629 dDisp;
608 630
609 D_SIZE ((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
610 TermWin.ncol, TermWin.nrow, szHint.width,
611 szHint.height));
612 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity; 631 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity;
613 szHint.win_gravity = NorthWestGravity; 632 szHint.win_gravity = NorthWestGravity;
614 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */ 633 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */
615 634
616 recalc_x = recalc_y = 0; 635 recalc_x = recalc_y = 0;
617 flags = 0; 636 flags = 0;
637
618 if (!parsed_geometry) 638 if (!parsed_geometry)
619 { 639 {
620 parsed_geometry = 1; 640 parsed_geometry = 1;
641
621 if (rs[Rs_geometry]) 642 if (rs[Rs_geometry])
622 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h); 643 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h);
644
623 if (flags & WidthValue) 645 if (flags & WidthValue)
624 { 646 {
625 TermWin.ncol = BOUND_POSITIVE_INT16 (w); 647 ncol = clamp (w, 0, std::numeric_limits<int16_t>::max ());
626 szHint.flags |= USSize; 648 szHint.flags |= USSize;
627 } 649 }
650
628 if (flags & HeightValue) 651 if (flags & HeightValue)
629 { 652 {
630 TermWin.nrow = BOUND_POSITIVE_INT16 (h); 653 nrow = clamp (h, 0, std::numeric_limits<int16_t>::max ());
631 szHint.flags |= USSize; 654 szHint.flags |= USSize;
632 } 655 }
656
633 if (flags & XValue) 657 if (flags & XValue)
634 { 658 {
635 szHint.x = x; 659 szHint.x = x;
636 szHint.flags |= USPosition; 660 szHint.flags |= USPosition;
661
637 if (flags & XNegative) 662 if (flags & XNegative)
638 { 663 {
639 recalc_x = 1; 664 recalc_x = 1;
640 szHint.win_gravity = NorthEastGravity; 665 szHint.win_gravity = NorthEastGravity;
641 } 666 }
642 } 667 }
668
643 if (flags & YValue) 669 if (flags & YValue)
644 { 670 {
645 szHint.y = y; 671 szHint.y = y;
646 szHint.flags |= USPosition; 672 szHint.flags |= USPosition;
673
647 if (flags & YNegative) 674 if (flags & YNegative)
648 { 675 {
649 recalc_y = 1; 676 recalc_y = 1;
677
650 if (szHint.win_gravity == NorthEastGravity) 678 if (szHint.win_gravity == NorthEastGravity)
651 szHint.win_gravity = SouthEastGravity; 679 szHint.win_gravity = SouthEastGravity;
652 else 680 else
653 szHint.win_gravity = SouthWestGravity; 681 szHint.win_gravity = SouthWestGravity;
654 } 682 }
655 } 683 }
656 } 684 }
657 685
658 /* TODO: BOUNDS */ 686 /* TODO: BOUNDS */
659 TermWin.width = TermWin.ncol * TermWin.fwidth; 687 width = ncol * fwidth;
660 TermWin.height = TermWin.nrow * TermWin.fheight; 688 height = nrow * fheight;
661 max_width = MAX_COLS * TermWin.fwidth; 689 max_width = MAX_COLS * fwidth;
662 max_height = MAX_ROWS * TermWin.fheight; 690 max_height = MAX_ROWS * fheight;
663 691
664 szHint.base_width = szHint.base_height = 2 * TermWin.int_bwidth; 692 szHint.base_width = szHint.base_height = 2 * int_bwidth;
665 693
666 sb_w = mb_h = 0; 694 sb_w = 0;
667 window_vt_x = window_vt_y = TermWin.int_bwidth; 695 window_vt_x = window_vt_y = int_bwidth;
668 696
669 if (scrollbar_visible ()) 697 if (scrollBar.state)
670 { 698 {
671 sb_w = scrollbar_TotalWidth (); 699 sb_w = scrollbar_TotalWidth ();
672 szHint.base_width += sb_w; 700 szHint.base_width += sb_w;
673 if (!(options & Opt_scrollBar_right)) 701 if (!OPTION (Opt_scrollBar_right))
674 window_vt_x += sb_w; 702 window_vt_x += sb_w;
675 } 703 }
676 704
677 if (menubar_visible ())
678 {
679 mb_h = menuBar_TotalHeight ();
680 szHint.base_height += mb_h;
681 window_vt_y += mb_h;
682 }
683
684 szHint.width_inc = TermWin.fwidth; 705 szHint.width_inc = fwidth;
685 szHint.height_inc = TermWin.fheight; 706 szHint.height_inc = fheight;
686 szHint.min_width = szHint.base_width + szHint.width_inc; 707 szHint.min_width = szHint.base_width + szHint.width_inc;
687 szHint.min_height = szHint.base_height + szHint.height_inc; 708 szHint.min_height = szHint.base_height + szHint.height_inc;
688 709
689 if (width && width - szHint.base_width < max_width) 710 if (newwidth && newwidth - szHint.base_width < max_width)
690 { 711 {
691 szHint.width = width; 712 szHint.width = newwidth;
692 TermWin.width = width - szHint.base_width; 713 width = newwidth - szHint.base_width;
693 } 714 }
694 else 715 else
695 { 716 {
696 MIN_IT (TermWin.width, max_width); 717 min_it (width, max_width);
697 szHint.width = szHint.base_width + TermWin.width; 718 szHint.width = szHint.base_width + width;
698 } 719 }
699 720
700 if (height && height - szHint.base_height < max_height) 721 if (newheight && newheight - szHint.base_height < max_height)
701 { 722 {
702 szHint.height = height; 723 szHint.height = newheight;
703 TermWin.height = height - szHint.base_height; 724 height = newheight - szHint.base_height;
704 } 725 }
705 else 726 else
706 { 727 {
707 MIN_IT (TermWin.height, max_height); 728 min_it (height, max_height);
708 szHint.height = szHint.base_height + TermWin.height; 729 szHint.height = szHint.base_height + height;
709 } 730 }
710 731
711 if (scrollbar_visible () && (options & Opt_scrollBar_right)) 732 if (scrollBar.state && OPTION (Opt_scrollBar_right))
712 window_sb_x = szHint.width - sb_w; 733 window_sb_x = szHint.width - sb_w;
713 734
714 if (recalc_x) 735 if (recalc_x)
715 szHint.x += (DisplayWidth (display->display, DefaultScreen (display->display)) 736 szHint.x += DisplayWidth (disp, display->screen) - szHint.width - 2 * ext_bwidth;
716 - szHint.width - 2 * TermWin.ext_bwidth);
717 if (recalc_y) 737 if (recalc_y)
718 szHint.y += (DisplayHeight (display->display, DefaultScreen (display->display)) 738 szHint.y += DisplayHeight (disp, display->screen) - szHint.height - 2 * ext_bwidth;
719 - szHint.height - 2 * TermWin.ext_bwidth);
720 739
721 TermWin.ncol = TermWin.width / TermWin.fwidth; 740 ncol = width / fwidth;
722 TermWin.nrow = TermWin.height / TermWin.fheight; 741 nrow = height / fheight;
723 D_SIZE ((stderr, "> Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
724 TermWin.ncol, TermWin.nrow, szHint.width,
725 szHint.height));
726 return;
727} 742}
728 743
729/*----------------------------------------------------------------------*/ 744/*----------------------------------------------------------------------*/
730/* 745/*
731 * Tell the teletype handler what size the window is. 746 * Tell the teletype handler what size the window is.
732 * Called after a window size change. 747 * Called after a window size change.
733 */ 748 */
734void 749void
735rxvt_term::tt_winch () 750rxvt_term::tt_winch ()
736{ 751{
737 if (pty.pty < 0) 752 if (pty->pty < 0)
738 return; 753 return;
739 754
740 struct winsize ws; 755 struct winsize ws;
741 756
742 ws.ws_col = TermWin.ncol; 757 ws.ws_col = ncol;
743 ws.ws_row = TermWin.nrow; 758 ws.ws_row = nrow;
744 ws.ws_xpixel = TermWin.width; 759 ws.ws_xpixel = width;
745 ws.ws_ypixel = TermWin.height; 760 ws.ws_ypixel = height;
746 (void)ioctl (pty.pty, TIOCSWINSZ, &ws); 761 (void)ioctl (pty->pty, TIOCSWINSZ, &ws);
747 762
748#if 0 763#if 0
749 // TIOCSWINSZ⎈ is supposed to do this automatically and correctly 764 // TIOCSWINSZ⎈ is supposed to do this automatically and correctly
750 if (cmd_pid) /* force through to the command */ 765 if (cmd_pid) /* force through to the command */
751 kill (cmd_pid, SIGWINCH); 766 kill (-cmd_pid, SIGWINCH);
752#endif 767#endif
753} 768}
754 769
755/*----------------------------------------------------------------------*/ 770/*----------------------------------------------------------------------*/
756/* set_fonts () - load and set the various fonts 771/* set_fonts () - load and set the various fonts
757/* 772 *
758 * init = 1 - initialize 773 * init = 1 - initialize
759 * 774 *
760 * fontname == FONT_UP - switch to bigger font 775 * fontname == FONT_UP - switch to bigger font
761 * fontname == FONT_DN - switch to smaller font 776 * fontname == FONT_DN - switch to smaller font
762 */ 777 */
… …
774 return false; 789 return false;
775 } 790 }
776 791
777#if ENABLE_STYLES 792#if ENABLE_STYLES
778 for (int i = RS_styleCount; --i; ) 793 for (int i = RS_styleCount; --i; )
779 if (TermWin.fontset[i] != TermWin.fontset[0]) 794 if (fontset[i] != fontset[0])
780 delete TermWin.fontset[i]; 795 delete fontset[i];
781#endif 796#endif
782 797
783 delete TermWin.fontset[0]; 798 delete fontset[0];
784 TermWin.fontset[0] = fs; 799 fontset[0] = fs;
785 800
786 prop = (*fs)[1]->properties (); 801 prop = (*fs)[1]->properties ();
802 prop.height += lineSpace;
787 fs->set_prop (prop); 803 fs->set_prop (prop);
788 804
789 TermWin.fwidth = prop.width; 805 fwidth = prop.width;
790 TermWin.fheight = prop.height; 806 fheight = prop.height;
791 TermWin.fweight = prop.weight; 807 fbase = prop.ascent;
792 TermWin.fslant = prop.slant;
793 TermWin.fbase = (*fs)[1]->ascent;
794 808
795 for (int style = 1; style < 4; style++) 809 for (int style = 1; style < 4; style++)
796 { 810 {
797#if ENABLE_STYLES 811#if ENABLE_STYLES
798 const char *res = rs[Rs_font + style]; 812 const char *res = rs[Rs_font + style];
799 813
800 if (res && !*res) 814 if (res && !*res)
801 TermWin.fontset[style] = TermWin.fontset[0]; 815 fontset[style] = fontset[0];
802 else 816 else
803 { 817 {
804 TermWin.fontset[style] = fs = new rxvt_fontset (this); 818 fontset[style] = fs = new rxvt_fontset (this);
805 rxvt_fontprop prop2 = prop; 819 rxvt_fontprop prop2 = prop;
806 820
807 if (res) 821 if (res)
808 prop2.weight = prop2.slant = rxvt_fontprop::unset; 822 prop2.weight = prop2.slant = rxvt_fontprop::unset;
809 else 823 else
810 { 824 {
811 res = TermWin.fontset[0]->fontdesc; 825 res = fontset[0]->fontdesc;
812 826
813 if (SET_STYLE (0, style) & RS_Bold) prop2.weight = rxvt_fontprop::bold; 827 if (SET_STYLE (0, style) & RS_Bold) prop2.weight = rxvt_fontprop::bold;
814 if (SET_STYLE (0, style) & RS_Italic) prop2.slant = rxvt_fontprop::italic; 828 if (SET_STYLE (0, style) & RS_Italic) prop2.slant = rxvt_fontprop::italic;
815 } 829 }
816 830
817 fs->populate (res); 831 fs->populate (res);
818 fs->set_prop (prop2); 832 fs->set_prop (prop2);
819 } 833 }
820#else 834#else
821 TermWin.fontset[style] = TermWin.fontset[0]; 835 fontset[style] = fontset[0];
822#endif 836#endif
823 } 837 }
824 838
825 if (TermWin.parent[0]) 839 if (parent[0])
826 { 840 {
827 resize_all_windows (0, 0, 0); 841 resize_all_windows (0, 0, 0);
828 scr_remap_chars (); 842 scr_remap_chars ();
829 scr_touch (true); 843 scr_touch (true);
830 } 844 }
… …
832 return true; 846 return true;
833} 847}
834 848
835void rxvt_term::set_string_property (Atom prop, const char *str, int len) 849void rxvt_term::set_string_property (Atom prop, const char *str, int len)
836{ 850{
837 // TODO: SMART_WINDOW_TITLE
838 XChangeProperty (display->display, TermWin.parent[0], 851 XChangeProperty (display->display, parent[0],
839 prop, XA_STRING, 8, PropModeReplace, 852 prop, XA_STRING, 8, PropModeReplace,
840 (const unsigned char *)str, len >= 0 ? len : strlen (str)); 853 (const unsigned char *)str, len >= 0 ? len : strlen (str));
841} 854}
842 855
843void rxvt_term::set_utf8_property (Atom prop, const char *str, int len) 856void rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
844{ 857{
845 // TODO: SMART_WINDOW_TITLE
846 wchar_t *ws = rxvt_mbstowcs (str, len); 858 wchar_t *ws = rxvt_mbstowcs (str, len);
847 char *s = rxvt_wcstoutf8 (ws); 859 char *s = rxvt_wcstoutf8 (ws);
848 860
849 XChangeProperty (display->display, TermWin.parent[0], 861 XChangeProperty (display->display, parent[0],
850 prop, xa[XA_UTF8_STRING], 8, PropModeReplace, 862 prop, xa[XA_UTF8_STRING], 8, PropModeReplace,
851 (const unsigned char *)s, strlen (s)); 863 (const unsigned char *)s, strlen (s));
852 864
853 free (s); 865 free (s);
854 free (ws); 866 free (ws);
… …
859/* xterm sequences - title, iconName, color (exptl) */ 871/* xterm sequences - title, iconName, color (exptl) */
860void 872void
861rxvt_term::set_title (const char *str) 873rxvt_term::set_title (const char *str)
862{ 874{
863 set_string_property (XA_WM_NAME, str); 875 set_string_property (XA_WM_NAME, str);
864#if ENABLE_FRILLS 876#if ENABLE_EWMH
865 set_utf8_property (xa[XA_NET_WM_NAME], str); 877 set_utf8_property (xa[XA_NET_WM_NAME], str);
866#endif 878#endif
867} 879}
868 880
869void 881void
870rxvt_term::set_icon_name (const char *str) 882rxvt_term::set_icon_name (const char *str)
871{ 883{
872 set_string_property (XA_WM_ICON_NAME, str); 884 set_string_property (XA_WM_ICON_NAME, str);
873#if ENABLE_FRILLS 885#if ENABLE_EWMH
874 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str); 886 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str);
875#endif 887#endif
876} 888}
877 889
878#ifdef XTERM_COLOR_CHANGE 890#ifdef XTERM_COLOR_CHANGE
… …
887 899
888 /* handle color aliases */ 900 /* handle color aliases */
889 if (isdigit (*color)) 901 if (isdigit (*color))
890 { 902 {
891 i = atoi (color); 903 i = atoi (color);
904
892 if (i >= 8 && i <= 15) 905 if (i >= 8 && i <= 15)
893 { /* bright colors */ 906 { /* bright colors */
894 i -= 8; 907 i -= 8;
895# ifndef NO_BRIGHTCOLOR
896 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i]; 908 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i];
897 SET_PIXCOLOR (idx); 909 SET_PIXCOLOR (idx);
898 goto Done; 910 goto done;
899# endif
900
901 } 911 }
912
902 if (i >= 0 && i <= 7) 913 if (i >= 0 && i <= 7)
903 { /* normal colors */ 914 { /* normal colors */
904 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i]; 915 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];
905 SET_PIXCOLOR (idx); 916 SET_PIXCOLOR (idx);
906 goto Done; 917 goto done;
907 } 918 }
908 } 919 }
909 920
910 if (!rXParseAllocColor (& xcol, color)) 921 if (!rXParseAllocColor (&xcol, color))
911 return; 922 return;
912 923
913 /* XStoreColor (display->display, display->cmap, XColor*); */ 924 /* XStoreColor (display->display, display->cmap, XColor*); */
914 925
915 /* 926 /*
… …
931 pix_colors_focused[idx] = xcol; 942 pix_colors_focused[idx] = xcol;
932 SET_PIXCOLOR (idx); 943 SET_PIXCOLOR (idx);
933 944
934 /* XSetWindowAttributes attr; */ 945 /* XSetWindowAttributes attr; */
935 /* Cursor cursor; */ 946 /* Cursor cursor; */
936Done: 947done:
948
937#ifdef OFF_FOCUS_FADING 949#if OFF_FOCUS_FADING
938 if (rs[Rs_fade]) 950 if (rs[Rs_fade])
939 pix_colors_unfocused[idx] = pix_colors_focused[idx].fade (display, atoi (rs[Rs_fade])); 951 pix_colors_unfocused[idx] = pix_colors_focused[idx].fade (display, atoi (rs[Rs_fade]), pix_colors[Color_fade]);
940#endif 952#endif
941 953
942 /*TODO: handle Color_BD, scrollbar background, etc. */ 954 /*TODO: handle Color_BD, scrollbar background, etc. */
943 955
944 recolour_cursor (); 956 recolour_cursor ();
… …
1015 1027
1016/* -------------------------------------------------------------------- * 1028/* -------------------------------------------------------------------- *
1017 * - WINDOW RESIZING - * 1029 * - WINDOW RESIZING - *
1018 * -------------------------------------------------------------------- */ 1030 * -------------------------------------------------------------------- */
1019void 1031void
1020rxvt_term::resize_all_windows (unsigned int width, unsigned int height, int ignoreparent) 1032rxvt_term::resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent)
1021{ 1033{
1022 int fix_screen; 1034 int fix_screen;
1035 int old_width = szHint.width;
1036 int old_height = szHint.height;
1037 dDisp;
1023 1038
1024#ifdef SMART_RESIZE
1025 int old_width = szHint.width, old_height = szHint.height;
1026#endif
1027
1028 window_calc (width, height); 1039 window_calc (newwidth, newheight);
1029 XSetWMNormalHints (display->display, TermWin.parent[0], &szHint); 1040 XSetWMNormalHints (disp, parent[0], &szHint);
1030 1041
1031 if (!ignoreparent) 1042 if (!ignoreparent)
1032 { 1043 {
1033#ifdef SMART_RESIZE 1044#ifdef SMART_RESIZE
1034 /* 1045 /*
… …
1038 int x, y, x1, y1; 1049 int x, y, x1, y1;
1039 int dx, dy; 1050 int dx, dy;
1040 unsigned int unused_w1, unused_h1, unused_b1, unused_d1; 1051 unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
1041 Window unused_cr; 1052 Window unused_cr;
1042 1053
1043 XTranslateCoordinates (display->display, TermWin.parent[0], display->root, 1054 XTranslateCoordinates (disp, parent[0], display->root,
1044 0, 0, &x, &y, &unused_cr); 1055 0, 0, &x, &y, &unused_cr);
1045 XGetGeometry (display->display, TermWin.parent[0], &unused_cr, &x1, &y1, 1056 XGetGeometry (disp, parent[0], &unused_cr, &x1, &y1,
1046 &unused_w1, &unused_h1, &unused_b1, &unused_d1); 1057 &unused_w1, &unused_h1, &unused_b1, &unused_d1);
1047 /* 1058 /*
1048 * if display->root isn't the parent window, a WM will probably have offset 1059 * if display->root isn't the parent window, a WM will probably have offset
1049 * our position for handles and decorations. Counter it 1060 * our position for handles and decorations. Counter it
1050 */ 1061 */
… …
1052 { 1063 {
1053 x -= x1; 1064 x -= x1;
1054 y -= y1; 1065 y -= y1;
1055 } 1066 }
1056 1067
1057 x1 = (DisplayWidth (display->display, display->screen) - old_width) / 2; 1068 x1 = (DisplayWidth (disp, display->screen) - old_width ) / 2;
1058 y1 = (DisplayHeight (display->display, display->screen) - old_height) / 2; 1069 y1 = (DisplayHeight (disp, display->screen) - old_height) / 2;
1059 dx = old_width - szHint.width; 1070 dx = old_width - szHint.width;
1060 dy = old_height - szHint.height; 1071 dy = old_height - szHint.height;
1061 1072
1062 /* Check position of the center of the window */ 1073 /* Check position of the center of the window */
1063 if (x < x1) /* left half */ 1074 if (x < x1) /* left half */
1064 dx = 0; 1075 dx = 0;
… …
1067 if (y < y1) /* top half */ 1078 if (y < y1) /* top half */
1068 dy = 0; 1079 dy = 0;
1069 else if (y == y1) /* exact center */ 1080 else if (y == y1) /* exact center */
1070 dy /= 2; 1081 dy /= 2;
1071 1082
1072 XMoveResizeWindow (display->display, TermWin.parent[0], x + dx, y + dy, 1083 XMoveResizeWindow (disp, parent[0], x + dx, y + dy,
1073 szHint.width, szHint.height); 1084 szHint.width, szHint.height);
1074#else 1085#else
1075 XResizeWindow (display->display, TermWin.parent[0], szHint.width, szHint.height); 1086 XResizeWindow (disp, parent[0], szHint.width, szHint.height);
1076#endif 1087#endif
1077 } 1088 }
1078 1089
1079 fix_screen = TermWin.ncol != prev_ncol || TermWin.nrow != prev_nrow; 1090 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
1080 1091
1081 if (fix_screen || width != old_width || height != old_height) 1092 if (fix_screen || newwidth != old_width || newheight != old_height)
1082 { 1093 {
1083 if (scrollbar_visible ()) 1094 if (scrollBar.state)
1084 { 1095 {
1085 XMoveResizeWindow (display->display, scrollBar.win, 1096 XMoveResizeWindow (disp, scrollBar.win,
1086 window_sb_x, 0, 1097 window_sb_x, 0,
1087 scrollbar_TotalWidth (), szHint.height); 1098 scrollbar_TotalWidth (), szHint.height);
1088 resize_scrollbar (); 1099 resize_scrollbar ();
1089 } 1100 }
1090 1101
1091 if (menubar_visible ())
1092 XMoveResizeWindow (display->display, menuBar.win,
1093 window_vt_x, 0,
1094 TermWin_TotalWidth (), menuBar_TotalHeight ());
1095
1096 XMoveResizeWindow (display->display, TermWin.vt, 1102 XMoveResizeWindow (disp, vt,
1097 window_vt_x, window_vt_y, 1103 window_vt_x, window_vt_y,
1098 TermWin_TotalWidth (), TermWin_TotalHeight ()); 1104 width, height);
1105
1099 scr_clear (); 1106 scr_clear ();
1100#ifdef XPM_BACKGROUND 1107#ifdef XPM_BACKGROUND
1101 resize_pixmap (); 1108 resize_pixmap ();
1102#endif 1109#endif
1103 } 1110 }
1104 1111
1105 if (fix_screen || old_height == 0) 1112 if (fix_screen || old_height == 0)
1106 {
1107 int curr_screen = -1;
1108 int old_ncol = prev_ncol;
1109
1110 /* scr_reset only works on the primary screen */
1111 if (old_height) /* this is not the first time through */
1112 {
1113 unsigned int ncol = TermWin.ncol;
1114 TermWin.ncol = prev_ncol; // save b/c scr_blank_screen_mem uses this
1115 curr_screen = scr_change_screen (PRIMARY);
1116 TermWin.ncol = ncol;
1117 }
1118
1119 scr_reset (); 1113 scr_reset ();
1120 1114
1121 if (curr_screen >= 0) /* this is not the first time through */ 1115#ifdef XPM_BACKGROUND
1122 { 1116 if (pixmap)
1123 scr_change_screen (curr_screen); 1117 scr_touch (false);
1124 selection_check (old_ncol != TermWin.ncol ? 4 : 0); 1118#endif
1125 }
1126 }
1127
1128 old_width = szHint.width;
1129 old_height = szHint.height;
1130 1119
1131#ifdef USE_XIM 1120#ifdef USE_XIM
1132 IMSetStatusPosition (); 1121 IMSetStatusPosition ();
1133#endif 1122#endif
1134} 1123}
… …
1136/* 1125/*
1137 * Set the width/height of the vt window in characters. Units are pixels. 1126 * Set the width/height of the vt window in characters. Units are pixels.
1138 * good for toggling 80/132 columns 1127 * good for toggling 80/132 columns
1139 */ 1128 */
1140void 1129void
1141rxvt_term::set_widthheight (unsigned int width, unsigned int height) 1130rxvt_term::set_widthheight (unsigned int newwidth, unsigned int newheight)
1142{ 1131{
1143 XWindowAttributes wattr; 1132 XWindowAttributes wattr;
1144 1133
1145 if (width == 0 || height == 0) 1134 if (newwidth == 0 || newheight == 0)
1146 { 1135 {
1147 XGetWindowAttributes (display->display, display->root, &wattr); 1136 XGetWindowAttributes (display->display, display->root, &wattr);
1137
1148 if (width == 0) 1138 if (newwidth == 0)
1149 width = wattr.width - szHint.base_width; 1139 newwidth = wattr.width - szHint.base_width;
1150 if (height == 0) 1140 if (newheight == 0)
1151 height = wattr.height - szHint.base_height; 1141 newheight = wattr.height - szHint.base_height;
1152 }
1153
1154 if (width != TermWin.width || height != TermWin.height)
1155 { 1142 }
1143
1144 if (newwidth != width || newheight != height)
1145 {
1156 width += szHint.base_width; 1146 newwidth += szHint.base_width;
1157 height += szHint.base_height; 1147 newheight += szHint.base_height;
1158 resize_all_windows (width, height, 0); 1148 resize_all_windows (newwidth, newheight, 0);
1159 } 1149 }
1160} 1150}
1161 1151
1162/* -------------------------------------------------------------------- * 1152/* -------------------------------------------------------------------- *
1163 * - X INPUT METHOD ROUTINES - * 1153 * - X INPUT METHOD ROUTINES - *
… …
1173 1163
1174void 1164void
1175rxvt_term::im_set_size (XRectangle &size) 1165rxvt_term::im_set_size (XRectangle &size)
1176{ 1166{
1177 // the int_bwidth terms make no sense to me 1167 // the int_bwidth terms make no sense to me
1178 size.x = TermWin.int_bwidth; 1168 size.x = int_bwidth;
1179 size.y = TermWin.int_bwidth; 1169 size.y = int_bwidth;
1180 size.width = Width2Pixel (TermWin.ncol) + TermWin.int_bwidth; 1170 size.width = Width2Pixel (ncol) + int_bwidth;
1181 size.height = Height2Pixel (TermWin.nrow) + TermWin.int_bwidth; 1171 size.height = Height2Pixel (nrow) + int_bwidth;
1182} 1172}
1183 1173
1184void 1174void
1185rxvt_term::im_set_preedit_area (XRectangle &preedit_rect, 1175rxvt_term::im_set_preedit_area (XRectangle &preedit_rect,
1186 XRectangle &status_rect, 1176 XRectangle &status_rect,
1187 const XRectangle &needed_rect) 1177 const XRectangle &needed_rect)
1188{ 1178{
1189 preedit_rect.x = needed_rect.width; 1179 preedit_rect.x = needed_rect.width;
1190 preedit_rect.y = 0; 1180 preedit_rect.y = 0;
1191 preedit_rect.width = Width2Pixel (TermWin.ncol) - needed_rect.width + 1; 1181 preedit_rect.width = Width2Pixel (ncol) - needed_rect.width + 1;
1192 preedit_rect.height = TermWin.fheight; 1182 preedit_rect.height = fheight;
1193 1183
1194 status_rect.x = 0; 1184 status_rect.x = 0;
1195 status_rect.y = 0; 1185 status_rect.y = 0;
1196 status_rect.width = needed_rect.width ? needed_rect.width : Width2Pixel (TermWin.ncol) + 1; 1186 status_rect.width = needed_rect.width ? needed_rect.width : Width2Pixel (ncol) + 1;
1197 status_rect.height = TermWin.fheight; 1187 status_rect.height = fheight;
1198} 1188}
1199 1189
1200/* Checking whether input method is running. */ 1190/* Checking whether input method is running. */
1201bool 1191bool
1202rxvt_term::IMisRunning () 1192rxvt_term::IMisRunning ()
… …
1230{ 1220{
1231 XPoint nspot; 1221 XPoint nspot;
1232 XVaNestedList preedit_attr; 1222 XVaNestedList preedit_attr;
1233 1223
1234 if (!Input_Context 1224 if (!Input_Context
1235 || !TermWin.focus 1225 || !focus
1236 || !(input_style & XIMPreeditPosition)) 1226 || !(input_style & (XIMPreeditPosition | XIMPreeditCallbacks)))
1237 return; 1227 return;
1238 1228
1239 im_set_position (nspot); 1229 im_set_position (nspot);
1240 1230
1241 if (nspot.x == spot.x && nspot.y == spot.y) 1231 if (nspot.x == spot.x && nspot.y == spot.y)
… …
1260 input_method = 0; 1250 input_method = 0;
1261 } 1251 }
1262 1252
1263 Input_Context = 0; 1253 Input_Context = 0;
1264} 1254}
1255
1256#ifdef ENABLE_XIM_ONTHESPOT
1257
1258static void
1259xim_preedit_start (XIC ic, XPointer client_data, XPointer call_data)
1260{
1261 ((rxvt_term *)client_data)->make_current ();
1262 HOOK_INVOKE (((rxvt_term *)client_data, HOOK_XIM_PREEDIT_START, DT_END));
1263}
1264
1265static void
1266xim_preedit_done (XIC ic, XPointer client_data, XPointer call_data)
1267{
1268 ((rxvt_term *)client_data)->make_current ();
1269 HOOK_INVOKE (((rxvt_term *)client_data, HOOK_XIM_PREEDIT_DONE, DT_END));
1270}
1271
1272static void
1273xim_preedit_draw (XIC ic, XPointer client_data, XIMPreeditDrawCallbackStruct *call_data)
1274{
1275 rxvt_term *term = (rxvt_term *)client_data;
1276 XIMText *text = call_data->text;
1277
1278 term->make_current ();
1279
1280 if (text)
1281 {
1282 void *str;
1283
1284 if (!text->encoding_is_wchar && text->string.multi_byte)
1285 {
1286 // of course, X makes it ugly again
1287 if (term->rs[Rs_imLocale])
1288 SET_LOCALE (term->rs[Rs_imLocale]);
1289
1290 str = rxvt_temp_buf ((text->length + 1) * sizeof (wchar_t));
1291 mbstowcs ((wchar_t *)str, text->string.multi_byte, text->length + 1);
1292
1293 if (term->rs[Rs_imLocale])
1294 SET_LOCALE (term->locale);
1295 }
1296 else
1297 str = (void *)text->string.wide_char;
1298
1299 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
1300 DT_INT, call_data->caret,
1301 DT_INT, call_data->chg_first,
1302 DT_INT, call_data->chg_length,
1303 DT_LCS_LEN, (void *)text->feedback, text->feedback ? (int)text->length : 0,
1304 DT_WCS_LEN, str, str ? (int)text->length : 0,
1305 DT_END));
1306 }
1307 else
1308 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
1309 DT_INT, call_data->caret,
1310 DT_INT, call_data->chg_first,
1311 DT_INT, call_data->chg_length,
1312 DT_END));
1313}
1314
1315#if 0
1316static void
1317xim_preedit_caret (XIC ic, XPointer client_data, XIMPreeditCaretCallbackStruct *call_data)
1318{
1319 ((rxvt_term *)client_data)->make_current ();
1320 HOOK_INVOKE (((rxvt_term *)client_data, HOOK_XIM_PREEDIT_CARET,
1321 DT_INT, call_data->position,
1322 DT_INT, call_data->direction,
1323 DT_INT, call_data->style,
1324 DT_END));
1325}
1326#endif
1327
1328#endif
1265 1329
1266/* 1330/*
1267 * Try to open a XIM with the current modifiers, then see if we can 1331 * Try to open a XIM with the current modifiers, then see if we can
1268 * open a suitable preedit type 1332 * open a suitable preedit type
1269 */ 1333 */
… …
1276 XRectangle rect, status_rect, needed_rect; 1340 XRectangle rect, status_rect, needed_rect;
1277 unsigned long fg, bg; 1341 unsigned long fg, bg;
1278 const char *p; 1342 const char *p;
1279 char **s; 1343 char **s;
1280 XIMStyles *xim_styles; 1344 XIMStyles *xim_styles;
1345#ifdef ENABLE_XIM_ONTHESPOT
1346 XIMCallback xcb[4];
1347#endif
1348
1349 set_environ (envv);
1281 1350
1282 if (! ((p = XSetLocaleModifiers (modifiers)) && *p)) 1351 if (! ((p = XSetLocaleModifiers (modifiers)) && *p))
1283 return false; 1352 return false;
1284 1353
1285 D_MAIN ((stderr, "rxvt_IM_get_IC ()"));
1286 input_method = display->get_xim (locale, modifiers); 1354 input_method = display->get_xim (locale, modifiers);
1287 if (input_method == NULL) 1355 if (input_method == NULL)
1288 return false; 1356 return false;
1289 1357
1290 xim = input_method->xim; 1358 xim = input_method->xim;
… …
1310 s = rxvt_splitcommastring (p); 1378 s = rxvt_splitcommastring (p);
1311 1379
1312 for (i = found = 0; !found && s[i]; i++) 1380 for (i = found = 0; !found && s[i]; i++)
1313 { 1381 {
1314 if (!strcmp (s[i], "OverTheSpot")) 1382 if (!strcmp (s[i], "OverTheSpot"))
1315 input_style = (XIMPreeditPosition | XIMStatusNothing); 1383 input_style = XIMPreeditPosition | XIMStatusNothing;
1316 else if (!strcmp (s[i], "OffTheSpot")) 1384 else if (!strcmp (s[i], "OffTheSpot"))
1317 input_style = (XIMPreeditArea | XIMStatusArea); 1385 input_style = XIMPreeditArea | XIMStatusArea;
1318 else if (!strcmp (s[i], "Root")) 1386 else if (!strcmp (s[i], "Root"))
1319 input_style = (XIMPreeditNothing | XIMStatusNothing); 1387 input_style = XIMPreeditNothing | XIMStatusNothing;
1320 else if (!strcmp (s[i], "None")) 1388 else if (!strcmp (s[i], "None"))
1321 input_style = (XIMPreeditNone | XIMStatusNone); 1389 input_style = XIMPreeditNone | XIMStatusNone;
1390#ifdef ENABLE_XIM_ONTHESPOT
1391 else if (SHOULD_INVOKE (HOOK_XIM_PREEDIT_START) && !strcmp (s[i], "OnTheSpot"))
1392 input_style = XIMPreeditCallbacks | XIMStatusNothing;
1393#endif
1394 else
1395 input_style = XIMPreeditNothing | XIMStatusNothing;
1322 1396
1323 for (j = 0; j < xim_styles->count_styles; j++) 1397 for (j = 0; j < xim_styles->count_styles; j++)
1324 if (input_style == xim_styles->supported_styles[j]) 1398 if (input_style == xim_styles->supported_styles[j])
1325 { 1399 {
1326 rxvt_freecommastring (s); 1400 rxvt_freecommastring (s);
… …
1360 "-*-*-*-R-*-*-%d-*-*-*-*-*-*," 1434 "-*-*-*-R-*-*-%d-*-*-*-*-*-*,"
1361 "-*-*-*-R-*-*-%d-*-*-*-*-*-*," 1435 "-*-*-*-R-*-*-%d-*-*-*-*-*-*,"
1362 "-*-*-*-R-*-*-%d-*-*-*-*-*-*," 1436 "-*-*-*-R-*-*-%d-*-*-*-*-*-*,"
1363 "-*-*-*-R-*-*-%d-*-*-*-*-*-*," 1437 "-*-*-*-R-*-*-%d-*-*-*-*-*-*,"
1364 "*", 1438 "*",
1365 TermWin.fheight, 1439 fheight,
1366 TermWin.fheight + 1, TermWin.fheight - 1, 1440 fheight + 1, fheight - 1,
1367 TermWin.fheight - 2, TermWin.fheight + 2); 1441 fheight - 2, fheight + 2);
1368 1442
1369 fs = XCreateFontSet (display->display, pat, 1443 fs = XCreateFontSet (display->display, rs[Rs_imFont] ? rs[Rs_imFont] : pat,
1370 &missing_charset_list, &missing_charset_count, &def_string); 1444 &missing_charset_list, &missing_charset_count, &def_string);
1371 1445
1372 if (missing_charset_list) 1446 if (missing_charset_list)
1373 XFreeStringList (missing_charset_list); 1447 XFreeStringList (missing_charset_list);
1374 1448
… …
1415 XNBackground, bg, 1489 XNBackground, bg,
1416 XNArea, &status_rect, 1490 XNArea, &status_rect,
1417 XNFontSet, fs, 1491 XNFontSet, fs,
1418 NULL); 1492 NULL);
1419 } 1493 }
1494 else if (input_style & XIMPreeditCallbacks)
1495 {
1496 im_set_position (spot);
1497
1498 xcb[0].client_data = (XPointer)this; xcb[0].callback = (XIMProc)xim_preedit_start;
1499 xcb[1].client_data = (XPointer)this; xcb[1].callback = (XIMProc)xim_preedit_done;
1500 xcb[2].client_data = (XPointer)this; xcb[2].callback = (XIMProc)xim_preedit_draw;
1501#if 0
1502 xcb[3].client_data = (XPointer)this; xcb[3].callback = (XIMProc)xim_preedit_caret;
1503#endif
1504
1505 preedit_attr = XVaCreateNestedList (0,
1506 XNSpotLocation, &spot,
1507 XNPreeditStartCallback, &xcb[0],
1508 XNPreeditDoneCallback , &xcb[1],
1509 XNPreeditDrawCallback , &xcb[2],
1510#if 0
1511 XNPreeditCaretCallback, &xcb[3],
1512#endif
1513 NULL);
1514 }
1420 1515
1421 Input_Context = XCreateIC (xim, 1516 Input_Context = XCreateIC (xim,
1422 XNInputStyle, input_style, 1517 XNInputStyle, input_style,
1423 XNClientWindow, TermWin.vt, 1518 XNClientWindow, vt,
1424 XNFocusWindow, TermWin.parent[0], 1519 XNFocusWindow, parent[0],
1425 preedit_attr ? XNPreeditAttributes : NULL, 1520 preedit_attr ? XNPreeditAttributes : NULL,
1426 preedit_attr, 1521 preedit_attr,
1427 status_attr ? XNStatusAttributes : NULL, 1522 status_attr ? XNStatusAttributes : NULL,
1428 status_attr, NULL); 1523 status_attr, NULL);
1429 1524
… …
1436 rxvt_warn ("failed to create input context, continuing without XIM.\n"); 1531 rxvt_warn ("failed to create input context, continuing without XIM.\n");
1437 im_destroy (); 1532 im_destroy ();
1438 return false; 1533 return false;
1439 } 1534 }
1440 1535
1536#if 0
1537 // unfortunately, only the focus window is used by XIM, hard to fix
1538 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL))
1539 vt_select_input ();
1540#endif
1541
1441 if (input_style & XIMPreeditArea) 1542 if (input_style & XIMPreeditArea)
1442 IMSetStatusPosition (); 1543 IMSetStatusPosition ();
1443 1544
1444 D_MAIN ((stderr, "rxvt_IM_get_IC () - successful connection"));
1445 return true; 1545 return true;
1446} 1546}
1447 1547
1448void 1548void
1449rxvt_term::im_cb () 1549rxvt_term::im_cb ()
1450{ 1550{
1451 int i, found, had_im; 1551 int i;
1452 const char *p; 1552 const char *p;
1453 char **s; 1553 char **s;
1454 char buf[IMBUFSIZ]; 1554 char buf[IMBUFSIZ];
1455 1555
1556 make_current ();
1557
1456 im_destroy (); 1558 im_destroy ();
1457 1559
1458 D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()"));
1459 if (Input_Context) 1560 if (Input_Context)
1460 return; 1561 return;
1461 1562
1462#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE) 1563#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1463 if (rs[Rs_imLocale]) 1564 if (rs[Rs_imLocale])
… …
1511{ 1612{
1512 XRectangle preedit_rect, status_rect, *needed_rect; 1613 XRectangle preedit_rect, status_rect, *needed_rect;
1513 XVaNestedList preedit_attr, status_attr; 1614 XVaNestedList preedit_attr, status_attr;
1514 1615
1515 if (!Input_Context 1616 if (!Input_Context
1516 || !TermWin.focus 1617 || !focus
1517 || !(input_style & XIMPreeditArea) 1618 || !(input_style & XIMPreeditArea)
1518 || !IMisRunning ()) 1619 || !IMisRunning ())
1519 return; 1620 return;
1520 1621
1521 /* Getting the necessary width of preedit area */ 1622 /* Getting the necessary width of preedit area */
… …
1536 XFree (preedit_attr); 1637 XFree (preedit_attr);
1537 XFree (status_attr); 1638 XFree (status_attr);
1538} 1639}
1539#endif /* USE_XIM */ 1640#endif /* USE_XIM */
1540 1641
1541/*----------------------------------------------------------------------*/
1542rxvt_t rxvt_current_term;
1543
1544/*----------------------- end-of-file (C source) -----------------------*/ 1642/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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