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

Diff Legend

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