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

Diff Legend

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