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

Diff Legend

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