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.73 by root, Fri Jul 30 14:59:12 2004 UTC vs.
Revision 1.329 by sf-exg, Wed Jul 21 11:02:14 2010 UTC

1/*--------------------------------*-C-*---------------------------------* 1/*----------------------------------------------------------------------*
2 * File: main.C 2 * File: main.C
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * 4 *
5 * All portions of code are copyright by their respective author/s. 5 * All portions of code are copyright by their respective author/s.
6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk> 6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk>
… …
11 * Copyright (c) 1997 mj olesen <olesen@me.QueensU.CA> 11 * Copyright (c) 1997 mj olesen <olesen@me.QueensU.CA>
12 * - extensive modifications 12 * - extensive modifications
13 * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de> 13 * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de>
14 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com> 14 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com>
15 * - extensive modifications 15 * - extensive modifications
16 * Copyright (c) 2003-2004 Marc Lehmann <pcg@goof.com> 16 * Copyright (c) 2003-2008 Marc Lehmann <pcg@goof.com>
17 * 17 *
18 * This program is free software; you can redistribute it and/or modify 18 * This program is free software; you can redistribute it and/or modify
19 * it under the terms of the GNU General Public License as published by 19 * it under the terms of the GNU General Public License as published by
20 * the Free Software Foundation; either version 2 of the License, or 20 * the Free Software Foundation; either version 2 of the License, or
21 * (at your option) any later version. 21 * (at your option) any later version.
… …
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"
36 37
38#include <limits>
39
40#include <cassert>
37#include <signal.h> 41#include <csignal>
38
39#ifdef TTY_GID_SUPPORT
40# include <grp.h>
41#endif
42
43#ifdef HAVE_TERMIOS_H
44# include <termios.h>
45#endif
46
47#include <cstring> 42#include <cstring>
48 43
44#include <termios.h>
45
46#ifdef HAVE_XSETLOCALE
47# define X_LOCALE
48# include <X11/Xlocale.h>
49#else
50# ifdef HAVE_SETLOCALE
51# include <clocale>
52# endif
53#endif
54
49vector<rxvt_term *> rxvt_term::termlist; 55vector<rxvt_term *> rxvt_term::termlist;
50 56
57// used to tell global functions which terminal instance is "active"
58rxvt_t rxvt_current_term;
59
51static char curlocale[128]; 60static char curlocale[128], savelocale[128];
52 61
53bool 62bool
54rxvt_set_locale (const char *locale) 63rxvt_set_locale (const char *locale) NOTHROW
55{ 64{
65 int size = strlen (locale) + 1;
66
67 if (size > sizeof (curlocale))
68 rxvt_fatal ("locale string too long, aborting.\n");
69
56 if (!locale || !STRNCMP (locale, curlocale, 128)) 70 if (!locale || !memcmp (locale, curlocale, size))
57 return false; 71 return false;
58 72
59 STRNCPY (curlocale, locale, 128); 73 memcpy (curlocale, locale, size);
60 setlocale (LC_CTYPE, curlocale); 74 setlocale (LC_CTYPE, curlocale);
61 return true; 75 return true;
62} 76}
63 77
78void
79rxvt_push_locale (const char *locale) NOTHROW
80{
81 strcpy (savelocale, curlocale);
82 rxvt_set_locale (locale);
83}
84
85void
86rxvt_pop_locale () NOTHROW
87{
88 rxvt_set_locale (savelocale);
89}
90
64#if ENABLE_COMBINING 91#if ENABLE_COMBINING
65class rxvt_composite_vec rxvt_composite; 92class rxvt_composite_vec rxvt_composite;
66 93
67text_t rxvt_composite_vec::compose (unicode_t c1, unicode_t c2) 94text_t rxvt_composite_vec::compose (unicode_t c1, unicode_t c2)
68{ 95{
69 compose_char *cc; 96 compose_char *cc;
70 97
71 // break compose chains, as stupid readline really likes to duplicate 98 // break compose chains, as stupid readline really likes to duplicate
72 // composing characters for some reason near the end of a line. 99 // composing characters for some reason near the end of a line.
73 cc = (*this)[c1]; 100 cc = (*this)[c1];
74 while (cc) 101 while (cc)
75 { 102 {
76 if (cc->c2 == c2) return c1; 103 if (cc->c2 == c2) return c1;
77 cc = (*this)[cc->c1]; 104 cc = (*this)[cc->c1];
78 } 105 }
79 106
80 // check to see wether this combination already exists otherwise 107 // check to see whether this combination already exists otherwise
81 for (cc = v.end (); cc-- > v.begin (); ) 108 for (cc = v.end (); cc-- > v.begin (); )
82 { 109 {
83 if (cc->c1 == c1 && cc->c2 == c2) 110 if (cc->c1 == c1 && cc->c2 == c2)
84 return COMPOSE_LO + (cc - v.begin ()); 111 return COMPOSE_LO + (cc - v.begin ());
85 } 112 }
… …
123 return len; 150 return len;
124 151
125} 152}
126#endif 153#endif
127 154
128void *
129rxvt_term::operator new (size_t s)
130{
131 void *p = malloc (s);
132
133 MEMSET (p, 0, s);
134 return p;
135}
136
137void
138rxvt_term::operator delete (void *p, size_t s)
139{
140 free (p);
141}
142
143rxvt_term::rxvt_term () 155rxvt_term::rxvt_term ()
144 : 156{
145 rootwin_ev (this, &rxvt_term::rootwin_cb), 157#if HAVE_BG_PIXMAP
146 termwin_ev (this, &rxvt_term::x_cb), 158 update_background_ev.set<rxvt_term, &rxvt_term::update_background_cb> (this);
147 vt_ev (this, &rxvt_term::x_cb),
148#ifdef HAVE_SCROLLBARS
149 scrollbar_ev (this, &rxvt_term::x_cb),
150#endif
151#ifdef MENUBAR
152 menubar_ev (this, &rxvt_term::x_cb),
153#endif 159#endif
154#ifdef CURSOR_BLINK 160#ifdef CURSOR_BLINK
155 cursor_blink_ev (this, &rxvt_term::cursor_blink_cb), 161 cursor_blink_ev.set <rxvt_term, &rxvt_term::cursor_blink_cb> (this); cursor_blink_ev.set (0., CURSOR_BLINK_INTERVAL);
156#endif 162#endif
157#ifdef TEXT_BLINK 163#ifdef TEXT_BLINK
158 text_blink_ev (this, &rxvt_term::text_blink_cb), 164 text_blink_ev.set <rxvt_term, &rxvt_term::text_blink_cb> (this); text_blink_ev.set (0., TEXT_BLINK_INTERVAL);
159#endif 165#endif
160#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 166#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
161 cont_scroll_ev (this, &rxvt_term::cont_scroll_cb), 167 cont_scroll_ev.set <rxvt_term, &rxvt_term::cont_scroll_cb> (this);
162#endif 168#endif
163#ifdef SELECTION_SCROLLING 169#ifdef SELECTION_SCROLLING
164 sel_scroll_ev (this, &rxvt_term::sel_scroll_cb), 170 sel_scroll_ev.set <rxvt_term, &rxvt_term::sel_scroll_cb> (this);
165#endif 171#endif
166#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 172#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
167 slip_wheel_ev (this, &rxvt_term::slip_wheel_cb), 173 slip_wheel_ev.set <rxvt_term, &rxvt_term::slip_wheel_cb> (this);
174#endif
175#if ENABLE_TRANSPARENCY || ENABLE_PERL
176 rootwin_ev.set <rxvt_term, &rxvt_term::rootwin_cb> (this),
177#endif
178 scrollbar_ev.set <rxvt_term, &rxvt_term::x_cb> (this),
179#ifdef USE_XIM
180 im_ev.set <rxvt_term, &rxvt_term::im_cb> (this),
168#endif 181#endif
169#ifdef POINTER_BLANK 182#ifdef POINTER_BLANK
170 pointer_ev (this, &rxvt_term::pointer_cb), 183 pointer_ev.set <rxvt_term, &rxvt_term::pointer_cb> (this);
171#endif 184#endif
185#ifndef NO_BELL
186 bell_ev.set <rxvt_term, &rxvt_term::bell_cb> (this);
187#endif
188 child_ev.set <rxvt_term, &rxvt_term::child_cb> (this);
189 flush_ev.set <rxvt_term, &rxvt_term::flush_cb> (this);
190 destroy_ev.set <rxvt_term, &rxvt_term::destroy_cb> (this);
191 pty_ev.set <rxvt_term, &rxvt_term::pty_cb> (this);
192 incr_ev.set <rxvt_term, &rxvt_term::incr_cb> (this);
193 termwin_ev.set <rxvt_term, &rxvt_term::x_cb> (this);
194 vt_ev.set <rxvt_term, &rxvt_term::x_cb> (this);
195
196 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base;
197
198 termlist.push_back (this);
199
200#ifdef KEYSYM_RESOURCE
201 keyboard = new keyboard_manager;
202#endif
203}
204
205// clean up the most important stuff, do *not* call x or free mem etc.
206// for use before an emergency exit
207void
208rxvt_term::emergency_cleanup ()
209{
210 if (cmd_pid)
211 kill (-cmd_pid, SIGHUP);
212
213 pty_ev.stop ();
214 delete pty; pty = 0;
215}
216
217rxvt_term::~rxvt_term ()
218{
219 termlist.erase (find (termlist.begin (), termlist.end(), this));
220
221 emergency_cleanup ();
222
223#if ENABLE_STYLES
224 for (int i = RS_styleCount; --i; )
225 if (fontset[i] != fontset[0])
226 delete fontset[i];
227#endif
228 delete fontset[0];
229
230#ifdef HAVE_BG_PIXMAP
231 bgPixmap.destroy ();
232#endif
233#ifdef HAVE_AFTERIMAGE
234 if (asv)
235 destroy_asvisual (asv, 0);
236 if (asimman)
237 destroy_image_manager (asimman, 0);
238#endif
239
240 if (display)
241 {
242 selection_clear ();
243 selection_clear (true);
244
172#ifdef USE_XIM 245#ifdef USE_XIM
173 im_ev (this, &rxvt_term::im_cb), 246 im_destroy ();
174#endif 247#endif
175 check_ev (this, &rxvt_term::check_cb), 248 scrollBar.destroy ();
176 destroy_ev (this, &rxvt_term::destroy_cb), 249 if (gc) XFreeGC (dpy, gc);
177 pty_ev (this, &rxvt_term::pty_cb),
178 incr_ev (this, &rxvt_term::incr_cb)
179{
180 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base;
181 250
182 termlist.push_back (this);
183}
184
185rxvt_term::~rxvt_term ()
186{
187 termlist.erase (find (termlist.begin (), termlist.end(), this));
188
189 if (cmd_fd >= 0)
190 close (cmd_fd);
191
192#ifndef NO_SETOWNER_TTYDEV
193 privileged_ttydev (RESTORE);
194#endif
195#ifdef UTMP_SUPPORT
196 privileged_utmp (RESTORE);
197#endif
198
199 delete TermWin.fontset;
200
201 if (display)
202 {
203 selection_clear ();
204
205#ifdef MENUBAR
206 if (menubarGC) XFreeGC (display->display, menubarGC);
207#endif
208#ifdef XTERM_SCROLLBAR
209 if (xscrollbarGC) XFreeGC (display->display, xscrollbarGC);
210 if (ShadowGC) XFreeGC (display->display, ShadowGC);
211#endif
212#ifdef PLAIN_SCROLLBAR
213 if (pscrollbarGC) XFreeGC (display->display, pscrollbarGC);
214#endif
215#ifdef NEXT_SCROLLBAR
216 if (blackGC) XFreeGC (display->display, blackGC);
217 if (whiteGC) XFreeGC (display->display, whiteGC);
218 if (grayGC) XFreeGC (display->display, grayGC);
219 if (darkGC) XFreeGC (display->display, darkGC);
220 if (stippleGC) XFreeGC (display->display, stippleGC);
221 if (dimple) XFreePixmap (display->display, dimple);
222 if (upArrow) XFreePixmap (display->display, upArrow);
223 if (downArrow) XFreePixmap (display->display, downArrow);
224 if (upArrowHi) XFreePixmap (display->display, upArrowHi);
225 if (downArrowHi) XFreePixmap (display->display, downArrowHi);
226#endif
227#if defined(MENUBAR) || defined(RXVT_SCROLLBAR)
228 if (topShadowGC) XFreeGC (display->display, topShadowGC);
229 if (botShadowGC) XFreeGC (display->display, botShadowGC);
230 if (scrollbarGC) XFreeGC (display->display, scrollbarGC);
231#endif
232 if (TermWin.gc) XFreeGC (display->display, TermWin.gc);
233
234#if defined(MENUBAR) && (MENUBAR_MAX > 1)
235 delete menuBar.drawable; 251 delete drawable;
236 //if (menuBar.win)
237 // XDestroyWindow (display->display, menuBar.win);
238#endif
239 delete TermWin.drawable;
240 // destroy all windows 252 // destroy all windows
241 if (TermWin.parent[0]) 253 if (parent[0])
242 XDestroyWindow (display->display, TermWin.parent[0]); 254 XDestroyWindow (dpy, parent[0]);
243 }
244 255
245 // TODO: free pixcolours, colours should become part of rxvt_display 256 for (int i = 0; i < TOTAL_COLORS; i++)
246 257 if (ISSET_PIXCOLOR (i))
247 delete PixColorsFocused; 258 {
259 pix_colors_focused [i].free (this);
248#ifdef OFF_FOCUS_FADING 260#if OFF_FOCUS_FADING
249 delete PixColorsUnFocused; 261 pix_colors_unfocused [i].free (this);
250#endif 262#endif
263 }
251 264
265 clear ();
266
267 display->flush (); /* ideally .put should do this */
252 displays.put (display); 268 displays.put (display);
269 }
253 270
254 scr_release (); 271 scr_release ();
255 272
256 /* clear all resources */ 273 /* clear all resources */
257 for (int i = 0; i < allocated.size (); i++) 274 for (int i = 0; i < allocated.size (); i++)
258 free (allocated[i]); 275 free (allocated [i]);
259 276
260 free (selection.text); 277 free (selection.text);
278 free (selection.clip_text);
261 // TODO: manage env vars in child only(!) 279 // TODO: manage env vars in child only(!)
262 free (env_windowid);
263 free (env_display); 280 free (env_display);
264 free (env_term); 281 free (env_term);
265 free (env_colorfgbg);
266 free (locale); 282 free (locale);
267#if 0 283 free (v_buffer);
268 free (codeset); 284 free (incr_buf);
269#endif
270 285
271 delete envv; 286 delete envv;
272 delete argv; 287 delete argv;
288
289#ifdef KEYSYM_RESOURCE
290 delete keyboard;
291#endif
292#ifndef NO_RESOURCES
293 XrmDestroyDatabase (option_db);
294#endif
295}
296
297// child has exited, usually destroys
298void
299rxvt_term::child_cb (ev::child &w, int status)
300{
301 HOOK_INVOKE ((this, HOOK_CHILD_EXIT, DT_INT, status, DT_END));
302
303 cmd_pid = 0;
304
305 if (!option (Opt_hold))
306 destroy ();
273} 307}
274 308
275void 309void
276rxvt_term::destroy () 310rxvt_term::destroy ()
277{ 311{
312 if (destroy_ev.is_active ())
313 return;
314
315 HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));
316
317#if ENABLE_OVERLAY
318 scr_overlay_off ();
319#endif
320
278 if (display) 321 if (display)
279 { 322 {
323#if USE_XIM
324 im_ev.stop (display);
325#endif
326 scrollbar_ev.stop (display);
327#if ENABLE_TRANSPARENCY || ENABLE_PERL
280 rootwin_ev.stop (display); 328 rootwin_ev.stop (display);
329#endif
330 incr_ev.stop ();
281 termwin_ev.stop (display); 331 termwin_ev.stop (display);
282 vt_ev.stop (display); 332 vt_ev.stop (display);
283#ifdef USE_XIM
284 im_destroy ();
285 im_ev.stop (display);
286#endif
287#ifdef HAVE_SCROLLBARS
288 scrollbar_ev.stop (display);
289#endif
290#ifdef MENUBAR
291 menubar_ev.stop (display);
292#endif
293 } 333 }
294 334
295 check_ev.stop (); 335 flush_ev.stop ();
296 pty_ev.stop (); 336 pty_ev.stop ();
297#ifdef CURSOR_BLINK 337#ifdef CURSOR_BLINK
298 cursor_blink_ev.stop (); 338 cursor_blink_ev.stop ();
299#endif 339#endif
300#ifdef TEXT_BLINK 340#ifdef TEXT_BLINK
… …
308#endif 348#endif
309#ifdef POINTER_BLANK 349#ifdef POINTER_BLANK
310 pointer_ev.stop (); 350 pointer_ev.stop ();
311#endif 351#endif
312 352
313 destroy_ev.start (0); 353 destroy_ev.start ();
314} 354}
315 355
316void 356void
317rxvt_term::destroy_cb (time_watcher &w) 357rxvt_term::destroy_cb (ev::idle &w, int revents)
318{ 358{
319 SET_R (this); 359 make_current ();
320 360
321 delete this; 361 delete this;
322}
323
324/*----------------------------------------------------------------------*/
325/* rxvt_init () */
326bool
327rxvt_term::init (int argc, const char *const *argv)
328{
329 SET_R (this);
330
331 if (!init_vars ())
332 return false;
333
334 /*
335 * Save and then give up any super-user privileges
336 * If we need privileges in any area then we must specifically request it.
337 * We should only need to be root in these cases:
338 * 1. write utmp entries on some systems
339 * 2. chown tty on some systems
340 */
341 privileges (SAVE);
342 privileges (IGNORE);
343
344 init_secondary ();
345
346 const char **cmd_argv = init_resources (argc, argv);
347
348 set_locale ("");
349
350#if MENUBAR_MAX
351 menubar_read (rs[Rs_menu]);
352#endif
353#ifdef HAVE_SCROLLBARS
354 if (Options & Opt_scrollBar)
355 scrollBar.setIdle (); /* set existence for size calculations */
356#endif
357
358 create_windows (argc, argv);
359
360 init_xlocale ();
361
362 scr_reset (); /* initialize screen */
363
364#if 0
365 XSynchronize (display->display, True);
366#endif
367
368#ifdef HAVE_SCROLLBARS
369 if (Options & Opt_scrollBar)
370 resize_scrollbar (); /* create and map scrollbar */
371#endif
372#if (MENUBAR_MAX)
373 if (menubar_visible ())
374 XMapWindow (display->display, menuBar.win);
375#endif
376#ifdef TRANSPARENT
377 if (Options & Opt_transparent)
378 {
379 XSelectInput (display->display, display->root, PropertyChangeMask);
380 check_our_parents ();
381 }
382#endif
383
384 rootwin_ev.start (display, display->root);
385
386 XMapWindow (display->display, TermWin.vt);
387 XMapWindow (display->display, TermWin.parent[0]);
388
389 init_command (cmd_argv);
390
391 pty_ev.start (cmd_fd, EVENT_READ);
392
393 check_ev.start ();
394
395 return true;
396}
397
398static int (*old_xerror_handler) (Display *dpy, XErrorEvent *event);
399
400void
401rxvt_init_signals ()
402{
403 /* install exit handler for cleanup */
404#if 0
405#ifdef HAVE_ATEXIT
406 atexit (rxvt_clean_exit);
407#else
408#endif
409#endif
410
411 struct sigaction sa;
412
413 sigfillset (&sa.sa_mask);
414 sa.sa_flags = SA_NOCLDSTOP | SA_RESTART;
415 sa.sa_handler = SIG_IGN; sigaction (SIGHUP , &sa, 0);
416 sa.sa_handler = SIG_IGN; sigaction (SIGPIPE, &sa, 0);
417 sa.sa_handler = rxvt_Exit_signal; sigaction (SIGINT , &sa, 0);
418 sa.sa_handler = rxvt_Exit_signal; sigaction (SIGQUIT, &sa, 0);
419 sa.sa_handler = rxvt_Exit_signal; sigaction (SIGTERM, &sa, 0);
420 sa.sa_handler = rxvt_Child_signal; sigaction (SIGCHLD, &sa, 0);
421
422 /* need to trap SIGURG for SVR4 (Unixware) rlogin */
423 /* signal (SIGURG, SIG_DFL); */
424
425 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
426 //XSetIOErrorHandler ((XErrorHandler) rxvt_xioerror_handler);
427}
428
429/* ------------------------------------------------------------------------- *
430 * SIGNAL HANDLING & EXIT HANDLER *
431 * ------------------------------------------------------------------------- */
432/*
433 * Catch a SIGCHLD signal and exit if the direct child has died
434 */
435
436void rxvt_term::child_exited (int pid)
437{
438 for (rxvt_term **t = termlist.begin (); t < termlist.end (); t++)
439 if (pid == (*t)->cmd_pid)
440 {
441 (*t)->destroy ();
442 break;
443 }
444}
445
446/* ARGSUSED */
447/* EXTPROTO */
448RETSIGTYPE
449rxvt_Child_signal (int sig __attribute__ ((unused)))
450{
451 int pid, save_errno = errno;
452
453 while ((pid = waitpid (-1, NULL, WNOHANG)) > 0)
454 rxvt_term::child_exited (pid);
455
456 errno = save_errno;
457}
458
459/*
460 * Catch a fatal signal and tidy up before quitting
461 */
462/* EXTPROTO */
463RETSIGTYPE
464rxvt_Exit_signal (int sig)
465{
466 signal (sig, SIG_DFL);
467#ifdef DEBUG_CMD
468 rxvt_warn ("caught signal %d, exiting.\n", sig);
469#endif
470 rxvt_clean_exit ();
471 kill (getpid (), sig);
472}
473
474/* INTPROTO */
475int
476rxvt_xerror_handler (Display *display, XErrorEvent *event)
477{
478 if (GET_R->allowedxerror == -1)
479 GET_R->allowedxerror = event->error_code;
480 else
481 {
482 old_xerror_handler (display, event);
483 GET_R->destroy ();
484 }
485
486 return 0;
487} 362}
488 363
489/*----------------------------------------------------------------------*/ 364/*----------------------------------------------------------------------*/
490/* 365/*
491 * Exit gracefully, clearing the utmp entry and restoring tty attributes 366 * Exit gracefully, clearing the utmp entry and restoring tty attributes
492 * TODO: if debugging, this should free up any known resources if we can 367 * TODO: if debugging, this should free up any known resources if we can
493 */ 368 */
494/* EXTPROTO */ 369static XErrorHandler old_xerror_handler;
495void
496rxvt_clean_exit ()
497{
498 // TODO: rxvtd should clean up all ressources
499 if (GET_R)
500 GET_R->destroy ();
501}
502 370
503/* ------------------------------------------------------------------------- * 371static void
504 * MEMORY ALLOCATION WRAPPERS * 372rxvt_emergency_cleanup ()
505 * ------------------------------------------------------------------------- */
506/* EXTPROTO */
507void *
508rxvt_malloc (size_t size)
509{ 373{
510 void *p; 374 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)
511 375 (*t)->emergency_cleanup ();
512 p = malloc (size);
513 if (p)
514 return p;
515
516 fprintf (stderr, RESNAME ": memory allocation failure. Aborting");
517 rxvt_clean_exit ();
518 exit (EXIT_FAILURE);
519 /* NOTREACHED */
520} 376}
521 377
522/* EXTPROTO */ 378#if !ENABLE_MINIMAL
523void * 379static void
524rxvt_calloc (size_t number, size_t size) 380print_x_error (Display *dpy, XErrorEvent *event)
525{ 381{
526 void *p; 382 char buffer[BUFSIZ];
527 383 char mesg[BUFSIZ];
528 p = calloc (number, size); 384 char number[32];
529 if (p) 385 char *mtype = "XlibMessage";
530 return p; 386 XGetErrorText(dpy, event->error_code, buffer, BUFSIZ);
531 387 XGetErrorDatabaseText(dpy, mtype, "XError", "X Error", mesg, BUFSIZ);
532 fprintf (stderr, RESNAME ": memory allocation failure. Aborting"); 388 rxvt_warn ("An X Error occured, trying to continue after report.\n");
533 rxvt_clean_exit (); 389 rxvt_warn ("%s: %s\n", mesg, buffer);
534 exit (EXIT_FAILURE); 390 XGetErrorDatabaseText(dpy, mtype, "MajorCode", "Request Major code %d", mesg, BUFSIZ);
535 /* NOTREACHED */ 391 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->request_code);
392 sprintf(number, "%d", event->request_code);
393 XGetErrorDatabaseText(dpy, "XRequest", number, "", buffer, BUFSIZ);
394 rxvt_warn ("(which is %s)\n", buffer);
395 if (event->request_code >= 128) {
396 XGetErrorDatabaseText(dpy, mtype, "MinorCode", "Request Minor code %d",
397 mesg, BUFSIZ);
398 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->minor_code);
399 }
400 if ((event->error_code == BadWindow) ||
401 (event->error_code == BadPixmap) ||
402 (event->error_code == BadCursor) ||
403 (event->error_code == BadFont) ||
404 (event->error_code == BadDrawable) ||
405 (event->error_code == BadColor) ||
406 (event->error_code == BadGC) ||
407 (event->error_code == BadIDChoice) ||
408 (event->error_code == BadValue) ||
409 (event->error_code == BadAtom)) {
410 if (event->error_code == BadValue)
411 XGetErrorDatabaseText(dpy, mtype, "Value", "Value 0x%x",
412 mesg, BUFSIZ);
413 else if (event->error_code == BadAtom)
414 XGetErrorDatabaseText(dpy, mtype, "AtomID", "AtomID 0x%x",
415 mesg, BUFSIZ);
416 else
417 XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x",
418 mesg, BUFSIZ);
419 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid);
420 }
421 XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d",
422 mesg, BUFSIZ);
423 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial);
536} 424}
425#endif
537 426
538/* EXTPROTO */ 427int
539void * 428rxvt_xerror_handler (Display *display, XErrorEvent *event)
540rxvt_realloc (void *ptr, size_t size)
541{ 429{
542 void *p; 430 if (GET_R->allowedxerror == -1)
543 431 GET_R->allowedxerror = event->error_code;
544 if (ptr)
545 p = realloc (ptr, size);
546 else 432 else
547 p = malloc (size); 433 {
548 if (p) 434 // GET_R is most likely not the terminal which caused the error,
435 // so just output the error and continue
436#if ENABLE_MINIMAL
437 old_xerror_handler (display, event);
438#else
439 print_x_error (display, event);
440#endif
441 }
442
549 return p; 443 return 0;
444}
550 445
551 fprintf (stderr, RESNAME ": memory allocation failure. Aborting"); 446int
552 rxvt_clean_exit (); 447rxvt_xioerror_handler (Display *display)
448{
449 rxvt_warn ("X connection to '%s' broken, unable to recover, exiting.\n",
450 DisplayString (display));
451 rxvt_emergency_cleanup ();
553 exit (EXIT_FAILURE); 452 _exit (EXIT_FAILURE);
554 /* NOTREACHED */
555} 453}
556 454
557/* ------------------------------------------------------------------------- * 455static struct sig_handlers
558 * PRIVILEGED OPERATIONS *
559 * ------------------------------------------------------------------------- */
560/* take care of suid/sgid super-user (root) privileges */
561void
562rxvt_term::privileges (int mode)
563{ 456{
564#if ! defined(__CYGWIN32__) 457 ev::sig sw_term, sw_int;
565# if !defined(HAVE_SETEUID) && defined(HAVE_SETREUID) 458
566 /* setreuid () is the poor man's setuid (), seteuid () */ 459 /*
567# define seteuid(a) setreuid(-1, (a)) 460 * Catch a fatal signal and tidy up before quitting
568# define setegid(a) setregid(-1, (a)) 461 */
569# define HAVE_SETEUID 462 void sig_term (ev::sig &w, int revents);
570# endif 463
571# ifdef HAVE_SETEUID 464 sig_handlers ()
572 switch (mode)
573 { 465 {
574 case IGNORE: 466 sw_term.set<sig_handlers, &sig_handlers::sig_term> (this);
575 /* 467 sw_int .set<sig_handlers, &sig_handlers::sig_term> (this);
576 * change effective uid/gid - not real uid/gid - so we can switch
577 * back to root later, as required
578 */
579 seteuid (getuid ());
580 setegid (getgid ());
581 break;
582 case SAVE:
583 euid = geteuid ();
584 egid = getegid ();
585 break;
586 case RESTORE:
587 seteuid (euid);
588 setegid (egid);
589 break;
590 } 468 }
591# else 469} sig_handlers;
592 switch (mode)
593 {
594 case IGNORE:
595 setuid (getuid ());
596 setgid (getgid ());
597 /* FALLTHROUGH */
598 case SAVE:
599 /* FALLTHROUGH */
600 case RESTORE:
601 break;
602 }
603# endif
604#endif
605}
606 470
607#ifdef UTMP_SUPPORT
608void 471void
609rxvt_term::privileged_utmp (char action) 472sig_handlers::sig_term (ev::sig &w, int revents)
610{ 473{
611 D_MAIN ((stderr, "rxvt_privileged_utmp (%c); waiting for: %c (pid: %d)", 474 rxvt_emergency_cleanup ();
612 action, next_utmp_action, getpid ())); 475 w.stop ();
613 if (next_utmp_action != action || (action != SAVE && action != RESTORE) 476 kill (getpid (), w.signum);
614 || (Options & Opt_utmpInhibit)
615 || ttydev == NULL || *ttydev == '\0')
616 return;
617
618 privileges (RESTORE);
619 if (action == SAVE)
620 {
621 next_utmp_action = RESTORE;
622 makeutent (ttydev, rs[Rs_display_name]);
623 }
624 else
625 { /* action == RESTORE */
626 next_utmp_action = IGNORE;
627 cleanutent ();
628 }
629 privileges (IGNORE);
630} 477}
631#endif
632 478
633#ifndef NO_SETOWNER_TTYDEV 479char **rxvt_environ; // startup environment
634void
635rxvt_term::privileged_ttydev (char action)
636{
637 D_MAIN ((stderr,
638 "privileged_ttydev (%c); waiting for: %c (pid: %d)",
639 action, next_tty_action, getpid ()));
640 if (next_tty_action != action || (action != SAVE && action != RESTORE)
641 || ttydev == NULL || *ttydev == '\0')
642 return;
643 480
644 privileges (RESTORE); 481void
482rxvt_init ()
483{
484 assert (("fontMask must not overlap other RS masks",
485 0 == (RS_fontMask & (RS_Sel | RS_baseattrMask | RS_customMask | RS_bgMask | RS_fgMask))));
645 486
646 if (action == SAVE) 487 ptytty::init ();
647 {
648 next_tty_action = RESTORE;
649# ifndef RESET_TTY_TO_COMMON_DEFAULTS
650 /* store original tty status for restoration rxvt_clean_exit () -- rgg 04/12/95 */
651 if (lstat (ttydev, &ttyfd_stat) < 0) /* you lose out */
652 next_tty_action = IGNORE;
653 else
654# endif
655 488
656 { 489 if (!ev_default_loop (0))
657 chown (ttydev, getuid (), ttygid); /* fail silently */ 490 rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n");
658 chmod (ttydev, ttymode);
659# ifdef HAVE_REVOKE
660 revoke (ttydev);
661# endif
662 491
663 } 492 rxvt_environ = environ;
664 }
665 else
666 { /* action == RESTORE */
667 next_tty_action = IGNORE;
668# ifndef RESET_TTY_TO_COMMON_DEFAULTS
669 chmod (ttydev, ttyfd_stat.st_mode);
670 chown (ttydev, ttyfd_stat.st_uid, ttyfd_stat.st_gid);
671# else
672 chmod (ttydev,
673 (S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH | S_IWOTH));
674 chown (ttydev, 0, 0);
675# endif
676 493
677 } 494 signal (SIGHUP, SIG_IGN);
495 signal (SIGPIPE, SIG_IGN);
678 496
679 privileges (IGNORE); 497 sig_handlers.sw_term.start (SIGTERM); ev_unref ();
498 sig_handlers.sw_int.start (SIGINT); ev_unref ();
680 499
681# ifndef RESET_TTY_TO_COMMON_DEFAULTS 500 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
682 D_MAIN ((stderr, "%s \"%s\": mode %03o, uid %d, gid %d", 501 // TODO: handle this with exceptions and tolerate the memory loss
683 action == RESTORE ? "Restoring" : (action == 502 XSetIOErrorHandler (rxvt_xioerror_handler);
684 SAVE ? "Saving" : 503
685 "UNKNOWN ERROR for"), ttydev, 504 XrmInitialize ();
686 ttyfd_stat.st_mode, ttyfd_stat.st_uid,
687 ttyfd_stat.st_gid));
688# endif
689} 505}
690#endif
691 506
692/*----------------------------------------------------------------------*/ 507/*----------------------------------------------------------------------*/
693/* 508/*
694 * window size/position calculcations for XSizeHint and other storage. 509 * window size/position calculations for XSizeHint and other storage.
695 * if width/height are non-zero then override calculated width/height 510 * if width/height are non-zero then override calculated width/height
696 */ 511 */
697void 512void
698rxvt_term::window_calc (unsigned int width, unsigned int height) 513rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
699{ 514{
700 short recalc_x, recalc_y; 515 short recalc_x, recalc_y;
701 int x, y, sb_w, mb_h, flags; 516 int x, y, flags;
702 unsigned int w, h; 517 unsigned int w, h;
703 unsigned int max_width, max_height; 518 unsigned int max_width, max_height;
704 519
705 D_SIZE ((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
706 TermWin.ncol, TermWin.nrow, szHint.width,
707 szHint.height));
708 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity; 520 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity;
709 szHint.win_gravity = NorthWestGravity; 521 szHint.win_gravity = NorthWestGravity;
710 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */ 522 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */
711 523
712 recalc_x = recalc_y = 0; 524 recalc_x = recalc_y = 0;
713 flags = 0; 525 flags = 0;
526
714 if (!parsed_geometry) 527 if (!parsed_geometry)
715 { 528 {
716 parsed_geometry = 1; 529 parsed_geometry = 1;
530
717 if (rs[Rs_geometry]) 531 if (rs[Rs_geometry])
718 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h); 532 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h);
533
719 if (flags & WidthValue) 534 if (flags & WidthValue)
720 { 535 {
721 TermWin.ncol = BOUND_POSITIVE_INT16 (w); 536 if (!w)
537 rxvt_fatal ("illegal window geometry (width and height must be non-zero), aborting.\n");
538
539 ncol = clamp (w, 1, std::numeric_limits<int16_t>::max ());
722 szHint.flags |= USSize; 540 szHint.flags |= USSize;
723 } 541 }
542
724 if (flags & HeightValue) 543 if (flags & HeightValue)
725 { 544 {
726 TermWin.nrow = BOUND_POSITIVE_INT16 (h); 545 if (!h)
546 rxvt_fatal ("illegal window geometry (width and height must be non-zero), aborting.\n");
547
548 nrow = clamp (h, 1, std::numeric_limits<int16_t>::max ());
727 szHint.flags |= USSize; 549 szHint.flags |= USSize;
728 } 550 }
551
729 if (flags & XValue) 552 if (flags & XValue)
730 { 553 {
731 szHint.x = x; 554 szHint.x = x;
732 szHint.flags |= USPosition; 555 szHint.flags |= USPosition;
556
733 if (flags & XNegative) 557 if (flags & XNegative)
734 { 558 {
735 recalc_x = 1; 559 recalc_x = 1;
736 szHint.win_gravity = NorthEastGravity; 560 szHint.win_gravity = NorthEastGravity;
737 } 561 }
738 } 562 }
563
739 if (flags & YValue) 564 if (flags & YValue)
740 { 565 {
741 szHint.y = y; 566 szHint.y = y;
742 szHint.flags |= USPosition; 567 szHint.flags |= USPosition;
568
743 if (flags & YNegative) 569 if (flags & YNegative)
744 { 570 {
745 recalc_y = 1; 571 recalc_y = 1;
572
746 if (szHint.win_gravity == NorthEastGravity) 573 if (szHint.win_gravity == NorthEastGravity)
747 szHint.win_gravity = SouthEastGravity; 574 szHint.win_gravity = SouthEastGravity;
748 else 575 else
749 szHint.win_gravity = SouthWestGravity; 576 szHint.win_gravity = SouthWestGravity;
750 } 577 }
751 } 578 }
752 } 579 }
753 580
754 /* TODO: BOUNDS */ 581 /* TODO: BOUNDS */
755 TermWin.width = TermWin.ncol * TermWin.fwidth; 582 width = ncol * fwidth;
756 TermWin.height = TermWin.nrow * TermWin.fheight; 583 height = nrow * fheight;
757 max_width = MAX_COLS * TermWin.fwidth; 584 max_width = MAX_COLS * fwidth;
758 max_height = MAX_ROWS * TermWin.fheight; 585 max_height = MAX_ROWS * fheight;
759 586
760 szHint.base_width = szHint.base_height = 2 * TermWin.int_bwidth; 587 szHint.base_width = szHint.base_height = 2 * int_bwidth;
761 588
762 sb_w = mb_h = 0;
763 window_vt_x = window_vt_y = TermWin.int_bwidth; 589 window_vt_x = window_vt_y = int_bwidth;
764 590
765 if (scrollbar_visible ()) 591 if (scrollBar.state)
766 { 592 {
767 sb_w = scrollbar_TotalWidth (); 593 int sb_w = scrollBar.total_width ();
768 szHint.base_width += sb_w; 594 szHint.base_width += sb_w;
595
769 if (!(Options & Opt_scrollBar_right)) 596 if (!option (Opt_scrollBar_right))
770 window_vt_x += sb_w; 597 window_vt_x += sb_w;
771 } 598 }
772 599
773 if (menubar_visible ())
774 {
775 mb_h = menuBar_TotalHeight ();
776 szHint.base_height += mb_h;
777 window_vt_y += mb_h;
778 }
779
780 szHint.width_inc = TermWin.fwidth; 600 szHint.width_inc = fwidth;
781 szHint.height_inc = TermWin.fheight; 601 szHint.height_inc = fheight;
782 szHint.min_width = szHint.base_width + szHint.width_inc; 602 szHint.min_width = szHint.base_width + szHint.width_inc;
783 szHint.min_height = szHint.base_height + szHint.height_inc; 603 szHint.min_height = szHint.base_height + szHint.height_inc;
784 604
785 if (width && width - szHint.base_width < max_width) 605 if (newwidth && newwidth - szHint.base_width < max_width)
786 { 606 {
787 szHint.width = width; 607 szHint.width = newwidth;
788 TermWin.width = width - szHint.base_width; 608 width = newwidth - szHint.base_width;
789 } 609 }
790 else 610 else
791 { 611 {
792 MIN_IT (TermWin.width, max_width); 612 min_it (width, max_width);
793 szHint.width = szHint.base_width + TermWin.width; 613 szHint.width = szHint.base_width + width;
794 } 614 }
795 615
796 if (height && height - szHint.base_height < max_height) 616 if (newheight && newheight - szHint.base_height < max_height)
797 { 617 {
798 szHint.height = height; 618 szHint.height = newheight;
799 TermWin.height = height - szHint.base_height; 619 height = newheight - szHint.base_height;
800 } 620 }
801 else 621 else
802 { 622 {
803 MIN_IT (TermWin.height, max_height); 623 min_it (height, max_height);
804 szHint.height = szHint.base_height + TermWin.height; 624 szHint.height = szHint.base_height + height;
805 } 625 }
806
807 if (scrollbar_visible () && (Options & Opt_scrollBar_right))
808 window_sb_x = szHint.width - sb_w;
809 626
810 if (recalc_x) 627 if (recalc_x)
811 szHint.x += (DisplayWidth (display->display, DefaultScreen (display->display)) 628 szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth;
812 - szHint.width - 2 * TermWin.ext_bwidth); 629
813 if (recalc_y) 630 if (recalc_y)
814 szHint.y += (DisplayHeight (display->display, DefaultScreen (display->display)) 631 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth;
815 - szHint.height - 2 * TermWin.ext_bwidth);
816 632
817 TermWin.ncol = TermWin.width / TermWin.fwidth; 633 ncol = width / fwidth;
818 TermWin.nrow = TermWin.height / TermWin.fheight; 634 nrow = height / fheight;
819 D_SIZE ((stderr, "> Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
820 TermWin.ncol, TermWin.nrow, szHint.width,
821 szHint.height));
822 return;
823} 635}
824 636
825/*----------------------------------------------------------------------*/ 637/*----------------------------------------------------------------------*/
826/* 638/*
827 * Tell the teletype handler what size the window is. 639 * Tell the teletype handler what size the window is.
828 * Called after a window size change. 640 * Called after a window size change.
829 */ 641 */
830void 642void
831rxvt_term::tt_winch () 643rxvt_term::tt_winch ()
832{ 644{
645 if (pty->pty < 0)
646 return;
647
833 struct winsize ws; 648 struct winsize ws;
834 649
835 if (cmd_fd < 0)
836 return;
837
838 ws.ws_col = TermWin.ncol; 650 ws.ws_col = ncol;
839 ws.ws_row = TermWin.nrow; 651 ws.ws_row = nrow;
840 ws.ws_xpixel = ws.ws_ypixel = 0; 652 ws.ws_xpixel = width;
841#ifndef DEBUG_SIZE 653 ws.ws_ypixel = height;
842 (void)ioctl (cmd_fd, TIOCSWINSZ, &ws); 654 ioctl (pty->pty, TIOCSWINSZ, &ws);
843#else 655
844 if (ioctl (cmd_fd, TIOCSWINSZ, &ws) < 0) 656#if 0
845 D_SIZE ((stderr, "Failed to send TIOCSWINSZ to fd %d", fd)); 657 // TIOCSWINSZ is supposed to do this automatically and correctly
846# ifdef SIGWINCH
847 else if (cmd_pid) /* force through to the command */ 658 if (cmd_pid) /* force through to the command */
848 kill (cmd_pid, SIGWINCH); 659 kill (-cmd_pid, SIGWINCH);
849# endif
850#endif 660#endif
851} 661}
852 662
853/*----------------------------------------------------------------------*/ 663/*----------------------------------------------------------------------*/
854/* rxvt_change_font () - Switch to a new font */ 664/* set_fonts () - load and set the various fonts
855/* 665 *
856 * init = 1 - initialize 666 * init = 1 - initialize
857 * 667 *
858 * fontname == FONT_UP - switch to bigger font 668 * fontname == FONT_UP - switch to bigger font
859 * fontname == FONT_DN - switch to smaller font 669 * fontname == FONT_DN - switch to smaller font
860 */ 670 */
861bool 671bool
862rxvt_term::change_font (const char *fontname) 672rxvt_term::set_fonts ()
863{ 673{
864 if (fontname == FONT_UP)
865 {
866 // TODO
867 }
868 else if (fontname == FONT_DN)
869 {
870 // TODO
871 }
872 else
873 {
874 rxvt_fontset *fs = new rxvt_fontset (this); 674 rxvt_fontset *fs = new rxvt_fontset (this);
675 rxvt_fontprop prop;
875 676
876 if (fs && fs->populate (fontname ? fontname : "fixed")) 677 if (!fs
678 || !fs->populate (rs[Rs_font] ? rs[Rs_font] : "fixed")
679 || !fs->realize_font (1))
680 {
681 delete fs;
682 return false;
683 }
684
685#if ENABLE_STYLES
686 for (int i = RS_styleCount; --i; )
687 if (fontset[i] != fontset[0])
688 delete fontset[i];
689#endif
690
691 delete fontset[0];
692 fontset[0] = fs;
693
694 prop = (*fs)[rxvt_fontset::firstFont]->properties ();
695 prop.height += lineSpace;
696 prop.width += letterSpace;
697
698 fs->set_prop (prop, false);
699
700 fwidth = prop.width;
701 fheight = prop.height;
702 fbase = prop.ascent;
703
704 for (int style = 1; style < 4; style++)
705 {
706#if ENABLE_STYLES
707 const char *res = rs[Rs_font + style];
708
709 if (res && !*res)
710 fontset[style] = fontset[0];
711 else
877 { 712 {
878 delete TermWin.fontset; 713 fontset[style] = fs = new rxvt_fontset (this);
879 TermWin.fontset = fs; 714 rxvt_fontprop prop2 = prop;
880 TermWin.fwidth = fs->base_font ()->width;
881 TermWin.fheight = fs->base_font ()->height;
882 TermWin.fbase = fs->base_font ()->ascent;
883 715
884 if (TermWin.parent[0]) 716 if (res)
885 { 717 {
886 resize_all_windows (0, 0, 0); 718 fs->populate (res);
887 scr_remap_chars (); 719 fs->set_prop (prop2, false);
888 scr_touch (true);
889 } 720 }
721 else
722 {
723 fs->populate (fontset[0]->fontdesc);
890 724
891 return true; 725 if (SET_STYLE (0, style) & RS_Bold) prop2.weight = rxvt_fontprop::bold;
726 if (SET_STYLE (0, style) & RS_Italic) prop2.slant = rxvt_fontprop::italic;
727
728 fs->set_prop (prop2, true);
729 }
730
892 } 731 }
732#else
733 fontset[style] = fontset[0];
734#endif
735 }
736
737 if (parent[0])
893 } 738 {
739 resize_all_windows (0, 0, 0);
740 scr_remap_chars ();
741 scr_touch (true);
742 }
894 743
895 return false; 744 return true;
896} 745}
897 746
898bool 747void
899rxvt_term::font_up_down (int n, int direction) 748rxvt_term::set_string_property (Atom prop, const char *str, int len)
900{ 749{
901 return false; 750 XChangeProperty (dpy, parent[0],
751 prop, XA_STRING, 8, PropModeReplace,
752 (const unsigned char *)str, len >= 0 ? len : strlen (str));
753}
754
755void
756rxvt_term::set_mbstring_property (Atom prop, const char *str, int len)
757{
758 XTextProperty ct;
759
760 if (XmbTextListToTextProperty (dpy, (char **)&str, 1, XStdICCTextStyle, &ct) >= 0)
761 {
762 XSetTextProperty (dpy, parent[0], &ct, prop);
763 XFree (ct.value);
764 }
765}
766
767void
768rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
769{
770 wchar_t *ws = rxvt_mbstowcs (str, len);
771 char *s = rxvt_wcstoutf8 (ws);
772
773 XChangeProperty (dpy, parent[0],
774 prop, xa[XA_UTF8_STRING], 8, PropModeReplace,
775 (const unsigned char *)s, strlen (s));
776
777 free (s);
778 free (ws);
902} 779}
903 780
904/*----------------------------------------------------------------------*/ 781/*----------------------------------------------------------------------*/
905/*----------------------------------------------------------------------*/ 782/*----------------------------------------------------------------------*/
906/* xterm sequences - title, iconName, color (exptl) */ 783/* xterm sequences - title, iconName, color (exptl) */
907void 784void
908rxvt_term::set_title (const char *str) 785rxvt_term::set_title (const char *str)
909{ 786{
910#ifdef SMART_WINDOW_TITLE 787 set_mbstring_property (XA_WM_NAME, str);
911 char *name; 788#if ENABLE_EWMH
912 789 set_utf8_property (xa[XA_NET_WM_NAME], str);
913 if (!XFetchName (display->display, TermWin.parent[0], &name))
914 name = NULL;
915
916 if (name == NULL || STRCMP (name, str))
917#endif
918 XStoreName (display->display, TermWin.parent[0], str);
919
920#ifdef SMART_WINDOW_TITLE
921 if (name)
922 XFree (name);
923#endif 790#endif
924} 791}
925 792
926void 793void
927rxvt_term::set_icon_name (const char *str) 794rxvt_term::set_icon_name (const char *str)
928{ 795{
929#ifdef SMART_WINDOW_TITLE 796 set_mbstring_property (XA_WM_ICON_NAME, str);
930 char *name; 797#if ENABLE_EWMH
931 798 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str);
932 if (!XGetIconName (display->display, TermWin.parent[0], &name))
933 name = NULL;
934
935 if (name == NULL || STRCMP (name, str))
936#endif 799#endif
937 XSetIconName (display->display, TermWin.parent[0], str);
938
939#ifdef SMART_WINDOW_TITLE
940 if (name)
941 XFree (name);
942#endif
943} 800}
944 801
802void
803rxvt_term::set_window_color (int idx, const char *color)
804{
945#ifdef XTERM_COLOR_CHANGE 805#ifdef XTERM_COLOR_CHANGE
946void
947rxvt_term::set_window_color (int idx, const char *color)
948{
949 rxvt_color xcol; 806 rxvt_color xcol;
950 int i;
951 807
952 if (color == NULL || *color == '\0') 808 if (color == NULL || *color == '\0')
953 return; 809 return;
954 810
811 color = strdup (color);
812 allocated.push_back ((void *)color);
813 rs[Rs_color + idx] = color;
814
955 /* handle color aliases */ 815 /* handle color aliases */
956 if (isdigit (*color)) 816 if (isdigit (*color))
957 { 817 {
958 i = atoi (color); 818 int i = atoi (color);
819
959 if (i >= 8 && i <= 15) 820 if (i >= 8 && i <= 15)
821 {
960 { /* bright colors */ 822 /* bright colors */
961 i -= 8;
962# ifndef NO_BRIGHTCOLOR
963 PixColorsFocused[idx] = PixColorsFocused[minBrightCOLOR + i]; 823 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i - 8];
964 SET_PIXCOLOR (idx);
965 goto Done; 824 goto done;
966# endif
967
968 } 825 }
826
969 if (i >= 0 && i <= 7) 827 if (i >= 0 && i <= 7)
828 {
970 { /* normal colors */ 829 /* normal colors */
971 PixColorsFocused[idx] = PixColorsFocused[minCOLOR + i]; 830 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];
972 SET_PIXCOLOR (idx);
973 goto Done; 831 goto done;
974 } 832 }
975 } 833 }
976 834
977 if (!rXParseAllocColor (& xcol, color)) 835 set_color (xcol, color);
978 return;
979
980 /* XStoreColor (display->display, XCMAP, XColor*); */
981 836
982 /* 837 /*
983 * FIXME: should free colors here, but no idea how to do it so instead, 838 * FIXME: should free colors here, but no idea how to do it so instead,
984 * so just keep gobbling up the colormap 839 * so just keep gobbling up the colormap
985 */ 840 */
986# if 0
987 for (i = Color_Black; i <= Color_White; i++)
988 if (PixColors[idx] == PixColors[i])
989 break;
990 if (i > Color_White)
991 {
992 /* fprintf (stderr, "XFreeColors: PixColors [%d] = %lu\n", idx, PixColors [idx]); */
993 XFreeColors (display->display, XCMAP, (PixColors + idx), 1,
994 DisplayPlanes (display->display, display->screen));
995 }
996# endif
997 841
998 PixColorsFocused[idx] = xcol; 842 pix_colors_focused[idx] = xcol;
999 SET_PIXCOLOR (idx);
1000 843
1001 /* XSetWindowAttributes attr; */
1002 /* Cursor cursor; */
1003Done: 844done:
1004#ifdef OFF_FOCUS_FADING
1005 PixColorsUnFocused[idx] = PixColorsFocused[idx].fade (display, atoi (rs[Rs_fade]));
1006#endif
1007 if (idx == Color_bg && ! (Options & Opt_transparent))
1008 XSetWindowBackground (display->display, TermWin.vt, PixColors[Color_bg]);
1009
1010 /* handle Color_BD, scrollbar background, etc. */ 845 /*TODO: handle Color_BD, scrollbar background, etc. */
1011 846
1012 set_colorfgbg (); 847 update_fade_color (idx);
1013 recolour_cursor (); 848 recolour_cursor ();
1014 scr_touch (true); 849 scr_recolour ();
850#endif /* XTERM_COLOR_CHANGE */
1015} 851}
1016
1017#else
1018# define set_window_color (idx,color) ((void)0)
1019#endif /* XTERM_COLOR_CHANGE */
1020 852
1021void 853void
1022rxvt_term::recolour_cursor () 854rxvt_term::recolour_cursor ()
1023{ 855{
1024 XColor xcol[2]; 856 XColor fg, bg;
1025 857
1026 xcol[0].pixel = ISSET_PIXCOLOR (Color_pointer_fg) ? PixColorsFocused[Color_pointer_fg] : PixColorsFocused[Color_fg]; 858 (ISSET_PIXCOLOR (Color_pointer_fg)
1027 xcol[1].pixel = ISSET_PIXCOLOR (Color_pointer_bg) ? PixColorsFocused[Color_pointer_bg] : PixColorsFocused[Color_bg]; 859 ? pix_colors_focused[Color_pointer_fg]
1028 XQueryColors (display->display, XCMAP, xcol, 2); 860 : pix_colors_focused[Color_fg]).get (fg);
1029 XRecolorCursor (display->display, TermWin_cursor, xcol + 0, xcol + 1); 861
862 (ISSET_PIXCOLOR (Color_pointer_bg)
863 ? pix_colors_focused[Color_pointer_bg]
864 : pix_colors_focused[Color_bg]).get (bg);
865
866 XRecolorCursor (dpy, TermWin_cursor, &fg, &bg);
1030} 867}
1031 868
1032/*----------------------------------------------------------------------*/ 869/*----------------------------------------------------------------------*/
1033/* 870/*
1034 * find if fg/bg matches any of the normal (low-intensity) colors 871 * find if fg/bg matches any of the normal (low-intensity) colors
1035 */ 872 */
1036void 873void
1037rxvt_term::set_colorfgbg () 874rxvt_term::set_colorfgbg ()
1038{ 875{
1039 unsigned int i; 876 unsigned int i;
1040 const char *xpmb = "\0"; 877 const char *xpmb = "";
1041 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1]; 878 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1];
1042 879
1043 env_colorfgbg =
1044 (char *)rxvt_malloc (sizeof ("COLORFGBG=default;default;bg") + 1);
1045 STRCPY (fstr, "default"); 880 strcpy (fstr, "default");
1046 STRCPY (bstr, "default"); 881 strcpy (bstr, "default");
1047 for (i = Color_Black; i <= Color_White; i++) 882 for (i = Color_Black; i <= Color_White; i++)
1048 if (PixColors[Color_fg] == PixColors[i]) 883 if (pix_colors[Color_fg] == pix_colors[i])
1049 { 884 {
1050 sprintf (fstr, "%d", (i - Color_Black)); 885 sprintf (fstr, "%d", (i - Color_Black));
1051 break; 886 break;
1052 } 887 }
888
1053 for (i = Color_Black; i <= Color_White; i++) 889 for (i = Color_Black; i <= Color_White; i++)
1054 if (PixColors[Color_bg] == PixColors[i]) 890 if (pix_colors[Color_bg] == pix_colors[i])
1055 { 891 {
1056 sprintf (bstr, "%d", (i - Color_Black)); 892 sprintf (bstr, "%d", (i - Color_Black));
1057#ifdef XPM_BACKGROUND 893#ifdef BG_IMAGE_FROM_FILE
1058 xpmb = "default;"; 894 xpmb = "default;";
1059#endif 895#endif
1060 break; 896 break;
1061 } 897 }
1062 898
1063 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr); 899 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr);
1064
1065#ifndef NO_BRIGHTCOLOR
1066 colorfgbg = DEFAULT_RSTYLE;
1067 for (i = minCOLOR; i <= maxCOLOR; i++)
1068 {
1069 if (PixColors[Color_fg] == PixColors[i])
1070 colorfgbg = SET_FGCOLOR (colorfgbg, i);
1071 if (PixColors[Color_bg] == PixColors[i])
1072 colorfgbg = SET_BGCOLOR (colorfgbg, i);
1073 }
1074#endif
1075} 900}
1076 901
1077/*----------------------------------------------------------------------*/ 902/*----------------------------------------------------------------------*/
1078/*
1079 * Colour determination for low colour displays, routine from
1080 * Hans de Goede <hans@highrise.nl>
1081 */
1082 903
1083int 904bool
1084rxvt_term::rXParseAllocColor (rxvt_color *screen_in_out, const char *colour) 905rxvt_term::set_color (rxvt_color &color, const char *name)
1085{ 906{
1086 if (!screen_in_out->set (display, colour)) 907 if (color.set (this, name))
1087 {
1088 rxvt_warn ("can't get colour '%s', continuing without.\n", colour);
1089 return false;
1090 }
1091
1092 return true; 908 return true;
909
910 rxvt_warn ("can't get colour '%s', continuing without.\n", name);
911 return false;
912}
913
914void
915rxvt_term::alias_color (int dst, int src)
916{
917 pix_colors[dst].set (this, rs[Rs_color + dst] = rs[Rs_color + src]);
1093} 918}
1094 919
1095/* -------------------------------------------------------------------- * 920/* -------------------------------------------------------------------- *
1096 * - WINDOW RESIZING - * 921 * - WINDOW RESIZING - *
1097 * -------------------------------------------------------------------- */ 922 * -------------------------------------------------------------------- */
1098void 923void
1099rxvt_term::resize_all_windows (unsigned int width, unsigned int height, int ignoreparent) 924rxvt_term::resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent)
1100{ 925{
1101 int fix_screen; 926 int fix_screen;
927 int old_width = szHint.width;
928 int old_height = szHint.height;
1102 929
1103#ifdef SMART_RESIZE
1104 int old_width = szHint.width, old_height = szHint.height;
1105#endif
1106
1107 window_calc (width, height); 930 window_calc (newwidth, newheight);
931
932 bool set_hint = !HOOK_INVOKE ((this, HOOK_RESIZE_ALL_WINDOWS, DT_INT, newwidth, DT_INT, newheight, DT_END));
933
934 // to avoid races between us and the wm, we clear the incremental size hints around the xresizewindow
935 if (set_hint)
936 {
937 szHint.flags &= ~(PBaseSize | PResizeInc);
1108 XSetWMNormalHints (display->display, TermWin.parent[0], &szHint); 938 XSetWMNormalHints (dpy, parent[0], &szHint);
939 szHint.flags |= PBaseSize | PResizeInc;
940 }
1109 941
1110 if (!ignoreparent) 942 if (!ignoreparent)
1111 { 943 {
1112#ifdef SMART_RESIZE 944#ifdef SMART_RESIZE
1113 /* 945 /*
… …
1117 int x, y, x1, y1; 949 int x, y, x1, y1;
1118 int dx, dy; 950 int dx, dy;
1119 unsigned int unused_w1, unused_h1, unused_b1, unused_d1; 951 unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
1120 Window unused_cr; 952 Window unused_cr;
1121 953
1122 XTranslateCoordinates (display->display, TermWin.parent[0], display->root, 954 XTranslateCoordinates (dpy, parent[0], display->root,
1123 0, 0, &x, &y, &unused_cr); 955 0, 0, &x, &y, &unused_cr);
1124 XGetGeometry (display->display, TermWin.parent[0], &unused_cr, &x1, &y1, 956 XGetGeometry (dpy, parent[0], &unused_cr, &x1, &y1,
1125 &unused_w1, &unused_h1, &unused_b1, &unused_d1); 957 &unused_w1, &unused_h1, &unused_b1, &unused_d1);
1126 /* 958 /*
1127 * if display->root isn't the parent window, a WM will probably have offset 959 * if display->root isn't the parent window, a WM will probably have offset
1128 * our position for handles and decorations. Counter it 960 * our position for handles and decorations. Counter it
1129 */ 961 */
… …
1131 { 963 {
1132 x -= x1; 964 x -= x1;
1133 y -= y1; 965 y -= y1;
1134 } 966 }
1135 967
1136 x1 = (DisplayWidth (display->display, display->screen) - old_width) / 2; 968 x1 = (DisplayWidth (dpy, display->screen) - old_width ) / 2;
1137 y1 = (DisplayHeight (display->display, display->screen) - old_height) / 2; 969 y1 = (DisplayHeight (dpy, display->screen) - old_height) / 2;
1138 dx = old_width - szHint.width; 970 dx = old_width - szHint.width;
1139 dy = old_height - szHint.height; 971 dy = old_height - szHint.height;
1140 972
1141 /* Check position of the center of the window */ 973 /* Check position of the center of the window */
1142 if (x < x1) /* left half */ 974 if (x < x1) /* left half */
1143 dx = 0; 975 dx = 0;
… …
1146 if (y < y1) /* top half */ 978 if (y < y1) /* top half */
1147 dy = 0; 979 dy = 0;
1148 else if (y == y1) /* exact center */ 980 else if (y == y1) /* exact center */
1149 dy /= 2; 981 dy /= 2;
1150 982
1151 XMoveResizeWindow (display->display, TermWin.parent[0], x + dx, y + dy, 983 XMoveResizeWindow (dpy, parent[0], x + dx, y + dy,
1152 szHint.width, szHint.height); 984 szHint.width, szHint.height);
1153#else 985#else
1154 XResizeWindow (display->display, TermWin.parent[0], szHint.width, szHint.height); 986 XResizeWindow (dpy, parent[0], szHint.width, szHint.height);
1155#endif 987#endif
1156 } 988 }
1157 989
990 if (set_hint)
991 XSetWMNormalHints (dpy, parent[0], &szHint);
992
1158 fix_screen = TermWin.ncol != prev_ncol || TermWin.nrow != prev_nrow; 993 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
1159 994
1160 if (fix_screen || width != old_width || height != old_height) 995 if (fix_screen || newwidth != old_width || newheight != old_height)
1161 { 996 {
1162 if (scrollbar_visible ()) 997 if (scrollBar.state)
1163 { 998 scrollBar.resize ();
1164 XMoveResizeWindow (display->display, scrollBar.win,
1165 window_sb_x, 0,
1166 scrollbar_TotalWidth (), szHint.height);
1167 resize_scrollbar ();
1168 }
1169 999
1170 if (menubar_visible ())
1171 XMoveResizeWindow (display->display, menuBar.win,
1172 window_vt_x, 0,
1173 TermWin_TotalWidth (), menuBar_TotalHeight ());
1174
1175 XMoveResizeWindow (display->display, TermWin.vt, 1000 XMoveResizeWindow (dpy, vt,
1176 window_vt_x, window_vt_y, 1001 window_vt_x, window_vt_y,
1177 TermWin_TotalWidth (), TermWin_TotalHeight ()); 1002 width, height);
1178 scr_clear (); 1003
1179#ifdef XPM_BACKGROUND 1004#ifdef HAVE_BG_PIXMAP
1180 resize_pixmap (); 1005 if (bgPixmap.window_size_sensitive ())
1006 update_background ();
1181#endif 1007#endif
1182 } 1008 }
1183 1009
1184 if (fix_screen || old_height == 0) 1010 if (fix_screen || old_height == 0)
1185 {
1186 int curr_screen = -1;
1187 int old_ncol = prev_ncol;
1188
1189 /* scr_reset only works on the primary screen */
1190 if (old_height) /* this is not the first time through */
1191 {
1192 unsigned int ncol = TermWin.ncol;
1193 TermWin.ncol = prev_ncol; // save b/c scr_blank_screen_mem uses this
1194 curr_screen = scr_change_screen (PRIMARY);
1195 TermWin.ncol = ncol;
1196 }
1197
1198 scr_reset (); 1011 scr_reset ();
1199 1012
1200 if (curr_screen >= 0) /* this is not the first time through */ 1013#ifdef HAVE_BG_PIXMAP
1201 { 1014// TODO: this don't seem to have any effect - do we still need it ? If so - in which case exactly ?
1202 scr_change_screen (curr_screen); 1015// if (bgPixmap.pixmap)
1203 selection_check (old_ncol != TermWin.ncol ? 4 : 0); 1016// scr_touch (false);
1204 } 1017#endif
1205 }
1206
1207 old_width = szHint.width;
1208 old_height = szHint.height;
1209 1018
1210#ifdef USE_XIM 1019#ifdef USE_XIM
1211 IMSetStatusPosition (); 1020 IMSetPosition ();
1212#endif 1021#endif
1213} 1022}
1214 1023
1215/* 1024/*
1216 * Set the width/height of the vt window in characters. Units are pixels. 1025 * Set the width/height of the vt window in characters. Units are pixels.
1217 * good for toggling 80/132 columns 1026 * good for toggling 80/132 columns
1218 */ 1027 */
1219void 1028void
1220rxvt_term::set_widthheight (unsigned int width, unsigned int height) 1029rxvt_term::set_widthheight (unsigned int newwidth, unsigned int newheight)
1221{ 1030{
1222 XWindowAttributes wattr; 1031 XWindowAttributes wattr;
1223 1032
1224 if (width == 0 || height == 0) 1033 if (newwidth == 0 || newheight == 0)
1225 { 1034 {
1226 XGetWindowAttributes (display->display, display->root, &wattr); 1035 XGetWindowAttributes (dpy, display->root, &wattr);
1036
1227 if (width == 0) 1037 if (newwidth == 0)
1228 width = wattr.width - szHint.base_width; 1038 newwidth = wattr.width - szHint.base_width;
1229 if (height == 0) 1039 if (newheight == 0)
1230 height = wattr.height - szHint.base_height; 1040 newheight = wattr.height - szHint.base_height;
1231 }
1232 if (width != TermWin.width || height != TermWin.height)
1233 { 1041 }
1042
1043 if (newwidth != width || newheight != height)
1044 {
1234 width += szHint.base_width; 1045 newwidth += szHint.base_width;
1235 height += szHint.base_height; 1046 newheight += szHint.base_height;
1236 resize_all_windows (width, height, 0); 1047 resize_all_windows (newwidth, newheight, 0);
1237 } 1048 }
1238} 1049}
1239 1050
1240/* -------------------------------------------------------------------- * 1051/* -------------------------------------------------------------------- *
1241 * - X INPUT METHOD ROUTINES - * 1052 * - X INPUT METHOD ROUTINES - *
1242 * -------------------------------------------------------------------- */ 1053 * -------------------------------------------------------------------- */
1243#ifdef USE_XIM 1054#ifdef USE_XIM
1244 1055
1245void 1056void
1057rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg)
1058{
1059 fg = pix_colors [Color_fg];
1060 bg = pix_colors [Color_bg];
1061}
1062
1063void
1246rxvt_term::im_set_size (XRectangle *size) 1064rxvt_term::im_set_size (XRectangle &size)
1247{ 1065{
1248 size->x = TermWin.int_bwidth; 1066 // the int_bwidth terms make no sense to me
1249 size->y = TermWin.int_bwidth; 1067 size.x = int_bwidth;
1250 size->width = Width2Pixel (TermWin.ncol); 1068 size.y = int_bwidth;
1251 size->height = Height2Pixel (TermWin.nrow); 1069 size.width = Width2Pixel (ncol) + int_bwidth;
1070 size.height = Height2Pixel (nrow) + int_bwidth;
1252} 1071}
1253 1072
1254void 1073void
1255rxvt_term::im_set_color (unsigned long *fg, unsigned long *bg) 1074rxvt_term::im_set_preedit_area (XRectangle &preedit_rect,
1075 XRectangle &status_rect,
1076 const XRectangle &needed_rect)
1256{ 1077{
1257 *fg = PixColors[Color_fg]; 1078 preedit_rect.x = needed_rect.width;
1258 *bg = PixColors[Color_bg]; 1079 preedit_rect.y = 0;
1080 preedit_rect.width = Width2Pixel (ncol) - needed_rect.width + 1;
1081 preedit_rect.height = fheight;
1082
1083 status_rect.x = 0;
1084 status_rect.y = 0;
1085 status_rect.width = needed_rect.width ? needed_rect.width : Width2Pixel (ncol) + 1;
1086 status_rect.height = fheight;
1259} 1087}
1260 1088
1261/* Checking whether input method is running. */ 1089/* Checking whether input method is running. */
1262bool 1090bool
1263rxvt_term::IMisRunning () 1091rxvt_term::IMisRunning ()
1264{ 1092{
1265 char *p; 1093 Atom atom;
1266 Atom atom; 1094 Window win;
1267 Window win;
1268 char server[IMBUFSIZ]; 1095 char server[IMBUFSIZ];
1269 1096
1270 /* get current locale modifier */ 1097 /* get current locale modifier */
1271 if ((p = XSetLocaleModifiers (NULL)) != NULL) 1098 if (char *p = XSetLocaleModifiers (0))
1272 { 1099 {
1273 STRCPY (server, "@server="); 1100 strcpy (server, "@server=");
1274 STRNCAT (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */ 1101 strncat (server, p + 4, IMBUFSIZ - 9); /* skip "@im=" */
1102
1275 if ((p = STRCHR (server + 1, '@')) != NULL) /* first one only */ 1103 if (p = strchr (server + 1, '@')) /* first one only */
1276 *p = '\0'; 1104 *p = '\0';
1277 1105
1278 atom = XInternAtom (display->display, server, False); 1106 atom = XInternAtom (dpy, server, False);
1279 win = XGetSelectionOwner (display->display, atom); 1107 win = XGetSelectionOwner (dpy, atom);
1108
1280 if (win != None) 1109 if (win != None)
1281 return True; 1110 return True;
1282 } 1111 }
1112
1283 return False; 1113 return False;
1284} 1114}
1285 1115
1286void 1116void
1287rxvt_term::IMSendSpot () 1117rxvt_term::IMSendSpot ()
1288{ 1118{
1289 XPoint spot; 1119 XPoint nspot;
1290 XVaNestedList preedit_attr; 1120 XVaNestedList preedit_attr;
1291 1121
1292 if (Input_Context == NULL 1122 if (!Input_Context
1293 || !TermWin.focus || ! (input_style & XIMPreeditPosition) 1123 || !focus
1294 || ! (event_type == KeyPress 1124 || !(input_style & (XIMPreeditPosition | XIMPreeditCallbacks)))
1295 || event_type == Expose
1296 || event_type == NoExpose
1297 || event_type == SelectionNotify
1298 || event_type == ButtonRelease || event_type == FocusIn)
1299 || !IMisRunning ())
1300 return; 1125 return;
1301 1126
1302 im_set_position (&spot); 1127 im_set_position (nspot);
1128
1129 if (nspot.x == spot.x && nspot.y == spot.y)
1130 return;
1131
1132 spot = nspot;
1303 1133
1304 preedit_attr = XVaCreateNestedList (0, XNSpotLocation, &spot, NULL); 1134 preedit_attr = XVaCreateNestedList (0, XNSpotLocation, &spot, NULL);
1305 XSetICValues (Input_Context, XNPreeditAttributes, preedit_attr, NULL); 1135 XSetICValues (Input_Context, XNPreeditAttributes, preedit_attr, NULL);
1306 XFree (preedit_attr); 1136 XFree (preedit_attr);
1307} 1137}
1308 1138
1309void 1139void
1310rxvt_term::im_set_preedit_area (XRectangle * preedit_rect, XRectangle * status_rect,
1311 XRectangle * needed_rect)
1312{
1313 int mbh, vtx = 0;
1314
1315 if (scrollbar_visible () && ! (Options & Opt_scrollBar_right))
1316 vtx = scrollbar_TotalWidth ();
1317
1318 mbh = menubar_visible () ? menuBar_TotalHeight () : 0;
1319 mbh -= TermWin.lineSpace;
1320
1321 preedit_rect->x = needed_rect->width + vtx;
1322 preedit_rect->y = Height2Pixel (TermWin.nrow - 1) + mbh;
1323
1324 preedit_rect->width = Width2Pixel (TermWin.ncol + 1) - needed_rect->width + vtx;
1325 preedit_rect->height = Height2Pixel (1);
1326
1327 status_rect->x = vtx;
1328 status_rect->y = Height2Pixel (TermWin.nrow - 1) + mbh;
1329
1330 status_rect->width = needed_rect->width ? needed_rect->width : Width2Pixel (TermWin.ncol + 1);
1331 status_rect->height = Height2Pixel (1);
1332}
1333
1334void
1335rxvt_term::im_destroy () 1140rxvt_term::im_destroy ()
1336{ 1141{
1337 if (Input_Context)
1338 {
1339 XDestroyIC (Input_Context);
1340 Input_Context = NULL;
1341 }
1342
1343 if (input_method) 1142 if (input_method)
1344 { 1143 {
1144 if (Input_Context && input_method->xim)
1145 XDestroyIC (Input_Context);
1146
1345 display->put_xim (input_method); 1147 display->put_xim (input_method);
1346 input_method = 0; 1148 input_method = 0;
1347 } 1149 }
1150
1151 Input_Context = 0;
1348} 1152}
1153
1154#ifdef ENABLE_XIM_ONTHESPOT
1155
1156static void
1157xim_preedit_start (XIC ic, XPointer client_data, XPointer call_data)
1158{
1159 ((rxvt_term *)client_data)->make_current ();
1160 HOOK_INVOKE (((rxvt_term *)client_data, HOOK_XIM_PREEDIT_START, DT_END));
1161}
1162
1163static void
1164xim_preedit_done (XIC ic, XPointer client_data, XPointer call_data)
1165{
1166 ((rxvt_term *)client_data)->make_current ();
1167 HOOK_INVOKE (((rxvt_term *)client_data, HOOK_XIM_PREEDIT_DONE, DT_END));
1168}
1169
1170static void
1171xim_preedit_draw (XIC ic, XPointer client_data, XIMPreeditDrawCallbackStruct *call_data)
1172{
1173 rxvt_term *term = (rxvt_term *)client_data;
1174 XIMText *text = call_data->text;
1175
1176 term->make_current ();
1177
1178 if (text)
1179 {
1180 wchar_t *str;
1181
1182 if (!text->encoding_is_wchar && text->string.multi_byte)
1183 {
1184 // of course, X makes it ugly again
1185 if (term->rs[Rs_imLocale])
1186 SET_LOCALE (term->rs[Rs_imLocale]);
1187
1188 str = rxvt_temp_buf<wchar_t> (text->length + 1);
1189 mbstowcs (str, text->string.multi_byte, text->length + 1);
1190
1191 if (term->rs[Rs_imLocale])
1192 SET_LOCALE (term->locale);
1193 }
1194 else
1195 str = text->string.wide_char;
1196
1197 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
1198 DT_INT, call_data->caret,
1199 DT_INT, call_data->chg_first,
1200 DT_INT, call_data->chg_length,
1201 DT_LCS_LEN, (void *)text->feedback, text->feedback ? (int)text->length : 0,
1202 DT_WCS_LEN, str, str ? (int)text->length : 0,
1203 DT_END));
1204 }
1205 else
1206 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
1207 DT_INT, call_data->caret,
1208 DT_INT, call_data->chg_first,
1209 DT_INT, call_data->chg_length,
1210 DT_END));
1211}
1212
1213#if 0
1214static void
1215xim_preedit_caret (XIC ic, XPointer client_data, XIMPreeditCaretCallbackStruct *call_data)
1216{
1217 ((rxvt_term *)client_data)->make_current ();
1218 HOOK_INVOKE (((rxvt_term *)client_data, HOOK_XIM_PREEDIT_CARET,
1219 DT_INT, call_data->position,
1220 DT_INT, call_data->direction,
1221 DT_INT, call_data->style,
1222 DT_END));
1223}
1224#endif
1225
1226#endif
1349 1227
1350/* 1228/*
1351 * Try to open a XIM with the current modifiers, then see if we can 1229 * Try to open a XIM with the current modifiers, then see if we can
1352 * open a suitable preedit type 1230 * open a suitable preedit type
1353 */ 1231 */
1354bool 1232bool
1355rxvt_term::IM_get_IC (const char *modifiers) 1233rxvt_term::IM_get_IC (const char *modifiers)
1356{ 1234{
1357 int i, j, found; 1235 int i, j, found;
1358 XIM xim; 1236 XIM xim;
1359 XPoint spot; 1237 XPoint spot;
1360 XRectangle rect, status_rect, needed_rect; 1238 XRectangle rect, status_rect, needed_rect;
1361 unsigned long fg, bg; 1239 unsigned long fg, bg;
1362 const char *p; 1240 const char *p;
1363 char **s; 1241 char **s;
1364 XIMStyles *xim_styles; 1242 XIMStyles *xim_styles;
1365 XVaNestedList preedit_attr, status_attr; 1243#ifdef ENABLE_XIM_ONTHESPOT
1244 XIMCallback xcb[4];
1245#endif
1246
1247 set_environ (envv);
1366 1248
1367 if (! ((p = XSetLocaleModifiers (modifiers)) && *p)) 1249 if (! ((p = XSetLocaleModifiers (modifiers)) && *p))
1368 return false; 1250 return false;
1369 1251
1370 D_MAIN ((stderr, "rxvt_IM_get_IC ()"));
1371 input_method = display->get_xim (locale, modifiers); 1252 input_method = display->get_xim (locale, modifiers);
1372 if (input_method == NULL) 1253 if (input_method == NULL)
1373 return false; 1254 return false;
1374 1255
1375 xim = input_method->xim; 1256 xim = input_method->xim;
1257 spot.x = spot.y = -1;
1376 1258
1377 xim_styles = NULL; 1259 xim_styles = NULL;
1378 if (XGetIMValues (xim, XNQueryInputStyle, &xim_styles, NULL) 1260 if (XGetIMValues (xim, XNQueryInputStyle, &xim_styles, NULL)
1379 || !xim_styles || !xim_styles->count_styles) 1261 || !xim_styles || !xim_styles->count_styles)
1380 { 1262 {
1381 display->put_xim (input_method); 1263 im_destroy ();
1382 return false; 1264 return false;
1383 } 1265 }
1384 1266
1385 p = rs[Rs_preeditType] ? rs[Rs_preeditType] : "OverTheSpot,OffTheSpot,Root"; 1267 const char *pet[] = { rs[Rs_preeditType], "OverTheSpot,OffTheSpot,Root,None" };
1268
1269 for (int pi = 0; pi < 2; pi++)
1270 {
1271 p = pet[pi];
1272
1273 if (!p)
1274 continue;
1275
1386 s = rxvt_splitcommastring (p); 1276 s = rxvt_splitcommastring (p);
1277
1387 for (i = found = 0; !found && s[i]; i++) 1278 for (i = found = 0; !found && s[i]; i++)
1388 { 1279 {
1389 if (!STRCMP (s[i], "OverTheSpot")) 1280 if (!strcmp (s[i], "OverTheSpot"))
1390 input_style = (XIMPreeditPosition | XIMStatusNothing); 1281 input_style = XIMPreeditPosition | XIMStatusNothing;
1391 else if (!STRCMP (s[i], "OffTheSpot")) 1282 else if (!strcmp (s[i], "OffTheSpot"))
1392 input_style = (XIMPreeditArea | XIMStatusArea); 1283 input_style = XIMPreeditArea | XIMStatusArea;
1393 else if (!STRCMP (s[i], "Root")) 1284 else if (!strcmp (s[i], "Root"))
1394 input_style = (XIMPreeditNothing | XIMStatusNothing); 1285 input_style = XIMPreeditNothing | XIMStatusNothing;
1286 else if (!strcmp (s[i], "None"))
1287 input_style = XIMPreeditNone | XIMStatusNone;
1288#ifdef ENABLE_XIM_ONTHESPOT
1289 else if (SHOULD_INVOKE (HOOK_XIM_PREEDIT_START) && !strcmp (s[i], "OnTheSpot"))
1290 input_style = XIMPreeditCallbacks | XIMStatusNothing;
1291#endif
1292 else
1293 input_style = XIMPreeditNothing | XIMStatusNothing;
1395 1294
1396 for (j = 0; j < xim_styles->count_styles; j++) 1295 for (j = 0; j < xim_styles->count_styles; j++)
1397 if (input_style == xim_styles->supported_styles[j]) 1296 if (input_style == xim_styles->supported_styles[j])
1398 { 1297 {
1298 rxvt_freecommastring (s);
1299
1399 found = 1; 1300 found = 1;
1400 break; 1301 goto foundpet;
1302 }
1303
1401 } 1304 }
1402 }
1403 1305
1404 for (i = 0; s[i]; i++) 1306 rxvt_freecommastring (s);
1405 free (s[i]); 1307 }
1406 1308
1407 free (s); 1309foundpet:
1310
1408 XFree (xim_styles); 1311 XFree (xim_styles);
1409 1312
1410 if (!found) 1313 if (!found)
1411 { 1314 {
1412 display->put_xim (input_method); 1315 im_destroy ();
1413 return false; 1316 return false;
1414 } 1317 }
1415 1318
1416 preedit_attr = status_attr = NULL; 1319 XFontSet fs = 0;
1320 XVaNestedList preedit_attr = 0, status_attr = 0;
1321
1322 if (input_style & (XIMPreeditPosition | XIMPreeditArea))
1323 {
1324 // fake us a font-set, please
1325 char **missing_charset_list;
1326 int missing_charset_count;
1327 char *def_string;
1328 char pat[512];
1329
1330 sprintf (pat,
1331 "-*-*-*-R-*-*-%d-*-*-*-*-*-*,"
1332 "-*-*-*-R-*-*-%d-*-*-*-*-*-*,"
1333 "-*-*-*-R-*-*-%d-*-*-*-*-*-*,"
1334 "-*-*-*-R-*-*-%d-*-*-*-*-*-*,"
1335 "-*-*-*-R-*-*-%d-*-*-*-*-*-*,"
1336 "*",
1337 fheight,
1338 fheight + 1, fheight - 1,
1339 fheight - 2, fheight + 2);
1340
1341 fs = XCreateFontSet (dpy, rs[Rs_imFont] ? rs[Rs_imFont] : pat,
1342 &missing_charset_list, &missing_charset_count, &def_string);
1343
1344 if (missing_charset_list)
1345 XFreeStringList (missing_charset_list);
1346
1347 if (!fs)
1348 {
1349 input_style &= ~(XIMPreeditPosition | XIMPreeditArea);
1350 rxvt_warn ("unable to create fontset for input method, try \"-pt Root\". Continuing.\n");
1351 }
1352 }
1417 1353
1418 if (input_style & XIMPreeditPosition) 1354 if (input_style & XIMPreeditPosition)
1419 { 1355 {
1420 im_set_size (&rect); 1356 im_set_size (rect);
1421 im_set_position (&spot); 1357 im_set_position (spot);
1422 im_set_color (&fg, &bg); 1358 im_set_color (fg, bg);
1423 1359
1424 preedit_attr = XVaCreateNestedList (0, XNArea, &rect, 1360 preedit_attr = XVaCreateNestedList (0,
1361 XNForeground, fg,
1362 XNBackground, bg,
1363 XNArea, &rect,
1425 XNSpotLocation, &spot, 1364 XNSpotLocation, &spot,
1426 XNForeground, fg, XNBackground, bg,
1427 //XNFontSet, TermWin.fontset, 1365 XNFontSet, fs,
1428 NULL); 1366 NULL);
1429 } 1367 }
1430 else if (input_style & XIMPreeditArea) 1368 else if (input_style & XIMPreeditArea)
1431 { 1369 {
1432 im_set_color (&fg, &bg); 1370 im_set_color (fg, bg);
1433 1371
1434 /* 1372 /*
1435 * The necessary width of preedit area is unknown 1373 * The necessary width of preedit area is unknown
1436 * until create input context. 1374 * until create input context.
1437 */ 1375 */
1438 needed_rect.width = 0; 1376 needed_rect.width = 0;
1439
1440 im_set_preedit_area (&rect, &status_rect, &needed_rect); 1377 im_set_preedit_area (rect, status_rect, needed_rect);
1441 1378
1442 preedit_attr = XVaCreateNestedList (0, XNArea, &rect, 1379 preedit_attr = XVaCreateNestedList (0,
1380 XNForeground, fg,
1443 XNForeground, fg, XNBackground, bg, 1381 XNBackground, bg,
1382 XNArea, &rect,
1383 XNFontSet, fs,
1384 NULL);
1385 status_attr = XVaCreateNestedList (0,
1386 XNForeground, fg,
1387 XNBackground, bg,
1388 XNArea, &status_rect,
1444 //XNFontSet, TermWin.fontset, 1389 XNFontSet, fs,
1445 NULL); 1390 NULL);
1446 status_attr = XVaCreateNestedList (0, XNArea, &status_rect, 1391 }
1447 XNForeground, fg, XNBackground, bg, 1392#if ENABLE_XIM_ONTHESPOT
1448 //XNFontSet, TermWin.fontset, 1393 else if (input_style & XIMPreeditCallbacks)
1394 {
1395 im_set_position (spot);
1396
1397 xcb[0].client_data = (XPointer)this; xcb[0].callback = (XIMProc)xim_preedit_start;
1398 xcb[1].client_data = (XPointer)this; xcb[1].callback = (XIMProc)xim_preedit_done;
1399 xcb[2].client_data = (XPointer)this; xcb[2].callback = (XIMProc)xim_preedit_draw;
1400# if 0
1401 xcb[3].client_data = (XPointer)this; xcb[3].callback = (XIMProc)xim_preedit_caret;
1402# endif
1403
1404 preedit_attr = XVaCreateNestedList (0,
1405 XNSpotLocation, &spot,
1406 XNPreeditStartCallback, &xcb[0],
1407 XNPreeditDoneCallback , &xcb[1],
1408 XNPreeditDrawCallback , &xcb[2],
1409# if 0
1410 XNPreeditCaretCallback, &xcb[3],
1411# endif
1449 NULL); 1412 NULL);
1450 } 1413 }
1414#endif
1451 1415
1452 Input_Context = XCreateIC (xim, XNInputStyle, input_style, 1416 Input_Context = XCreateIC (xim,
1417 XNInputStyle, input_style,
1453 XNClientWindow, TermWin.parent[0], 1418 XNClientWindow, vt,
1454 XNFocusWindow, TermWin.parent[0], 1419 XNFocusWindow, parent[0],
1455 preedit_attr ? XNPreeditAttributes : NULL, 1420 preedit_attr ? XNPreeditAttributes : NULL,
1456 preedit_attr, 1421 preedit_attr,
1457 status_attr ? XNStatusAttributes : NULL, 1422 status_attr ? XNStatusAttributes : NULL,
1458 status_attr, NULL); 1423 status_attr, NULL);
1424
1459 if (preedit_attr) XFree (preedit_attr); 1425 if (preedit_attr) XFree (preedit_attr);
1460 if (status_attr) XFree (status_attr); 1426 if (status_attr) XFree (status_attr);
1427 if (fs) XFreeFontSet (dpy, fs);
1461 1428
1462 if (Input_Context == NULL) 1429 if (Input_Context == NULL)
1463 { 1430 {
1464 rxvt_warn ("failed to create input context, continuing without XIM.\n"); 1431 rxvt_warn ("failed to create input context, continuing without XIM.\n");
1465 display->put_xim (input_method); 1432 im_destroy ();
1466 return false; 1433 return false;
1467 } 1434 }
1468 1435
1469 if (input_style & XIMPreeditArea) 1436#if 0
1437 // unfortunately, only the focus window is used by XIM, hard to fix
1438 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL))
1439 vt_select_input ();
1440#endif
1441
1470 IMSetStatusPosition (); 1442 IMSetPosition ();
1471 1443
1472 D_MAIN ((stderr, "rxvt_IM_get_IC () - successful connection"));
1473 return true; 1444 return true;
1474} 1445}
1475 1446
1476void 1447void
1477rxvt_term::im_cb () 1448rxvt_term::im_cb ()
1478{ 1449{
1479 int i, found, had_im; 1450 int i;
1480 const char *p; 1451 const char *p;
1481 char **s; 1452 char **s;
1482 char buf[IMBUFSIZ]; 1453 char buf[IMBUFSIZ];
1483 1454
1455 make_current ();
1456
1484 im_destroy (); 1457 im_destroy ();
1485 1458
1486 D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()"));
1487 if (Input_Context) 1459 if (Input_Context)
1488 return; 1460 return;
1489 1461
1490#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE) 1462#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1491 if (rs[Rs_imLocale]) 1463 if (rs[Rs_imLocale])
… …
1496 if (p && *p) 1468 if (p && *p)
1497 { 1469 {
1498 bool found = false; 1470 bool found = false;
1499 1471
1500 s = rxvt_splitcommastring (p); 1472 s = rxvt_splitcommastring (p);
1473
1501 for (i = 0; s[i]; i++) 1474 for (i = 0; s[i]; i++)
1502 { 1475 {
1503 if (*s[i]) 1476 if (*s[i])
1504 { 1477 {
1505 STRCPY (buf, "@im="); 1478 strcpy (buf, "@im=");
1506 STRNCAT (buf, s[i], IMBUFSIZ - 5); 1479 strncat (buf, s[i], IMBUFSIZ - 5);
1507 if (IM_get_IC (buf)) 1480 if (IM_get_IC (buf))
1508 { 1481 {
1509 found = true; 1482 found = true;
1510 break; 1483 break;
1511 } 1484 }
1512 } 1485 }
1513 } 1486 }
1514 for (i = 0; s[i]; i++) 1487
1515 free (s[i]); 1488 rxvt_freecommastring (s);
1516 free (s);
1517 1489
1518 if (found) 1490 if (found)
1519 goto done; 1491 goto done;
1520 } 1492 }
1521 1493
… …
1533 SET_LOCALE (locale); 1505 SET_LOCALE (locale);
1534#endif 1506#endif
1535} 1507}
1536 1508
1537void 1509void
1538rxvt_term::IMSetStatusPosition () 1510rxvt_term::IMSetPosition ()
1539{ 1511{
1540 XRectangle preedit_rect, status_rect, *needed_rect; 1512 XRectangle preedit_rect, status_rect, *needed_rect;
1541 XVaNestedList preedit_attr, status_attr; 1513 XVaNestedList preedit_attr, status_attr;
1542 1514
1543 if (Input_Context == NULL 1515 if (!Input_Context
1544 || !TermWin.focus || ! (input_style & XIMPreeditArea) 1516 || !focus
1517 || !(input_style & (XIMPreeditArea | XIMPreeditPosition))
1545 || !IMisRunning ()) 1518 || !IMisRunning ())
1546 return; 1519 return;
1547 1520
1521 if (input_style & XIMPreeditPosition)
1522 {
1523 im_set_size (preedit_rect);
1524 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);
1525
1526 XSetICValues (Input_Context,
1527 XNPreeditAttributes, preedit_attr, NULL);
1528 }
1529 else
1530 {
1548 /* Getting the necessary width of preedit area */ 1531 /* Getting the necessary width of preedit area */
1549 status_attr = XVaCreateNestedList (0, XNAreaNeeded, &needed_rect, NULL); 1532 status_attr = XVaCreateNestedList (0, XNAreaNeeded, &needed_rect, NULL);
1550 XGetICValues (Input_Context, XNStatusAttributes, status_attr, NULL); 1533 XGetICValues (Input_Context, XNStatusAttributes, status_attr, NULL);
1551 XFree (status_attr); 1534 XFree (status_attr);
1552 1535
1553 im_set_preedit_area (&preedit_rect, &status_rect, needed_rect); 1536 im_set_preedit_area (preedit_rect, status_rect, *needed_rect);
1537 XFree (needed_rect);
1554 1538
1555 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL); 1539 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);
1556 status_attr = XVaCreateNestedList (0, XNArea, &status_rect, NULL); 1540 status_attr = XVaCreateNestedList (0, XNArea, &status_rect, NULL);
1557 1541
1558 XSetICValues (Input_Context, 1542 XSetICValues (Input_Context,
1559 XNPreeditAttributes, preedit_attr, 1543 XNPreeditAttributes, preedit_attr,
1560 XNStatusAttributes, status_attr, NULL); 1544 XNStatusAttributes, status_attr,
1545 NULL);
1561 1546
1547 XFree (status_attr);
1548 }
1549
1562 XFree (preedit_attr); 1550 XFree (preedit_attr);
1563 XFree (status_attr);
1564} 1551}
1565#endif /* USE_XIM */ 1552#endif /* USE_XIM */
1566 1553
1567/*----------------------------------------------------------------------*/ 1554void
1568rxvt_t rxvt_current_term; 1555rxvt_term::get_window_origin (int &x, int &y)
1556{
1557 Window cr;
1558 XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr);
1559/* fprintf (stderr, "origin is %+d%+d\n", x, y);*/
1560}
1561
1562Pixmap
1563rxvt_term::get_pixmap_property (int prop_id)
1564{
1565 if (prop_id > 0 && prop_id < NUM_XA)
1566 if (xa[prop_id])
1567 {
1568 int aformat;
1569 unsigned long nitems, bytes_after;
1570 Atom atype;
1571 unsigned char *prop = NULL;
1572 int result = XGetWindowProperty (dpy, display->root, xa[prop_id],
1573 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1574 &nitems, &bytes_after, &prop);
1575 if (result == Success && prop && atype == XA_PIXMAP)
1576 return *(Pixmap *)prop;
1577 }
1578
1579 return None;
1580}
1581
1582#ifdef HAVE_BG_PIXMAP
1583# if TRACE_PIXMAPS
1584# undef update_background
1585void
1586rxvt_term::trace_update_background (const char *file, int line)
1587{
1588 fprintf (stderr, "%s:%d:update_background()\n", file, line);
1589 update_background ();
1590}
1591# endif
1592
1593void
1594rxvt_term::update_background ()
1595{
1596 if (update_background_ev.is_active ())
1597 return;
1598
1599 bgPixmap.invalidate ();
1600
1601 ev_tstamp to_wait = 0.5 - (ev::now () - bgPixmap.valid_since);
1602
1603 if (to_wait <= 0.)
1604 bgPixmap.render ();
1605 else
1606 update_background_ev.start (to_wait);
1607}
1608
1609void
1610rxvt_term::update_background_cb (ev::timer &w, int revents)
1611{
1612 make_current ();
1613
1614 update_background_ev.stop ();
1615 bgPixmap.render ();
1616 refresh_check ();
1617}
1618
1619#endif /* HAVE_BG_PIXMAP */
1569 1620
1570/*----------------------- end-of-file (C source) -----------------------*/ 1621/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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