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.312 by root, Tue Nov 4 16:41:12 2008 UTC vs.
Revision 1.378 by root, Tue Jun 5 11:10:50 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));
… …
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 scrollbar_ev.set <rxvt_term, &rxvt_term::x_cb> (this), 176 scrollbar_ev.set <rxvt_term, &rxvt_term::x_cb> (this),
178#ifdef USE_XIM 177#if USE_XIM
179 im_ev.set <rxvt_term, &rxvt_term::im_cb> (this), 178 im_ev.set <rxvt_term, &rxvt_term::im_cb> (this),
180#endif 179#endif
181#ifdef POINTER_BLANK 180#ifdef POINTER_BLANK
182 pointer_ev.set <rxvt_term, &rxvt_term::pointer_cb> (this); 181 pointer_ev.set <rxvt_term, &rxvt_term::pointer_cb> (this);
183#endif 182#endif
… …
186#endif 185#endif
187 child_ev.set <rxvt_term, &rxvt_term::child_cb> (this); 186 child_ev.set <rxvt_term, &rxvt_term::child_cb> (this);
188 flush_ev.set <rxvt_term, &rxvt_term::flush_cb> (this); 187 flush_ev.set <rxvt_term, &rxvt_term::flush_cb> (this);
189 destroy_ev.set <rxvt_term, &rxvt_term::destroy_cb> (this); 188 destroy_ev.set <rxvt_term, &rxvt_term::destroy_cb> (this);
190 pty_ev.set <rxvt_term, &rxvt_term::pty_cb> (this); 189 pty_ev.set <rxvt_term, &rxvt_term::pty_cb> (this);
191 incr_ev.set <rxvt_term, &rxvt_term::incr_cb> (this);
192 termwin_ev.set <rxvt_term, &rxvt_term::x_cb> (this); 190 termwin_ev.set <rxvt_term, &rxvt_term::x_cb> (this);
193 vt_ev.set <rxvt_term, &rxvt_term::x_cb> (this); 191 vt_ev.set <rxvt_term, &rxvt_term::x_cb> (this);
194 192
195 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base; 193 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base;
196 194
… …
225 delete fontset[i]; 223 delete fontset[i];
226#endif 224#endif
227 delete fontset[0]; 225 delete fontset[0];
228 226
229#ifdef HAVE_BG_PIXMAP 227#ifdef HAVE_BG_PIXMAP
230 bgPixmap.destroy (); 228 bg_destroy ();
231#endif
232#ifdef HAVE_AFTERIMAGE
233 if (asv)
234 destroy_asvisual (asv, 0);
235 if (asimman)
236 destroy_image_manager (asimman, 0);
237#endif 229#endif
238 230
239 if (display) 231 if (display)
240 { 232 {
241 selection_clear (); 233 selection_clear ();
234 selection_clear (true);
242 235
243#ifdef USE_XIM 236#if USE_XIM
244 im_destroy (); 237 im_destroy ();
245#endif 238#endif
246 scrollBar.destroy (); 239 scrollBar.destroy ();
247 if (gc) XFreeGC (dpy, gc); 240 if (gc) XFreeGC (dpy, gc);
248 241
249 delete drawable; 242 delete drawable;
250 // destroy all windows 243 // destroy all windows
251 if (parent[0]) 244 if (parent)
252 XDestroyWindow (dpy, parent[0]); 245 XDestroyWindow (dpy, parent);
253 246
254 for (int i = 0; i < TOTAL_COLORS; i++) 247 for (int i = 0; i < TOTAL_COLORS; i++)
255 if (ISSET_PIXCOLOR (i)) 248 if (ISSET_PIXCOLOR (i))
256 { 249 {
257 pix_colors_focused [i].free (this); 250 pix_colors_focused [i].free (this);
… …
271 /* clear all resources */ 264 /* clear all resources */
272 for (int i = 0; i < allocated.size (); i++) 265 for (int i = 0; i < allocated.size (); i++)
273 free (allocated [i]); 266 free (allocated [i]);
274 267
275 free (selection.text); 268 free (selection.text);
276 // TODO: manage env vars in child only(!) 269 free (selection.clip_text);
277 free (env_display);
278 free (env_term);
279 free (locale); 270 free (locale);
280 free (v_buffer); 271 free (v_buffer);
281 free (incr_buf); 272
273 delete selection_req;
282 274
283 delete envv; 275 delete envv;
284 delete argv; 276 delete argv;
285 277
286#ifdef KEYSYM_RESOURCE 278#ifdef KEYSYM_RESOURCE
… …
322#endif 314#endif
323 scrollbar_ev.stop (display); 315 scrollbar_ev.stop (display);
324#if ENABLE_TRANSPARENCY || ENABLE_PERL 316#if ENABLE_TRANSPARENCY || ENABLE_PERL
325 rootwin_ev.stop (display); 317 rootwin_ev.stop (display);
326#endif 318#endif
327 incr_ev.stop ();
328 termwin_ev.stop (display); 319 termwin_ev.stop (display);
329 vt_ev.stop (display); 320 vt_ev.stop (display);
330 } 321 }
331 322
332 flush_ev.stop (); 323 flush_ev.stop ();
… …
354rxvt_term::destroy_cb (ev::idle &w, int revents) 345rxvt_term::destroy_cb (ev::idle &w, int revents)
355{ 346{
356 make_current (); 347 make_current ();
357 348
358 delete this; 349 delete this;
350}
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);
359} 362}
360 363
361/*----------------------------------------------------------------------*/ 364/*----------------------------------------------------------------------*/
362/* 365/*
363 * Exit gracefully, clearing the utmp entry and restoring tty attributes 366 * Exit gracefully, clearing the utmp entry and restoring tty attributes
… …
371 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++) 374 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)
372 (*t)->emergency_cleanup (); 375 (*t)->emergency_cleanup ();
373} 376}
374 377
375#if !ENABLE_MINIMAL 378#if !ENABLE_MINIMAL
376static void 379static void ecb_cold
377print_x_error (Display *dpy, XErrorEvent *event) 380print_x_error (Display *dpy, XErrorEvent *event)
378{ 381{
379 char buffer[BUFSIZ]; 382 char buffer[BUFSIZ];
380 char mesg[BUFSIZ]; 383 char mesg[BUFSIZ];
381 char number[32]; 384 char number[32];
382 char *mtype = "XlibMessage"; 385 const char mtype[] = "XlibMessage";
386
383 XGetErrorText(dpy, event->error_code, buffer, BUFSIZ); 387 XGetErrorText (dpy, event->error_code, buffer, BUFSIZ);
384 XGetErrorDatabaseText(dpy, mtype, "XError", "X Error", mesg, BUFSIZ); 388 XGetErrorDatabaseText (dpy, mtype, "XError", "X Error", mesg, BUFSIZ);
385 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");
386 rxvt_warn ("%s: %s\n", mesg, buffer); 390 rxvt_warn ("%s: %s\n", mesg, buffer);
387 XGetErrorDatabaseText(dpy, mtype, "MajorCode", "Request Major code %d", mesg, BUFSIZ); 391 XGetErrorDatabaseText (dpy, mtype, "MajorCode", "Request Major code %d", mesg, BUFSIZ);
388 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->request_code); 392 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->request_code);
389 sprintf(number, "%d", event->request_code); 393 sprintf (number, "%d", event->request_code);
390 XGetErrorDatabaseText(dpy, "XRequest", number, "", buffer, BUFSIZ); 394 XGetErrorDatabaseText (dpy, "XRequest", number, "", buffer, BUFSIZ);
391 rxvt_warn ("(which is %s)\n", buffer); 395 rxvt_warn ("(which is %s)\n", buffer);
396
392 if (event->request_code >= 128) { 397 if (event->request_code >= 128)
398 {
393 XGetErrorDatabaseText(dpy, mtype, "MinorCode", "Request Minor code %d", 399 XGetErrorDatabaseText (dpy, mtype, "MinorCode", "Request Minor code %d", mesg, BUFSIZ);
394 mesg, BUFSIZ);
395 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->minor_code); 400 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->minor_code);
396 } 401 }
402
397 if ((event->error_code == BadWindow) || 403 if (event->error_code == BadWindow
398 (event->error_code == BadPixmap) || 404 || event->error_code == BadPixmap
399 (event->error_code == BadCursor) || 405 || event->error_code == BadCursor
400 (event->error_code == BadFont) || 406 || event->error_code == BadFont
401 (event->error_code == BadDrawable) || 407 || event->error_code == BadDrawable
402 (event->error_code == BadColor) || 408 || event->error_code == BadColor
403 (event->error_code == BadGC) || 409 || event->error_code == BadGC
404 (event->error_code == BadIDChoice) || 410 || event->error_code == BadIDChoice
405 (event->error_code == BadValue) || 411 || event->error_code == BadValue
406 (event->error_code == BadAtom)) { 412 || event->error_code == BadAtom)
413 {
407 if (event->error_code == BadValue) 414 if (event->error_code == BadValue)
408 XGetErrorDatabaseText(dpy, mtype, "Value", "Value 0x%x", 415 XGetErrorDatabaseText(dpy, mtype, "Value", "Value 0x%x", mesg, BUFSIZ);
409 mesg, BUFSIZ);
410 else if (event->error_code == BadAtom) 416 else if (event->error_code == BadAtom)
411 XGetErrorDatabaseText(dpy, mtype, "AtomID", "AtomID 0x%x", 417 XGetErrorDatabaseText(dpy, mtype, "AtomID", "AtomID 0x%x", mesg, BUFSIZ);
412 mesg, BUFSIZ); 418 else
413 else
414 XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x", 419 XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x", mesg, BUFSIZ);
415 mesg, BUFSIZ); 420
416 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid); 421 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid);
417 } 422 }
423
418 XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d", 424 XGetErrorDatabaseText (dpy, mtype, "ErrorSerial", "Error Serial #%d", mesg, BUFSIZ);
419 mesg, BUFSIZ);
420 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial); 425 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial);
421} 426}
422#endif 427#endif
423 428
424int 429int ecb_cold
425rxvt_xerror_handler (Display *display, XErrorEvent *event) 430rxvt_xerror_handler (Display *display, XErrorEvent *event)
426{ 431{
427 if (GET_R->allowedxerror == -1) 432 if (GET_R->allowedxerror == -1)
428 GET_R->allowedxerror = event->error_code; 433 GET_R->allowedxerror = event->error_code;
429 else 434 else
… …
438 } 443 }
439 444
440 return 0; 445 return 0;
441} 446}
442 447
443int 448int ecb_cold
444rxvt_xioerror_handler (Display *display) 449rxvt_xioerror_handler (Display *display)
445{ 450{
446 rxvt_warn ("X connection to '%s' broken, unable to recover, exiting.\n", 451 rxvt_warn ("X connection to '%s' broken, unable to recover, exiting.\n",
447 DisplayString (display)); 452 DisplayString (display));
448 rxvt_emergency_cleanup (); 453 rxvt_emergency_cleanup ();
… …
471 rxvt_emergency_cleanup (); 476 rxvt_emergency_cleanup ();
472 w.stop (); 477 w.stop ();
473 kill (getpid (), w.signum); 478 kill (getpid (), w.signum);
474} 479}
475 480
481static void
482rxvt_get_ttymode (struct termios *tio)
483{
484 if (tcgetattr (STDIN_FILENO, tio) < 0)
485 memset (tio, 0, sizeof (struct termios));
486
487 for (int i = 0; i < NCCS; i++)
488 tio->c_cc[i] = VDISABLE;
489
490 tio->c_cc[VINTR] = CINTR;
491 tio->c_cc[VQUIT] = CQUIT;
492 tio->c_cc[VERASE] = CERASE;
493#ifdef VERASE2
494 tio->c_cc[VERASE2] = CERASE2;
495#endif
496 tio->c_cc[VKILL] = CKILL;
497 tio->c_cc[VEOF] = CEOF;
498 tio->c_cc[VSTART] = CSTART;
499 tio->c_cc[VSTOP] = CSTOP;
500 tio->c_cc[VSUSP] = CSUSP;
501# ifdef VDSUSP
502 tio->c_cc[VDSUSP] = CDSUSP;
503# endif
504# ifdef VREPRINT
505 tio->c_cc[VREPRINT] = CRPRNT;
506# endif
507# ifdef VDISCRD
508 tio->c_cc[VDISCRD] = CFLUSH;
509# endif
510# ifdef VWERSE
511 tio->c_cc[VWERSE] = CWERASE;
512# endif
513# ifdef VLNEXT
514 tio->c_cc[VLNEXT] = CLNEXT;
515# endif
516# ifdef VSTATUS
517 tio->c_cc[VSTATUS] = CSTATUS;
518# endif
519
520# if VMIN != VEOF
521 tio->c_cc[VMIN] = 1;
522# endif
523# if VTIME != VEOL
524 tio->c_cc[VTIME] = 0;
525# endif
526
527 /* input modes */
528 tio->c_iflag = (BRKINT | IGNPAR | ICRNL
529# ifdef IMAXBEL
530 | IMAXBEL
531# endif
532 | IXON);
533
534 /* output modes */
535 tio->c_oflag = (OPOST | ONLCR);
536
537 /* control modes */
538 tio->c_cflag = (CS8 | CREAD);
539
540 /* local modes */
541 tio->c_lflag = (ISIG | ICANON | IEXTEN | ECHO
542# if defined (ECHOCTL) && defined (ECHOKE)
543 | ECHOCTL | ECHOKE
544# endif
545 | ECHOE | ECHOK);
546}
547
476char **rxvt_environ; // startup environment 548char **rxvt_environ; // startup environment
477 549
478void 550void
479rxvt_init () 551rxvt_init ()
480{ 552{
481 ptytty::init (); 553 assert (("fontMask must not overlap other RS masks",
554 0 == (RS_fontMask & (RS_Sel | RS_baseattrMask | RS_customMask | RS_bgMask | RS_fgMask))));
482 555
556 rxvt_get_ttymode (&rxvt_term::def_tio);
557
558 // get rid of stdin/stdout as we don't need them, to free resources
559 dup2 (STDERR_FILENO, STDIN_FILENO);
560 dup2 (STDERR_FILENO, STDOUT_FILENO);
561
483 if (!ev_default_loop (0)) 562 if (!ev_default_loop ())
484 rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n"); 563 rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n");
485 564
486 rxvt_environ = environ; 565 rxvt_environ = environ;
487 566
488 signal (SIGHUP, SIG_IGN); 567 signal (SIGHUP, SIG_IGN);
489 signal (SIGPIPE, SIG_IGN); 568 signal (SIGPIPE, SIG_IGN);
490 569
491 sig_handlers.sw_term.start (SIGTERM); ev_unref (); 570 sig_handlers.sw_term.start (SIGTERM); ev_unref ();
492 sig_handlers.sw_int.start (SIGINT); ev_unref (); 571 sig_handlers.sw_int.start (SIGINT); ev_unref ();
493
494 /* need to trap SIGURG for SVR4 (Unixware) rlogin */
495 /* signal (SIGURG, SIG_DFL); */
496 572
497 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); 573 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
498 // TODO: handle this with exceptions and tolerate the memory loss 574 // TODO: handle this with exceptions and tolerate the memory loss
499 XSetIOErrorHandler (rxvt_xioerror_handler); 575 XSetIOErrorHandler (rxvt_xioerror_handler);
500 576
501 XrmInitialize (); 577 XrmInitialize ();
578
579#if HAVE_PIXBUF
580 g_type_init ();
581#endif
502} 582}
503 583
504/*----------------------------------------------------------------------*/ 584/*----------------------------------------------------------------------*/
505/* 585/*
506 * window size/position calculations for XSizeHint and other storage. 586 * window size/position calculations for XSizeHint and other storage.
… …
627 if (recalc_y) 707 if (recalc_y)
628 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth; 708 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth;
629 709
630 ncol = width / fwidth; 710 ncol = width / fwidth;
631 nrow = height / fheight; 711 nrow = height / fheight;
712
713 // When the size of the vt window is not a multiple of the cell
714 // size, i.e., when the wm does not honour our size hints, there are
715 // extra areas not covered by the terminal screen. Such gaps, when a
716 // bg pixmap is set, would have to be cleared manually to properly
717 // refresh the background. We take the simpler route and shrink the
718 // vt window so as to avoid creating gaps.
719 vt_width = ncol * fwidth;
720 vt_height = nrow * fheight;
632} 721}
633 722
634/*----------------------------------------------------------------------*/ 723/*----------------------------------------------------------------------*/
635/* 724/*
636 * Tell the teletype handler what size the window is. 725 * Tell the teletype handler what size the window is.
… …
644 733
645 struct winsize ws; 734 struct winsize ws;
646 735
647 ws.ws_col = ncol; 736 ws.ws_col = ncol;
648 ws.ws_row = nrow; 737 ws.ws_row = nrow;
649 ws.ws_xpixel = width; 738 ws.ws_xpixel = vt_width;
650 ws.ws_ypixel = height; 739 ws.ws_ypixel = vt_height;
651 (void)ioctl (pty->pty, TIOCSWINSZ, &ws); 740 ioctl (pty->pty, TIOCSWINSZ, &ws);
652 741
653#if 0 742#if 0
654 // TIOCSWINSZ is supposed to do this automatically and correctly 743 // TIOCSWINSZ is supposed to do this automatically and correctly
655 if (cmd_pid) /* force through to the command */ 744 if (cmd_pid) /* force through to the command */
656 kill (-cmd_pid, SIGWINCH); 745 kill (-cmd_pid, SIGWINCH);
657#endif 746#endif
658} 747}
659 748
660/*----------------------------------------------------------------------*/ 749/*----------------------------------------------------------------------*/
661/* set_fonts () - load and set the various fonts 750/* load and set the various fonts */
662 *
663 * init = 1 - initialize
664 *
665 * fontname == FONT_UP - switch to bigger font
666 * fontname == FONT_DN - switch to smaller font
667 */
668bool 751bool
669rxvt_term::set_fonts () 752rxvt_term::set_fonts ()
670{ 753{
671 rxvt_fontset *fs = new rxvt_fontset (this); 754 rxvt_fontset *fs = new rxvt_fontset (this);
672 rxvt_fontprop prop; 755 rxvt_fontprop prop;
… …
686#endif 769#endif
687 770
688 delete fontset[0]; 771 delete fontset[0];
689 fontset[0] = fs; 772 fontset[0] = fs;
690 773
691 prop = (*fs)[1]->properties (); 774 prop = (*fs)[rxvt_fontset::firstFont]->properties ();
692 prop.height += lineSpace; 775 prop.width += letterSpace;
693 776
694 fs->set_prop (prop, false); 777 fs->set_prop (prop, false);
695 778
696 fwidth = prop.width; 779 fwidth = prop.width;
697 fheight = prop.height; 780 fheight = prop.height + lineSpace;
698 fbase = prop.ascent; 781 fbase = prop.ascent;
699 782
700 for (int style = 1; style < 4; style++) 783 for (int style = 1; style < 4; style++)
701 { 784 {
702#if ENABLE_STYLES 785#if ENABLE_STYLES
… …
728#else 811#else
729 fontset[style] = fontset[0]; 812 fontset[style] = fontset[0];
730#endif 813#endif
731 } 814 }
732 815
733 if (parent[0]) 816 if (parent)
734 { 817 {
735 resize_all_windows (0, 0, 0); 818 resize_all_windows (0, 0, 0);
736 scr_remap_chars (); 819 scr_remap_chars ();
737 scr_touch (true); 820 scr_touch (true);
738 } 821 }
… …
741} 824}
742 825
743void 826void
744rxvt_term::set_string_property (Atom prop, const char *str, int len) 827rxvt_term::set_string_property (Atom prop, const char *str, int len)
745{ 828{
746 XChangeProperty (dpy, parent[0], 829 XChangeProperty (dpy, parent,
747 prop, XA_STRING, 8, PropModeReplace, 830 prop, XA_STRING, 8, PropModeReplace,
748 (const unsigned char *)str, len >= 0 ? len : strlen (str)); 831 (const unsigned char *)str, len >= 0 ? len : strlen (str));
749} 832}
750 833
751void 834void
835rxvt_term::set_mbstring_property (Atom prop, const char *str, int len)
836{
837 XTextProperty ct;
838
839 if (XmbTextListToTextProperty (dpy, (char **)&str, 1, XStdICCTextStyle, &ct) >= 0)
840 {
841 XSetTextProperty (dpy, parent, &ct, prop);
842 XFree (ct.value);
843 }
844}
845
846void
752rxvt_term::set_utf8_property (Atom prop, const char *str, int len) 847rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
753{ 848{
754 wchar_t *ws = rxvt_mbstowcs (str, len); 849 wchar_t *ws = rxvt_mbstowcs (str, len);
755 char *s = rxvt_wcstoutf8 (ws); 850 char *s = rxvt_wcstoutf8 (ws);
756 851
757 XChangeProperty (dpy, parent[0], 852 XChangeProperty (dpy, parent,
758 prop, xa[XA_UTF8_STRING], 8, PropModeReplace, 853 prop, xa[XA_UTF8_STRING], 8, PropModeReplace,
759 (const unsigned char *)s, strlen (s)); 854 (const unsigned char *)s, strlen (s));
760 855
761 free (s); 856 free (s);
762 free (ws); 857 free (ws);
… …
766/*----------------------------------------------------------------------*/ 861/*----------------------------------------------------------------------*/
767/* xterm sequences - title, iconName, color (exptl) */ 862/* xterm sequences - title, iconName, color (exptl) */
768void 863void
769rxvt_term::set_title (const char *str) 864rxvt_term::set_title (const char *str)
770{ 865{
771 set_string_property (XA_WM_NAME, str); 866 set_mbstring_property (XA_WM_NAME, str);
772#if ENABLE_EWMH 867#if ENABLE_EWMH
773 set_utf8_property (xa[XA_NET_WM_NAME], str); 868 set_utf8_property (xa[XA_NET_WM_NAME], str);
774#endif 869#endif
775} 870}
776 871
777void 872void
778rxvt_term::set_icon_name (const char *str) 873rxvt_term::set_icon_name (const char *str)
779{ 874{
780 set_string_property (XA_WM_ICON_NAME, str); 875 set_mbstring_property (XA_WM_ICON_NAME, str);
781#if ENABLE_EWMH 876#if ENABLE_EWMH
782 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str); 877 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str);
783#endif 878#endif
784} 879}
785 880
… …
852 947
853/*----------------------------------------------------------------------*/ 948/*----------------------------------------------------------------------*/
854/* 949/*
855 * find if fg/bg matches any of the normal (low-intensity) colors 950 * find if fg/bg matches any of the normal (low-intensity) colors
856 */ 951 */
857void 952char *
858rxvt_term::set_colorfgbg () 953rxvt_term::get_colorfgbg ()
859{ 954{
860 unsigned int i; 955 unsigned int i;
861 const char *xpmb = ""; 956 const char *xpmb = "";
862 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1]; 957 char fstr[] = "default";
958 char bstr[] = "default";
959 char *env_colorfgbg;
863 960
864 strcpy (fstr, "default");
865 strcpy (bstr, "default");
866 for (i = Color_Black; i <= Color_White; i++) 961 for (i = Color_Black; i <= Color_White; i++)
867 if (pix_colors[Color_fg] == pix_colors[i]) 962 if (pix_colors[Color_fg] == pix_colors[i])
868 { 963 {
869 sprintf (fstr, "%d", (i - Color_Black)); 964 sprintf (fstr, "%d", i - Color_Black);
870 break; 965 break;
871 } 966 }
872 967
873 for (i = Color_Black; i <= Color_White; i++) 968 for (i = Color_Black; i <= Color_White; i++)
874 if (pix_colors[Color_bg] == pix_colors[i]) 969 if (pix_colors[Color_bg] == pix_colors[i])
875 { 970 {
876 sprintf (bstr, "%d", (i - Color_Black)); 971 sprintf (bstr, "%d", i - Color_Black);
877#ifdef BG_IMAGE_FROM_FILE 972#if BG_IMAGE_FROM_FILE
878 xpmb = "default;"; 973 xpmb = "default;";
879#endif 974#endif
880 break; 975 break;
881 } 976 }
882 977
978 env_colorfgbg = (char *)rxvt_malloc (sizeof ("COLORFGBG=default;default;bg"));
883 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr); 979 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr);
980 return env_colorfgbg;
884} 981}
885 982
886/*----------------------------------------------------------------------*/ 983/*----------------------------------------------------------------------*/
887 984
888bool 985bool
… …
913 1010
914 window_calc (newwidth, newheight); 1011 window_calc (newwidth, newheight);
915 1012
916 bool set_hint = !HOOK_INVOKE ((this, HOOK_RESIZE_ALL_WINDOWS, DT_INT, newwidth, DT_INT, newheight, DT_END)); 1013 bool set_hint = !HOOK_INVOKE ((this, HOOK_RESIZE_ALL_WINDOWS, DT_INT, newwidth, DT_INT, newheight, DT_END));
917 1014
1015 // to avoid races between us and the wm, we clear the incremental size hints around the xresizewindow
918 if (set_hint) 1016 if (set_hint)
919 { 1017 {
920 szHint.flags &= ~(PBaseSize | PResizeInc); 1018 szHint.flags &= ~(PBaseSize | PResizeInc);
921 XSetWMNormalHints (dpy, parent[0], &szHint); 1019 XSetWMNormalHints (dpy, parent, &szHint);
922 szHint.flags |= PBaseSize | PResizeInc; 1020 szHint.flags |= PBaseSize | PResizeInc;
923 } 1021 }
924 1022
925 if (!ignoreparent) 1023 if (!ignoreparent)
926 { 1024 {
… …
932 int x, y, x1, y1; 1030 int x, y, x1, y1;
933 int dx, dy; 1031 int dx, dy;
934 unsigned int unused_w1, unused_h1, unused_b1, unused_d1; 1032 unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
935 Window unused_cr; 1033 Window unused_cr;
936 1034
937 XTranslateCoordinates (dpy, parent[0], display->root, 1035 XTranslateCoordinates (dpy, parent, display->root,
938 0, 0, &x, &y, &unused_cr); 1036 0, 0, &x, &y, &unused_cr);
939 XGetGeometry (dpy, parent[0], &unused_cr, &x1, &y1, 1037 XGetGeometry (dpy, parent, &unused_cr, &x1, &y1,
940 &unused_w1, &unused_h1, &unused_b1, &unused_d1); 1038 &unused_w1, &unused_h1, &unused_b1, &unused_d1);
941 /* 1039 /*
942 * if display->root isn't the parent window, a WM will probably have offset 1040 * if display->root isn't the parent window, a WM will probably have offset
943 * our position for handles and decorations. Counter it 1041 * our position for handles and decorations. Counter it
944 */ 1042 */
… …
961 if (y < y1) /* top half */ 1059 if (y < y1) /* top half */
962 dy = 0; 1060 dy = 0;
963 else if (y == y1) /* exact center */ 1061 else if (y == y1) /* exact center */
964 dy /= 2; 1062 dy /= 2;
965 1063
966 XMoveResizeWindow (dpy, parent[0], x + dx, y + dy, 1064 XMoveResizeWindow (dpy, parent, x + dx, y + dy,
967 szHint.width, szHint.height); 1065 szHint.width, szHint.height);
968#else 1066#else
969 XResizeWindow (dpy, parent[0], szHint.width, szHint.height); 1067 XResizeWindow (dpy, parent, szHint.width, szHint.height);
970#endif 1068#endif
971 } 1069 }
1070
1071 if (set_hint)
1072 XSetWMNormalHints (dpy, parent, &szHint);
972 1073
973 fix_screen = ncol != prev_ncol || nrow != prev_nrow; 1074 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
974 1075
975 if (fix_screen || newwidth != old_width || newheight != old_height) 1076 if (fix_screen || newwidth != old_width || newheight != old_height)
976 { 1077 {
977 if (scrollBar.state) 1078 if (scrollBar.state)
978 scrollBar.resize (); 1079 scrollBar.resize ();
979 1080
980 XMoveResizeWindow (dpy, vt, 1081 XMoveResizeWindow (dpy, vt,
981 window_vt_x, window_vt_y, 1082 window_vt_x, window_vt_y,
982 width, height); 1083 vt_width, vt_height);
1084
1085 HOOK_INVOKE ((this, HOOK_SIZE_CHANGE, DT_INT, newwidth, DT_INT, newheight, DT_END));
983 1086
984#ifdef HAVE_BG_PIXMAP 1087#ifdef HAVE_BG_PIXMAP
985 if (bgPixmap.window_size_sensitive ()) 1088 if (bg_window_size_sensitive ())
986 update_background (); 1089 update_background ();
987#endif 1090#endif
988
989 scr_clear ();
990 } 1091 }
991
992 if (set_hint)
993 XSetWMNormalHints (dpy, parent[0], &szHint);
994 1092
995 if (fix_screen || old_height == 0) 1093 if (fix_screen || old_height == 0)
996 scr_reset (); 1094 scr_reset ();
997 1095
998 // TODO, with nvidia-8178, resizes kill the alpha channel, report if not fixed in newer version
999 //scr_touch (false);
1000
1001#ifdef HAVE_BG_PIXMAP
1002// TODO: this don't seem to have any effect - do we still need it ? If so - in which case exactly ?
1003// if (bgPixmap.pixmap)
1004// scr_touch (false);
1005#endif
1006
1007#ifdef USE_XIM 1096#if USE_XIM
1008 IMSetPosition (); 1097 im_set_position ();
1009#endif 1098#endif
1010} 1099}
1011 1100
1012/* 1101/*
1013 * Set the width/height of the vt window in characters. Units are pixels. 1102 * Set the width/height of the vt window in characters. Units are pixels.
… …
1026 newwidth = wattr.width - szHint.base_width; 1115 newwidth = wattr.width - szHint.base_width;
1027 if (newheight == 0) 1116 if (newheight == 0)
1028 newheight = wattr.height - szHint.base_height; 1117 newheight = wattr.height - szHint.base_height;
1029 } 1118 }
1030 1119
1031 if (newwidth != width || newheight != height) 1120 if (newwidth != vt_width || newheight != vt_height)
1032 { 1121 {
1033 newwidth += szHint.base_width; 1122 newwidth += szHint.base_width;
1034 newheight += szHint.base_height; 1123 newheight += szHint.base_height;
1035 resize_all_windows (newwidth, newheight, 0); 1124 resize_all_windows (newwidth, newheight, 0);
1036 } 1125 }
1037} 1126}
1038 1127
1039/* -------------------------------------------------------------------- * 1128/* -------------------------------------------------------------------- *
1040 * - X INPUT METHOD ROUTINES - * 1129 * - X INPUT METHOD ROUTINES - *
1041 * -------------------------------------------------------------------- */ 1130 * -------------------------------------------------------------------- */
1042#ifdef USE_XIM 1131#if USE_XIM
1043 1132
1044void 1133void
1045rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg) 1134rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg)
1046{ 1135{
1047 fg = pix_colors [Color_fg]; 1136 fg = pix_colors [Color_fg];
… …
1074 status_rect.height = fheight; 1163 status_rect.height = fheight;
1075} 1164}
1076 1165
1077/* Checking whether input method is running. */ 1166/* Checking whether input method is running. */
1078bool 1167bool
1079rxvt_term::IMisRunning () 1168rxvt_term::im_is_running ()
1080{ 1169{
1081 char *p;
1082 Atom atom; 1170 Atom atom;
1083 Window win; 1171 Window win;
1084 char server[IMBUFSIZ]; 1172 char server[IMBUFSIZ];
1085 1173
1086 /* get current locale modifier */ 1174 /* get current locale modifier */
1087 if ((p = XSetLocaleModifiers (NULL)) != NULL) 1175 if (char *p = XSetLocaleModifiers (0))
1088 { 1176 {
1089 strcpy (server, "@server="); 1177 strcpy (server, "@server=");
1090 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */ 1178 strncat (server, p + 4, IMBUFSIZ - 9); /* skip "@im=" */
1091 1179
1092 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */ 1180 if (p = strchr (server + 1, '@')) /* first one only */
1093 *p = '\0'; 1181 *p = '\0';
1094 1182
1095 atom = XInternAtom (dpy, server, False); 1183 atom = XInternAtom (dpy, server, False);
1096 win = XGetSelectionOwner (dpy, atom); 1184 win = XGetSelectionOwner (dpy, atom);
1097 1185
1098 if (win != None) 1186 if (win != None)
1099 return True; 1187 return true;
1100 } 1188 }
1101 1189
1102 return False; 1190 return false;
1103} 1191}
1104 1192
1105void 1193void
1106rxvt_term::IMSendSpot () 1194rxvt_term::im_send_spot ()
1107{ 1195{
1108 XPoint nspot; 1196 XPoint nspot;
1109 XVaNestedList preedit_attr; 1197 XVaNestedList preedit_attr;
1110 1198
1111 if (!Input_Context 1199 if (!Input_Context
… …
1164 1252
1165 term->make_current (); 1253 term->make_current ();
1166 1254
1167 if (text) 1255 if (text)
1168 { 1256 {
1169 void *str; 1257 wchar_t *str;
1170 1258
1171 if (!text->encoding_is_wchar && text->string.multi_byte) 1259 if (!text->encoding_is_wchar && text->string.multi_byte)
1172 { 1260 {
1173 // of course, X makes it ugly again 1261 // of course, X makes it ugly again
1174 if (term->rs[Rs_imLocale]) 1262 if (term->rs[Rs_imLocale])
1175 SET_LOCALE (term->rs[Rs_imLocale]); 1263 SET_LOCALE (term->rs[Rs_imLocale]);
1176 1264
1177 str = rxvt_temp_buf ((text->length + 1) * sizeof (wchar_t)); 1265 str = rxvt_temp_buf<wchar_t> (text->length + 1);
1178 mbstowcs ((wchar_t *)str, text->string.multi_byte, text->length + 1); 1266 mbstowcs (str, text->string.multi_byte, text->length + 1);
1179 1267
1180 if (term->rs[Rs_imLocale]) 1268 if (term->rs[Rs_imLocale])
1181 SET_LOCALE (term->locale); 1269 SET_LOCALE (term->locale);
1182 } 1270 }
1183 else 1271 else
1184 str = (void *)text->string.wide_char; 1272 str = text->string.wide_char;
1185 1273
1186 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW, 1274 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
1187 DT_INT, call_data->caret, 1275 DT_INT, call_data->caret,
1188 DT_INT, call_data->chg_first, 1276 DT_INT, call_data->chg_first,
1189 DT_INT, call_data->chg_length, 1277 DT_INT, call_data->chg_length,
… …
1217/* 1305/*
1218 * Try to open a XIM with the current modifiers, then see if we can 1306 * Try to open a XIM with the current modifiers, then see if we can
1219 * open a suitable preedit type 1307 * open a suitable preedit type
1220 */ 1308 */
1221bool 1309bool
1222rxvt_term::IM_get_IC (const char *modifiers) 1310rxvt_term::im_get_ic (const char *modifiers)
1223{ 1311{
1224 int i, j, found; 1312 int i, j, found;
1225 XIM xim; 1313 XIM xim;
1226 XPoint spot; 1314 XPoint spot;
1227 XRectangle rect, status_rect, needed_rect; 1315 XRectangle rect, status_rect, needed_rect;
1228 unsigned long fg, bg; 1316 unsigned long fg, bg;
1229 const char *p; 1317 const char *p;
1230 char **s; 1318 char **s;
1231 XIMStyles *xim_styles; 1319 XIMStyles *xim_styles;
1232#ifdef ENABLE_XIM_ONTHESPOT
1233 XIMCallback xcb[4];
1234#endif
1235 1320
1236 set_environ (envv); 1321 set_environ (envv);
1237 1322
1238 if (! ((p = XSetLocaleModifiers (modifiers)) && *p)) 1323 if (! ((p = XSetLocaleModifiers (modifiers)) && *p))
1239 return false; 1324 return false;
… …
1260 p = pet[pi]; 1345 p = pet[pi];
1261 1346
1262 if (!p) 1347 if (!p)
1263 continue; 1348 continue;
1264 1349
1265 s = rxvt_splitcommastring (p); 1350 s = rxvt_strsplit (',', p);
1266 1351
1267 for (i = found = 0; !found && s[i]; i++) 1352 for (i = found = 0; !found && s[i]; i++)
1268 { 1353 {
1269 if (!strcmp (s[i], "OverTheSpot")) 1354 if (!strcmp (s[i], "OverTheSpot"))
1270 input_style = XIMPreeditPosition | XIMStatusNothing; 1355 input_style = XIMPreeditPosition | XIMStatusNothing;
… …
1282 input_style = XIMPreeditNothing | XIMStatusNothing; 1367 input_style = XIMPreeditNothing | XIMStatusNothing;
1283 1368
1284 for (j = 0; j < xim_styles->count_styles; j++) 1369 for (j = 0; j < xim_styles->count_styles; j++)
1285 if (input_style == xim_styles->supported_styles[j]) 1370 if (input_style == xim_styles->supported_styles[j])
1286 { 1371 {
1287 rxvt_freecommastring (s); 1372 rxvt_free_strsplit (s);
1288 1373
1289 found = 1; 1374 found = 1;
1290 goto foundpet; 1375 goto foundpet;
1291 } 1376 }
1292 1377
1293 } 1378 }
1294 1379
1295 rxvt_freecommastring (s); 1380 rxvt_free_strsplit (s);
1296 } 1381 }
1297 1382
1298foundpet: 1383foundpet:
1299 1384
1300 XFree (xim_styles); 1385 XFree (xim_styles);
… …
1379 NULL); 1464 NULL);
1380 } 1465 }
1381#if ENABLE_XIM_ONTHESPOT 1466#if ENABLE_XIM_ONTHESPOT
1382 else if (input_style & XIMPreeditCallbacks) 1467 else if (input_style & XIMPreeditCallbacks)
1383 { 1468 {
1469 XIMCallback xcb[4];
1470
1384 im_set_position (spot); 1471 im_set_position (spot);
1385 1472
1386 xcb[0].client_data = (XPointer)this; xcb[0].callback = (XIMProc)xim_preedit_start; 1473 xcb[0].client_data = (XPointer)this; xcb[0].callback = (XIMProc)xim_preedit_start;
1387 xcb[1].client_data = (XPointer)this; xcb[1].callback = (XIMProc)xim_preedit_done; 1474 xcb[1].client_data = (XPointer)this; xcb[1].callback = (XIMProc)xim_preedit_done;
1388 xcb[2].client_data = (XPointer)this; xcb[2].callback = (XIMProc)xim_preedit_draw; 1475 xcb[2].client_data = (XPointer)this; xcb[2].callback = (XIMProc)xim_preedit_draw;
… …
1403#endif 1490#endif
1404 1491
1405 Input_Context = XCreateIC (xim, 1492 Input_Context = XCreateIC (xim,
1406 XNInputStyle, input_style, 1493 XNInputStyle, input_style,
1407 XNClientWindow, vt, 1494 XNClientWindow, vt,
1408 XNFocusWindow, parent[0], 1495 XNFocusWindow, parent,
1409 preedit_attr ? XNPreeditAttributes : NULL, 1496 preedit_attr ? XNPreeditAttributes : NULL,
1410 preedit_attr, 1497 preedit_attr,
1411 status_attr ? XNStatusAttributes : NULL, 1498 status_attr ? XNStatusAttributes : NULL,
1412 status_attr, NULL); 1499 status_attr, NULL);
1413 1500
… …
1426 // unfortunately, only the focus window is used by XIM, hard to fix 1513 // unfortunately, only the focus window is used by XIM, hard to fix
1427 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL)) 1514 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL))
1428 vt_select_input (); 1515 vt_select_input ();
1429#endif 1516#endif
1430 1517
1431 IMSetPosition (); 1518 im_set_position ();
1432 1519
1433 return true; 1520 return true;
1434} 1521}
1435 1522
1436void 1523void
… …
1446 im_destroy (); 1533 im_destroy ();
1447 1534
1448 if (Input_Context) 1535 if (Input_Context)
1449 return; 1536 return;
1450 1537
1451#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1452 if (rs[Rs_imLocale]) 1538 if (rs[Rs_imLocale])
1453 SET_LOCALE (rs[Rs_imLocale]); 1539 SET_LOCALE (rs[Rs_imLocale]);
1454#endif
1455 1540
1456 p = rs[Rs_inputMethod]; 1541 p = rs[Rs_inputMethod];
1457 if (p && *p) 1542 if (p && *p)
1458 { 1543 {
1459 bool found = false; 1544 bool found = false;
1460 1545
1461 s = rxvt_splitcommastring (p); 1546 s = rxvt_strsplit (',', p);
1462 1547
1463 for (i = 0; s[i]; i++) 1548 for (i = 0; s[i]; i++)
1464 { 1549 {
1465 if (*s[i]) 1550 if (*s[i])
1466 { 1551 {
1467 strcpy (buf, "@im="); 1552 strcpy (buf, "@im=");
1468 strncat (buf, s[i], IMBUFSIZ - 5); 1553 strncat (buf, s[i], IMBUFSIZ - 5);
1469 if (IM_get_IC (buf)) 1554 if (im_get_ic (buf))
1470 { 1555 {
1471 found = true; 1556 found = true;
1472 break; 1557 break;
1473 } 1558 }
1474 } 1559 }
1475 } 1560 }
1476 1561
1477 rxvt_freecommastring (s); 1562 rxvt_free_strsplit (s);
1478 1563
1479 if (found) 1564 if (found)
1480 goto done; 1565 goto done;
1481 } 1566 }
1482 1567
1483 /* try with XMODIFIERS env. var. */ 1568 /* try with XMODIFIERS env. var. */
1484 if (IM_get_IC ("")) 1569 if (im_get_ic (""))
1485 goto done; 1570 goto done;
1486 1571
1487 /* try with no modifiers base IF the user didn't specify an IM */ 1572 /* try with no modifiers base IF the user didn't specify an IM */
1488 if (IM_get_IC ("@im=none")) 1573 if (im_get_ic ("@im=none"))
1489 goto done; 1574 goto done;
1490 1575
1491done: 1576done:
1492#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1493 if (rs[Rs_imLocale]) 1577 if (rs[Rs_imLocale])
1494 SET_LOCALE (locale); 1578 SET_LOCALE (locale);
1495#endif
1496} 1579}
1497 1580
1498void 1581void
1499rxvt_term::IMSetPosition () 1582rxvt_term::im_set_position ()
1500{ 1583{
1501 XRectangle preedit_rect, status_rect, *needed_rect; 1584 XRectangle preedit_rect, status_rect, *needed_rect;
1502 XVaNestedList preedit_attr, status_attr; 1585 XVaNestedList preedit_attr, status_attr;
1503 1586
1504 if (!Input_Context 1587 if (!Input_Context
1505 || !focus 1588 || !focus
1506 || !(input_style & (XIMPreeditArea | XIMPreeditPosition)) 1589 || !(input_style & (XIMPreeditArea | XIMPreeditPosition))
1507 || !IMisRunning ()) 1590 || !im_is_running ())
1508 return; 1591 return;
1509 1592
1510 if (input_style & XIMPreeditPosition) 1593 if (input_style & XIMPreeditPosition)
1511 { 1594 {
1512 im_set_size (preedit_rect); 1595 im_set_size (preedit_rect);
… …
1542 1625
1543void 1626void
1544rxvt_term::get_window_origin (int &x, int &y) 1627rxvt_term::get_window_origin (int &x, int &y)
1545{ 1628{
1546 Window cr; 1629 Window cr;
1547 XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr); 1630 XTranslateCoordinates (dpy, parent, display->root, 0, 0, &x, &y, &cr);
1548/* fprintf (stderr, "origin is %+d%+d\n", x, y);*/
1549}
1550
1551Pixmap
1552rxvt_term::get_pixmap_property (int prop_id)
1553{
1554 if (prop_id > 0 && prop_id < NUM_XA)
1555 if (xa[prop_id])
1556 {
1557 int aformat;
1558 unsigned long nitems, bytes_after;
1559 Atom atype;
1560 unsigned char *prop = NULL;
1561 int result = XGetWindowProperty (dpy, display->root, xa[prop_id],
1562 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1563 &nitems, &bytes_after, &prop);
1564 if (result == Success && prop && atype == XA_PIXMAP)
1565 return *(Pixmap *)prop;
1566 }
1567
1568 return None;
1569} 1631}
1570 1632
1571#ifdef HAVE_BG_PIXMAP 1633#ifdef HAVE_BG_PIXMAP
1572# if TRACE_PIXMAPS
1573# undef update_background
1574void
1575rxvt_term::trace_update_background (const char *file, int line)
1576{
1577 fprintf (stderr, "%s:%d:update_background()\n", file, line);
1578 update_background ();
1579}
1580# endif
1581 1634
1582void 1635void
1583rxvt_term::update_background () 1636rxvt_term::update_background ()
1584{ 1637{
1585 if (update_background_ev.is_active ()) 1638 if (update_background_ev.is_active ())
1586 return; 1639 return;
1587 1640
1588 bgPixmap.invalidate (); 1641 bg_invalidate ();
1589 1642
1643 if (!mapped)
1644 return;
1645
1590 ev_tstamp to_wait = 0.5 - (ev::now () - bgPixmap.valid_since); 1646 ev_tstamp to_wait = 0.5 - (ev::now () - bg_valid_since);
1591 1647
1592 if (to_wait <= 0.) 1648 if (to_wait <= 0.)
1593 bgPixmap.render (); 1649 bg_render ();
1594 else 1650 else
1595 update_background_ev.start (to_wait); 1651 update_background_ev.start (to_wait);
1596} 1652}
1597 1653
1598void 1654void
1599rxvt_term::update_background_cb (ev::timer &w, int revents) 1655rxvt_term::update_background_cb (ev::timer &w, int revents)
1600{ 1656{
1601 make_current (); 1657 make_current ();
1602 1658
1603 update_background_ev.stop (); 1659 update_background_ev.stop ();
1604 bgPixmap.render (); 1660 bg_render ();
1605 refresh_check (); 1661 refresh_check ();
1606} 1662}
1607 1663
1608#endif /* HAVE_BG_PIXMAP */ 1664#endif /* HAVE_BG_PIXMAP */
1609 1665

Diff Legend

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