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.301 by ayin, Sat Jan 19 13:00:10 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-2007 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#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 ();
229#endif
230
231#if HAVE_IMG
232 delete bg_img;
233#endif 233#endif
234 234
235 if (display) 235 if (display)
236 { 236 {
237 selection_clear (); 237 selection_clear ();
238 selection_clear (true);
238 239
239#ifdef USE_XIM 240#if USE_XIM
240 im_destroy (); 241 im_destroy ();
241#endif 242#endif
242#ifdef XTERM_SCROLLBAR 243 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); 244 if (gc) XFreeGC (dpy, gc);
267 245
268 delete drawable; 246 delete drawable;
269 // destroy all windows 247 // destroy all windows
270 if (parent[0]) 248 if (parent)
271 XDestroyWindow (dpy, parent[0]); 249 XDestroyWindow (dpy, parent);
272 250
273 for (int i = 0; i < TOTAL_COLORS; i++) 251 for (int i = 0; i < TOTAL_COLORS; i++)
274 if (ISSET_PIXCOLOR (i)) 252 if (ISSET_PIXCOLOR (i))
275 { 253 {
276 pix_colors_focused [i].free (this); 254 pix_colors_focused [i].free (this);
… …
290 /* clear all resources */ 268 /* clear all resources */
291 for (int i = 0; i < allocated.size (); i++) 269 for (int i = 0; i < allocated.size (); i++)
292 free (allocated [i]); 270 free (allocated [i]);
293 271
294 free (selection.text); 272 free (selection.text);
295 // TODO: manage env vars in child only(!) 273 free (selection.clip_text);
296 free (env_display);
297 free (env_term);
298 free (locale); 274 free (locale);
299 free (v_buffer); 275 free (v_buffer);
300 free (incr_buf); 276
277 delete selection_req;
301 278
302 delete envv; 279 delete envv;
303 delete argv; 280 delete argv;
304 281
305#ifdef KEYSYM_RESOURCE 282#ifdef KEYSYM_RESOURCE
… …
337 if (display) 314 if (display)
338 { 315 {
339#if USE_XIM 316#if USE_XIM
340 im_ev.stop (display); 317 im_ev.stop (display);
341#endif 318#endif
342#if HAVE_SCROLLBARS
343 scrollbar_ev.stop (display); 319 scrollbar_ev.stop (display);
344#endif 320#if BG_IMAGE_FROM_ROOT || ENABLE_PERL
345#if ENABLE_TRANSPARENCY || ENABLE_PERL
346 rootwin_ev.stop (display); 321 rootwin_ev.stop (display);
347#endif 322#endif
348 incr_ev.stop ();
349 termwin_ev.stop (display); 323 termwin_ev.stop (display);
350 vt_ev.stop (display); 324 vt_ev.stop (display);
351 } 325 }
352 326
353 flush_ev.stop (); 327 flush_ev.stop ();
… …
377 make_current (); 351 make_current ();
378 352
379 delete this; 353 delete this;
380} 354}
381 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
382/*----------------------------------------------------------------------*/ 368/*----------------------------------------------------------------------*/
383/* 369/*
384 * Exit gracefully, clearing the utmp entry and restoring tty attributes 370 * 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 */ 371 */
387static XErrorHandler old_xerror_handler; 372static XErrorHandler old_xerror_handler;
388 373
389static void 374static void
390rxvt_emergency_cleanup () 375rxvt_emergency_cleanup ()
… …
392 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++)
393 (*t)->emergency_cleanup (); 378 (*t)->emergency_cleanup ();
394} 379}
395 380
396#if !ENABLE_MINIMAL 381#if !ENABLE_MINIMAL
397static void 382static void ecb_cold
398print_x_error (Display *dpy, XErrorEvent *event) 383print_x_error (Display *dpy, XErrorEvent *event)
399{ 384{
400 char buffer[BUFSIZ]; 385 char buffer[BUFSIZ];
401 char mesg[BUFSIZ]; 386 char mesg[BUFSIZ];
402 char number[32]; 387 char number[32];
403 char *mtype = "XlibMessage"; 388
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"); 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);
407 rxvt_warn ("%s: %s\n", mesg, buffer); 396 rxvt_warn ("+ %s: %s\n", mesg, buffer);
397
408 XGetErrorDatabaseText(dpy, mtype, "MajorCode", "Request Major code %d", mesg, BUFSIZ); 398 XGetErrorDatabaseText (dpy, "XlibMessage", "MajorCode", "Request Major code %d", mesg, BUFSIZ);
409 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->request_code); 399 snprintf (buffer, BUFSIZ, "+ %s\n", mesg); rxvt_warn (buffer, event->request_code);
410 sprintf(number, "%d", event->request_code); 400
411 XGetErrorDatabaseText(dpy, "XRequest", number, "", buffer, BUFSIZ);
412 rxvt_warn ("(which is %s)\n", buffer);
413 if (event->request_code >= 128) { 401 if (event->request_code >= 128)
414 XGetErrorDatabaseText(dpy, mtype, "MinorCode", "Request Minor code %d", 402 {
415 mesg, BUFSIZ); 403#if 0
416 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);
417 } 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
418 if ((event->error_code == BadWindow) || 457 if (event->error_code == BadWindow
419 (event->error_code == BadPixmap) || 458 || event->error_code == BadPixmap
420 (event->error_code == BadCursor) || 459 || event->error_code == BadCursor
421 (event->error_code == BadFont) || 460 || event->error_code == BadFont
422 (event->error_code == BadDrawable) || 461 || event->error_code == BadDrawable
423 (event->error_code == BadColor) || 462 || event->error_code == BadColor
424 (event->error_code == BadGC) || 463 || event->error_code == BadGC
425 (event->error_code == BadIDChoice) || 464 || event->error_code == BadIDChoice
426 (event->error_code == BadValue) || 465 || event->error_code == BadValue
427 (event->error_code == BadAtom)) { 466 || event->error_code == BadAtom)
467 {
428 if (event->error_code == BadValue) 468 if (event->error_code == BadValue)
429 XGetErrorDatabaseText(dpy, mtype, "Value", "Value 0x%x", 469 XGetErrorDatabaseText (dpy, "XlibMessage", "Value", "Value 0x%x", mesg, BUFSIZ);
430 mesg, BUFSIZ);
431 else if (event->error_code == BadAtom) 470 else if (event->error_code == BadAtom)
432 XGetErrorDatabaseText(dpy, mtype, "AtomID", "AtomID 0x%x", 471 XGetErrorDatabaseText (dpy, "XlibMessage", "AtomID", "AtomID 0x%x", mesg, BUFSIZ);
433 mesg, BUFSIZ); 472 else
434 else
435 XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x", 473 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 474
445int 475 snprintf (buffer, BUFSIZ, "+ %s\n", mesg); rxvt_warn (buffer, event->resourceid);
476 }
477}
478#endif
479
480int ecb_cold
446rxvt_xerror_handler (Display *display, XErrorEvent *event) 481rxvt_xerror_handler (Display *display, XErrorEvent *event)
447{ 482{
448 if (GET_R->allowedxerror == -1) 483 if (GET_R->allowedxerror == -1)
449 GET_R->allowedxerror = event->error_code; 484 GET_R->allowedxerror = event->error_code;
450 else 485 else
… …
459 } 494 }
460 495
461 return 0; 496 return 0;
462} 497}
463 498
464int 499int ecb_cold
465rxvt_xioerror_handler (Display *display) 500rxvt_xioerror_handler (Display *display)
466{ 501{
467 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",
468 DisplayString (display)); 503 DisplayString (display));
469 rxvt_emergency_cleanup (); 504 rxvt_emergency_cleanup ();
… …
492 rxvt_emergency_cleanup (); 527 rxvt_emergency_cleanup ();
493 w.stop (); 528 w.stop ();
494 kill (getpid (), w.signum); 529 kill (getpid (), w.signum);
495} 530}
496 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
497char **rxvt_environ; // startup environment 599char **rxvt_environ; // startup environment
498 600
499void 601void
500rxvt_init () 602rxvt_init ()
501{ 603{
502 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))));
503 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
504 if (!ev_default_loop (0)) 613 if (!ev_default_loop ())
505 rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n"); 614 rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n");
506 615
507 rxvt_environ = environ; 616 rxvt_environ = environ;
508 617
509 signal (SIGHUP, SIG_IGN); 618 signal (SIGHUP, SIG_IGN);
510 signal (SIGPIPE, SIG_IGN); 619 signal (SIGPIPE, SIG_IGN);
511 620
512 sig_handlers.sw_term.start (SIGTERM); ev_unref (); 621 sig_handlers.sw_term.start (SIGTERM); ev_unref ();
513 sig_handlers.sw_int.start (SIGINT); ev_unref (); 622 sig_handlers.sw_int.start (SIGINT); ev_unref ();
514
515 /* need to trap SIGURG for SVR4 (Unixware) rlogin */
516 /* signal (SIGURG, SIG_DFL); */
517 623
518 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); 624 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
519 // TODO: handle this with exceptions and tolerate the memory loss 625 // TODO: handle this with exceptions and tolerate the memory loss
520 XSetIOErrorHandler (rxvt_xioerror_handler); 626 XSetIOErrorHandler (rxvt_xioerror_handler);
521 627
522 XrmInitialize (); 628 XrmInitialize ();
629
630#if HAVE_PIXBUF
631 g_type_init ();
632#endif
523} 633}
524 634
525/*----------------------------------------------------------------------*/ 635/*----------------------------------------------------------------------*/
526/* 636/*
527 * window size/position calculations for XSizeHint and other storage. 637 * window size/position calculations for XSizeHint and other storage.
… …
529 */ 639 */
530void 640void
531rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight) 641rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
532{ 642{
533 short recalc_x, recalc_y; 643 short recalc_x, recalc_y;
534 int x, y, sb_w, flags; 644 int x, y, flags;
535 unsigned int w, h; 645 unsigned int w, h;
536 unsigned int max_width, max_height; 646 unsigned int max_width, max_height;
537 647
538 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity; 648 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity;
539 szHint.win_gravity = NorthWestGravity; 649 szHint.win_gravity = NorthWestGravity;
… …
549 if (rs[Rs_geometry]) 659 if (rs[Rs_geometry])
550 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h); 660 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h);
551 661
552 if (flags & WidthValue) 662 if (flags & WidthValue)
553 { 663 {
664 if (!w)
665 rxvt_fatal ("illegal window geometry (width and height must be non-zero), aborting.\n");
666
554 ncol = clamp (w, 0, std::numeric_limits<int16_t>::max ()); 667 ncol = clamp (w, 1, std::numeric_limits<int16_t>::max ());
555 szHint.flags |= USSize; 668 szHint.flags |= USSize;
556 } 669 }
557 670
558 if (flags & HeightValue) 671 if (flags & HeightValue)
559 { 672 {
673 if (!h)
674 rxvt_fatal ("illegal window geometry (width and height must be non-zero), aborting.\n");
675
560 nrow = clamp (h, 0, std::numeric_limits<int16_t>::max ()); 676 nrow = clamp (h, 1, std::numeric_limits<int16_t>::max ());
561 szHint.flags |= USSize; 677 szHint.flags |= USSize;
562 } 678 }
563 679
564 if (flags & XValue) 680 if (flags & XValue)
565 { 681 {
… …
596 max_width = MAX_COLS * fwidth; 712 max_width = MAX_COLS * fwidth;
597 max_height = MAX_ROWS * fheight; 713 max_height = MAX_ROWS * fheight;
598 714
599 szHint.base_width = szHint.base_height = 2 * int_bwidth; 715 szHint.base_width = szHint.base_height = 2 * int_bwidth;
600 716
601 sb_w = 0;
602 window_vt_x = window_vt_y = int_bwidth; 717 window_vt_x = window_vt_y = int_bwidth;
603 718
604 if (scrollBar.state) 719 if (scrollBar.state)
605 { 720 {
606 sb_w = scrollbar_TotalWidth (); 721 int sb_w = scrollBar.total_width ();
607 szHint.base_width += sb_w; 722 szHint.base_width += sb_w;
608 723
609 if (!option (Opt_scrollBar_right)) 724 if (!option (Opt_scrollBar_right))
610 window_vt_x += sb_w; 725 window_vt_x += sb_w;
611 } 726 }
… …
635 { 750 {
636 min_it (height, max_height); 751 min_it (height, max_height);
637 szHint.height = szHint.base_height + height; 752 szHint.height = szHint.base_height + height;
638 } 753 }
639 754
640 if (scrollBar.state && option (Opt_scrollBar_right))
641 window_sb_x = szHint.width - sb_w;
642
643 if (recalc_x) 755 if (recalc_x)
644 szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth; 756 szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth;
645 757
646 if (recalc_y) 758 if (recalc_y)
647 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth; 759 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth;
648 760
649 ncol = width / fwidth; 761 ncol = width / fwidth;
650 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;
651} 772}
652 773
653/*----------------------------------------------------------------------*/ 774/*----------------------------------------------------------------------*/
654/* 775/*
655 * Tell the teletype handler what size the window is. 776 * Tell the teletype handler what size the window is.
… …
663 784
664 struct winsize ws; 785 struct winsize ws;
665 786
666 ws.ws_col = ncol; 787 ws.ws_col = ncol;
667 ws.ws_row = nrow; 788 ws.ws_row = nrow;
668 ws.ws_xpixel = width; 789 ws.ws_xpixel = vt_width;
669 ws.ws_ypixel = height; 790 ws.ws_ypixel = vt_height;
670 (void)ioctl (pty->pty, TIOCSWINSZ, &ws); 791 ioctl (pty->pty, TIOCSWINSZ, &ws);
671 792
672#if 0 793#if 0
673 // TIOCSWINSZ is supposed to do this automatically and correctly 794 // TIOCSWINSZ is supposed to do this automatically and correctly
674 if (cmd_pid) /* force through to the command */ 795 if (cmd_pid) /* force through to the command */
675 kill (-cmd_pid, SIGWINCH); 796 kill (-cmd_pid, SIGWINCH);
676#endif 797#endif
677} 798}
678 799
679/*----------------------------------------------------------------------*/ 800/*----------------------------------------------------------------------*/
680/* set_fonts () - load and set the various fonts 801/* 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 802bool
688rxvt_term::set_fonts () 803rxvt_term::set_fonts ()
689{ 804{
690 rxvt_fontset *fs = new rxvt_fontset (this); 805 rxvt_fontset *fs = new rxvt_fontset (this);
691 rxvt_fontprop prop; 806 rxvt_fontprop prop;
… …
705#endif 820#endif
706 821
707 delete fontset[0]; 822 delete fontset[0];
708 fontset[0] = fs; 823 fontset[0] = fs;
709 824
710 prop = (*fs)[1]->properties (); 825 prop = (*fs)[rxvt_fontset::firstFont]->properties ();
711 prop.height += lineSpace; 826 prop.width = max (prop.width + letterSpace, 1);
712 827
713 fs->set_prop (prop, false); 828 fs->set_prop (prop, false);
714 829
715 fwidth = prop.width; 830 fwidth = prop.width;
716 fheight = prop.height; 831 fheight = prop.height + lineSpace;
717 fbase = prop.ascent; 832 fbase = prop.ascent;
718 833
719 for (int style = 1; style < 4; style++) 834 for (int style = 1; style < 4; style++)
720 { 835 {
721#if ENABLE_STYLES 836#if ENABLE_STYLES
… …
747#else 862#else
748 fontset[style] = fontset[0]; 863 fontset[style] = fontset[0];
749#endif 864#endif
750 } 865 }
751 866
752 if (parent[0]) 867 if (parent)
753 { 868 {
754 resize_all_windows (0, 0, 0); 869 resize_all_windows (0, 0, 0);
755 scr_remap_chars (); 870 scr_remap_chars ();
756 scr_touch (true); 871 scr_touch (true);
757 } 872 }
… …
760} 875}
761 876
762void 877void
763rxvt_term::set_string_property (Atom prop, const char *str, int len) 878rxvt_term::set_string_property (Atom prop, const char *str, int len)
764{ 879{
765 XChangeProperty (dpy, parent[0], 880 XChangeProperty (dpy, parent,
766 prop, XA_STRING, 8, PropModeReplace, 881 prop, XA_STRING, 8, PropModeReplace,
767 (const unsigned char *)str, len >= 0 ? len : strlen (str)); 882 (const unsigned char *)str, len >= 0 ? len : strlen (str));
768} 883}
769 884
770void 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
771rxvt_term::set_utf8_property (Atom prop, const char *str, int len) 898rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
772{ 899{
773 wchar_t *ws = rxvt_mbstowcs (str, len); 900 wchar_t *ws = rxvt_mbstowcs (str, len);
774 char *s = rxvt_wcstoutf8 (ws); 901 char *s = rxvt_wcstoutf8 (ws);
775 902
776 XChangeProperty (dpy, parent[0], 903 XChangeProperty (dpy, parent,
777 prop, xa[XA_UTF8_STRING], 8, PropModeReplace, 904 prop, xa[XA_UTF8_STRING], 8, PropModeReplace,
778 (const unsigned char *)s, strlen (s)); 905 (const unsigned char *)s, strlen (s));
779 906
780 free (s); 907 free (s);
781 free (ws); 908 free (ws);
… …
785/*----------------------------------------------------------------------*/ 912/*----------------------------------------------------------------------*/
786/* xterm sequences - title, iconName, color (exptl) */ 913/* xterm sequences - title, iconName, color (exptl) */
787void 914void
788rxvt_term::set_title (const char *str) 915rxvt_term::set_title (const char *str)
789{ 916{
790 set_string_property (XA_WM_NAME, str); 917 set_mbstring_property (XA_WM_NAME, str);
791#if ENABLE_EWMH 918#if ENABLE_EWMH
792 set_utf8_property (xa[XA_NET_WM_NAME], str); 919 set_utf8_property (xa[XA_NET_WM_NAME], str);
793#endif 920#endif
794} 921}
795 922
796void 923void
797rxvt_term::set_icon_name (const char *str) 924rxvt_term::set_icon_name (const char *str)
798{ 925{
799 set_string_property (XA_WM_ICON_NAME, str); 926 set_mbstring_property (XA_WM_ICON_NAME, str);
800#if ENABLE_EWMH 927#if ENABLE_EWMH
801 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str); 928 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str);
802#endif 929#endif
803} 930}
804 931
805void 932void
806rxvt_term::set_window_color (int idx, const char *color) 933rxvt_term::set_window_color (int idx, const char *color)
807{ 934{
808#ifdef XTERM_COLOR_CHANGE 935#ifdef XTERM_COLOR_CHANGE
809 rxvt_color xcol; 936 rxvt_color xcol;
810 int i;
811 937
812 if (color == NULL || *color == '\0') 938 if (color == NULL || *color == '\0')
813 return; 939 return;
814 940
815 color = strdup (color); 941 color = strdup (color);
… …
817 rs[Rs_color + idx] = color; 943 rs[Rs_color + idx] = color;
818 944
819 /* handle color aliases */ 945 /* handle color aliases */
820 if (isdigit (*color)) 946 if (isdigit (*color))
821 { 947 {
822 i = atoi (color); 948 int i = atoi (color);
823 949
824 if (i >= 8 && i <= 15) 950 if (i >= 8 && i <= 15)
825 { 951 {
826 /* bright colors */ 952 /* bright colors */
827 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i - 8]; 953 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i - 8];
… …
872 998
873/*----------------------------------------------------------------------*/ 999/*----------------------------------------------------------------------*/
874/* 1000/*
875 * 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
876 */ 1002 */
877void 1003char *
878rxvt_term::set_colorfgbg () 1004rxvt_term::get_colorfgbg ()
879{ 1005{
880 unsigned int i; 1006 unsigned int i;
881 const char *xpmb = ""; 1007 const char *xpmb = "";
882 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1]; 1008 char fstr[] = "default";
1009 char bstr[] = "default";
1010 char *env_colorfgbg;
883 1011
884 strcpy (fstr, "default");
885 strcpy (bstr, "default");
886 for (i = Color_Black; i <= Color_White; i++) 1012 for (i = Color_Black; i <= Color_White; i++)
887 if (pix_colors[Color_fg] == pix_colors[i]) 1013 if (pix_colors[Color_fg] == pix_colors[i])
888 { 1014 {
889 sprintf (fstr, "%d", (i - Color_Black)); 1015 sprintf (fstr, "%d", i - Color_Black);
890 break; 1016 break;
891 } 1017 }
892 1018
893 for (i = Color_Black; i <= Color_White; i++) 1019 for (i = Color_Black; i <= Color_White; i++)
894 if (pix_colors[Color_bg] == pix_colors[i]) 1020 if (pix_colors[Color_bg] == pix_colors[i])
895 { 1021 {
896 sprintf (bstr, "%d", (i - Color_Black)); 1022 sprintf (bstr, "%d", i - Color_Black);
897#ifdef BG_IMAGE_FROM_FILE 1023#if BG_IMAGE_FROM_FILE
898 xpmb = "default;"; 1024 xpmb = "default;";
899#endif 1025#endif
900 break; 1026 break;
901 } 1027 }
902 1028
1029 env_colorfgbg = (char *)rxvt_malloc (sizeof ("COLORFGBG=default;default;bg"));
903 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;
904} 1032}
905 1033
906/*----------------------------------------------------------------------*/ 1034/*----------------------------------------------------------------------*/
907 1035
908bool 1036bool
… …
931 int old_width = szHint.width; 1059 int old_width = szHint.width;
932 int old_height = szHint.height; 1060 int old_height = szHint.height;
933 1061
934 window_calc (newwidth, newheight); 1062 window_calc (newwidth, newheight);
935 1063
936 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);
937 XSetWMNormalHints (dpy, parent[0], &szHint); 1070 XSetWMNormalHints (dpy, parent, &szHint);
1071 szHint.flags |= PBaseSize | PResizeInc;
1072 }
938 1073
939 if (!ignoreparent) 1074 if (!ignoreparent)
940 { 1075 {
941#ifdef SMART_RESIZE 1076#ifdef SMART_RESIZE
942 /* 1077 /*
… …
946 int x, y, x1, y1; 1081 int x, y, x1, y1;
947 int dx, dy; 1082 int dx, dy;
948 unsigned int unused_w1, unused_h1, unused_b1, unused_d1; 1083 unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
949 Window unused_cr; 1084 Window unused_cr;
950 1085
951 XTranslateCoordinates (dpy, parent[0], display->root, 1086 XTranslateCoordinates (dpy, parent, display->root,
952 0, 0, &x, &y, &unused_cr); 1087 0, 0, &x, &y, &unused_cr);
953 XGetGeometry (dpy, parent[0], &unused_cr, &x1, &y1, 1088 XGetGeometry (dpy, parent, &unused_cr, &x1, &y1,
954 &unused_w1, &unused_h1, &unused_b1, &unused_d1); 1089 &unused_w1, &unused_h1, &unused_b1, &unused_d1);
955 /* 1090 /*
956 * 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
957 * our position for handles and decorations. Counter it 1092 * our position for handles and decorations. Counter it
958 */ 1093 */
… …
975 if (y < y1) /* top half */ 1110 if (y < y1) /* top half */
976 dy = 0; 1111 dy = 0;
977 else if (y == y1) /* exact center */ 1112 else if (y == y1) /* exact center */
978 dy /= 2; 1113 dy /= 2;
979 1114
980 XMoveResizeWindow (dpy, parent[0], x + dx, y + dy, 1115 XMoveResizeWindow (dpy, parent, x + dx, y + dy,
981 szHint.width, szHint.height); 1116 szHint.width, szHint.height);
982#else 1117#else
983 XResizeWindow (dpy, parent[0], szHint.width, szHint.height); 1118 XResizeWindow (dpy, parent, szHint.width, szHint.height);
984#endif 1119#endif
985 } 1120 }
1121
1122 if (set_hint)
1123 XSetWMNormalHints (dpy, parent, &szHint);
986 1124
987 fix_screen = ncol != prev_ncol || nrow != prev_nrow; 1125 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
988 1126
989 if (fix_screen || newwidth != old_width || newheight != old_height) 1127 if (fix_screen || newwidth != old_width || newheight != old_height)
990 { 1128 {
991 if (scrollBar.state) 1129 if (scrollBar.state)
992 { 1130 scrollBar.resize ();
993 XMoveResizeWindow (dpy, scrollBar.win,
994 window_sb_x, 0,
995 scrollbar_TotalWidth (), szHint.height);
996 resize_scrollbar ();
997 }
998 1131
999 XMoveResizeWindow (dpy, vt, 1132 XMoveResizeWindow (dpy, vt,
1000 window_vt_x, window_vt_y, 1133 window_vt_x, window_vt_y,
1001 width, height); 1134 vt_width, vt_height);
1135
1136 HOOK_INVOKE ((this, HOOK_SIZE_CHANGE, DT_INT, newwidth, DT_INT, newheight, DT_END));
1002 1137
1003#ifdef HAVE_BG_PIXMAP 1138#ifdef HAVE_BG_PIXMAP
1004 if (bgPixmap.window_size_sensitive ()) 1139 if (bg_window_size_sensitive ())
1005 update_background (); 1140 update_background ();
1006#endif 1141#endif
1007
1008 scr_clear ();
1009 } 1142 }
1010 1143
1011 if (fix_screen || old_height == 0) 1144 if (fix_screen || old_height == 0)
1012 scr_reset (); 1145 scr_reset ();
1013 1146
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 1147#if USE_XIM
1024 IMSetPosition (); 1148 im_set_position ();
1025#endif 1149#endif
1026} 1150}
1027 1151
1028/* 1152/*
1029 * 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.
… …
1042 newwidth = wattr.width - szHint.base_width; 1166 newwidth = wattr.width - szHint.base_width;
1043 if (newheight == 0) 1167 if (newheight == 0)
1044 newheight = wattr.height - szHint.base_height; 1168 newheight = wattr.height - szHint.base_height;
1045 } 1169 }
1046 1170
1047 if (newwidth != width || newheight != height) 1171 if (newwidth != vt_width || newheight != vt_height)
1048 { 1172 {
1049 newwidth += szHint.base_width; 1173 newwidth += szHint.base_width;
1050 newheight += szHint.base_height; 1174 newheight += szHint.base_height;
1051 resize_all_windows (newwidth, newheight, 0); 1175 resize_all_windows (newwidth, newheight, 0);
1052 } 1176 }
1053} 1177}
1054 1178
1055/* -------------------------------------------------------------------- * 1179/* -------------------------------------------------------------------- *
1056 * - X INPUT METHOD ROUTINES - * 1180 * - X INPUT METHOD ROUTINES - *
1057 * -------------------------------------------------------------------- */ 1181 * -------------------------------------------------------------------- */
1058#ifdef USE_XIM 1182#if USE_XIM
1059 1183
1060void 1184void
1061rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg) 1185rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg)
1062{ 1186{
1063 fg = pix_colors [Color_fg]; 1187 fg = pix_colors [Color_fg];
… …
1090 status_rect.height = fheight; 1214 status_rect.height = fheight;
1091} 1215}
1092 1216
1093/* Checking whether input method is running. */ 1217/* Checking whether input method is running. */
1094bool 1218bool
1095rxvt_term::IMisRunning () 1219rxvt_term::im_is_running ()
1096{ 1220{
1097 char *p;
1098 Atom atom; 1221 Atom atom;
1099 Window win; 1222 Window win;
1100 char server[IMBUFSIZ]; 1223 char server[IMBUFSIZ];
1101 1224
1102 /* get current locale modifier */ 1225 /* get current locale modifier */
1103 if ((p = XSetLocaleModifiers (NULL)) != NULL) 1226 if (char *p = XSetLocaleModifiers (0))
1104 { 1227 {
1105 strcpy (server, "@server="); 1228 strcpy (server, "@server=");
1106 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */ 1229 strncat (server, p + 4, IMBUFSIZ - 9); /* skip "@im=" */
1107 1230
1108 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */ 1231 if (p = strchr (server + 1, '@')) /* first one only */
1109 *p = '\0'; 1232 *p = '\0';
1110 1233
1111 atom = XInternAtom (dpy, server, False); 1234 atom = XInternAtom (dpy, server, False);
1112 win = XGetSelectionOwner (dpy, atom); 1235 win = XGetSelectionOwner (dpy, atom);
1113 1236
1114 if (win != None) 1237 if (win != None)
1115 return True; 1238 return true;
1116 } 1239 }
1117 1240
1118 return False; 1241 return false;
1119} 1242}
1120 1243
1121void 1244void
1122rxvt_term::IMSendSpot () 1245rxvt_term::im_send_spot ()
1123{ 1246{
1124 XPoint nspot; 1247 XPoint nspot;
1125 XVaNestedList preedit_attr; 1248 XVaNestedList preedit_attr;
1126 1249
1127 if (!Input_Context 1250 if (!Input_Context
… …
1180 1303
1181 term->make_current (); 1304 term->make_current ();
1182 1305
1183 if (text) 1306 if (text)
1184 { 1307 {
1185 void *str; 1308 wchar_t *str;
1186 1309
1187 if (!text->encoding_is_wchar && text->string.multi_byte) 1310 if (!text->encoding_is_wchar && text->string.multi_byte)
1188 { 1311 {
1189 // of course, X makes it ugly again 1312 // of course, X makes it ugly again
1190 if (term->rs[Rs_imLocale]) 1313 if (term->rs[Rs_imLocale])
1191 SET_LOCALE (term->rs[Rs_imLocale]); 1314 SET_LOCALE (term->rs[Rs_imLocale]);
1192 1315
1193 str = rxvt_temp_buf ((text->length + 1) * sizeof (wchar_t)); 1316 str = rxvt_temp_buf<wchar_t> (text->length + 1);
1194 mbstowcs ((wchar_t *)str, text->string.multi_byte, text->length + 1); 1317 mbstowcs (str, text->string.multi_byte, text->length + 1);
1195 1318
1196 if (term->rs[Rs_imLocale]) 1319 if (term->rs[Rs_imLocale])
1197 SET_LOCALE (term->locale); 1320 SET_LOCALE (term->locale);
1198 } 1321 }
1199 else 1322 else
1200 str = (void *)text->string.wide_char; 1323 str = text->string.wide_char;
1201 1324
1202 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW, 1325 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
1203 DT_INT, call_data->caret, 1326 DT_INT, call_data->caret,
1204 DT_INT, call_data->chg_first, 1327 DT_INT, call_data->chg_first,
1205 DT_INT, call_data->chg_length, 1328 DT_INT, call_data->chg_length,
… …
1233/* 1356/*
1234 * 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
1235 * open a suitable preedit type 1358 * open a suitable preedit type
1236 */ 1359 */
1237bool 1360bool
1238rxvt_term::IM_get_IC (const char *modifiers) 1361rxvt_term::im_get_ic (const char *modifiers)
1239{ 1362{
1240 int i, j, found; 1363 int i, j, found;
1241 XIM xim; 1364 XIM xim;
1242 XPoint spot; 1365 XPoint spot;
1243 XRectangle rect, status_rect, needed_rect; 1366 XRectangle rect, status_rect, needed_rect;
1244 unsigned long fg, bg; 1367 unsigned long fg, bg;
1245 const char *p; 1368 const char *p;
1246 char **s; 1369 char **s;
1247 XIMStyles *xim_styles; 1370 XIMStyles *xim_styles;
1248#ifdef ENABLE_XIM_ONTHESPOT
1249 XIMCallback xcb[4];
1250#endif
1251 1371
1252 set_environ (envv); 1372 set_environ (envv);
1253 1373
1254 if (! ((p = XSetLocaleModifiers (modifiers)) && *p)) 1374 if (! ((p = XSetLocaleModifiers (modifiers)) && *p))
1255 return false; 1375 return false;
… …
1276 p = pet[pi]; 1396 p = pet[pi];
1277 1397
1278 if (!p) 1398 if (!p)
1279 continue; 1399 continue;
1280 1400
1281 s = rxvt_splitcommastring (p); 1401 s = rxvt_strsplit (',', p);
1282 1402
1283 for (i = found = 0; !found && s[i]; i++) 1403 for (i = found = 0; !found && s[i]; i++)
1284 { 1404 {
1285 if (!strcmp (s[i], "OverTheSpot")) 1405 if (!strcmp (s[i], "OverTheSpot"))
1286 input_style = XIMPreeditPosition | XIMStatusNothing; 1406 input_style = XIMPreeditPosition | XIMStatusNothing;
… …
1298 input_style = XIMPreeditNothing | XIMStatusNothing; 1418 input_style = XIMPreeditNothing | XIMStatusNothing;
1299 1419
1300 for (j = 0; j < xim_styles->count_styles; j++) 1420 for (j = 0; j < xim_styles->count_styles; j++)
1301 if (input_style == xim_styles->supported_styles[j]) 1421 if (input_style == xim_styles->supported_styles[j])
1302 { 1422 {
1303 rxvt_freecommastring (s); 1423 rxvt_free_strsplit (s);
1304 1424
1305 found = 1; 1425 found = 1;
1306 goto foundpet; 1426 goto foundpet;
1307 } 1427 }
1308 1428
1309 } 1429 }
1310 1430
1311 rxvt_freecommastring (s); 1431 rxvt_free_strsplit (s);
1312 } 1432 }
1313 1433
1314foundpet: 1434foundpet:
1315 1435
1316 XFree (xim_styles); 1436 XFree (xim_styles);
… …
1395 NULL); 1515 NULL);
1396 } 1516 }
1397#if ENABLE_XIM_ONTHESPOT 1517#if ENABLE_XIM_ONTHESPOT
1398 else if (input_style & XIMPreeditCallbacks) 1518 else if (input_style & XIMPreeditCallbacks)
1399 { 1519 {
1520 XIMCallback xcb[4];
1521
1400 im_set_position (spot); 1522 im_set_position (spot);
1401 1523
1402 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;
1403 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;
1404 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;
… …
1419#endif 1541#endif
1420 1542
1421 Input_Context = XCreateIC (xim, 1543 Input_Context = XCreateIC (xim,
1422 XNInputStyle, input_style, 1544 XNInputStyle, input_style,
1423 XNClientWindow, vt, 1545 XNClientWindow, vt,
1424 XNFocusWindow, parent[0], 1546 XNFocusWindow, parent,
1425 preedit_attr ? XNPreeditAttributes : NULL, 1547 preedit_attr ? XNPreeditAttributes : NULL,
1426 preedit_attr, 1548 preedit_attr,
1427 status_attr ? XNStatusAttributes : NULL, 1549 status_attr ? XNStatusAttributes : NULL,
1428 status_attr, NULL); 1550 status_attr, NULL);
1429 1551
… …
1442 // 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
1443 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL)) 1565 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL))
1444 vt_select_input (); 1566 vt_select_input ();
1445#endif 1567#endif
1446 1568
1447 IMSetPosition (); 1569 im_set_position ();
1448 1570
1449 return true; 1571 return true;
1450} 1572}
1451 1573
1452void 1574void
… …
1462 im_destroy (); 1584 im_destroy ();
1463 1585
1464 if (Input_Context) 1586 if (Input_Context)
1465 return; 1587 return;
1466 1588
1467#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1468 if (rs[Rs_imLocale]) 1589 if (rs[Rs_imLocale])
1469 SET_LOCALE (rs[Rs_imLocale]); 1590 SET_LOCALE (rs[Rs_imLocale]);
1470#endif
1471 1591
1472 p = rs[Rs_inputMethod]; 1592 p = rs[Rs_inputMethod];
1473 if (p && *p) 1593 if (p && *p)
1474 { 1594 {
1475 bool found = false; 1595 bool found = false;
1476 1596
1477 s = rxvt_splitcommastring (p); 1597 s = rxvt_strsplit (',', p);
1478 1598
1479 for (i = 0; s[i]; i++) 1599 for (i = 0; s[i]; i++)
1480 { 1600 {
1481 if (*s[i]) 1601 if (*s[i])
1482 { 1602 {
1483 strcpy (buf, "@im="); 1603 strcpy (buf, "@im=");
1484 strncat (buf, s[i], IMBUFSIZ - 5); 1604 strncat (buf, s[i], IMBUFSIZ - 5);
1485 if (IM_get_IC (buf)) 1605 if (im_get_ic (buf))
1486 { 1606 {
1487 found = true; 1607 found = true;
1488 break; 1608 break;
1489 } 1609 }
1490 } 1610 }
1491 } 1611 }
1492 1612
1493 rxvt_freecommastring (s); 1613 rxvt_free_strsplit (s);
1494 1614
1495 if (found) 1615 if (found)
1496 goto done; 1616 goto done;
1497 } 1617 }
1498 1618
1499 /* try with XMODIFIERS env. var. */ 1619 /* try with XMODIFIERS env. var. */
1500 if (IM_get_IC ("")) 1620 if (im_get_ic (""))
1501 goto done; 1621 goto done;
1502 1622
1503 /* 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 */
1504 if (IM_get_IC ("@im=none")) 1624 if (im_get_ic ("@im=none"))
1505 goto done; 1625 goto done;
1506 1626
1507done: 1627done:
1508#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1509 if (rs[Rs_imLocale]) 1628 if (rs[Rs_imLocale])
1510 SET_LOCALE (locale); 1629 SET_LOCALE (locale);
1511#endif
1512} 1630}
1513 1631
1514void 1632void
1515rxvt_term::IMSetPosition () 1633rxvt_term::im_set_position ()
1516{ 1634{
1517 XRectangle preedit_rect, status_rect, *needed_rect; 1635 XRectangle preedit_rect, status_rect, *needed_rect;
1518 XVaNestedList preedit_attr, status_attr; 1636 XVaNestedList preedit_attr, status_attr;
1519 1637
1520 if (!Input_Context 1638 if (!Input_Context
1521 || !focus 1639 || !focus
1522 || !(input_style & (XIMPreeditArea | XIMPreeditPosition)) 1640 || !(input_style & (XIMPreeditArea | XIMPreeditPosition))
1523 || !IMisRunning ()) 1641 || !im_is_running ())
1524 return; 1642 return;
1525 1643
1526 if (input_style & XIMPreeditPosition) 1644 if (input_style & XIMPreeditPosition)
1527 { 1645 {
1528 im_set_size (preedit_rect); 1646 im_set_size (preedit_rect);
… …
1558 1676
1559void 1677void
1560rxvt_term::get_window_origin (int &x, int &y) 1678rxvt_term::get_window_origin (int &x, int &y)
1561{ 1679{
1562 Window cr; 1680 Window cr;
1563 XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr); 1681 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} 1682}
1586 1683
1587#ifdef HAVE_BG_PIXMAP 1684#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 1685
1598void 1686void
1599rxvt_term::update_background () 1687rxvt_term::update_background ()
1600{ 1688{
1601 if (update_background_ev.is_active ()) 1689 if (update_background_ev.is_active ())
1602 return; 1690 return;
1603 1691
1604 bgPixmap.invalidate (); 1692 bg_invalidate ();
1605 1693
1694 if (!mapped)
1695 return;
1696
1606 ev_tstamp to_wait = 0.5 - (ev::now () - bgPixmap.valid_since); 1697 ev_tstamp to_wait = 0.5 - (ev::now () - bg_valid_since);
1607 1698
1608 if (to_wait <= 0.) 1699 if (to_wait <= 0.)
1609 bgPixmap.render (); 1700 bg_render ();
1610 else 1701 else
1611 update_background_ev.start (to_wait); 1702 update_background_ev.start (to_wait);
1612} 1703}
1613 1704
1614void 1705void
1615rxvt_term::update_background_cb (ev::timer &w, int revents) 1706rxvt_term::update_background_cb (ev::timer &w, int revents)
1616{ 1707{
1617 make_current (); 1708 make_current ();
1618 1709
1619 update_background_ev.stop (); 1710 update_background_ev.stop ();
1620 bgPixmap.render (); 1711 bg_render ();
1621 refresh_check (); 1712 refresh_check ();
1622} 1713}
1623 1714
1624#endif /* HAVE_BG_PIXMAP */ 1715#endif /* HAVE_BG_PIXMAP */
1625 1716

Diff Legend

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