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.292 by root, Mon Dec 24 10:58:09 2007 UTC vs.
Revision 1.380 by root, Tue Jun 5 11:35:58 2012 UTC

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

Diff Legend

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