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

Diff Legend

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