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.373 by root, Mon May 28 16:40:03 2012 UTC

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

Diff Legend

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