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.303 by ayin, Sun Jan 27 22:48:33 2008 UTC vs.
Revision 1.385 by sf-exg, Sun Dec 30 11:34:43 2012 UTC

11 * Copyright (c) 1997 mj olesen <olesen@me.QueensU.CA> 11 * Copyright (c) 1997 mj olesen <olesen@me.QueensU.CA>
12 * - extensive modifications 12 * - extensive modifications
13 * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de> 13 * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de>
14 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com> 14 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com>
15 * - extensive modifications 15 * - extensive modifications
16 * Copyright (c) 2003-2008 Marc Lehmann <pcg@goof.com> 16 * Copyright (c) 2003-2010 Marc Lehmann <schmorp@schmorp.de>
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 "init.h"
35#include "keyboard.h" 36#include "keyboard.h"
36#include "rxvtperl.h" 37#include "rxvtperl.h"
37 38
38#include <limits> 39#include <limits>
39 40
41#include <assert.h>
40#include <csignal> 42#include <signal.h>
41#include <cstring> 43#include <string.h>
42 44
43#include <termios.h> 45#include <termios.h>
44 46
45#ifdef HAVE_XSETLOCALE 47#ifdef HAVE_XSETLOCALE
46# define X_LOCALE 48# define X_LOCALE
47# include <X11/Xlocale.h> 49# include <X11/Xlocale.h>
48#else 50#else
49# ifdef HAVE_SETLOCALE
50# include <clocale> 51# include <locale.h>
51# endif 52#endif
52#endif
53 53
54struct termios rxvt_term::def_tio;
54vector<rxvt_term *> rxvt_term::termlist; 55vector<rxvt_term *> rxvt_term::termlist;
55 56
56// used to tell global functions which terminal instance is "active" 57// used to tell global functions which terminal instance is "active"
57rxvt_t rxvt_current_term; 58rxvt_t rxvt_current_term;
58 59
93text_t rxvt_composite_vec::compose (unicode_t c1, unicode_t c2) 94text_t rxvt_composite_vec::compose (unicode_t c1, unicode_t c2)
94{ 95{
95 compose_char *cc; 96 compose_char *cc;
96 97
97 // break compose chains, as stupid readline really likes to duplicate 98 // break compose chains, as stupid readline really likes to duplicate
98 // composing characters for some reason near the end of a line. 99 // composing characters for some reason, near the end of a line.
99 cc = (*this)[c1]; 100 cc = (*this)[c1];
100 while (cc) 101 while (cc)
101 { 102 {
102 if (cc->c2 == c2) return c1; 103 if (cc->c2 == c2) return c1;
103 cc = (*this)[cc->c1]; 104 cc = (*this)[cc->c1];
104 } 105 }
105 106
106 // check to see wether this combination already exists otherwise 107 // check to see whether this combination already exists otherwise
107 for (cc = v.end (); cc-- > v.begin (); ) 108 for (cc = v.begin (); cc < v.end (); cc++)
108 {
109 if (cc->c1 == c1 && cc->c2 == c2) 109 if (cc->c1 == c1 && cc->c2 == c2)
110 return COMPOSE_LO + (cc - v.begin ()); 110 return COMPOSE_LO + (cc - v.begin ());
111 }
112 111
113 // allocate a new combination 112 // allocate a new combination
114 if (v.size () == COMPOSE_HI - COMPOSE_LO + 1) 113 if (v.size () == COMPOSE_HI - COMPOSE_LO + 1)
115 { 114 {
116 static int seen; 115 static int seen;
117 116
118 if (!seen++) 117 if (!seen++)
119 fprintf (stderr, "too many unrepresentable composite characters, try --enable-unicode3\n"); 118 rxvt_warn ("too many unrepresentable composite characters, try --enable-unicode3\n");
120 119
121 return REPLACEMENT_CHAR; 120 return REPLACEMENT_CHAR;
122 } 121 }
123 122
124 v.push_back (compose_char (c1, c2)); 123 v.push_back (compose_char (c1, c2));
169 sel_scroll_ev.set <rxvt_term, &rxvt_term::sel_scroll_cb> (this); 168 sel_scroll_ev.set <rxvt_term, &rxvt_term::sel_scroll_cb> (this);
170#endif 169#endif
171#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 170#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
172 slip_wheel_ev.set <rxvt_term, &rxvt_term::slip_wheel_cb> (this); 171 slip_wheel_ev.set <rxvt_term, &rxvt_term::slip_wheel_cb> (this);
173#endif 172#endif
174#if ENABLE_TRANSPARENCY || ENABLE_PERL 173#if BG_IMAGE_FROM_ROOT || ENABLE_PERL
175 rootwin_ev.set <rxvt_term, &rxvt_term::rootwin_cb> (this), 174 rootwin_ev.set <rxvt_term, &rxvt_term::rootwin_cb> (this),
176#endif 175#endif
177 scrollbar_ev.set <rxvt_term, &rxvt_term::x_cb> (this), 176 scrollbar_ev.set <rxvt_term, &rxvt_term::x_cb> (this),
178#ifdef USE_XIM 177#if USE_XIM
179 im_ev.set <rxvt_term, &rxvt_term::im_cb> (this), 178 im_ev.set <rxvt_term, &rxvt_term::im_cb> (this),
180#endif 179#endif
181#ifdef POINTER_BLANK 180#ifdef POINTER_BLANK
182 pointer_ev.set <rxvt_term, &rxvt_term::pointer_cb> (this); 181 pointer_ev.set <rxvt_term, &rxvt_term::pointer_cb> (this);
183#endif 182#endif
186#endif 185#endif
187 child_ev.set <rxvt_term, &rxvt_term::child_cb> (this); 186 child_ev.set <rxvt_term, &rxvt_term::child_cb> (this);
188 flush_ev.set <rxvt_term, &rxvt_term::flush_cb> (this); 187 flush_ev.set <rxvt_term, &rxvt_term::flush_cb> (this);
189 destroy_ev.set <rxvt_term, &rxvt_term::destroy_cb> (this); 188 destroy_ev.set <rxvt_term, &rxvt_term::destroy_cb> (this);
190 pty_ev.set <rxvt_term, &rxvt_term::pty_cb> (this); 189 pty_ev.set <rxvt_term, &rxvt_term::pty_cb> (this);
191 incr_ev.set <rxvt_term, &rxvt_term::incr_cb> (this);
192 termwin_ev.set <rxvt_term, &rxvt_term::x_cb> (this); 190 termwin_ev.set <rxvt_term, &rxvt_term::x_cb> (this);
193 vt_ev.set <rxvt_term, &rxvt_term::x_cb> (this); 191 vt_ev.set <rxvt_term, &rxvt_term::x_cb> (this);
194 192
195 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base; 193 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base;
196 194
225 delete fontset[i]; 223 delete fontset[i];
226#endif 224#endif
227 delete fontset[0]; 225 delete fontset[0];
228 226
229#ifdef HAVE_BG_PIXMAP 227#ifdef HAVE_BG_PIXMAP
230 bgPixmap.destroy (); 228 bg_destroy ();
229#endif
230
231#if HAVE_IMG
232 delete bg_img;
231#endif 233#endif
232 234
233 if (display) 235 if (display)
234 { 236 {
235 selection_clear (); 237 selection_clear ();
238 selection_clear (true);
236 239
237#ifdef USE_XIM 240#if USE_XIM
238 im_destroy (); 241 im_destroy ();
239#endif 242#endif
240#ifdef XTERM_SCROLLBAR 243 scrollBar.destroy ();
241 if (xscrollbarGC) XFreeGC (dpy, xscrollbarGC);
242 if (ShadowGC) XFreeGC (dpy, ShadowGC);
243#endif
244#ifdef PLAIN_SCROLLBAR
245 if (pscrollbarGC) XFreeGC (dpy, pscrollbarGC);
246#endif
247#ifdef NEXT_SCROLLBAR
248 if (blackGC) XFreeGC (dpy, blackGC);
249 if (whiteGC) XFreeGC (dpy, whiteGC);
250 if (grayGC) XFreeGC (dpy, grayGC);
251 if (darkGC) XFreeGC (dpy, darkGC);
252 if (stippleGC) XFreeGC (dpy, stippleGC);
253 if (dimple) XFreePixmap (dpy, dimple);
254 if (upArrow) XFreePixmap (dpy, upArrow);
255 if (downArrow) XFreePixmap (dpy, downArrow);
256 if (upArrowHi) XFreePixmap (dpy, upArrowHi);
257 if (downArrowHi) XFreePixmap (dpy, downArrowHi);
258#endif
259#ifdef RXVT_SCROLLBAR
260 if (topShadowGC) XFreeGC (dpy, topShadowGC);
261 if (botShadowGC) XFreeGC (dpy, botShadowGC);
262 if (scrollbarGC) XFreeGC (dpy, scrollbarGC);
263#endif
264 if (gc) XFreeGC (dpy, gc); 244 if (gc) XFreeGC (dpy, gc);
265 245
266 delete drawable; 246 delete drawable;
267 // destroy all windows 247 // destroy all windows
268 if (parent[0]) 248 if (parent)
269 XDestroyWindow (dpy, parent[0]); 249 XDestroyWindow (dpy, parent);
270 250
271 for (int i = 0; i < TOTAL_COLORS; i++) 251 for (int i = 0; i < TOTAL_COLORS; i++)
272 if (ISSET_PIXCOLOR (i)) 252 if (ISSET_PIXCOLOR (i))
273 { 253 {
274 pix_colors_focused [i].free (this); 254 pix_colors_focused [i].free (this);
288 /* clear all resources */ 268 /* clear all resources */
289 for (int i = 0; i < allocated.size (); i++) 269 for (int i = 0; i < allocated.size (); i++)
290 free (allocated [i]); 270 free (allocated [i]);
291 271
292 free (selection.text); 272 free (selection.text);
293 // TODO: manage env vars in child only(!) 273 free (selection.clip_text);
294 free (env_display);
295 free (env_term);
296 free (locale); 274 free (locale);
297 free (v_buffer); 275 free (v_buffer);
298 free (incr_buf); 276
277 delete selection_req;
299 278
300 delete envv; 279 delete envv;
301 delete argv; 280 delete argv;
302 281
303#ifdef KEYSYM_RESOURCE 282#ifdef KEYSYM_RESOURCE
336 { 315 {
337#if USE_XIM 316#if USE_XIM
338 im_ev.stop (display); 317 im_ev.stop (display);
339#endif 318#endif
340 scrollbar_ev.stop (display); 319 scrollbar_ev.stop (display);
341#if ENABLE_TRANSPARENCY || ENABLE_PERL 320#if BG_IMAGE_FROM_ROOT || ENABLE_PERL
342 rootwin_ev.stop (display); 321 rootwin_ev.stop (display);
343#endif 322#endif
344 incr_ev.stop ();
345 termwin_ev.stop (display); 323 termwin_ev.stop (display);
346 vt_ev.stop (display); 324 vt_ev.stop (display);
347 } 325 }
348 326
349 flush_ev.stop (); 327 flush_ev.stop ();
373 make_current (); 351 make_current ();
374 352
375 delete this; 353 delete this;
376} 354}
377 355
356void
357rxvt_term::set_option (uint8_t opt, bool set) NOTHROW
358{
359 if (!opt)
360 return;
361
362 uint8_t mask = 1 << (opt & 7);
363 uint8_t &val = options [opt >> 3];
364
365 val = val & ~mask | (set ? mask : 0);
366}
367
378/*----------------------------------------------------------------------*/ 368/*----------------------------------------------------------------------*/
379/* 369/*
380 * Exit gracefully, clearing the utmp entry and restoring tty attributes 370 * Exit gracefully, clearing the utmp entry and restoring tty attributes
381 * TODO: if debugging, this should free up any known resources if we can
382 */ 371 */
383static XErrorHandler old_xerror_handler; 372static XErrorHandler old_xerror_handler;
384 373
385static void 374static void
386rxvt_emergency_cleanup () 375rxvt_emergency_cleanup ()
388 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++) 377 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)
389 (*t)->emergency_cleanup (); 378 (*t)->emergency_cleanup ();
390} 379}
391 380
392#if !ENABLE_MINIMAL 381#if !ENABLE_MINIMAL
393static void 382static void ecb_cold
394print_x_error (Display *dpy, XErrorEvent *event) 383print_x_error (Display *dpy, XErrorEvent *event)
395{ 384{
396 char buffer[BUFSIZ]; 385 char buffer[BUFSIZ];
397 char mesg[BUFSIZ]; 386 char mesg[BUFSIZ];
398 char number[32]; 387 char number[32];
399 char *mtype = "XlibMessage"; 388
400 XGetErrorText(dpy, event->error_code, buffer, BUFSIZ);
401 XGetErrorDatabaseText(dpy, mtype, "XError", "X Error", mesg, BUFSIZ);
402 rxvt_warn ("An X Error occured, trying to continue after report.\n"); 389 rxvt_warn ("An X Error occurred, trying to continue after report.\n");
390
391 XGetErrorDatabaseText (dpy, "XlibMessage", "ErrorSerial", "Error Serial #%d", mesg, BUFSIZ);
392 snprintf (buffer, BUFSIZ, "+ %s\n", mesg); rxvt_warn (buffer, event->serial);
393
394 XGetErrorText (dpy, event->error_code, buffer, BUFSIZ);
395 XGetErrorDatabaseText (dpy, "XlibMessage", "XError", "X Error", mesg, BUFSIZ);
403 rxvt_warn ("%s: %s\n", mesg, buffer); 396 rxvt_warn ("+ %s: %s\n", mesg, buffer);
397
404 XGetErrorDatabaseText(dpy, mtype, "MajorCode", "Request Major code %d", mesg, BUFSIZ); 398 XGetErrorDatabaseText (dpy, "XlibMessage", "MajorCode", "Request Major code %d", mesg, BUFSIZ);
405 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->request_code); 399 snprintf (buffer, BUFSIZ, "+ %s\n", mesg); rxvt_warn (buffer, event->request_code);
406 sprintf(number, "%d", event->request_code); 400
407 XGetErrorDatabaseText(dpy, "XRequest", number, "", buffer, BUFSIZ);
408 rxvt_warn ("(which is %s)\n", buffer);
409 if (event->request_code >= 128) { 401 if (event->request_code >= 128)
410 XGetErrorDatabaseText(dpy, mtype, "MinorCode", "Request Minor code %d", 402 {
411 mesg, BUFSIZ); 403#if 0
412 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->minor_code); 404 /* XListExtensions and probably query extensions hangs when there are multiple queues errors */
405 int nexts;
406 char **exts = XListExtensions (dpy, &nexts);
407
408 while (nexts)
409 {
410 char *extname = exts [nexts - 1];
411 int major, first_event, first_error;
412
413 if (XQueryExtension (dpy, extname, &major, &first_event, &first_error) && major == event->request_code)
414 {
415 XGetErrorDatabaseText (dpy, "XlibMessage", "MinorCode", "Request Minor code %d", mesg, BUFSIZ);
416 rxvt_warn ("+ (which is extension %s minor code %d)\n", extname, event->minor_code);
417
418 snprintf (buffer, BUFSIZ, "%s.%d", extname, event->minor_code);
419 XGetErrorDatabaseText (dpy, "XRequest", buffer, "an unregistered minor code", buffer, BUFSIZ);
420 rxvt_warn ("+ (which is %s)\n", buffer);
421
422 break;
423 }
424
425 printf ("nextss %d %s\n", nexts, extname);//D
426 --nexts;
427 ++exts;
428 }
429#else
430 int nexts = 0;
431 char **exts = 0;
432#endif
433
434 if (!nexts)
435 {
436 rxvt_warn ("+ (which is an unknown extension)\n", buffer);
437
438 XGetErrorDatabaseText (dpy, "XlibMessage", "MinorCode", "Request Minor code %d", mesg, BUFSIZ);
439 snprintf (buffer, BUFSIZ, "+ %s\n", mesg); rxvt_warn (buffer, event->minor_code);
440
441#if 0
442 sprintf (number, "RENDER.%d", event->minor_code);
443 XGetErrorDatabaseText (dpy, "XRequest", number, "", buffer, BUFSIZ);
444 rxvt_warn ("+ (which is %s)\n", buffer);
445#endif
446 }
447
448 XFreeExtensionList (exts);
413 } 449 }
450 else
451 {
452 sprintf (number, "%d", event->request_code);
453 XGetErrorDatabaseText (dpy, "XRequest", number, "", buffer, BUFSIZ);
454 rxvt_warn ("+ (which is %s)\n", buffer);
455 }
456
414 if ((event->error_code == BadWindow) || 457 if (event->error_code == BadWindow
415 (event->error_code == BadPixmap) || 458 || event->error_code == BadPixmap
416 (event->error_code == BadCursor) || 459 || event->error_code == BadCursor
417 (event->error_code == BadFont) || 460 || event->error_code == BadFont
418 (event->error_code == BadDrawable) || 461 || event->error_code == BadDrawable
419 (event->error_code == BadColor) || 462 || event->error_code == BadColor
420 (event->error_code == BadGC) || 463 || event->error_code == BadGC
421 (event->error_code == BadIDChoice) || 464 || event->error_code == BadIDChoice
422 (event->error_code == BadValue) || 465 || event->error_code == BadValue
423 (event->error_code == BadAtom)) { 466 || event->error_code == BadAtom)
467 {
424 if (event->error_code == BadValue) 468 if (event->error_code == BadValue)
425 XGetErrorDatabaseText(dpy, mtype, "Value", "Value 0x%x", 469 XGetErrorDatabaseText (dpy, "XlibMessage", "Value", "Value 0x%x", mesg, BUFSIZ);
426 mesg, BUFSIZ);
427 else if (event->error_code == BadAtom) 470 else if (event->error_code == BadAtom)
428 XGetErrorDatabaseText(dpy, mtype, "AtomID", "AtomID 0x%x", 471 XGetErrorDatabaseText (dpy, "XlibMessage", "AtomID", "AtomID 0x%x", mesg, BUFSIZ);
429 mesg, BUFSIZ); 472 else
430 else
431 XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x", 473 XGetErrorDatabaseText (dpy, "XlibMessage", "ResourceID", "ResourceID 0x%x", mesg, BUFSIZ);
432 mesg, BUFSIZ);
433 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid);
434 }
435 XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d",
436 mesg, BUFSIZ);
437 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial);
438}
439#endif
440 474
441int 475 snprintf (buffer, BUFSIZ, "+ %s\n", mesg); rxvt_warn (buffer, event->resourceid);
476 }
477}
478#endif
479
480int ecb_cold
442rxvt_xerror_handler (Display *display, XErrorEvent *event) 481rxvt_xerror_handler (Display *display, XErrorEvent *event)
443{ 482{
444 if (GET_R->allowedxerror == -1) 483 if (GET_R->allowedxerror == -1)
445 GET_R->allowedxerror = event->error_code; 484 GET_R->allowedxerror = event->error_code;
446 else 485 else
455 } 494 }
456 495
457 return 0; 496 return 0;
458} 497}
459 498
460int 499int ecb_cold
461rxvt_xioerror_handler (Display *display) 500rxvt_xioerror_handler (Display *display)
462{ 501{
463 rxvt_warn ("X connection to '%s' broken, unable to recover, exiting.\n", 502 rxvt_warn ("X connection to '%s' broken, unable to recover, exiting.\n",
464 DisplayString (display)); 503 DisplayString (display));
465 rxvt_emergency_cleanup (); 504 rxvt_emergency_cleanup ();
488 rxvt_emergency_cleanup (); 527 rxvt_emergency_cleanup ();
489 w.stop (); 528 w.stop ();
490 kill (getpid (), w.signum); 529 kill (getpid (), w.signum);
491} 530}
492 531
532static void
533rxvt_get_ttymode (struct termios *tio)
534{
535 if (tcgetattr (STDIN_FILENO, tio) < 0)
536 memset (tio, 0, sizeof (struct termios));
537
538 for (int i = 0; i < NCCS; i++)
539 tio->c_cc[i] = VDISABLE;
540
541 tio->c_cc[VINTR] = CINTR;
542 tio->c_cc[VQUIT] = CQUIT;
543 tio->c_cc[VERASE] = CERASE;
544#ifdef VERASE2
545 tio->c_cc[VERASE2] = CERASE2;
546#endif
547 tio->c_cc[VKILL] = CKILL;
548 tio->c_cc[VEOF] = CEOF;
549 tio->c_cc[VSTART] = CSTART;
550 tio->c_cc[VSTOP] = CSTOP;
551 tio->c_cc[VSUSP] = CSUSP;
552# ifdef VDSUSP
553 tio->c_cc[VDSUSP] = CDSUSP;
554# endif
555# ifdef VREPRINT
556 tio->c_cc[VREPRINT] = CRPRNT;
557# endif
558# ifdef VDISCRD
559 tio->c_cc[VDISCRD] = CFLUSH;
560# endif
561# ifdef VWERSE
562 tio->c_cc[VWERSE] = CWERASE;
563# endif
564# ifdef VLNEXT
565 tio->c_cc[VLNEXT] = CLNEXT;
566# endif
567# ifdef VSTATUS
568 tio->c_cc[VSTATUS] = CSTATUS;
569# endif
570
571# if VMIN != VEOF
572 tio->c_cc[VMIN] = 1;
573# endif
574# if VTIME != VEOL
575 tio->c_cc[VTIME] = 0;
576# endif
577
578 /* input modes */
579 tio->c_iflag = (BRKINT | IGNPAR | ICRNL
580# ifdef IMAXBEL
581 | IMAXBEL
582# endif
583 | IXON);
584
585 /* output modes */
586 tio->c_oflag = (OPOST | ONLCR);
587
588 /* control modes */
589 tio->c_cflag = (CS8 | CREAD);
590
591 /* local modes */
592 tio->c_lflag = (ISIG | ICANON | IEXTEN | ECHO
593# if defined (ECHOCTL) && defined (ECHOKE)
594 | ECHOCTL | ECHOKE
595# endif
596 | ECHOE | ECHOK);
597}
598
493char **rxvt_environ; // startup environment 599char **rxvt_environ; // startup environment
494 600
495void 601void
496rxvt_init () 602rxvt_init ()
497{ 603{
498 ptytty::init (); 604 assert (("fontMask must not overlap other RS masks",
605 0 == (RS_fontMask & (RS_Sel | RS_baseattrMask | RS_customMask | RS_bgMask | RS_fgMask))));
499 606
607 rxvt_get_ttymode (&rxvt_term::def_tio);
608
609 // get rid of stdin/stdout as we don't need them, to free resources
610 dup2 (STDERR_FILENO, STDIN_FILENO);
611 dup2 (STDERR_FILENO, STDOUT_FILENO);
612
500 if (!ev_default_loop (0)) 613 if (!ev_default_loop ())
501 rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n"); 614 rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n");
502 615
503 rxvt_environ = environ; 616 rxvt_environ = environ;
504 617
505 signal (SIGHUP, SIG_IGN); 618 signal (SIGHUP, SIG_IGN);
506 signal (SIGPIPE, SIG_IGN); 619 signal (SIGPIPE, SIG_IGN);
507 620
508 sig_handlers.sw_term.start (SIGTERM); ev_unref (); 621 sig_handlers.sw_term.start (SIGTERM); ev_unref ();
509 sig_handlers.sw_int.start (SIGINT); ev_unref (); 622 sig_handlers.sw_int.start (SIGINT); ev_unref ();
510
511 /* need to trap SIGURG for SVR4 (Unixware) rlogin */
512 /* signal (SIGURG, SIG_DFL); */
513 623
514 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); 624 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
515 // TODO: handle this with exceptions and tolerate the memory loss 625 // TODO: handle this with exceptions and tolerate the memory loss
516 XSetIOErrorHandler (rxvt_xioerror_handler); 626 XSetIOErrorHandler (rxvt_xioerror_handler);
517 627
518 XrmInitialize (); 628 XrmInitialize ();
629
630#if HAVE_PIXBUF
631 g_type_init ();
632#endif
519} 633}
520 634
521/*----------------------------------------------------------------------*/ 635/*----------------------------------------------------------------------*/
522/* 636/*
523 * window size/position calculations for XSizeHint and other storage. 637 * window size/position calculations for XSizeHint and other storage.
525 */ 639 */
526void 640void
527rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight) 641rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
528{ 642{
529 short recalc_x, recalc_y; 643 short recalc_x, recalc_y;
530 int x, y, sb_w, flags; 644 int x, y, flags;
531 unsigned int w, h; 645 unsigned int w, h;
532 unsigned int max_width, max_height; 646 unsigned int max_width, max_height;
533 647
534 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity; 648 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity;
535 szHint.win_gravity = NorthWestGravity; 649 szHint.win_gravity = NorthWestGravity;
545 if (rs[Rs_geometry]) 659 if (rs[Rs_geometry])
546 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h); 660 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h);
547 661
548 if (flags & WidthValue) 662 if (flags & WidthValue)
549 { 663 {
664 if (!w)
665 rxvt_fatal ("illegal window geometry (width and height must be non-zero), aborting.\n");
666
550 ncol = clamp (w, 0, std::numeric_limits<int16_t>::max ()); 667 ncol = clamp (w, 1, std::numeric_limits<int16_t>::max ());
551 szHint.flags |= USSize; 668 szHint.flags |= USSize;
552 } 669 }
553 670
554 if (flags & HeightValue) 671 if (flags & HeightValue)
555 { 672 {
673 if (!h)
674 rxvt_fatal ("illegal window geometry (width and height must be non-zero), aborting.\n");
675
556 nrow = clamp (h, 0, std::numeric_limits<int16_t>::max ()); 676 nrow = clamp (h, 1, std::numeric_limits<int16_t>::max ());
557 szHint.flags |= USSize; 677 szHint.flags |= USSize;
558 } 678 }
559 679
560 if (flags & XValue) 680 if (flags & XValue)
561 { 681 {
592 max_width = MAX_COLS * fwidth; 712 max_width = MAX_COLS * fwidth;
593 max_height = MAX_ROWS * fheight; 713 max_height = MAX_ROWS * fheight;
594 714
595 szHint.base_width = szHint.base_height = 2 * int_bwidth; 715 szHint.base_width = szHint.base_height = 2 * int_bwidth;
596 716
597 sb_w = 0;
598 window_vt_x = window_vt_y = int_bwidth; 717 window_vt_x = window_vt_y = int_bwidth;
599 718
600 if (scrollBar.state) 719 if (scrollBar.state)
601 { 720 {
602 sb_w = scrollbar_TotalWidth (); 721 int sb_w = scrollBar.total_width ();
603 szHint.base_width += sb_w; 722 szHint.base_width += sb_w;
604 723
605 if (!option (Opt_scrollBar_right)) 724 if (!option (Opt_scrollBar_right))
606 window_vt_x += sb_w; 725 window_vt_x += sb_w;
607 } 726 }
631 { 750 {
632 min_it (height, max_height); 751 min_it (height, max_height);
633 szHint.height = szHint.base_height + height; 752 szHint.height = szHint.base_height + height;
634 } 753 }
635 754
636 if (scrollBar.state && option (Opt_scrollBar_right))
637 window_sb_x = szHint.width - sb_w;
638
639 if (recalc_x) 755 if (recalc_x)
640 szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth; 756 szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth;
641 757
642 if (recalc_y) 758 if (recalc_y)
643 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth; 759 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth;
644 760
645 ncol = width / fwidth; 761 ncol = width / fwidth;
646 nrow = height / fheight; 762 nrow = height / fheight;
763
764 // When the size of the vt window is not a multiple of the cell
765 // size, i.e., when the wm does not honour our size hints, there are
766 // extra areas not covered by the terminal screen. Such gaps, when a
767 // bg pixmap is set, would have to be cleared manually to properly
768 // refresh the background. We take the simpler route and shrink the
769 // vt window so as to avoid creating gaps.
770 vt_width = ncol * fwidth;
771 vt_height = nrow * fheight;
647} 772}
648 773
649/*----------------------------------------------------------------------*/ 774/*----------------------------------------------------------------------*/
650/* 775/*
651 * Tell the teletype handler what size the window is. 776 * Tell the teletype handler what size the window is.
659 784
660 struct winsize ws; 785 struct winsize ws;
661 786
662 ws.ws_col = ncol; 787 ws.ws_col = ncol;
663 ws.ws_row = nrow; 788 ws.ws_row = nrow;
664 ws.ws_xpixel = width; 789 ws.ws_xpixel = vt_width;
665 ws.ws_ypixel = height; 790 ws.ws_ypixel = vt_height;
666 (void)ioctl (pty->pty, TIOCSWINSZ, &ws); 791 ioctl (pty->pty, TIOCSWINSZ, &ws);
667 792
668#if 0 793#if 0
669 // TIOCSWINSZ is supposed to do this automatically and correctly 794 // TIOCSWINSZ is supposed to do this automatically and correctly
670 if (cmd_pid) /* force through to the command */ 795 if (cmd_pid) /* force through to the command */
671 kill (-cmd_pid, SIGWINCH); 796 kill (-cmd_pid, SIGWINCH);
672#endif 797#endif
673} 798}
674 799
675/*----------------------------------------------------------------------*/ 800/*----------------------------------------------------------------------*/
676/* set_fonts () - load and set the various fonts 801/* load and set the various fonts */
677 *
678 * init = 1 - initialize
679 *
680 * fontname == FONT_UP - switch to bigger font
681 * fontname == FONT_DN - switch to smaller font
682 */
683bool 802bool
684rxvt_term::set_fonts () 803rxvt_term::set_fonts ()
685{ 804{
686 rxvt_fontset *fs = new rxvt_fontset (this); 805 rxvt_fontset *fs = new rxvt_fontset (this);
687 rxvt_fontprop prop; 806 rxvt_fontprop prop;
701#endif 820#endif
702 821
703 delete fontset[0]; 822 delete fontset[0];
704 fontset[0] = fs; 823 fontset[0] = fs;
705 824
706 prop = (*fs)[1]->properties (); 825 prop = (*fs)[rxvt_fontset::firstFont]->properties ();
707 prop.height += lineSpace; 826 prop.width = max (prop.width + letterSpace, 1);
708 827
709 fs->set_prop (prop, false); 828 fs->set_prop (prop, false);
710 829
711 fwidth = prop.width; 830 fwidth = prop.width;
712 fheight = prop.height; 831 fheight = prop.height + lineSpace;
713 fbase = prop.ascent; 832 fbase = prop.ascent;
714 833
715 for (int style = 1; style < 4; style++) 834 for (int style = 1; style < 4; style++)
716 { 835 {
717#if ENABLE_STYLES 836#if ENABLE_STYLES
743#else 862#else
744 fontset[style] = fontset[0]; 863 fontset[style] = fontset[0];
745#endif 864#endif
746 } 865 }
747 866
748 if (parent[0]) 867 if (parent)
749 { 868 {
750 resize_all_windows (0, 0, 0); 869 resize_all_windows (0, 0, 0);
751 scr_remap_chars (); 870 scr_remap_chars ();
752 scr_touch (true); 871 scr_touch (true);
753 } 872 }
756} 875}
757 876
758void 877void
759rxvt_term::set_string_property (Atom prop, const char *str, int len) 878rxvt_term::set_string_property (Atom prop, const char *str, int len)
760{ 879{
761 XChangeProperty (dpy, parent[0], 880 XChangeProperty (dpy, parent,
762 prop, XA_STRING, 8, PropModeReplace, 881 prop, XA_STRING, 8, PropModeReplace,
763 (const unsigned char *)str, len >= 0 ? len : strlen (str)); 882 (const unsigned char *)str, len >= 0 ? len : strlen (str));
764} 883}
765 884
766void 885void
886rxvt_term::set_mbstring_property (Atom prop, const char *str, int len)
887{
888 XTextProperty ct;
889
890 if (XmbTextListToTextProperty (dpy, (char **)&str, 1, XStdICCTextStyle, &ct) >= 0)
891 {
892 XSetTextProperty (dpy, parent, &ct, prop);
893 XFree (ct.value);
894 }
895}
896
897void
767rxvt_term::set_utf8_property (Atom prop, const char *str, int len) 898rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
768{ 899{
769 wchar_t *ws = rxvt_mbstowcs (str, len); 900 wchar_t *ws = rxvt_mbstowcs (str, len);
770 char *s = rxvt_wcstoutf8 (ws); 901 char *s = rxvt_wcstoutf8 (ws);
771 902
772 XChangeProperty (dpy, parent[0], 903 XChangeProperty (dpy, parent,
773 prop, xa[XA_UTF8_STRING], 8, PropModeReplace, 904 prop, xa[XA_UTF8_STRING], 8, PropModeReplace,
774 (const unsigned char *)s, strlen (s)); 905 (const unsigned char *)s, strlen (s));
775 906
776 free (s); 907 free (s);
777 free (ws); 908 free (ws);
781/*----------------------------------------------------------------------*/ 912/*----------------------------------------------------------------------*/
782/* xterm sequences - title, iconName, color (exptl) */ 913/* xterm sequences - title, iconName, color (exptl) */
783void 914void
784rxvt_term::set_title (const char *str) 915rxvt_term::set_title (const char *str)
785{ 916{
786 set_string_property (XA_WM_NAME, str); 917 set_mbstring_property (XA_WM_NAME, str);
787#if ENABLE_EWMH 918#if ENABLE_EWMH
788 set_utf8_property (xa[XA_NET_WM_NAME], str); 919 set_utf8_property (xa[XA_NET_WM_NAME], str);
789#endif 920#endif
790} 921}
791 922
792void 923void
793rxvt_term::set_icon_name (const char *str) 924rxvt_term::set_icon_name (const char *str)
794{ 925{
795 set_string_property (XA_WM_ICON_NAME, str); 926 set_mbstring_property (XA_WM_ICON_NAME, str);
796#if ENABLE_EWMH 927#if ENABLE_EWMH
797 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str); 928 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str);
798#endif 929#endif
799} 930}
800 931
801void 932void
802rxvt_term::set_window_color (int idx, const char *color) 933rxvt_term::set_window_color (int idx, const char *color)
803{ 934{
804#ifdef XTERM_COLOR_CHANGE 935#ifdef XTERM_COLOR_CHANGE
805 rxvt_color xcol; 936 rxvt_color xcol;
806 int i;
807 937
808 if (color == NULL || *color == '\0') 938 if (color == NULL || *color == '\0')
809 return; 939 return;
810 940
811 color = strdup (color); 941 color = strdup (color);
813 rs[Rs_color + idx] = color; 943 rs[Rs_color + idx] = color;
814 944
815 /* handle color aliases */ 945 /* handle color aliases */
816 if (isdigit (*color)) 946 if (isdigit (*color))
817 { 947 {
818 i = atoi (color); 948 int i = atoi (color);
819 949
820 if (i >= 8 && i <= 15) 950 if (i >= 8 && i <= 15)
821 { 951 {
822 /* bright colors */ 952 /* bright colors */
823 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i - 8]; 953 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i - 8];
868 998
869/*----------------------------------------------------------------------*/ 999/*----------------------------------------------------------------------*/
870/* 1000/*
871 * find if fg/bg matches any of the normal (low-intensity) colors 1001 * find if fg/bg matches any of the normal (low-intensity) colors
872 */ 1002 */
873void 1003char *
874rxvt_term::set_colorfgbg () 1004rxvt_term::get_colorfgbg ()
875{ 1005{
876 unsigned int i; 1006 unsigned int i;
877 const char *xpmb = ""; 1007 const char *xpmb = "";
878 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1]; 1008 char fstr[] = "default";
1009 char bstr[] = "default";
1010 char *env_colorfgbg;
879 1011
880 strcpy (fstr, "default");
881 strcpy (bstr, "default");
882 for (i = Color_Black; i <= Color_White; i++) 1012 for (i = Color_Black; i <= Color_White; i++)
883 if (pix_colors[Color_fg] == pix_colors[i]) 1013 if (pix_colors[Color_fg] == pix_colors[i])
884 { 1014 {
885 sprintf (fstr, "%d", (i - Color_Black)); 1015 sprintf (fstr, "%d", i - Color_Black);
886 break; 1016 break;
887 } 1017 }
888 1018
889 for (i = Color_Black; i <= Color_White; i++) 1019 for (i = Color_Black; i <= Color_White; i++)
890 if (pix_colors[Color_bg] == pix_colors[i]) 1020 if (pix_colors[Color_bg] == pix_colors[i])
891 { 1021 {
892 sprintf (bstr, "%d", (i - Color_Black)); 1022 sprintf (bstr, "%d", i - Color_Black);
893#ifdef BG_IMAGE_FROM_FILE 1023#if BG_IMAGE_FROM_FILE
894 xpmb = "default;"; 1024 xpmb = "default;";
895#endif 1025#endif
896 break; 1026 break;
897 } 1027 }
898 1028
1029 env_colorfgbg = (char *)rxvt_malloc (sizeof ("COLORFGBG=default;default;bg"));
899 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr); 1030 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr);
1031 return env_colorfgbg;
900} 1032}
901 1033
902/*----------------------------------------------------------------------*/ 1034/*----------------------------------------------------------------------*/
903 1035
904bool 1036bool
927 int old_width = szHint.width; 1059 int old_width = szHint.width;
928 int old_height = szHint.height; 1060 int old_height = szHint.height;
929 1061
930 window_calc (newwidth, newheight); 1062 window_calc (newwidth, newheight);
931 1063
932 if (!HOOK_INVOKE ((this, HOOK_RESIZE_ALL_WINDOWS, DT_INT, newwidth, DT_INT, newheight, DT_END))) 1064 bool set_hint = !HOOK_INVOKE ((this, HOOK_RESIZE_ALL_WINDOWS, DT_INT, newwidth, DT_INT, newheight, DT_END));
1065
1066 // to avoid races between us and the wm, we clear the incremental size hints around the xresizewindow
1067 if (set_hint)
1068 {
1069 szHint.flags &= ~(PBaseSize | PResizeInc);
933 XSetWMNormalHints (dpy, parent[0], &szHint); 1070 XSetWMNormalHints (dpy, parent, &szHint);
1071 szHint.flags |= PBaseSize | PResizeInc;
1072 }
934 1073
935 if (!ignoreparent) 1074 if (!ignoreparent)
936 { 1075 {
937#ifdef SMART_RESIZE 1076#ifdef SMART_RESIZE
938 /* 1077 /*
942 int x, y, x1, y1; 1081 int x, y, x1, y1;
943 int dx, dy; 1082 int dx, dy;
944 unsigned int unused_w1, unused_h1, unused_b1, unused_d1; 1083 unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
945 Window unused_cr; 1084 Window unused_cr;
946 1085
947 XTranslateCoordinates (dpy, parent[0], display->root, 1086 XTranslateCoordinates (dpy, parent, display->root,
948 0, 0, &x, &y, &unused_cr); 1087 0, 0, &x, &y, &unused_cr);
949 XGetGeometry (dpy, parent[0], &unused_cr, &x1, &y1, 1088 XGetGeometry (dpy, parent, &unused_cr, &x1, &y1,
950 &unused_w1, &unused_h1, &unused_b1, &unused_d1); 1089 &unused_w1, &unused_h1, &unused_b1, &unused_d1);
951 /* 1090 /*
952 * if display->root isn't the parent window, a WM will probably have offset 1091 * if display->root isn't the parent window, a WM will probably have offset
953 * our position for handles and decorations. Counter it 1092 * our position for handles and decorations. Counter it
954 */ 1093 */
971 if (y < y1) /* top half */ 1110 if (y < y1) /* top half */
972 dy = 0; 1111 dy = 0;
973 else if (y == y1) /* exact center */ 1112 else if (y == y1) /* exact center */
974 dy /= 2; 1113 dy /= 2;
975 1114
976 XMoveResizeWindow (dpy, parent[0], x + dx, y + dy, 1115 XMoveResizeWindow (dpy, parent, x + dx, y + dy,
977 szHint.width, szHint.height); 1116 szHint.width, szHint.height);
978#else 1117#else
979 XResizeWindow (dpy, parent[0], szHint.width, szHint.height); 1118 XResizeWindow (dpy, parent, szHint.width, szHint.height);
980#endif 1119#endif
981 } 1120 }
1121
1122 if (set_hint)
1123 XSetWMNormalHints (dpy, parent, &szHint);
982 1124
983 fix_screen = ncol != prev_ncol || nrow != prev_nrow; 1125 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
984 1126
985 if (fix_screen || newwidth != old_width || newheight != old_height) 1127 if (fix_screen || newwidth != old_width || newheight != old_height)
986 { 1128 {
987 if (scrollBar.state) 1129 if (scrollBar.state)
988 { 1130 scrollBar.resize ();
989 XMoveResizeWindow (dpy, scrollBar.win,
990 window_sb_x, 0,
991 scrollbar_TotalWidth (), szHint.height);
992 resize_scrollbar ();
993 }
994 1131
995 XMoveResizeWindow (dpy, vt, 1132 XMoveResizeWindow (dpy, vt,
996 window_vt_x, window_vt_y, 1133 window_vt_x, window_vt_y,
997 width, height); 1134 vt_width, vt_height);
1135
1136 HOOK_INVOKE ((this, HOOK_SIZE_CHANGE, DT_INT, newwidth, DT_INT, newheight, DT_END));
998 1137
999#ifdef HAVE_BG_PIXMAP 1138#ifdef HAVE_BG_PIXMAP
1000 if (bgPixmap.window_size_sensitive ()) 1139 if (bg_window_size_sensitive ())
1001 update_background (); 1140 update_background ();
1002#endif 1141#endif
1003
1004 scr_clear ();
1005 } 1142 }
1006 1143
1007 if (fix_screen || old_height == 0) 1144 if (fix_screen || old_height == 0)
1008 scr_reset (); 1145 scr_reset ();
1009 1146
1010 // TODO, with nvidia-8178, resizes kill the alpha channel, report if not fixed in newer version
1011 //scr_touch (false);
1012
1013#ifdef HAVE_BG_PIXMAP
1014// TODO: this don't seem to have any effect - do we still need it ? If so - in which case exactly ?
1015// if (bgPixmap.pixmap)
1016// scr_touch (false);
1017#endif
1018
1019#ifdef USE_XIM 1147#if USE_XIM
1020 IMSetPosition (); 1148 im_set_position ();
1021#endif 1149#endif
1022} 1150}
1023 1151
1024/* 1152/*
1025 * Set the width/height of the vt window in characters. Units are pixels. 1153 * Set the width/height of the vt window in characters. Units are pixels.
1038 newwidth = wattr.width - szHint.base_width; 1166 newwidth = wattr.width - szHint.base_width;
1039 if (newheight == 0) 1167 if (newheight == 0)
1040 newheight = wattr.height - szHint.base_height; 1168 newheight = wattr.height - szHint.base_height;
1041 } 1169 }
1042 1170
1043 if (newwidth != width || newheight != height) 1171 if (newwidth != vt_width || newheight != vt_height)
1044 { 1172 {
1045 newwidth += szHint.base_width; 1173 newwidth += szHint.base_width;
1046 newheight += szHint.base_height; 1174 newheight += szHint.base_height;
1047 resize_all_windows (newwidth, newheight, 0); 1175 resize_all_windows (newwidth, newheight, 0);
1048 } 1176 }
1049} 1177}
1050 1178
1051/* -------------------------------------------------------------------- * 1179/* -------------------------------------------------------------------- *
1052 * - X INPUT METHOD ROUTINES - * 1180 * - X INPUT METHOD ROUTINES - *
1053 * -------------------------------------------------------------------- */ 1181 * -------------------------------------------------------------------- */
1054#ifdef USE_XIM 1182#if USE_XIM
1055 1183
1056void 1184void
1057rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg) 1185rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg)
1058{ 1186{
1059 fg = pix_colors [Color_fg]; 1187 fg = pix_colors [Color_fg];
1086 status_rect.height = fheight; 1214 status_rect.height = fheight;
1087} 1215}
1088 1216
1089/* Checking whether input method is running. */ 1217/* Checking whether input method is running. */
1090bool 1218bool
1091rxvt_term::IMisRunning () 1219rxvt_term::im_is_running ()
1092{ 1220{
1093 char *p;
1094 Atom atom; 1221 Atom atom;
1095 Window win; 1222 Window win;
1096 char server[IMBUFSIZ]; 1223 char server[IMBUFSIZ];
1097 1224
1098 /* get current locale modifier */ 1225 /* get current locale modifier */
1099 if ((p = XSetLocaleModifiers (NULL)) != NULL) 1226 if (char *p = XSetLocaleModifiers (0))
1100 { 1227 {
1101 strcpy (server, "@server="); 1228 strcpy (server, "@server=");
1102 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */ 1229 strncat (server, p + 4, IMBUFSIZ - 9); /* skip "@im=" */
1103 1230
1104 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */ 1231 if (p = strchr (server + 1, '@')) /* first one only */
1105 *p = '\0'; 1232 *p = '\0';
1106 1233
1107 atom = XInternAtom (dpy, server, False); 1234 atom = XInternAtom (dpy, server, False);
1108 win = XGetSelectionOwner (dpy, atom); 1235 win = XGetSelectionOwner (dpy, atom);
1109 1236
1110 if (win != None) 1237 if (win != None)
1111 return True; 1238 return true;
1112 } 1239 }
1113 1240
1114 return False; 1241 return false;
1115} 1242}
1116 1243
1117void 1244void
1118rxvt_term::IMSendSpot () 1245rxvt_term::im_send_spot ()
1119{ 1246{
1120 XPoint nspot; 1247 XPoint nspot;
1121 XVaNestedList preedit_attr; 1248 XVaNestedList preedit_attr;
1122 1249
1123 if (!Input_Context 1250 if (!Input_Context
1176 1303
1177 term->make_current (); 1304 term->make_current ();
1178 1305
1179 if (text) 1306 if (text)
1180 { 1307 {
1181 void *str; 1308 wchar_t *str;
1182 1309
1183 if (!text->encoding_is_wchar && text->string.multi_byte) 1310 if (!text->encoding_is_wchar && text->string.multi_byte)
1184 { 1311 {
1185 // of course, X makes it ugly again 1312 // of course, X makes it ugly again
1186 if (term->rs[Rs_imLocale]) 1313 if (term->rs[Rs_imLocale])
1187 SET_LOCALE (term->rs[Rs_imLocale]); 1314 SET_LOCALE (term->rs[Rs_imLocale]);
1188 1315
1189 str = rxvt_temp_buf ((text->length + 1) * sizeof (wchar_t)); 1316 str = rxvt_temp_buf<wchar_t> (text->length + 1);
1190 mbstowcs ((wchar_t *)str, text->string.multi_byte, text->length + 1); 1317 mbstowcs (str, text->string.multi_byte, text->length + 1);
1191 1318
1192 if (term->rs[Rs_imLocale]) 1319 if (term->rs[Rs_imLocale])
1193 SET_LOCALE (term->locale); 1320 SET_LOCALE (term->locale);
1194 } 1321 }
1195 else 1322 else
1196 str = (void *)text->string.wide_char; 1323 str = text->string.wide_char;
1197 1324
1198 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW, 1325 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
1199 DT_INT, call_data->caret, 1326 DT_INT, call_data->caret,
1200 DT_INT, call_data->chg_first, 1327 DT_INT, call_data->chg_first,
1201 DT_INT, call_data->chg_length, 1328 DT_INT, call_data->chg_length,
1229/* 1356/*
1230 * Try to open a XIM with the current modifiers, then see if we can 1357 * Try to open a XIM with the current modifiers, then see if we can
1231 * open a suitable preedit type 1358 * open a suitable preedit type
1232 */ 1359 */
1233bool 1360bool
1234rxvt_term::IM_get_IC (const char *modifiers) 1361rxvt_term::im_get_ic (const char *modifiers)
1235{ 1362{
1236 int i, j, found; 1363 int i, j, found;
1237 XIM xim; 1364 XIM xim;
1238 XPoint spot; 1365 XPoint spot;
1239 XRectangle rect, status_rect, needed_rect; 1366 XRectangle rect, status_rect, needed_rect;
1240 unsigned long fg, bg; 1367 unsigned long fg, bg;
1241 const char *p; 1368 const char *p;
1242 char **s; 1369 char **s;
1243 XIMStyles *xim_styles; 1370 XIMStyles *xim_styles;
1244#ifdef ENABLE_XIM_ONTHESPOT
1245 XIMCallback xcb[4];
1246#endif
1247 1371
1248 set_environ (envv); 1372 set_environ (envv);
1249 1373
1250 if (! ((p = XSetLocaleModifiers (modifiers)) && *p)) 1374 if (! ((p = XSetLocaleModifiers (modifiers)) && *p))
1251 return false; 1375 return false;
1272 p = pet[pi]; 1396 p = pet[pi];
1273 1397
1274 if (!p) 1398 if (!p)
1275 continue; 1399 continue;
1276 1400
1277 s = rxvt_splitcommastring (p); 1401 s = rxvt_strsplit (',', p);
1278 1402
1279 for (i = found = 0; !found && s[i]; i++) 1403 for (i = found = 0; !found && s[i]; i++)
1280 { 1404 {
1281 if (!strcmp (s[i], "OverTheSpot")) 1405 if (!strcmp (s[i], "OverTheSpot"))
1282 input_style = XIMPreeditPosition | XIMStatusNothing; 1406 input_style = XIMPreeditPosition | XIMStatusNothing;
1294 input_style = XIMPreeditNothing | XIMStatusNothing; 1418 input_style = XIMPreeditNothing | XIMStatusNothing;
1295 1419
1296 for (j = 0; j < xim_styles->count_styles; j++) 1420 for (j = 0; j < xim_styles->count_styles; j++)
1297 if (input_style == xim_styles->supported_styles[j]) 1421 if (input_style == xim_styles->supported_styles[j])
1298 { 1422 {
1299 rxvt_freecommastring (s); 1423 rxvt_free_strsplit (s);
1300 1424
1301 found = 1; 1425 found = 1;
1302 goto foundpet; 1426 goto foundpet;
1303 } 1427 }
1304 1428
1305 } 1429 }
1306 1430
1307 rxvt_freecommastring (s); 1431 rxvt_free_strsplit (s);
1308 } 1432 }
1309 1433
1310foundpet: 1434foundpet:
1311 1435
1312 XFree (xim_styles); 1436 XFree (xim_styles);
1391 NULL); 1515 NULL);
1392 } 1516 }
1393#if ENABLE_XIM_ONTHESPOT 1517#if ENABLE_XIM_ONTHESPOT
1394 else if (input_style & XIMPreeditCallbacks) 1518 else if (input_style & XIMPreeditCallbacks)
1395 { 1519 {
1520 XIMCallback xcb[4];
1521
1396 im_set_position (spot); 1522 im_set_position (spot);
1397 1523
1398 xcb[0].client_data = (XPointer)this; xcb[0].callback = (XIMProc)xim_preedit_start; 1524 xcb[0].client_data = (XPointer)this; xcb[0].callback = (XIMProc)xim_preedit_start;
1399 xcb[1].client_data = (XPointer)this; xcb[1].callback = (XIMProc)xim_preedit_done; 1525 xcb[1].client_data = (XPointer)this; xcb[1].callback = (XIMProc)xim_preedit_done;
1400 xcb[2].client_data = (XPointer)this; xcb[2].callback = (XIMProc)xim_preedit_draw; 1526 xcb[2].client_data = (XPointer)this; xcb[2].callback = (XIMProc)xim_preedit_draw;
1415#endif 1541#endif
1416 1542
1417 Input_Context = XCreateIC (xim, 1543 Input_Context = XCreateIC (xim,
1418 XNInputStyle, input_style, 1544 XNInputStyle, input_style,
1419 XNClientWindow, vt, 1545 XNClientWindow, vt,
1420 XNFocusWindow, parent[0], 1546 XNFocusWindow, parent,
1421 preedit_attr ? XNPreeditAttributes : NULL, 1547 preedit_attr ? XNPreeditAttributes : NULL,
1422 preedit_attr, 1548 preedit_attr,
1423 status_attr ? XNStatusAttributes : NULL, 1549 status_attr ? XNStatusAttributes : NULL,
1424 status_attr, NULL); 1550 status_attr, NULL);
1425 1551
1438 // unfortunately, only the focus window is used by XIM, hard to fix 1564 // unfortunately, only the focus window is used by XIM, hard to fix
1439 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL)) 1565 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL))
1440 vt_select_input (); 1566 vt_select_input ();
1441#endif 1567#endif
1442 1568
1443 IMSetPosition (); 1569 im_set_position ();
1444 1570
1445 return true; 1571 return true;
1446} 1572}
1447 1573
1448void 1574void
1458 im_destroy (); 1584 im_destroy ();
1459 1585
1460 if (Input_Context) 1586 if (Input_Context)
1461 return; 1587 return;
1462 1588
1463#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1464 if (rs[Rs_imLocale]) 1589 if (rs[Rs_imLocale])
1465 SET_LOCALE (rs[Rs_imLocale]); 1590 SET_LOCALE (rs[Rs_imLocale]);
1466#endif
1467 1591
1468 p = rs[Rs_inputMethod]; 1592 p = rs[Rs_inputMethod];
1469 if (p && *p) 1593 if (p && *p)
1470 { 1594 {
1471 bool found = false; 1595 bool found = false;
1472 1596
1473 s = rxvt_splitcommastring (p); 1597 s = rxvt_strsplit (',', p);
1474 1598
1475 for (i = 0; s[i]; i++) 1599 for (i = 0; s[i]; i++)
1476 { 1600 {
1477 if (*s[i]) 1601 if (*s[i])
1478 { 1602 {
1479 strcpy (buf, "@im="); 1603 strcpy (buf, "@im=");
1480 strncat (buf, s[i], IMBUFSIZ - 5); 1604 strncat (buf, s[i], IMBUFSIZ - 5);
1481 if (IM_get_IC (buf)) 1605 if (im_get_ic (buf))
1482 { 1606 {
1483 found = true; 1607 found = true;
1484 break; 1608 break;
1485 } 1609 }
1486 } 1610 }
1487 } 1611 }
1488 1612
1489 rxvt_freecommastring (s); 1613 rxvt_free_strsplit (s);
1490 1614
1491 if (found) 1615 if (found)
1492 goto done; 1616 goto done;
1493 } 1617 }
1494 1618
1495 /* try with XMODIFIERS env. var. */ 1619 /* try with XMODIFIERS env. var. */
1496 if (IM_get_IC ("")) 1620 if (im_get_ic (""))
1497 goto done; 1621 goto done;
1498 1622
1499 /* try with no modifiers base IF the user didn't specify an IM */ 1623 /* try with no modifiers base IF the user didn't specify an IM */
1500 if (IM_get_IC ("@im=none")) 1624 if (im_get_ic ("@im=none"))
1501 goto done; 1625 goto done;
1502 1626
1503done: 1627done:
1504#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1505 if (rs[Rs_imLocale]) 1628 if (rs[Rs_imLocale])
1506 SET_LOCALE (locale); 1629 SET_LOCALE (locale);
1507#endif
1508} 1630}
1509 1631
1510void 1632void
1511rxvt_term::IMSetPosition () 1633rxvt_term::im_set_position ()
1512{ 1634{
1513 XRectangle preedit_rect, status_rect, *needed_rect; 1635 XRectangle preedit_rect, status_rect, *needed_rect;
1514 XVaNestedList preedit_attr, status_attr; 1636 XVaNestedList preedit_attr, status_attr;
1515 1637
1516 if (!Input_Context 1638 if (!Input_Context
1517 || !focus 1639 || !focus
1518 || !(input_style & (XIMPreeditArea | XIMPreeditPosition)) 1640 || !(input_style & (XIMPreeditArea | XIMPreeditPosition))
1519 || !IMisRunning ()) 1641 || !im_is_running ())
1520 return; 1642 return;
1521 1643
1522 if (input_style & XIMPreeditPosition) 1644 if (input_style & XIMPreeditPosition)
1523 { 1645 {
1524 im_set_size (preedit_rect); 1646 im_set_size (preedit_rect);
1554 1676
1555void 1677void
1556rxvt_term::get_window_origin (int &x, int &y) 1678rxvt_term::get_window_origin (int &x, int &y)
1557{ 1679{
1558 Window cr; 1680 Window cr;
1559 XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr); 1681 XTranslateCoordinates (dpy, parent, display->root, 0, 0, &x, &y, &cr);
1560/* fprintf (stderr, "origin is %+d%+d\n", x, y);*/
1561}
1562
1563Pixmap
1564rxvt_term::get_pixmap_property (int prop_id)
1565{
1566 if (prop_id > 0 && prop_id < NUM_XA)
1567 if (xa[prop_id])
1568 {
1569 int aformat;
1570 unsigned long nitems, bytes_after;
1571 Atom atype;
1572 unsigned char *prop = NULL;
1573 int result = XGetWindowProperty (dpy, display->root, xa[prop_id],
1574 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1575 &nitems, &bytes_after, &prop);
1576 if (result == Success && prop && atype == XA_PIXMAP)
1577 return *(Pixmap *)prop;
1578 }
1579
1580 return None;
1581} 1682}
1582 1683
1583#ifdef HAVE_BG_PIXMAP 1684#ifdef HAVE_BG_PIXMAP
1584# if TRACE_PIXMAPS
1585# undef update_background
1586void
1587rxvt_term::trace_update_background (const char *file, int line)
1588{
1589 fprintf (stderr, "%s:%d:update_background()\n", file, line);
1590 update_background ();
1591}
1592# endif
1593 1685
1594void 1686void
1595rxvt_term::update_background () 1687rxvt_term::update_background ()
1596{ 1688{
1597 if (update_background_ev.is_active ()) 1689 if (update_background_ev.is_active ())
1598 return; 1690 return;
1599 1691
1600 bgPixmap.invalidate (); 1692 bg_invalidate ();
1601 1693
1694 if (!mapped)
1695 return;
1696
1602 ev_tstamp to_wait = 0.5 - (ev::now () - bgPixmap.valid_since); 1697 ev_tstamp to_wait = 0.5 - (ev::now () - bg_valid_since);
1603 1698
1604 if (to_wait <= 0.) 1699 if (to_wait <= 0.)
1605 bgPixmap.render (); 1700 bg_render ();
1606 else 1701 else
1607 update_background_ev.start (to_wait); 1702 update_background_ev.start (to_wait);
1608} 1703}
1609 1704
1610void 1705void
1611rxvt_term::update_background_cb (ev::timer &w, int revents) 1706rxvt_term::update_background_cb (ev::timer &w, int revents)
1612{ 1707{
1613 make_current (); 1708 make_current ();
1614 1709
1615 update_background_ev.stop (); 1710 update_background_ev.stop ();
1616 bgPixmap.render (); 1711 bg_render ();
1617 refresh_check (); 1712 refresh_check ();
1618} 1713}
1619 1714
1620#endif /* HAVE_BG_PIXMAP */ 1715#endif /* HAVE_BG_PIXMAP */
1621 1716

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines