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.300 by root, Sat Jan 19 00:24:53 2008 UTC vs.
Revision 1.367 by root, Wed Jan 18 11:47:51 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 <cassert>
40#include <csignal> 42#include <csignal>
41#include <cstring> 43#include <cstring>
42 44
43#include <termios.h> 45#include <termios.h>
44 46
… …
49# ifdef HAVE_SETLOCALE 51# ifdef HAVE_SETLOCALE
50# include <clocale> 52# include <clocale>
51# endif 53# endif
52#endif 54#endif
53 55
56struct termios rxvt_term::def_tio;
54vector<rxvt_term *> rxvt_term::termlist; 57vector<rxvt_term *> rxvt_term::termlist;
55 58
56// used to tell global functions which terminal instance is "active" 59// used to tell global functions which terminal instance is "active"
57rxvt_t rxvt_current_term; 60rxvt_t rxvt_current_term;
58 61
… …
93text_t rxvt_composite_vec::compose (unicode_t c1, unicode_t c2) 96text_t rxvt_composite_vec::compose (unicode_t c1, unicode_t c2)
94{ 97{
95 compose_char *cc; 98 compose_char *cc;
96 99
97 // break compose chains, as stupid readline really likes to duplicate 100 // break compose chains, as stupid readline really likes to duplicate
98 // composing characters for some reason near the end of a line. 101 // composing characters for some reason, near the end of a line.
99 cc = (*this)[c1]; 102 cc = (*this)[c1];
100 while (cc) 103 while (cc)
101 { 104 {
102 if (cc->c2 == c2) return c1; 105 if (cc->c2 == c2) return c1;
103 cc = (*this)[cc->c1]; 106 cc = (*this)[cc->c1];
104 } 107 }
105 108
106 // check to see wether this combination already exists otherwise 109 // check to see whether this combination already exists otherwise
107 for (cc = v.end (); cc-- > v.begin (); ) 110 for (cc = v.begin (); cc < v.end (); cc++)
108 {
109 if (cc->c1 == c1 && cc->c2 == c2) 111 if (cc->c1 == c1 && cc->c2 == c2)
110 return COMPOSE_LO + (cc - v.begin ()); 112 return COMPOSE_LO + (cc - v.begin ());
111 }
112 113
113 // allocate a new combination 114 // allocate a new combination
114 if (v.size () == COMPOSE_HI - COMPOSE_LO + 1) 115 if (v.size () == COMPOSE_HI - COMPOSE_LO + 1)
115 { 116 {
116 static int seen; 117 static int seen;
117 118
118 if (!seen++) 119 if (!seen++)
119 fprintf (stderr, "too many unrepresentable composite characters, try --enable-unicode3\n"); 120 rxvt_warn ("too many unrepresentable composite characters, try --enable-unicode3\n");
120 121
121 return REPLACEMENT_CHAR; 122 return REPLACEMENT_CHAR;
122 } 123 }
123 124
124 v.push_back (compose_char (c1, c2)); 125 v.push_back (compose_char (c1, c2));
… …
172 slip_wheel_ev.set <rxvt_term, &rxvt_term::slip_wheel_cb> (this); 173 slip_wheel_ev.set <rxvt_term, &rxvt_term::slip_wheel_cb> (this);
173#endif 174#endif
174#if ENABLE_TRANSPARENCY || ENABLE_PERL 175#if ENABLE_TRANSPARENCY || ENABLE_PERL
175 rootwin_ev.set <rxvt_term, &rxvt_term::rootwin_cb> (this), 176 rootwin_ev.set <rxvt_term, &rxvt_term::rootwin_cb> (this),
176#endif 177#endif
177#ifdef HAVE_SCROLLBARS
178 scrollbar_ev.set <rxvt_term, &rxvt_term::x_cb> (this), 178 scrollbar_ev.set <rxvt_term, &rxvt_term::x_cb> (this),
179#endif
180#ifdef USE_XIM 179#ifdef USE_XIM
181 im_ev.set <rxvt_term, &rxvt_term::im_cb> (this), 180 im_ev.set <rxvt_term, &rxvt_term::im_cb> (this),
182#endif 181#endif
183#ifdef POINTER_BLANK 182#ifdef POINTER_BLANK
184 pointer_ev.set <rxvt_term, &rxvt_term::pointer_cb> (this); 183 pointer_ev.set <rxvt_term, &rxvt_term::pointer_cb> (this);
… …
188#endif 187#endif
189 child_ev.set <rxvt_term, &rxvt_term::child_cb> (this); 188 child_ev.set <rxvt_term, &rxvt_term::child_cb> (this);
190 flush_ev.set <rxvt_term, &rxvt_term::flush_cb> (this); 189 flush_ev.set <rxvt_term, &rxvt_term::flush_cb> (this);
191 destroy_ev.set <rxvt_term, &rxvt_term::destroy_cb> (this); 190 destroy_ev.set <rxvt_term, &rxvt_term::destroy_cb> (this);
192 pty_ev.set <rxvt_term, &rxvt_term::pty_cb> (this); 191 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); 192 termwin_ev.set <rxvt_term, &rxvt_term::x_cb> (this);
195 vt_ev.set <rxvt_term, &rxvt_term::x_cb> (this); 193 vt_ev.set <rxvt_term, &rxvt_term::x_cb> (this);
196 194
197 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base; 195 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base;
198 196
… …
227 delete fontset[i]; 225 delete fontset[i];
228#endif 226#endif
229 delete fontset[0]; 227 delete fontset[0];
230 228
231#ifdef HAVE_BG_PIXMAP 229#ifdef HAVE_BG_PIXMAP
232 bgPixmap.destroy (); 230 bg_destroy ();
233#endif 231#endif
234 232
235 if (display) 233 if (display)
236 { 234 {
237 selection_clear (); 235 selection_clear ();
236 selection_clear (true);
238 237
239#ifdef USE_XIM 238#ifdef USE_XIM
240 im_destroy (); 239 im_destroy ();
241#endif 240#endif
242#ifdef XTERM_SCROLLBAR 241 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); 242 if (gc) XFreeGC (dpy, gc);
267 243
268 delete drawable; 244 delete drawable;
269 // destroy all windows 245 // destroy all windows
270 if (parent[0]) 246 if (parent)
271 XDestroyWindow (dpy, parent[0]); 247 XDestroyWindow (dpy, parent);
272 248
273 for (int i = 0; i < TOTAL_COLORS; i++) 249 for (int i = 0; i < TOTAL_COLORS; i++)
274 if (ISSET_PIXCOLOR (i)) 250 if (ISSET_PIXCOLOR (i))
275 { 251 {
276 pix_colors_focused [i].free (this); 252 pix_colors_focused [i].free (this);
… …
290 /* clear all resources */ 266 /* clear all resources */
291 for (int i = 0; i < allocated.size (); i++) 267 for (int i = 0; i < allocated.size (); i++)
292 free (allocated [i]); 268 free (allocated [i]);
293 269
294 free (selection.text); 270 free (selection.text);
295 // TODO: manage env vars in child only(!) 271 free (selection.clip_text);
296 free (env_display);
297 free (env_term);
298 free (locale); 272 free (locale);
299 free (v_buffer); 273 free (v_buffer);
300 free (incr_buf); 274
275 delete selection_req;
301 276
302 delete envv; 277 delete envv;
303 delete argv; 278 delete argv;
304 279
305#ifdef KEYSYM_RESOURCE 280#ifdef KEYSYM_RESOURCE
… …
337 if (display) 312 if (display)
338 { 313 {
339#if USE_XIM 314#if USE_XIM
340 im_ev.stop (display); 315 im_ev.stop (display);
341#endif 316#endif
342#if HAVE_SCROLLBARS
343 scrollbar_ev.stop (display); 317 scrollbar_ev.stop (display);
344#endif
345#if ENABLE_TRANSPARENCY || ENABLE_PERL 318#if ENABLE_TRANSPARENCY || ENABLE_PERL
346 rootwin_ev.stop (display); 319 rootwin_ev.stop (display);
347#endif 320#endif
348 incr_ev.stop ();
349 termwin_ev.stop (display); 321 termwin_ev.stop (display);
350 vt_ev.stop (display); 322 vt_ev.stop (display);
351 } 323 }
352 324
353 flush_ev.stop (); 325 flush_ev.stop ();
… …
375rxvt_term::destroy_cb (ev::idle &w, int revents) 347rxvt_term::destroy_cb (ev::idle &w, int revents)
376{ 348{
377 make_current (); 349 make_current ();
378 350
379 delete this; 351 delete this;
352}
353
354void
355rxvt_term::set_option (uint8_t opt, bool set)
356{
357 if (!opt)
358 return;
359
360 uint8_t mask = 1 << (opt & 7);
361 uint8_t &val = options [opt >> 3];
362
363 val = val & ~mask | (set ? mask : 0);
380} 364}
381 365
382/*----------------------------------------------------------------------*/ 366/*----------------------------------------------------------------------*/
383/* 367/*
384 * Exit gracefully, clearing the utmp entry and restoring tty attributes 368 * Exit gracefully, clearing the utmp entry and restoring tty attributes
… …
398print_x_error (Display *dpy, XErrorEvent *event) 382print_x_error (Display *dpy, XErrorEvent *event)
399{ 383{
400 char buffer[BUFSIZ]; 384 char buffer[BUFSIZ];
401 char mesg[BUFSIZ]; 385 char mesg[BUFSIZ];
402 char number[32]; 386 char number[32];
403 char *mtype = "XlibMessage"; 387 const char mtype[] = "XlibMessage";
404 XGetErrorText(dpy, event->error_code, buffer, BUFSIZ); 388 XGetErrorText(dpy, event->error_code, buffer, BUFSIZ);
405 XGetErrorDatabaseText(dpy, mtype, "XError", "X Error", mesg, BUFSIZ); 389 XGetErrorDatabaseText(dpy, mtype, "XError", "X Error", mesg, BUFSIZ);
406 rxvt_warn ("An X Error occured, trying to continue after report.\n"); 390 rxvt_warn ("An X Error occurred, trying to continue after report.\n");
407 rxvt_warn ("%s: %s\n", mesg, buffer); 391 rxvt_warn ("%s: %s\n", mesg, buffer);
408 XGetErrorDatabaseText(dpy, mtype, "MajorCode", "Request Major code %d", mesg, BUFSIZ); 392 XGetErrorDatabaseText(dpy, mtype, "MajorCode", "Request Major code %d", mesg, BUFSIZ);
409 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->request_code); 393 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->request_code);
410 sprintf(number, "%d", event->request_code); 394 sprintf(number, "%d", event->request_code);
411 XGetErrorDatabaseText(dpy, "XRequest", number, "", buffer, BUFSIZ); 395 XGetErrorDatabaseText(dpy, "XRequest", number, "", buffer, BUFSIZ);
412 rxvt_warn ("(which is %s)\n", buffer); 396 rxvt_warn ("(which is %s)\n", buffer);
413 if (event->request_code >= 128) { 397 if (event->request_code >= 128) {
414 XGetErrorDatabaseText(dpy, mtype, "MinorCode", "Request Minor code %d", 398 XGetErrorDatabaseText(dpy, mtype, "MinorCode", "Request Minor code %d",
415 mesg, BUFSIZ); 399 mesg, BUFSIZ);
416 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->minor_code); 400 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->minor_code);
417 } 401 }
418 if ((event->error_code == BadWindow) || 402 if ((event->error_code == BadWindow) ||
419 (event->error_code == BadPixmap) || 403 (event->error_code == BadPixmap) ||
420 (event->error_code == BadCursor) || 404 (event->error_code == BadCursor) ||
421 (event->error_code == BadFont) || 405 (event->error_code == BadFont) ||
422 (event->error_code == BadDrawable) || 406 (event->error_code == BadDrawable) ||
423 (event->error_code == BadColor) || 407 (event->error_code == BadColor) ||
424 (event->error_code == BadGC) || 408 (event->error_code == BadGC) ||
425 (event->error_code == BadIDChoice) || 409 (event->error_code == BadIDChoice) ||
426 (event->error_code == BadValue) || 410 (event->error_code == BadValue) ||
427 (event->error_code == BadAtom)) { 411 (event->error_code == BadAtom)) {
428 if (event->error_code == BadValue) 412 if (event->error_code == BadValue)
429 XGetErrorDatabaseText(dpy, mtype, "Value", "Value 0x%x", 413 XGetErrorDatabaseText(dpy, mtype, "Value", "Value 0x%x",
430 mesg, BUFSIZ); 414 mesg, BUFSIZ);
431 else if (event->error_code == BadAtom) 415 else if (event->error_code == BadAtom)
432 XGetErrorDatabaseText(dpy, mtype, "AtomID", "AtomID 0x%x", 416 XGetErrorDatabaseText(dpy, mtype, "AtomID", "AtomID 0x%x",
433 mesg, BUFSIZ); 417 mesg, BUFSIZ);
434 else 418 else
435 XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x", 419 XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x",
436 mesg, BUFSIZ); 420 mesg, BUFSIZ);
437 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid); 421 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid);
438 } 422 }
439 XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d", 423 XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d",
440 mesg, BUFSIZ); 424 mesg, BUFSIZ);
441 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial); 425 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial);
442} 426}
443#endif 427#endif
444 428
445int 429int
… …
468 DisplayString (display)); 452 DisplayString (display));
469 rxvt_emergency_cleanup (); 453 rxvt_emergency_cleanup ();
470 _exit (EXIT_FAILURE); 454 _exit (EXIT_FAILURE);
471} 455}
472 456
473/*----------------------------------------------------------------------*/
474void
475rxvt_term::init (int argc, const char *const *argv, stringvec *envv)
476{
477 this->envv = envv;
478
479 SET_R (this);
480 set_locale ("");
481 set_environ (envv); // few things in X do not call setlocale :(
482
483 init_vars ();
484
485 init_secondary ();
486
487 const char **cmd_argv = init_resources (argc, argv);
488
489#ifdef KEYSYM_RESOURCE
490 keyboard->register_done ();
491#endif
492
493#ifdef HAVE_SCROLLBARS
494 if (option (Opt_scrollBar))
495 scrollBar.setIdle (); /* set existence for size calculations */
496#endif
497
498 pty = ptytty::create ();
499
500 create_windows (argc, argv);
501
502 init_xlocale ();
503
504 scr_reset (); // initialize screen
505
506#if 0
507 XSynchronize (dpy, True);
508#endif
509
510#ifdef HAVE_SCROLLBARS
511 if (option (Opt_scrollBar))
512 resize_scrollbar (); /* create and map scrollbar */
513#endif
514#ifdef HAVE_BG_PIXMAP
515 {
516 bgPixmap.set_target (this);
517 bgPixmap.invalidate ();
518
519#ifdef ENABLE_TRANSPARENCY
520 if (option (Opt_transparent))
521 {
522 bgPixmap.set_transparent ();
523
524#ifdef HAVE_AFTERIMAGE
525 if (rs [Rs_blurradius])
526 bgPixmap.set_blur_radius (rs [Rs_blurradius]);
527#endif
528 if (ISSET_PIXCOLOR (Color_tint))
529 bgPixmap.set_tint (pix_colors_focused [Color_tint]);
530
531 if (rs [Rs_shade])
532 bgPixmap.set_shade (rs [Rs_shade]);
533
534 bgPixmap.set_root_pixmap ();
535 XSelectInput (dpy, display->root, PropertyChangeMask);
536 rootwin_ev.start (display, display->root);
537 }
538#endif
539
540#ifdef BG_IMAGE_FROM_FILE
541 if (rs[Rs_backgroundPixmap])
542 {
543 const char *p = rs[Rs_backgroundPixmap];
544
545 if ((p = strchr (p, ';')) != 0)
546 {
547 p++;
548 bgPixmap.set_geometry (p);
549 }
550 else
551 bgPixmap.set_defaultGeometry ();
552
553 if (bgPixmap.set_file (rs[Rs_backgroundPixmap]))
554 if (!bgPixmap.window_position_sensitive ())
555 update_background ();
556 }
557#endif
558 }
559#endif
560
561#if ENABLE_PERL
562 rootwin_ev.start (display, display->root);
563#endif
564
565 set_colorfgbg ();
566
567 init_command (cmd_argv);
568
569 free (cmd_argv);
570
571 if (pty->pty >= 0)
572 pty_ev.start (pty->pty, ev::READ);
573
574 HOOK_INVOKE ((this, HOOK_START, DT_END));
575
576#if ENABLE_XEMBED
577 if (rs[Rs_embed])
578 {
579 long info[2] = { 0, XEMBED_MAPPED };
580
581 XChangeProperty (dpy, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
582 32, PropModeReplace, (unsigned char *)&info, 2);
583 }
584#endif
585
586 XMapWindow (dpy, vt);
587 XMapWindow (dpy, parent[0]);
588
589 refresh_check ();
590}
591
592static struct sig_handlers 457static struct sig_handlers
593{ 458{
594 ev::sig sw_term, sw_int; 459 ev::sig sw_term, sw_int;
595 460
596 /* 461 /*
… …
611 rxvt_emergency_cleanup (); 476 rxvt_emergency_cleanup ();
612 w.stop (); 477 w.stop ();
613 kill (getpid (), w.signum); 478 kill (getpid (), w.signum);
614} 479}
615 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
616char **rxvt_environ; // startup environment 548char **rxvt_environ; // startup environment
617 549
618void 550void
619rxvt_init () 551rxvt_init ()
620{ 552{
621 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))));
622 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
623 if (!ev_default_loop (0)) 562 if (!ev_default_loop ())
624 rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n"); 563 rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n");
625 564
626 rxvt_environ = environ; 565 rxvt_environ = environ;
627 566
628 signal (SIGHUP, SIG_IGN); 567 signal (SIGHUP, SIG_IGN);
629 signal (SIGPIPE, SIG_IGN); 568 signal (SIGPIPE, SIG_IGN);
630 569
631 sig_handlers.sw_term.start (SIGTERM); ev_unref (); 570 sig_handlers.sw_term.start (SIGTERM); ev_unref ();
632 sig_handlers.sw_int.start (SIGINT); ev_unref (); 571 sig_handlers.sw_int.start (SIGINT); ev_unref ();
633
634 /* need to trap SIGURG for SVR4 (Unixware) rlogin */
635 /* signal (SIGURG, SIG_DFL); */
636 572
637 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); 573 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
638 // TODO: handle this with exceptions and tolerate the memory loss 574 // TODO: handle this with exceptions and tolerate the memory loss
639 XSetIOErrorHandler (rxvt_xioerror_handler); 575 XSetIOErrorHandler (rxvt_xioerror_handler);
640 576
… …
648 */ 584 */
649void 585void
650rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight) 586rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
651{ 587{
652 short recalc_x, recalc_y; 588 short recalc_x, recalc_y;
653 int x, y, sb_w, flags; 589 int x, y, flags;
654 unsigned int w, h; 590 unsigned int w, h;
655 unsigned int max_width, max_height; 591 unsigned int max_width, max_height;
656 592
657 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity; 593 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity;
658 szHint.win_gravity = NorthWestGravity; 594 szHint.win_gravity = NorthWestGravity;
… …
668 if (rs[Rs_geometry]) 604 if (rs[Rs_geometry])
669 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h); 605 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h);
670 606
671 if (flags & WidthValue) 607 if (flags & WidthValue)
672 { 608 {
609 if (!w)
610 rxvt_fatal ("illegal window geometry (width and height must be non-zero), aborting.\n");
611
673 ncol = clamp (w, 0, std::numeric_limits<int16_t>::max ()); 612 ncol = clamp (w, 1, std::numeric_limits<int16_t>::max ());
674 szHint.flags |= USSize; 613 szHint.flags |= USSize;
675 } 614 }
676 615
677 if (flags & HeightValue) 616 if (flags & HeightValue)
678 { 617 {
618 if (!h)
619 rxvt_fatal ("illegal window geometry (width and height must be non-zero), aborting.\n");
620
679 nrow = clamp (h, 0, std::numeric_limits<int16_t>::max ()); 621 nrow = clamp (h, 1, std::numeric_limits<int16_t>::max ());
680 szHint.flags |= USSize; 622 szHint.flags |= USSize;
681 } 623 }
682 624
683 if (flags & XValue) 625 if (flags & XValue)
684 { 626 {
… …
715 max_width = MAX_COLS * fwidth; 657 max_width = MAX_COLS * fwidth;
716 max_height = MAX_ROWS * fheight; 658 max_height = MAX_ROWS * fheight;
717 659
718 szHint.base_width = szHint.base_height = 2 * int_bwidth; 660 szHint.base_width = szHint.base_height = 2 * int_bwidth;
719 661
720 sb_w = 0;
721 window_vt_x = window_vt_y = int_bwidth; 662 window_vt_x = window_vt_y = int_bwidth;
722 663
723 if (scrollBar.state) 664 if (scrollBar.state)
724 { 665 {
725 sb_w = scrollbar_TotalWidth (); 666 int sb_w = scrollBar.total_width ();
726 szHint.base_width += sb_w; 667 szHint.base_width += sb_w;
727 668
728 if (!option (Opt_scrollBar_right)) 669 if (!option (Opt_scrollBar_right))
729 window_vt_x += sb_w; 670 window_vt_x += sb_w;
730 } 671 }
… …
754 { 695 {
755 min_it (height, max_height); 696 min_it (height, max_height);
756 szHint.height = szHint.base_height + height; 697 szHint.height = szHint.base_height + height;
757 } 698 }
758 699
759 if (scrollBar.state && option (Opt_scrollBar_right))
760 window_sb_x = szHint.width - sb_w;
761
762 if (recalc_x) 700 if (recalc_x)
763 szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth; 701 szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth;
764 702
765 if (recalc_y) 703 if (recalc_y)
766 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth; 704 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth;
767 705
768 ncol = width / fwidth; 706 ncol = width / fwidth;
769 nrow = height / fheight; 707 nrow = height / fheight;
708
709 // When the size of the vt window is not a multiple of the cell
710 // size, i.e., when the wm does not honour our size hints, there are
711 // extra areas not covered by the terminal screen. Such gaps, when a
712 // bg pixmap is set, would have to be cleared manually to properly
713 // refresh the background. We take the simpler route and shrink the
714 // vt window so as to avoid creating gaps.
715 vt_width = ncol * fwidth;
716 vt_height = nrow * fheight;
770} 717}
771 718
772/*----------------------------------------------------------------------*/ 719/*----------------------------------------------------------------------*/
773/* 720/*
774 * Tell the teletype handler what size the window is. 721 * Tell the teletype handler what size the window is.
… …
782 729
783 struct winsize ws; 730 struct winsize ws;
784 731
785 ws.ws_col = ncol; 732 ws.ws_col = ncol;
786 ws.ws_row = nrow; 733 ws.ws_row = nrow;
787 ws.ws_xpixel = width; 734 ws.ws_xpixel = vt_width;
788 ws.ws_ypixel = height; 735 ws.ws_ypixel = vt_height;
789 (void)ioctl (pty->pty, TIOCSWINSZ, &ws); 736 ioctl (pty->pty, TIOCSWINSZ, &ws);
790 737
791#if 0 738#if 0
792 // TIOCSWINSZ is supposed to do this automatically and correctly 739 // TIOCSWINSZ is supposed to do this automatically and correctly
793 if (cmd_pid) /* force through to the command */ 740 if (cmd_pid) /* force through to the command */
794 kill (-cmd_pid, SIGWINCH); 741 kill (-cmd_pid, SIGWINCH);
795#endif 742#endif
796} 743}
797 744
798/*----------------------------------------------------------------------*/ 745/*----------------------------------------------------------------------*/
799/* set_fonts () - load and set the various fonts 746/* load and set the various fonts */
800 *
801 * init = 1 - initialize
802 *
803 * fontname == FONT_UP - switch to bigger font
804 * fontname == FONT_DN - switch to smaller font
805 */
806bool 747bool
807rxvt_term::set_fonts () 748rxvt_term::set_fonts ()
808{ 749{
809 rxvt_fontset *fs = new rxvt_fontset (this); 750 rxvt_fontset *fs = new rxvt_fontset (this);
810 rxvt_fontprop prop; 751 rxvt_fontprop prop;
… …
824#endif 765#endif
825 766
826 delete fontset[0]; 767 delete fontset[0];
827 fontset[0] = fs; 768 fontset[0] = fs;
828 769
829 prop = (*fs)[1]->properties (); 770 prop = (*fs)[rxvt_fontset::firstFont]->properties ();
830 prop.height += lineSpace; 771 prop.height += lineSpace;
772 prop.width += letterSpace;
831 773
832 fs->set_prop (prop, false); 774 fs->set_prop (prop, false);
833 775
834 fwidth = prop.width; 776 fwidth = prop.width;
835 fheight = prop.height; 777 fheight = prop.height;
… …
866#else 808#else
867 fontset[style] = fontset[0]; 809 fontset[style] = fontset[0];
868#endif 810#endif
869 } 811 }
870 812
871 if (parent[0]) 813 if (parent)
872 { 814 {
873 resize_all_windows (0, 0, 0); 815 resize_all_windows (0, 0, 0);
874 scr_remap_chars (); 816 scr_remap_chars ();
875 scr_touch (true); 817 scr_touch (true);
876 } 818 }
… …
879} 821}
880 822
881void 823void
882rxvt_term::set_string_property (Atom prop, const char *str, int len) 824rxvt_term::set_string_property (Atom prop, const char *str, int len)
883{ 825{
884 XChangeProperty (dpy, parent[0], 826 XChangeProperty (dpy, parent,
885 prop, XA_STRING, 8, PropModeReplace, 827 prop, XA_STRING, 8, PropModeReplace,
886 (const unsigned char *)str, len >= 0 ? len : strlen (str)); 828 (const unsigned char *)str, len >= 0 ? len : strlen (str));
887} 829}
888 830
889void 831void
832rxvt_term::set_mbstring_property (Atom prop, const char *str, int len)
833{
834 XTextProperty ct;
835
836 if (XmbTextListToTextProperty (dpy, (char **)&str, 1, XStdICCTextStyle, &ct) >= 0)
837 {
838 XSetTextProperty (dpy, parent, &ct, prop);
839 XFree (ct.value);
840 }
841}
842
843void
890rxvt_term::set_utf8_property (Atom prop, const char *str, int len) 844rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
891{ 845{
892 wchar_t *ws = rxvt_mbstowcs (str, len); 846 wchar_t *ws = rxvt_mbstowcs (str, len);
893 char *s = rxvt_wcstoutf8 (ws); 847 char *s = rxvt_wcstoutf8 (ws);
894 848
895 XChangeProperty (dpy, parent[0], 849 XChangeProperty (dpy, parent,
896 prop, xa[XA_UTF8_STRING], 8, PropModeReplace, 850 prop, xa[XA_UTF8_STRING], 8, PropModeReplace,
897 (const unsigned char *)s, strlen (s)); 851 (const unsigned char *)s, strlen (s));
898 852
899 free (s); 853 free (s);
900 free (ws); 854 free (ws);
… …
904/*----------------------------------------------------------------------*/ 858/*----------------------------------------------------------------------*/
905/* xterm sequences - title, iconName, color (exptl) */ 859/* xterm sequences - title, iconName, color (exptl) */
906void 860void
907rxvt_term::set_title (const char *str) 861rxvt_term::set_title (const char *str)
908{ 862{
909 set_string_property (XA_WM_NAME, str); 863 set_mbstring_property (XA_WM_NAME, str);
910#if ENABLE_EWMH 864#if ENABLE_EWMH
911 set_utf8_property (xa[XA_NET_WM_NAME], str); 865 set_utf8_property (xa[XA_NET_WM_NAME], str);
912#endif 866#endif
913} 867}
914 868
915void 869void
916rxvt_term::set_icon_name (const char *str) 870rxvt_term::set_icon_name (const char *str)
917{ 871{
918 set_string_property (XA_WM_ICON_NAME, str); 872 set_mbstring_property (XA_WM_ICON_NAME, str);
919#if ENABLE_EWMH 873#if ENABLE_EWMH
920 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str); 874 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str);
921#endif 875#endif
922} 876}
923 877
924void 878void
925rxvt_term::set_window_color (int idx, const char *color) 879rxvt_term::set_window_color (int idx, const char *color)
926{ 880{
927#ifdef XTERM_COLOR_CHANGE 881#ifdef XTERM_COLOR_CHANGE
928 rxvt_color xcol; 882 rxvt_color xcol;
929 int i;
930 883
931 if (color == NULL || *color == '\0') 884 if (color == NULL || *color == '\0')
932 return; 885 return;
933 886
934 color = strdup (color); 887 color = strdup (color);
… …
936 rs[Rs_color + idx] = color; 889 rs[Rs_color + idx] = color;
937 890
938 /* handle color aliases */ 891 /* handle color aliases */
939 if (isdigit (*color)) 892 if (isdigit (*color))
940 { 893 {
941 i = atoi (color); 894 int i = atoi (color);
942 895
943 if (i >= 8 && i <= 15) 896 if (i >= 8 && i <= 15)
944 { 897 {
945 /* bright colors */ 898 /* bright colors */
946 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i - 8]; 899 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i - 8];
… …
991 944
992/*----------------------------------------------------------------------*/ 945/*----------------------------------------------------------------------*/
993/* 946/*
994 * find if fg/bg matches any of the normal (low-intensity) colors 947 * find if fg/bg matches any of the normal (low-intensity) colors
995 */ 948 */
996void 949char *
997rxvt_term::set_colorfgbg () 950rxvt_term::get_colorfgbg ()
998{ 951{
999 unsigned int i; 952 unsigned int i;
1000 const char *xpmb = ""; 953 const char *xpmb = "";
1001 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1]; 954 char fstr[] = "default";
955 char bstr[] = "default";
956 char *env_colorfgbg;
1002 957
1003 strcpy (fstr, "default");
1004 strcpy (bstr, "default");
1005 for (i = Color_Black; i <= Color_White; i++) 958 for (i = Color_Black; i <= Color_White; i++)
1006 if (pix_colors[Color_fg] == pix_colors[i]) 959 if (pix_colors[Color_fg] == pix_colors[i])
1007 { 960 {
1008 sprintf (fstr, "%d", (i - Color_Black)); 961 sprintf (fstr, "%d", i - Color_Black);
1009 break; 962 break;
1010 } 963 }
1011 964
1012 for (i = Color_Black; i <= Color_White; i++) 965 for (i = Color_Black; i <= Color_White; i++)
1013 if (pix_colors[Color_bg] == pix_colors[i]) 966 if (pix_colors[Color_bg] == pix_colors[i])
1014 { 967 {
1015 sprintf (bstr, "%d", (i - Color_Black)); 968 sprintf (bstr, "%d", i - Color_Black);
1016#ifdef BG_IMAGE_FROM_FILE 969#ifdef BG_IMAGE_FROM_FILE
1017 xpmb = "default;"; 970 xpmb = "default;";
1018#endif 971#endif
1019 break; 972 break;
1020 } 973 }
1021 974
975 env_colorfgbg = (char *)rxvt_malloc (sizeof ("COLORFGBG=default;default;bg"));
1022 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr); 976 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr);
977 return env_colorfgbg;
1023} 978}
1024 979
1025/*----------------------------------------------------------------------*/ 980/*----------------------------------------------------------------------*/
1026 981
1027bool 982bool
… …
1050 int old_width = szHint.width; 1005 int old_width = szHint.width;
1051 int old_height = szHint.height; 1006 int old_height = szHint.height;
1052 1007
1053 window_calc (newwidth, newheight); 1008 window_calc (newwidth, newheight);
1054 1009
1055 if (!HOOK_INVOKE ((this, HOOK_RESIZE_ALL_WINDOWS, DT_INT, newwidth, DT_INT, newheight, DT_END))) 1010 bool set_hint = !HOOK_INVOKE ((this, HOOK_RESIZE_ALL_WINDOWS, DT_INT, newwidth, DT_INT, newheight, DT_END));
1011
1012 // to avoid races between us and the wm, we clear the incremental size hints around the xresizewindow
1013 if (set_hint)
1014 {
1015 szHint.flags &= ~(PBaseSize | PResizeInc);
1056 XSetWMNormalHints (dpy, parent[0], &szHint); 1016 XSetWMNormalHints (dpy, parent, &szHint);
1017 szHint.flags |= PBaseSize | PResizeInc;
1018 }
1057 1019
1058 if (!ignoreparent) 1020 if (!ignoreparent)
1059 { 1021 {
1060#ifdef SMART_RESIZE 1022#ifdef SMART_RESIZE
1061 /* 1023 /*
… …
1065 int x, y, x1, y1; 1027 int x, y, x1, y1;
1066 int dx, dy; 1028 int dx, dy;
1067 unsigned int unused_w1, unused_h1, unused_b1, unused_d1; 1029 unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
1068 Window unused_cr; 1030 Window unused_cr;
1069 1031
1070 XTranslateCoordinates (dpy, parent[0], display->root, 1032 XTranslateCoordinates (dpy, parent, display->root,
1071 0, 0, &x, &y, &unused_cr); 1033 0, 0, &x, &y, &unused_cr);
1072 XGetGeometry (dpy, parent[0], &unused_cr, &x1, &y1, 1034 XGetGeometry (dpy, parent, &unused_cr, &x1, &y1,
1073 &unused_w1, &unused_h1, &unused_b1, &unused_d1); 1035 &unused_w1, &unused_h1, &unused_b1, &unused_d1);
1074 /* 1036 /*
1075 * if display->root isn't the parent window, a WM will probably have offset 1037 * if display->root isn't the parent window, a WM will probably have offset
1076 * our position for handles and decorations. Counter it 1038 * our position for handles and decorations. Counter it
1077 */ 1039 */
… …
1094 if (y < y1) /* top half */ 1056 if (y < y1) /* top half */
1095 dy = 0; 1057 dy = 0;
1096 else if (y == y1) /* exact center */ 1058 else if (y == y1) /* exact center */
1097 dy /= 2; 1059 dy /= 2;
1098 1060
1099 XMoveResizeWindow (dpy, parent[0], x + dx, y + dy, 1061 XMoveResizeWindow (dpy, parent, x + dx, y + dy,
1100 szHint.width, szHint.height); 1062 szHint.width, szHint.height);
1101#else 1063#else
1102 XResizeWindow (dpy, parent[0], szHint.width, szHint.height); 1064 XResizeWindow (dpy, parent, szHint.width, szHint.height);
1103#endif 1065#endif
1104 } 1066 }
1067
1068 if (set_hint)
1069 XSetWMNormalHints (dpy, parent, &szHint);
1105 1070
1106 fix_screen = ncol != prev_ncol || nrow != prev_nrow; 1071 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
1107 1072
1108 if (fix_screen || newwidth != old_width || newheight != old_height) 1073 if (fix_screen || newwidth != old_width || newheight != old_height)
1109 { 1074 {
1110 if (scrollBar.state) 1075 if (scrollBar.state)
1111 { 1076 scrollBar.resize ();
1112 XMoveResizeWindow (dpy, scrollBar.win,
1113 window_sb_x, 0,
1114 scrollbar_TotalWidth (), szHint.height);
1115 resize_scrollbar ();
1116 }
1117 1077
1118 XMoveResizeWindow (dpy, vt, 1078 XMoveResizeWindow (dpy, vt,
1119 window_vt_x, window_vt_y, 1079 window_vt_x, window_vt_y,
1120 width, height); 1080 vt_width, vt_height);
1121 1081
1122#ifdef HAVE_BG_PIXMAP 1082#ifdef HAVE_BG_PIXMAP
1123 if (bgPixmap.window_size_sensitive ()) 1083 if (bg_window_size_sensitive ())
1124 update_background (); 1084 update_background ();
1125#endif 1085#endif
1126
1127 scr_clear ();
1128 } 1086 }
1129 1087
1130 if (fix_screen || old_height == 0) 1088 if (fix_screen || old_height == 0)
1131 scr_reset (); 1089 scr_reset ();
1132 1090
1133 // TODO, with nvidia-8178, resizes kill the alpha channel, report if not fixed in newer version
1134 //scr_touch (false);
1135
1136#ifdef HAVE_BG_PIXMAP
1137// TODO: this don't seem to have any effect - do we still need it ? If so - in which case exactly ?
1138// if (bgPixmap.pixmap)
1139// scr_touch (false);
1140#endif
1141
1142#ifdef USE_XIM 1091#ifdef USE_XIM
1143 IMSetPosition (); 1092 im_set_position ();
1144#endif 1093#endif
1145} 1094}
1146 1095
1147/* 1096/*
1148 * Set the width/height of the vt window in characters. Units are pixels. 1097 * Set the width/height of the vt window in characters. Units are pixels.
… …
1161 newwidth = wattr.width - szHint.base_width; 1110 newwidth = wattr.width - szHint.base_width;
1162 if (newheight == 0) 1111 if (newheight == 0)
1163 newheight = wattr.height - szHint.base_height; 1112 newheight = wattr.height - szHint.base_height;
1164 } 1113 }
1165 1114
1166 if (newwidth != width || newheight != height) 1115 if (newwidth != vt_width || newheight != vt_height)
1167 { 1116 {
1168 newwidth += szHint.base_width; 1117 newwidth += szHint.base_width;
1169 newheight += szHint.base_height; 1118 newheight += szHint.base_height;
1170 resize_all_windows (newwidth, newheight, 0); 1119 resize_all_windows (newwidth, newheight, 0);
1171 } 1120 }
… …
1209 status_rect.height = fheight; 1158 status_rect.height = fheight;
1210} 1159}
1211 1160
1212/* Checking whether input method is running. */ 1161/* Checking whether input method is running. */
1213bool 1162bool
1214rxvt_term::IMisRunning () 1163rxvt_term::im_is_running ()
1215{ 1164{
1216 char *p;
1217 Atom atom; 1165 Atom atom;
1218 Window win; 1166 Window win;
1219 char server[IMBUFSIZ]; 1167 char server[IMBUFSIZ];
1220 1168
1221 /* get current locale modifier */ 1169 /* get current locale modifier */
1222 if ((p = XSetLocaleModifiers (NULL)) != NULL) 1170 if (char *p = XSetLocaleModifiers (0))
1223 { 1171 {
1224 strcpy (server, "@server="); 1172 strcpy (server, "@server=");
1225 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */ 1173 strncat (server, p + 4, IMBUFSIZ - 9); /* skip "@im=" */
1226 1174
1227 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */ 1175 if (p = strchr (server + 1, '@')) /* first one only */
1228 *p = '\0'; 1176 *p = '\0';
1229 1177
1230 atom = XInternAtom (dpy, server, False); 1178 atom = XInternAtom (dpy, server, False);
1231 win = XGetSelectionOwner (dpy, atom); 1179 win = XGetSelectionOwner (dpy, atom);
1232 1180
1233 if (win != None) 1181 if (win != None)
1234 return True; 1182 return true;
1235 } 1183 }
1236 1184
1237 return False; 1185 return false;
1238} 1186}
1239 1187
1240void 1188void
1241rxvt_term::IMSendSpot () 1189rxvt_term::im_send_spot ()
1242{ 1190{
1243 XPoint nspot; 1191 XPoint nspot;
1244 XVaNestedList preedit_attr; 1192 XVaNestedList preedit_attr;
1245 1193
1246 if (!Input_Context 1194 if (!Input_Context
… …
1299 1247
1300 term->make_current (); 1248 term->make_current ();
1301 1249
1302 if (text) 1250 if (text)
1303 { 1251 {
1304 void *str; 1252 wchar_t *str;
1305 1253
1306 if (!text->encoding_is_wchar && text->string.multi_byte) 1254 if (!text->encoding_is_wchar && text->string.multi_byte)
1307 { 1255 {
1308 // of course, X makes it ugly again 1256 // of course, X makes it ugly again
1309 if (term->rs[Rs_imLocale]) 1257 if (term->rs[Rs_imLocale])
1310 SET_LOCALE (term->rs[Rs_imLocale]); 1258 SET_LOCALE (term->rs[Rs_imLocale]);
1311 1259
1312 str = rxvt_temp_buf ((text->length + 1) * sizeof (wchar_t)); 1260 str = rxvt_temp_buf<wchar_t> (text->length + 1);
1313 mbstowcs ((wchar_t *)str, text->string.multi_byte, text->length + 1); 1261 mbstowcs (str, text->string.multi_byte, text->length + 1);
1314 1262
1315 if (term->rs[Rs_imLocale]) 1263 if (term->rs[Rs_imLocale])
1316 SET_LOCALE (term->locale); 1264 SET_LOCALE (term->locale);
1317 } 1265 }
1318 else 1266 else
1319 str = (void *)text->string.wide_char; 1267 str = text->string.wide_char;
1320 1268
1321 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW, 1269 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
1322 DT_INT, call_data->caret, 1270 DT_INT, call_data->caret,
1323 DT_INT, call_data->chg_first, 1271 DT_INT, call_data->chg_first,
1324 DT_INT, call_data->chg_length, 1272 DT_INT, call_data->chg_length,
… …
1352/* 1300/*
1353 * Try to open a XIM with the current modifiers, then see if we can 1301 * Try to open a XIM with the current modifiers, then see if we can
1354 * open a suitable preedit type 1302 * open a suitable preedit type
1355 */ 1303 */
1356bool 1304bool
1357rxvt_term::IM_get_IC (const char *modifiers) 1305rxvt_term::im_get_ic (const char *modifiers)
1358{ 1306{
1359 int i, j, found; 1307 int i, j, found;
1360 XIM xim; 1308 XIM xim;
1361 XPoint spot; 1309 XPoint spot;
1362 XRectangle rect, status_rect, needed_rect; 1310 XRectangle rect, status_rect, needed_rect;
1363 unsigned long fg, bg; 1311 unsigned long fg, bg;
1364 const char *p; 1312 const char *p;
1365 char **s; 1313 char **s;
1366 XIMStyles *xim_styles; 1314 XIMStyles *xim_styles;
1367#ifdef ENABLE_XIM_ONTHESPOT
1368 XIMCallback xcb[4];
1369#endif
1370 1315
1371 set_environ (envv); 1316 set_environ (envv);
1372 1317
1373 if (! ((p = XSetLocaleModifiers (modifiers)) && *p)) 1318 if (! ((p = XSetLocaleModifiers (modifiers)) && *p))
1374 return false; 1319 return false;
… …
1395 p = pet[pi]; 1340 p = pet[pi];
1396 1341
1397 if (!p) 1342 if (!p)
1398 continue; 1343 continue;
1399 1344
1400 s = rxvt_splitcommastring (p); 1345 s = rxvt_strsplit (',', p);
1401 1346
1402 for (i = found = 0; !found && s[i]; i++) 1347 for (i = found = 0; !found && s[i]; i++)
1403 { 1348 {
1404 if (!strcmp (s[i], "OverTheSpot")) 1349 if (!strcmp (s[i], "OverTheSpot"))
1405 input_style = XIMPreeditPosition | XIMStatusNothing; 1350 input_style = XIMPreeditPosition | XIMStatusNothing;
… …
1417 input_style = XIMPreeditNothing | XIMStatusNothing; 1362 input_style = XIMPreeditNothing | XIMStatusNothing;
1418 1363
1419 for (j = 0; j < xim_styles->count_styles; j++) 1364 for (j = 0; j < xim_styles->count_styles; j++)
1420 if (input_style == xim_styles->supported_styles[j]) 1365 if (input_style == xim_styles->supported_styles[j])
1421 { 1366 {
1422 rxvt_freecommastring (s); 1367 rxvt_free_strsplit (s);
1423 1368
1424 found = 1; 1369 found = 1;
1425 goto foundpet; 1370 goto foundpet;
1426 } 1371 }
1427 1372
1428 } 1373 }
1429 1374
1430 rxvt_freecommastring (s); 1375 rxvt_free_strsplit (s);
1431 } 1376 }
1432 1377
1433foundpet: 1378foundpet:
1434 1379
1435 XFree (xim_styles); 1380 XFree (xim_styles);
… …
1514 NULL); 1459 NULL);
1515 } 1460 }
1516#if ENABLE_XIM_ONTHESPOT 1461#if ENABLE_XIM_ONTHESPOT
1517 else if (input_style & XIMPreeditCallbacks) 1462 else if (input_style & XIMPreeditCallbacks)
1518 { 1463 {
1464 XIMCallback xcb[4];
1465
1519 im_set_position (spot); 1466 im_set_position (spot);
1520 1467
1521 xcb[0].client_data = (XPointer)this; xcb[0].callback = (XIMProc)xim_preedit_start; 1468 xcb[0].client_data = (XPointer)this; xcb[0].callback = (XIMProc)xim_preedit_start;
1522 xcb[1].client_data = (XPointer)this; xcb[1].callback = (XIMProc)xim_preedit_done; 1469 xcb[1].client_data = (XPointer)this; xcb[1].callback = (XIMProc)xim_preedit_done;
1523 xcb[2].client_data = (XPointer)this; xcb[2].callback = (XIMProc)xim_preedit_draw; 1470 xcb[2].client_data = (XPointer)this; xcb[2].callback = (XIMProc)xim_preedit_draw;
… …
1538#endif 1485#endif
1539 1486
1540 Input_Context = XCreateIC (xim, 1487 Input_Context = XCreateIC (xim,
1541 XNInputStyle, input_style, 1488 XNInputStyle, input_style,
1542 XNClientWindow, vt, 1489 XNClientWindow, vt,
1543 XNFocusWindow, parent[0], 1490 XNFocusWindow, parent,
1544 preedit_attr ? XNPreeditAttributes : NULL, 1491 preedit_attr ? XNPreeditAttributes : NULL,
1545 preedit_attr, 1492 preedit_attr,
1546 status_attr ? XNStatusAttributes : NULL, 1493 status_attr ? XNStatusAttributes : NULL,
1547 status_attr, NULL); 1494 status_attr, NULL);
1548 1495
… …
1561 // unfortunately, only the focus window is used by XIM, hard to fix 1508 // unfortunately, only the focus window is used by XIM, hard to fix
1562 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL)) 1509 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL))
1563 vt_select_input (); 1510 vt_select_input ();
1564#endif 1511#endif
1565 1512
1566 IMSetPosition (); 1513 im_set_position ();
1567 1514
1568 return true; 1515 return true;
1569} 1516}
1570 1517
1571void 1518void
… …
1591 p = rs[Rs_inputMethod]; 1538 p = rs[Rs_inputMethod];
1592 if (p && *p) 1539 if (p && *p)
1593 { 1540 {
1594 bool found = false; 1541 bool found = false;
1595 1542
1596 s = rxvt_splitcommastring (p); 1543 s = rxvt_strsplit (',', p);
1597 1544
1598 for (i = 0; s[i]; i++) 1545 for (i = 0; s[i]; i++)
1599 { 1546 {
1600 if (*s[i]) 1547 if (*s[i])
1601 { 1548 {
1602 strcpy (buf, "@im="); 1549 strcpy (buf, "@im=");
1603 strncat (buf, s[i], IMBUFSIZ - 5); 1550 strncat (buf, s[i], IMBUFSIZ - 5);
1604 if (IM_get_IC (buf)) 1551 if (im_get_ic (buf))
1605 { 1552 {
1606 found = true; 1553 found = true;
1607 break; 1554 break;
1608 } 1555 }
1609 } 1556 }
1610 } 1557 }
1611 1558
1612 rxvt_freecommastring (s); 1559 rxvt_free_strsplit (s);
1613 1560
1614 if (found) 1561 if (found)
1615 goto done; 1562 goto done;
1616 } 1563 }
1617 1564
1618 /* try with XMODIFIERS env. var. */ 1565 /* try with XMODIFIERS env. var. */
1619 if (IM_get_IC ("")) 1566 if (im_get_ic (""))
1620 goto done; 1567 goto done;
1621 1568
1622 /* try with no modifiers base IF the user didn't specify an IM */ 1569 /* try with no modifiers base IF the user didn't specify an IM */
1623 if (IM_get_IC ("@im=none")) 1570 if (im_get_ic ("@im=none"))
1624 goto done; 1571 goto done;
1625 1572
1626done: 1573done: ;
1627#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE) 1574#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1628 if (rs[Rs_imLocale]) 1575 if (rs[Rs_imLocale])
1629 SET_LOCALE (locale); 1576 SET_LOCALE (locale);
1630#endif 1577#endif
1631} 1578}
1632 1579
1633void 1580void
1634rxvt_term::IMSetPosition () 1581rxvt_term::im_set_position ()
1635{ 1582{
1636 XRectangle preedit_rect, status_rect, *needed_rect; 1583 XRectangle preedit_rect, status_rect, *needed_rect;
1637 XVaNestedList preedit_attr, status_attr; 1584 XVaNestedList preedit_attr, status_attr;
1638 1585
1639 if (!Input_Context 1586 if (!Input_Context
1640 || !focus 1587 || !focus
1641 || !(input_style & (XIMPreeditArea | XIMPreeditPosition)) 1588 || !(input_style & (XIMPreeditArea | XIMPreeditPosition))
1642 || !IMisRunning ()) 1589 || !im_is_running ())
1643 return; 1590 return;
1644 1591
1645 if (input_style & XIMPreeditPosition) 1592 if (input_style & XIMPreeditPosition)
1646 { 1593 {
1647 im_set_size (preedit_rect); 1594 im_set_size (preedit_rect);
… …
1677 1624
1678void 1625void
1679rxvt_term::get_window_origin (int &x, int &y) 1626rxvt_term::get_window_origin (int &x, int &y)
1680{ 1627{
1681 Window cr; 1628 Window cr;
1682 XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr); 1629 XTranslateCoordinates (dpy, parent, display->root, 0, 0, &x, &y, &cr);
1683/* fprintf (stderr, "origin is %+d%+d\n", x, y);*/
1684} 1630}
1685 1631
1686Pixmap 1632Pixmap
1687rxvt_term::get_pixmap_property (int prop_id) 1633rxvt_term::get_pixmap_property (Atom property)
1688{ 1634{
1689 if (prop_id > 0 && prop_id < NUM_XA) 1635 Pixmap pixmap = None;
1690 if (xa[prop_id]) 1636
1691 {
1692 int aformat; 1637 int aformat;
1693 unsigned long nitems, bytes_after; 1638 unsigned long nitems, bytes_after;
1694 Atom atype; 1639 Atom atype;
1695 unsigned char *prop = NULL; 1640 unsigned char *prop;
1696 int result = XGetWindowProperty (dpy, display->root, xa[prop_id], 1641 int result = XGetWindowProperty (dpy, display->root, property,
1697 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 1642 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1698 &nitems, &bytes_after, &prop); 1643 &nitems, &bytes_after, &prop);
1699 if (result == Success && prop && atype == XA_PIXMAP) 1644 if (result == Success)
1645 {
1646 if (atype == XA_PIXMAP)
1700 return *(Pixmap *)prop; 1647 pixmap = *(Pixmap *)prop;
1648 XFree (prop);
1701 } 1649 }
1702 1650
1703 return None; 1651 return pixmap;
1704} 1652}
1705 1653
1706#ifdef HAVE_BG_PIXMAP 1654#ifdef HAVE_BG_PIXMAP
1707# if TRACE_PIXMAPS
1708# undef update_background
1709void
1710rxvt_term::trace_update_background (const char *file, int line)
1711{
1712 fprintf (stderr, "%s:%d:update_background()\n", file, line);
1713 update_background ();
1714}
1715# endif
1716 1655
1717void 1656void
1718rxvt_term::update_background () 1657rxvt_term::update_background ()
1719{ 1658{
1720 if (update_background_ev.is_active ()) 1659 if (update_background_ev.is_active ())
1721 return; 1660 return;
1722 1661
1723 bgPixmap.invalidate (); 1662 bg_invalidate ();
1724 1663
1664 if (!mapped)
1665 return;
1666
1725 ev_tstamp to_wait = 0.5 - (ev::now () - bgPixmap.valid_since); 1667 ev_tstamp to_wait = 0.5 - (ev::now () - bg_valid_since);
1726 1668
1727 if (to_wait <= 0.) 1669 if (to_wait <= 0.)
1728 bgPixmap.render (); 1670 bg_render ();
1729 else 1671 else
1730 update_background_ev.start (to_wait); 1672 update_background_ev.start (to_wait);
1731} 1673}
1732 1674
1733void 1675void
1734rxvt_term::update_background_cb (ev::timer &w, int revents) 1676rxvt_term::update_background_cb (ev::timer &w, int revents)
1735{ 1677{
1736 make_current (); 1678 make_current ();
1737 1679
1738 update_background_ev.stop (); 1680 update_background_ev.stop ();
1739 bgPixmap.render (); 1681 bg_render ();
1740 refresh_check (); 1682 refresh_check ();
1741} 1683}
1742 1684
1743#endif /* HAVE_BG_PIXMAP */ 1685#endif /* HAVE_BG_PIXMAP */
1744 1686

Diff Legend

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