ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/main.C
(Generate patch)

Comparing rxvt-unicode/src/main.C (file contents):
Revision 1.300 by root, Sat Jan 19 00:24:53 2008 UTC vs.
Revision 1.392 by sf-exg, Mon Nov 3 09:40:26 2014 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 3 of the License, or
21 * (at your option) any later version. 21 * (at your option) any later version.
22 * 22 *
23 * This program is distributed in the hope that it will be useful, 23 * This program is distributed in the hope that it will be useful,
24 * but WITHOUT ANY WARRANTY; without even the implied warranty of 24 * but WITHOUT ANY WARRANTY; without even the implied warranty of
25 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 25 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
… …
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));
… …
169 sel_scroll_ev.set <rxvt_term, &rxvt_term::sel_scroll_cb> (this); 168 sel_scroll_ev.set <rxvt_term, &rxvt_term::sel_scroll_cb> (this);
170#endif 169#endif
171#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 170#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
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 BG_IMAGE_FROM_ROOT || 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
… …
227 delete fontset[i]; 223 delete fontset[i];
228#endif 224#endif
229 delete fontset[0]; 225 delete fontset[0];
230 226
231#ifdef HAVE_BG_PIXMAP 227#ifdef HAVE_BG_PIXMAP
232 bgPixmap.destroy (); 228 bg_destroy ();
229#endif
230
231#if HAVE_IMG
232 delete bg_img;
233#endif 233#endif
234 234
235 if (display) 235 if (display)
236 { 236 {
237 selection_clear (); 237 selection_clear ();
238 selection_clear (true);
238 239
239#ifdef USE_XIM 240#if USE_XIM
240 im_destroy (); 241 im_destroy ();
241#endif 242#endif
242#ifdef XTERM_SCROLLBAR 243 scrollBar.destroy ();
243 if (xscrollbarGC) XFreeGC (dpy, xscrollbarGC); 244
244 if (ShadowGC) XFreeGC (dpy, ShadowGC); 245 if (gc)
245#endif
246#ifdef PLAIN_SCROLLBAR
247 if (pscrollbarGC) XFreeGC (dpy, pscrollbarGC);
248#endif
249#ifdef NEXT_SCROLLBAR
250 if (blackGC) XFreeGC (dpy, blackGC);
251 if (whiteGC) XFreeGC (dpy, whiteGC);
252 if (grayGC) XFreeGC (dpy, grayGC);
253 if (darkGC) XFreeGC (dpy, darkGC);
254 if (stippleGC) XFreeGC (dpy, stippleGC);
255 if (dimple) XFreePixmap (dpy, dimple);
256 if (upArrow) XFreePixmap (dpy, upArrow);
257 if (downArrow) XFreePixmap (dpy, downArrow);
258 if (upArrowHi) XFreePixmap (dpy, upArrowHi);
259 if (downArrowHi) XFreePixmap (dpy, downArrowHi);
260#endif
261#ifdef RXVT_SCROLLBAR
262 if (topShadowGC) XFreeGC (dpy, topShadowGC);
263 if (botShadowGC) XFreeGC (dpy, botShadowGC);
264 if (scrollbarGC) XFreeGC (dpy, scrollbarGC);
265#endif
266 if (gc) XFreeGC (dpy, gc); 246 XFreeGC (dpy, gc);
267 247
268 delete drawable; 248 delete drawable;
249
269 // destroy all windows 250 // destroy all windows
270 if (parent[0]) 251 if (parent)
271 XDestroyWindow (dpy, parent[0]); 252 XDestroyWindow (dpy, parent);
272 253
273 for (int i = 0; i < TOTAL_COLORS; i++) 254 for (int i = 0; i < TOTAL_COLORS; i++)
274 if (ISSET_PIXCOLOR (i)) 255 if (ISSET_PIXCOLOR (i))
275 { 256 {
276 pix_colors_focused [i].free (this); 257 pix_colors_focused [i].free (this);
… …
290 /* clear all resources */ 271 /* clear all resources */
291 for (int i = 0; i < allocated.size (); i++) 272 for (int i = 0; i < allocated.size (); i++)
292 free (allocated [i]); 273 free (allocated [i]);
293 274
294 free (selection.text); 275 free (selection.text);
295 // TODO: manage env vars in child only(!) 276 free (selection.clip_text);
296 free (env_display);
297 free (env_term);
298 free (locale); 277 free (locale);
299 free (v_buffer); 278 free (v_buffer);
300 free (incr_buf); 279
280 delete selection_req;
281
282 if (env && memcmp (env, envv->begin (), envv->size () * sizeof (char *)))
283 rxvt_warn ("env has been modified, probably as a result of a lib calling setenv.\n");
284
285 delete env;
301 286
302 delete envv; 287 delete envv;
303 delete argv; 288 delete argv;
304 289
305#ifdef KEYSYM_RESOURCE 290#ifdef KEYSYM_RESOURCE
… …
337 if (display) 322 if (display)
338 { 323 {
339#if USE_XIM 324#if USE_XIM
340 im_ev.stop (display); 325 im_ev.stop (display);
341#endif 326#endif
342#if HAVE_SCROLLBARS
343 scrollbar_ev.stop (display); 327 scrollbar_ev.stop (display);
344#endif 328#if BG_IMAGE_FROM_ROOT || ENABLE_PERL
345#if ENABLE_TRANSPARENCY || ENABLE_PERL
346 rootwin_ev.stop (display); 329 rootwin_ev.stop (display);
347#endif 330#endif
348 incr_ev.stop ();
349 termwin_ev.stop (display); 331 termwin_ev.stop (display);
350 vt_ev.stop (display); 332 vt_ev.stop (display);
351 } 333 }
352 334
353 flush_ev.stop (); 335 flush_ev.stop ();
… …
377 make_current (); 359 make_current ();
378 360
379 delete this; 361 delete this;
380} 362}
381 363
364void
365rxvt_term::set_option (uint8_t opt, bool set) NOTHROW
366{
367 if (!opt)
368 return;
369
370 uint8_t mask = 1 << (opt & 7);
371 uint8_t &val = options [opt >> 3];
372
373 val = val & ~mask | (set ? mask : 0);
374}
375
382/*----------------------------------------------------------------------*/ 376/*----------------------------------------------------------------------*/
383/* 377/*
384 * Exit gracefully, clearing the utmp entry and restoring tty attributes 378 * Exit gracefully, clearing the utmp entry and restoring tty attributes
385 * TODO: if debugging, this should free up any known resources if we can
386 */ 379 */
387static XErrorHandler old_xerror_handler; 380static XErrorHandler old_xerror_handler;
388 381
389static void 382static void
390rxvt_emergency_cleanup () 383rxvt_emergency_cleanup ()
… …
392 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++) 385 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)
393 (*t)->emergency_cleanup (); 386 (*t)->emergency_cleanup ();
394} 387}
395 388
396#if !ENABLE_MINIMAL 389#if !ENABLE_MINIMAL
397static void 390static void ecb_cold
398print_x_error (Display *dpy, XErrorEvent *event) 391print_x_error (Display *dpy, XErrorEvent *event)
399{ 392{
400 char buffer[BUFSIZ]; 393 char buffer[BUFSIZ];
401 char mesg[BUFSIZ]; 394 char mesg[BUFSIZ];
402 char number[32]; 395 char number[32];
403 char *mtype = "XlibMessage"; 396
404 XGetErrorText(dpy, event->error_code, buffer, BUFSIZ);
405 XGetErrorDatabaseText(dpy, mtype, "XError", "X Error", mesg, BUFSIZ);
406 rxvt_warn ("An X Error occured, trying to continue after report.\n"); 397 rxvt_warn ("An X Error occurred, trying to continue after report.\n");
398
399 XGetErrorDatabaseText (dpy, "XlibMessage", "ErrorSerial", "Error Serial #%d", mesg, BUFSIZ);
400 snprintf (buffer, BUFSIZ, "+ %s\n", mesg); rxvt_warn (buffer, event->serial);
401
402 XGetErrorText (dpy, event->error_code, buffer, BUFSIZ);
403 XGetErrorDatabaseText (dpy, "XlibMessage", "XError", "X Error", mesg, BUFSIZ);
407 rxvt_warn ("%s: %s\n", mesg, buffer); 404 rxvt_warn ("+ %s: %s\n", mesg, buffer);
405
408 XGetErrorDatabaseText(dpy, mtype, "MajorCode", "Request Major code %d", mesg, BUFSIZ); 406 XGetErrorDatabaseText (dpy, "XlibMessage", "MajorCode", "Request Major code %d", mesg, BUFSIZ);
409 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->request_code); 407 snprintf (buffer, BUFSIZ, "+ %s\n", mesg); rxvt_warn (buffer, event->request_code);
410 sprintf(number, "%d", event->request_code); 408
411 XGetErrorDatabaseText(dpy, "XRequest", number, "", buffer, BUFSIZ);
412 rxvt_warn ("(which is %s)\n", buffer);
413 if (event->request_code >= 128) { 409 if (event->request_code >= 128)
414 XGetErrorDatabaseText(dpy, mtype, "MinorCode", "Request Minor code %d", 410 {
415 mesg, BUFSIZ); 411#if 0
416 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->minor_code); 412 /* XListExtensions and probably query extensions hangs when there are multiple queues errors */
413 int nexts;
414 char **exts = XListExtensions (dpy, &nexts);
415
416 while (nexts)
417 {
418 char *extname = exts [nexts - 1];
419 int major, first_event, first_error;
420
421 if (XQueryExtension (dpy, extname, &major, &first_event, &first_error) && major == event->request_code)
422 {
423 XGetErrorDatabaseText (dpy, "XlibMessage", "MinorCode", "Request Minor code %d", mesg, BUFSIZ);
424 rxvt_warn ("+ (which is extension %s minor code %d)\n", extname, event->minor_code);
425
426 snprintf (buffer, BUFSIZ, "%s.%d", extname, event->minor_code);
427 XGetErrorDatabaseText (dpy, "XRequest", buffer, "an unregistered minor code", buffer, BUFSIZ);
428 rxvt_warn ("+ (which is %s)\n", buffer);
429
430 break;
431 }
432
433 printf ("nextss %d %s\n", nexts, extname);//D
434 --nexts;
435 ++exts;
436 }
437#else
438 int nexts = 0;
439 char **exts = 0;
440#endif
441
442 if (!nexts)
443 {
444 rxvt_warn ("+ (which is an unknown extension)\n", buffer);
445
446 XGetErrorDatabaseText (dpy, "XlibMessage", "MinorCode", "Request Minor code %d", mesg, BUFSIZ);
447 snprintf (buffer, BUFSIZ, "+ %s\n", mesg); rxvt_warn (buffer, event->minor_code);
448
449#if 0
450 sprintf (number, "RENDER.%d", event->minor_code);
451 XGetErrorDatabaseText (dpy, "XRequest", number, "", buffer, BUFSIZ);
452 rxvt_warn ("+ (which is %s)\n", buffer);
453#endif
454 }
455
456 XFreeExtensionList (exts);
417 } 457 }
458 else
459 {
460 sprintf (number, "%d", event->request_code);
461 XGetErrorDatabaseText (dpy, "XRequest", number, "", buffer, BUFSIZ);
462 rxvt_warn ("+ (which is %s)\n", buffer);
463 }
464
418 if ((event->error_code == BadWindow) || 465 if (event->error_code == BadWindow
419 (event->error_code == BadPixmap) || 466 || event->error_code == BadPixmap
420 (event->error_code == BadCursor) || 467 || event->error_code == BadCursor
421 (event->error_code == BadFont) || 468 || event->error_code == BadFont
422 (event->error_code == BadDrawable) || 469 || event->error_code == BadDrawable
423 (event->error_code == BadColor) || 470 || event->error_code == BadColor
424 (event->error_code == BadGC) || 471 || event->error_code == BadGC
425 (event->error_code == BadIDChoice) || 472 || event->error_code == BadIDChoice
426 (event->error_code == BadValue) || 473 || event->error_code == BadValue
427 (event->error_code == BadAtom)) { 474 || event->error_code == BadAtom)
475 {
428 if (event->error_code == BadValue) 476 if (event->error_code == BadValue)
429 XGetErrorDatabaseText(dpy, mtype, "Value", "Value 0x%x", 477 XGetErrorDatabaseText (dpy, "XlibMessage", "Value", "Value 0x%x", mesg, BUFSIZ);
430 mesg, BUFSIZ);
431 else if (event->error_code == BadAtom) 478 else if (event->error_code == BadAtom)
432 XGetErrorDatabaseText(dpy, mtype, "AtomID", "AtomID 0x%x", 479 XGetErrorDatabaseText (dpy, "XlibMessage", "AtomID", "AtomID 0x%x", mesg, BUFSIZ);
433 mesg, BUFSIZ); 480 else
434 else
435 XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x", 481 XGetErrorDatabaseText (dpy, "XlibMessage", "ResourceID", "ResourceID 0x%x", mesg, BUFSIZ);
436 mesg, BUFSIZ);
437 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid);
438 }
439 XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d",
440 mesg, BUFSIZ);
441 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial);
442}
443#endif
444 482
445int 483 snprintf (buffer, BUFSIZ, "+ %s\n", mesg); rxvt_warn (buffer, event->resourceid);
484 }
485}
486#endif
487
488int ecb_cold
446rxvt_xerror_handler (Display *display, XErrorEvent *event) 489rxvt_xerror_handler (Display *display, XErrorEvent *event)
447{ 490{
448 if (GET_R->allowedxerror == -1) 491 if (GET_R->allowedxerror == -1)
449 GET_R->allowedxerror = event->error_code; 492 GET_R->allowedxerror = event->error_code;
450 else 493 else
… …
459 } 502 }
460 503
461 return 0; 504 return 0;
462} 505}
463 506
464int 507int ecb_cold
465rxvt_xioerror_handler (Display *display) 508rxvt_xioerror_handler (Display *display)
466{ 509{
467 rxvt_warn ("X connection to '%s' broken, unable to recover, exiting.\n", 510 rxvt_warn ("X connection to '%s' broken, unable to recover, exiting.\n",
468 DisplayString (display)); 511 DisplayString (display));
469 rxvt_emergency_cleanup (); 512 rxvt_emergency_cleanup ();
470 _exit (EXIT_FAILURE); 513 _exit (EXIT_FAILURE);
471}
472
473/*----------------------------------------------------------------------*/
474void
475rxvt_term::init (int argc, const char *const *argv, stringvec *envv)
476{
477 this->envv = envv;
478
479 SET_R (this);
480 set_locale ("");
481 set_environ (envv); // few things in X do not call setlocale :(
482
483 init_vars ();
484
485 init_secondary ();
486
487 const char **cmd_argv = init_resources (argc, argv);
488
489#ifdef KEYSYM_RESOURCE
490 keyboard->register_done ();
491#endif
492
493#ifdef HAVE_SCROLLBARS
494 if (option (Opt_scrollBar))
495 scrollBar.setIdle (); /* set existence for size calculations */
496#endif
497
498 pty = ptytty::create ();
499
500 create_windows (argc, argv);
501
502 init_xlocale ();
503
504 scr_reset (); // initialize screen
505
506#if 0
507 XSynchronize (dpy, True);
508#endif
509
510#ifdef HAVE_SCROLLBARS
511 if (option (Opt_scrollBar))
512 resize_scrollbar (); /* create and map scrollbar */
513#endif
514#ifdef HAVE_BG_PIXMAP
515 {
516 bgPixmap.set_target (this);
517 bgPixmap.invalidate ();
518
519#ifdef ENABLE_TRANSPARENCY
520 if (option (Opt_transparent))
521 {
522 bgPixmap.set_transparent ();
523
524#ifdef HAVE_AFTERIMAGE
525 if (rs [Rs_blurradius])
526 bgPixmap.set_blur_radius (rs [Rs_blurradius]);
527#endif
528 if (ISSET_PIXCOLOR (Color_tint))
529 bgPixmap.set_tint (pix_colors_focused [Color_tint]);
530
531 if (rs [Rs_shade])
532 bgPixmap.set_shade (rs [Rs_shade]);
533
534 bgPixmap.set_root_pixmap ();
535 XSelectInput (dpy, display->root, PropertyChangeMask);
536 rootwin_ev.start (display, display->root);
537 }
538#endif
539
540#ifdef BG_IMAGE_FROM_FILE
541 if (rs[Rs_backgroundPixmap])
542 {
543 const char *p = rs[Rs_backgroundPixmap];
544
545 if ((p = strchr (p, ';')) != 0)
546 {
547 p++;
548 bgPixmap.set_geometry (p);
549 }
550 else
551 bgPixmap.set_defaultGeometry ();
552
553 if (bgPixmap.set_file (rs[Rs_backgroundPixmap]))
554 if (!bgPixmap.window_position_sensitive ())
555 update_background ();
556 }
557#endif
558 }
559#endif
560
561#if ENABLE_PERL
562 rootwin_ev.start (display, display->root);
563#endif
564
565 set_colorfgbg ();
566
567 init_command (cmd_argv);
568
569 free (cmd_argv);
570
571 if (pty->pty >= 0)
572 pty_ev.start (pty->pty, ev::READ);
573
574 HOOK_INVOKE ((this, HOOK_START, DT_END));
575
576#if ENABLE_XEMBED
577 if (rs[Rs_embed])
578 {
579 long info[2] = { 0, XEMBED_MAPPED };
580
581 XChangeProperty (dpy, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
582 32, PropModeReplace, (unsigned char *)&info, 2);
583 }
584#endif
585
586 XMapWindow (dpy, vt);
587 XMapWindow (dpy, parent[0]);
588
589 refresh_check ();
590} 514}
591 515
592static struct sig_handlers 516static struct sig_handlers
593{ 517{
594 ev::sig sw_term, sw_int; 518 ev::sig sw_term, sw_int;
… …
611 rxvt_emergency_cleanup (); 535 rxvt_emergency_cleanup ();
612 w.stop (); 536 w.stop ();
613 kill (getpid (), w.signum); 537 kill (getpid (), w.signum);
614} 538}
615 539
540static void
541rxvt_get_ttymode (struct termios *tio)
542{
543 if (tcgetattr (STDIN_FILENO, tio) < 0)
544 memset (tio, 0, sizeof (struct termios));
545
546 for (int i = 0; i < NCCS; i++)
547 tio->c_cc[i] = VDISABLE;
548
549 tio->c_cc[VINTR] = CINTR;
550 tio->c_cc[VQUIT] = CQUIT;
551 tio->c_cc[VERASE] = CERASE;
552#ifdef VERASE2
553 tio->c_cc[VERASE2] = CERASE2;
554#endif
555 tio->c_cc[VKILL] = CKILL;
556 tio->c_cc[VEOF] = CEOF;
557 tio->c_cc[VSTART] = CSTART;
558 tio->c_cc[VSTOP] = CSTOP;
559 tio->c_cc[VSUSP] = CSUSP;
560# ifdef VDSUSP
561 tio->c_cc[VDSUSP] = CDSUSP;
562# endif
563# ifdef VREPRINT
564 tio->c_cc[VREPRINT] = CRPRNT;
565# endif
566# ifdef VDISCRD
567 tio->c_cc[VDISCRD] = CFLUSH;
568# endif
569# ifdef VWERSE
570 tio->c_cc[VWERSE] = CWERASE;
571# endif
572# ifdef VLNEXT
573 tio->c_cc[VLNEXT] = CLNEXT;
574# endif
575# ifdef VSTATUS
576 tio->c_cc[VSTATUS] = CSTATUS;
577# endif
578
579# if VMIN != VEOF
580 tio->c_cc[VMIN] = 1;
581# endif
582# if VTIME != VEOL
583 tio->c_cc[VTIME] = 0;
584# endif
585
586 /* input modes */
587 tio->c_iflag = (BRKINT | IGNPAR | ICRNL
588# ifdef IMAXBEL
589 | IMAXBEL
590# endif
591 | IXON);
592
593 /* output modes */
594 tio->c_oflag = (OPOST | ONLCR);
595
596 /* control modes */
597 tio->c_cflag = (CS8 | CREAD);
598
599 /* local modes */
600 tio->c_lflag = (ISIG | ICANON | IEXTEN | ECHO
601# if defined (ECHOCTL) && defined (ECHOKE)
602 | ECHOCTL | ECHOKE
603# endif
604 | ECHOE | ECHOK);
605}
606
616char **rxvt_environ; // startup environment 607char **rxvt_environ; // startup environment
617 608
618void 609void
619rxvt_init () 610rxvt_init ()
620{ 611{
621 ptytty::init (); 612 assert (("fontMask must not overlap other RS masks",
613 0 == (RS_fontMask & (RS_Sel | RS_baseattrMask | RS_customMask | RS_bgMask | RS_fgMask))));
622 614
615 rxvt_get_ttymode (&rxvt_term::def_tio);
616
617 // get rid of stdin/stdout as we don't need them, to free resources
618 dup2 (STDERR_FILENO, STDIN_FILENO);
619 dup2 (STDERR_FILENO, STDOUT_FILENO);
620
623 if (!ev_default_loop (0)) 621 if (!ev_default_loop ())
624 rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n"); 622 rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n");
625 623
626 rxvt_environ = environ; 624 rxvt_environ = environ;
627 625
628 signal (SIGHUP, SIG_IGN); 626 signal (SIGHUP, SIG_IGN);
629 signal (SIGPIPE, SIG_IGN); 627 signal (SIGPIPE, SIG_IGN);
630 628
631 sig_handlers.sw_term.start (SIGTERM); ev_unref (); 629 sig_handlers.sw_term.start (SIGTERM); ev_unref ();
632 sig_handlers.sw_int.start (SIGINT); ev_unref (); 630 sig_handlers.sw_int.start (SIGINT); ev_unref ();
633
634 /* need to trap SIGURG for SVR4 (Unixware) rlogin */
635 /* signal (SIGURG, SIG_DFL); */
636 631
637 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); 632 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
638 // TODO: handle this with exceptions and tolerate the memory loss 633 // TODO: handle this with exceptions and tolerate the memory loss
639 XSetIOErrorHandler (rxvt_xioerror_handler); 634 XSetIOErrorHandler (rxvt_xioerror_handler);
640 635
641 XrmInitialize (); 636 XrmInitialize ();
637
638#if HAVE_PIXBUF
639 g_type_init ();
640#endif
642} 641}
643 642
644/*----------------------------------------------------------------------*/ 643/*----------------------------------------------------------------------*/
645/* 644/*
646 * window size/position calculations for XSizeHint and other storage. 645 * window size/position calculations for XSizeHint and other storage.
… …
648 */ 647 */
649void 648void
650rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight) 649rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
651{ 650{
652 short recalc_x, recalc_y; 651 short recalc_x, recalc_y;
653 int x, y, sb_w, flags; 652 int x, y, flags;
654 unsigned int w, h; 653 unsigned int w, h;
655 unsigned int max_width, max_height; 654 unsigned int max_width, max_height;
656 655
657 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity; 656 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity;
658 szHint.win_gravity = NorthWestGravity; 657 szHint.win_gravity = NorthWestGravity;
… …
668 if (rs[Rs_geometry]) 667 if (rs[Rs_geometry])
669 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h); 668 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h);
670 669
671 if (flags & WidthValue) 670 if (flags & WidthValue)
672 { 671 {
672 if (!w)
673 rxvt_fatal ("illegal window geometry (width and height must be non-zero), aborting.\n");
674
673 ncol = clamp (w, 0, std::numeric_limits<int16_t>::max ()); 675 ncol = clamp (w, 1, std::numeric_limits<int16_t>::max ());
674 szHint.flags |= USSize; 676 szHint.flags |= USSize;
675 } 677 }
676 678
677 if (flags & HeightValue) 679 if (flags & HeightValue)
678 { 680 {
681 if (!h)
682 rxvt_fatal ("illegal window geometry (width and height must be non-zero), aborting.\n");
683
679 nrow = clamp (h, 0, std::numeric_limits<int16_t>::max ()); 684 nrow = clamp (h, 1, std::numeric_limits<int16_t>::max ());
680 szHint.flags |= USSize; 685 szHint.flags |= USSize;
681 } 686 }
682 687
683 if (flags & XValue) 688 if (flags & XValue)
684 { 689 {
… …
715 max_width = MAX_COLS * fwidth; 720 max_width = MAX_COLS * fwidth;
716 max_height = MAX_ROWS * fheight; 721 max_height = MAX_ROWS * fheight;
717 722
718 szHint.base_width = szHint.base_height = 2 * int_bwidth; 723 szHint.base_width = szHint.base_height = 2 * int_bwidth;
719 724
720 sb_w = 0;
721 window_vt_x = window_vt_y = int_bwidth; 725 window_vt_x = window_vt_y = int_bwidth;
722 726
723 if (scrollBar.state) 727 if (scrollBar.state)
724 { 728 {
725 sb_w = scrollbar_TotalWidth (); 729 int sb_w = scrollBar.total_width ();
726 szHint.base_width += sb_w; 730 szHint.base_width += sb_w;
727 731
728 if (!option (Opt_scrollBar_right)) 732 if (!option (Opt_scrollBar_right))
729 window_vt_x += sb_w; 733 window_vt_x += sb_w;
730 } 734 }
… …
754 { 758 {
755 min_it (height, max_height); 759 min_it (height, max_height);
756 szHint.height = szHint.base_height + height; 760 szHint.height = szHint.base_height + height;
757 } 761 }
758 762
759 if (scrollBar.state && option (Opt_scrollBar_right))
760 window_sb_x = szHint.width - sb_w;
761
762 if (recalc_x) 763 if (recalc_x)
763 szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth; 764 szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth;
764 765
765 if (recalc_y) 766 if (recalc_y)
766 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth; 767 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth;
767 768
768 ncol = width / fwidth; 769 ncol = width / fwidth;
769 nrow = height / fheight; 770 nrow = height / fheight;
771
772 // When the size of the vt window is not a multiple of the cell
773 // size, i.e., when the wm does not honour our size hints, there are
774 // extra areas not covered by the terminal screen. Such gaps, when a
775 // bg pixmap is set, would have to be cleared manually to properly
776 // refresh the background. We take the simpler route and shrink the
777 // vt window so as to avoid creating gaps.
778 vt_width = ncol * fwidth;
779 vt_height = nrow * fheight;
770} 780}
771 781
772/*----------------------------------------------------------------------*/ 782/*----------------------------------------------------------------------*/
773/* 783/*
774 * Tell the teletype handler what size the window is. 784 * Tell the teletype handler what size the window is.
… …
782 792
783 struct winsize ws; 793 struct winsize ws;
784 794
785 ws.ws_col = ncol; 795 ws.ws_col = ncol;
786 ws.ws_row = nrow; 796 ws.ws_row = nrow;
787 ws.ws_xpixel = width; 797 ws.ws_xpixel = vt_width;
788 ws.ws_ypixel = height; 798 ws.ws_ypixel = vt_height;
789 (void)ioctl (pty->pty, TIOCSWINSZ, &ws); 799 ioctl (pty->pty, TIOCSWINSZ, &ws);
790 800
791#if 0 801#if 0
792 // TIOCSWINSZ is supposed to do this automatically and correctly 802 // TIOCSWINSZ is supposed to do this automatically and correctly
793 if (cmd_pid) /* force through to the command */ 803 if (cmd_pid) /* force through to the command */
794 kill (-cmd_pid, SIGWINCH); 804 kill (-cmd_pid, SIGWINCH);
795#endif 805#endif
796} 806}
797 807
798/*----------------------------------------------------------------------*/ 808/*----------------------------------------------------------------------*/
799/* set_fonts () - load and set the various fonts 809/* load and set the various fonts */
800 *
801 * init = 1 - initialize
802 *
803 * fontname == FONT_UP - switch to bigger font
804 * fontname == FONT_DN - switch to smaller font
805 */
806bool 810bool
807rxvt_term::set_fonts () 811rxvt_term::set_fonts ()
808{ 812{
809 rxvt_fontset *fs = new rxvt_fontset (this); 813 rxvt_fontset *fs = new rxvt_fontset (this);
810 rxvt_fontprop prop; 814 rxvt_fontprop prop;
… …
824#endif 828#endif
825 829
826 delete fontset[0]; 830 delete fontset[0];
827 fontset[0] = fs; 831 fontset[0] = fs;
828 832
829 prop = (*fs)[1]->properties (); 833 prop = (*fs)[rxvt_fontset::firstFont]->properties ();
830 prop.height += lineSpace; 834 prop.width = max (prop.width + letterSpace, 1);
831 835
832 fs->set_prop (prop, false); 836 fs->set_prop (prop, false);
833 837
834 fwidth = prop.width; 838 fwidth = prop.width;
835 fheight = prop.height; 839 fheight = prop.height + lineSpace;
836 fbase = prop.ascent; 840 fbase = prop.ascent;
837 841
838 for (int style = 1; style < 4; style++) 842 for (int style = 1; style < 4; style++)
839 { 843 {
840#if ENABLE_STYLES 844#if ENABLE_STYLES
… …
866#else 870#else
867 fontset[style] = fontset[0]; 871 fontset[style] = fontset[0];
868#endif 872#endif
869 } 873 }
870 874
871 if (parent[0]) 875 if (parent)
872 { 876 {
873 resize_all_windows (0, 0, 0); 877 resize_all_windows (0, 0, 0);
874 scr_remap_chars (); 878 scr_remap_chars ();
875 scr_touch (true); 879 scr_touch (true);
876 } 880 }
… …
879} 883}
880 884
881void 885void
882rxvt_term::set_string_property (Atom prop, const char *str, int len) 886rxvt_term::set_string_property (Atom prop, const char *str, int len)
883{ 887{
884 XChangeProperty (dpy, parent[0], 888 XChangeProperty (dpy, parent,
885 prop, XA_STRING, 8, PropModeReplace, 889 prop, XA_STRING, 8, PropModeReplace,
886 (const unsigned char *)str, len >= 0 ? len : strlen (str)); 890 (const unsigned char *)str, len >= 0 ? len : strlen (str));
887} 891}
888 892
889void 893void
894rxvt_term::set_mbstring_property (Atom prop, const char *str, int len)
895{
896 XTextProperty ct;
897
898 if (XmbTextListToTextProperty (dpy, (char **)&str, 1, XStdICCTextStyle, &ct) >= 0)
899 {
900 XSetTextProperty (dpy, parent, &ct, prop);
901 XFree (ct.value);
902 }
903}
904
905void
890rxvt_term::set_utf8_property (Atom prop, const char *str, int len) 906rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
891{ 907{
892 wchar_t *ws = rxvt_mbstowcs (str, len); 908 wchar_t *ws = rxvt_mbstowcs (str, len);
893 char *s = rxvt_wcstoutf8 (ws); 909 char *s = rxvt_wcstoutf8 (ws);
894 910
895 XChangeProperty (dpy, parent[0], 911 XChangeProperty (dpy, parent,
896 prop, xa[XA_UTF8_STRING], 8, PropModeReplace, 912 prop, xa[XA_UTF8_STRING], 8, PropModeReplace,
897 (const unsigned char *)s, strlen (s)); 913 (const unsigned char *)s, strlen (s));
898 914
899 free (s); 915 free (s);
900 free (ws); 916 free (ws);
… …
904/*----------------------------------------------------------------------*/ 920/*----------------------------------------------------------------------*/
905/* xterm sequences - title, iconName, color (exptl) */ 921/* xterm sequences - title, iconName, color (exptl) */
906void 922void
907rxvt_term::set_title (const char *str) 923rxvt_term::set_title (const char *str)
908{ 924{
909 set_string_property (XA_WM_NAME, str); 925 set_mbstring_property (XA_WM_NAME, str);
910#if ENABLE_EWMH 926#if ENABLE_EWMH
911 set_utf8_property (xa[XA_NET_WM_NAME], str); 927 set_utf8_property (xa[XA_NET_WM_NAME], str);
912#endif 928#endif
913} 929}
914 930
915void 931void
916rxvt_term::set_icon_name (const char *str) 932rxvt_term::set_icon_name (const char *str)
917{ 933{
918 set_string_property (XA_WM_ICON_NAME, str); 934 set_mbstring_property (XA_WM_ICON_NAME, str);
919#if ENABLE_EWMH 935#if ENABLE_EWMH
920 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str); 936 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str);
921#endif 937#endif
922} 938}
923 939
924void 940void
925rxvt_term::set_window_color (int idx, const char *color) 941rxvt_term::set_window_color (int idx, const char *color)
926{ 942{
927#ifdef XTERM_COLOR_CHANGE 943#ifdef XTERM_COLOR_CHANGE
928 rxvt_color xcol; 944 rxvt_color xcol;
929 int i;
930 945
931 if (color == NULL || *color == '\0') 946 if (color == NULL || *color == '\0')
932 return; 947 return;
933 948
934 color = strdup (color); 949 color = strdup (color);
… …
936 rs[Rs_color + idx] = color; 951 rs[Rs_color + idx] = color;
937 952
938 /* handle color aliases */ 953 /* handle color aliases */
939 if (isdigit (*color)) 954 if (isdigit (*color))
940 { 955 {
941 i = atoi (color); 956 int i = atoi (color);
942 957
943 if (i >= 8 && i <= 15) 958 if (i >= 8 && i <= 15)
944 { 959 {
945 /* bright colors */ 960 /* bright colors */
946 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i - 8]; 961 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i - 8];
… …
991 1006
992/*----------------------------------------------------------------------*/ 1007/*----------------------------------------------------------------------*/
993/* 1008/*
994 * find if fg/bg matches any of the normal (low-intensity) colors 1009 * find if fg/bg matches any of the normal (low-intensity) colors
995 */ 1010 */
996void 1011char *
997rxvt_term::set_colorfgbg () 1012rxvt_term::get_colorfgbg ()
998{ 1013{
999 unsigned int i; 1014 unsigned int i;
1000 const char *xpmb = ""; 1015 const char *xpmb = "";
1001 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1]; 1016 char fstr[] = "default";
1017 char bstr[] = "default";
1018 char *env_colorfgbg;
1002 1019
1003 strcpy (fstr, "default");
1004 strcpy (bstr, "default");
1005 for (i = Color_Black; i <= Color_White; i++) 1020 for (i = Color_Black; i <= Color_White; i++)
1006 if (pix_colors[Color_fg] == pix_colors[i]) 1021 if (pix_colors[Color_fg] == pix_colors[i])
1007 { 1022 {
1008 sprintf (fstr, "%d", (i - Color_Black)); 1023 sprintf (fstr, "%d", i - Color_Black);
1009 break; 1024 break;
1010 } 1025 }
1011 1026
1012 for (i = Color_Black; i <= Color_White; i++) 1027 for (i = Color_Black; i <= Color_White; i++)
1013 if (pix_colors[Color_bg] == pix_colors[i]) 1028 if (pix_colors[Color_bg] == pix_colors[i])
1014 { 1029 {
1015 sprintf (bstr, "%d", (i - Color_Black)); 1030 sprintf (bstr, "%d", i - Color_Black);
1016#ifdef BG_IMAGE_FROM_FILE 1031#if BG_IMAGE_FROM_FILE
1017 xpmb = "default;"; 1032 xpmb = "default;";
1018#endif 1033#endif
1019 break; 1034 break;
1020 } 1035 }
1021 1036
1037 env_colorfgbg = (char *)rxvt_malloc (sizeof ("COLORFGBG=default;default;bg"));
1022 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr); 1038 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr);
1039 return env_colorfgbg;
1023} 1040}
1024 1041
1025/*----------------------------------------------------------------------*/ 1042/*----------------------------------------------------------------------*/
1026 1043
1027bool 1044bool
… …
1050 int old_width = szHint.width; 1067 int old_width = szHint.width;
1051 int old_height = szHint.height; 1068 int old_height = szHint.height;
1052 1069
1053 window_calc (newwidth, newheight); 1070 window_calc (newwidth, newheight);
1054 1071
1055 if (!HOOK_INVOKE ((this, HOOK_RESIZE_ALL_WINDOWS, DT_INT, newwidth, DT_INT, newheight, DT_END))) 1072 bool set_hint = !HOOK_INVOKE ((this, HOOK_RESIZE_ALL_WINDOWS, DT_INT, newwidth, DT_INT, newheight, DT_END));
1073
1074 // to avoid races between us and the wm, we clear the incremental size hints around the xresizewindow
1075 if (set_hint)
1076 {
1077 szHint.flags &= ~(PBaseSize | PResizeInc);
1056 XSetWMNormalHints (dpy, parent[0], &szHint); 1078 XSetWMNormalHints (dpy, parent, &szHint);
1079 szHint.flags |= PBaseSize | PResizeInc;
1080 }
1057 1081
1058 if (!ignoreparent) 1082 if (!ignoreparent)
1059 { 1083 {
1060#ifdef SMART_RESIZE 1084#ifdef SMART_RESIZE
1061 /* 1085 /*
… …
1065 int x, y, x1, y1; 1089 int x, y, x1, y1;
1066 int dx, dy; 1090 int dx, dy;
1067 unsigned int unused_w1, unused_h1, unused_b1, unused_d1; 1091 unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
1068 Window unused_cr; 1092 Window unused_cr;
1069 1093
1070 XTranslateCoordinates (dpy, parent[0], display->root, 1094 XTranslateCoordinates (dpy, parent, display->root,
1071 0, 0, &x, &y, &unused_cr); 1095 0, 0, &x, &y, &unused_cr);
1072 XGetGeometry (dpy, parent[0], &unused_cr, &x1, &y1, 1096 XGetGeometry (dpy, parent, &unused_cr, &x1, &y1,
1073 &unused_w1, &unused_h1, &unused_b1, &unused_d1); 1097 &unused_w1, &unused_h1, &unused_b1, &unused_d1);
1074 /* 1098 /*
1075 * if display->root isn't the parent window, a WM will probably have offset 1099 * if display->root isn't the parent window, a WM will probably have offset
1076 * our position for handles and decorations. Counter it 1100 * our position for handles and decorations. Counter it
1077 */ 1101 */
… …
1094 if (y < y1) /* top half */ 1118 if (y < y1) /* top half */
1095 dy = 0; 1119 dy = 0;
1096 else if (y == y1) /* exact center */ 1120 else if (y == y1) /* exact center */
1097 dy /= 2; 1121 dy /= 2;
1098 1122
1099 XMoveResizeWindow (dpy, parent[0], x + dx, y + dy, 1123 XMoveResizeWindow (dpy, parent, x + dx, y + dy,
1100 szHint.width, szHint.height); 1124 szHint.width, szHint.height);
1101#else 1125#else
1102 XResizeWindow (dpy, parent[0], szHint.width, szHint.height); 1126 XResizeWindow (dpy, parent, szHint.width, szHint.height);
1103#endif 1127#endif
1104 } 1128 }
1129
1130 if (set_hint)
1131 XSetWMNormalHints (dpy, parent, &szHint);
1105 1132
1106 fix_screen = ncol != prev_ncol || nrow != prev_nrow; 1133 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
1107 1134
1108 if (fix_screen || newwidth != old_width || newheight != old_height) 1135 if (fix_screen || newwidth != old_width || newheight != old_height)
1109 { 1136 {
1110 if (scrollBar.state) 1137 if (scrollBar.state)
1111 { 1138 scrollBar.resize ();
1112 XMoveResizeWindow (dpy, scrollBar.win,
1113 window_sb_x, 0,
1114 scrollbar_TotalWidth (), szHint.height);
1115 resize_scrollbar ();
1116 }
1117 1139
1118 XMoveResizeWindow (dpy, vt, 1140 XMoveResizeWindow (dpy, vt,
1119 window_vt_x, window_vt_y, 1141 window_vt_x, window_vt_y,
1120 width, height); 1142 vt_width, vt_height);
1143
1144 HOOK_INVOKE ((this, HOOK_SIZE_CHANGE, DT_INT, newwidth, DT_INT, newheight, DT_END));
1121 1145
1122#ifdef HAVE_BG_PIXMAP 1146#ifdef HAVE_BG_PIXMAP
1123 if (bgPixmap.window_size_sensitive ()) 1147 if (bg_window_size_sensitive ())
1124 update_background (); 1148 update_background ();
1125#endif 1149#endif
1126
1127 scr_clear ();
1128 } 1150 }
1129 1151
1130 if (fix_screen || old_height == 0) 1152 if (fix_screen || old_height == 0)
1131 scr_reset (); 1153 scr_reset ();
1132 1154
1133 // TODO, with nvidia-8178, resizes kill the alpha channel, report if not fixed in newer version
1134 //scr_touch (false);
1135
1136#ifdef HAVE_BG_PIXMAP
1137// TODO: this don't seem to have any effect - do we still need it ? If so - in which case exactly ?
1138// if (bgPixmap.pixmap)
1139// scr_touch (false);
1140#endif
1141
1142#ifdef USE_XIM 1155#if USE_XIM
1143 IMSetPosition (); 1156 im_set_position ();
1144#endif 1157#endif
1145} 1158}
1146 1159
1147/* 1160/*
1148 * Set the width/height of the vt window in characters. Units are pixels. 1161 * Set the width/height of the vt window in characters. Units are pixels.
… …
1161 newwidth = wattr.width - szHint.base_width; 1174 newwidth = wattr.width - szHint.base_width;
1162 if (newheight == 0) 1175 if (newheight == 0)
1163 newheight = wattr.height - szHint.base_height; 1176 newheight = wattr.height - szHint.base_height;
1164 } 1177 }
1165 1178
1166 if (newwidth != width || newheight != height) 1179 if (newwidth != vt_width || newheight != vt_height)
1167 { 1180 {
1168 newwidth += szHint.base_width; 1181 newwidth += szHint.base_width;
1169 newheight += szHint.base_height; 1182 newheight += szHint.base_height;
1170 resize_all_windows (newwidth, newheight, 0); 1183 resize_all_windows (newwidth, newheight, 0);
1171 } 1184 }
1172} 1185}
1173 1186
1174/* -------------------------------------------------------------------- * 1187/* -------------------------------------------------------------------- *
1175 * - X INPUT METHOD ROUTINES - * 1188 * - X INPUT METHOD ROUTINES - *
1176 * -------------------------------------------------------------------- */ 1189 * -------------------------------------------------------------------- */
1177#ifdef USE_XIM 1190#if USE_XIM
1178 1191
1179void 1192void
1180rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg) 1193rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg)
1181{ 1194{
1182 fg = pix_colors [Color_fg]; 1195 fg = pix_colors [Color_fg];
… …
1209 status_rect.height = fheight; 1222 status_rect.height = fheight;
1210} 1223}
1211 1224
1212/* Checking whether input method is running. */ 1225/* Checking whether input method is running. */
1213bool 1226bool
1214rxvt_term::IMisRunning () 1227rxvt_term::im_is_running ()
1215{ 1228{
1216 char *p;
1217 Atom atom; 1229 Atom atom;
1218 Window win; 1230 Window win;
1219 char server[IMBUFSIZ]; 1231 char server[IMBUFSIZ];
1220 1232
1221 /* get current locale modifier */ 1233 /* get current locale modifier */
1222 if ((p = XSetLocaleModifiers (NULL)) != NULL) 1234 if (char *p = XSetLocaleModifiers (0))
1223 { 1235 {
1224 strcpy (server, "@server="); 1236 strcpy (server, "@server=");
1225 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */ 1237 strncat (server, p + 4, IMBUFSIZ - 9); /* skip "@im=" */
1226 1238
1227 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */ 1239 if (p = strchr (server + 1, '@')) /* first one only */
1228 *p = '\0'; 1240 *p = '\0';
1229 1241
1230 atom = XInternAtom (dpy, server, False); 1242 atom = XInternAtom (dpy, server, False);
1231 win = XGetSelectionOwner (dpy, atom); 1243 win = XGetSelectionOwner (dpy, atom);
1232 1244
1233 if (win != None) 1245 if (win != None)
1234 return True; 1246 return true;
1235 } 1247 }
1236 1248
1237 return False; 1249 return false;
1238} 1250}
1239 1251
1240void 1252void
1241rxvt_term::IMSendSpot () 1253rxvt_term::im_send_spot ()
1242{ 1254{
1243 XPoint nspot; 1255 XPoint nspot;
1244 XVaNestedList preedit_attr; 1256 XVaNestedList preedit_attr;
1245 1257
1246 if (!Input_Context 1258 if (!Input_Context
… …
1299 1311
1300 term->make_current (); 1312 term->make_current ();
1301 1313
1302 if (text) 1314 if (text)
1303 { 1315 {
1304 void *str; 1316 wchar_t *str;
1305 1317
1306 if (!text->encoding_is_wchar && text->string.multi_byte) 1318 if (!text->encoding_is_wchar && text->string.multi_byte)
1307 { 1319 {
1308 // of course, X makes it ugly again 1320 // of course, X makes it ugly again
1309 if (term->rs[Rs_imLocale]) 1321 if (term->rs[Rs_imLocale])
1310 SET_LOCALE (term->rs[Rs_imLocale]); 1322 SET_LOCALE (term->rs[Rs_imLocale]);
1311 1323
1312 str = rxvt_temp_buf ((text->length + 1) * sizeof (wchar_t)); 1324 str = rxvt_temp_buf<wchar_t> (text->length + 1);
1313 mbstowcs ((wchar_t *)str, text->string.multi_byte, text->length + 1); 1325 mbstowcs (str, text->string.multi_byte, text->length + 1);
1314 1326
1315 if (term->rs[Rs_imLocale]) 1327 if (term->rs[Rs_imLocale])
1316 SET_LOCALE (term->locale); 1328 SET_LOCALE (term->locale);
1317 } 1329 }
1318 else 1330 else
1319 str = (void *)text->string.wide_char; 1331 str = text->string.wide_char;
1320 1332
1321 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW, 1333 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
1322 DT_INT, call_data->caret, 1334 DT_INT, call_data->caret,
1323 DT_INT, call_data->chg_first, 1335 DT_INT, call_data->chg_first,
1324 DT_INT, call_data->chg_length, 1336 DT_INT, call_data->chg_length,
… …
1352/* 1364/*
1353 * Try to open a XIM with the current modifiers, then see if we can 1365 * Try to open a XIM with the current modifiers, then see if we can
1354 * open a suitable preedit type 1366 * open a suitable preedit type
1355 */ 1367 */
1356bool 1368bool
1357rxvt_term::IM_get_IC (const char *modifiers) 1369rxvt_term::im_get_ic (const char *modifiers)
1358{ 1370{
1359 int i, j, found; 1371 int i, j, found;
1360 XIM xim; 1372 XIM xim;
1361 XPoint spot; 1373 XPoint spot;
1362 XRectangle rect, status_rect, needed_rect; 1374 XRectangle rect, status_rect, needed_rect;
1363 unsigned long fg, bg; 1375 unsigned long fg, bg;
1364 const char *p; 1376 const char *p;
1365 char **s; 1377 char **s;
1366 XIMStyles *xim_styles; 1378 XIMStyles *xim_styles;
1367#ifdef ENABLE_XIM_ONTHESPOT
1368 XIMCallback xcb[4];
1369#endif
1370 1379
1371 set_environ (envv); 1380 set_environ (env);
1372 1381
1373 if (! ((p = XSetLocaleModifiers (modifiers)) && *p)) 1382 if (!((p = XSetLocaleModifiers (modifiers)) && *p))
1374 return false; 1383 return false;
1375 1384
1376 input_method = display->get_xim (locale, modifiers); 1385 input_method = display->get_xim (locale, modifiers);
1377 if (input_method == NULL) 1386 if (input_method == NULL)
1378 return false; 1387 return false;
… …
1395 p = pet[pi]; 1404 p = pet[pi];
1396 1405
1397 if (!p) 1406 if (!p)
1398 continue; 1407 continue;
1399 1408
1400 s = rxvt_splitcommastring (p); 1409 s = rxvt_strsplit (',', p);
1401 1410
1402 for (i = found = 0; !found && s[i]; i++) 1411 for (i = found = 0; !found && s[i]; i++)
1403 { 1412 {
1404 if (!strcmp (s[i], "OverTheSpot")) 1413 if (!strcmp (s[i], "OverTheSpot"))
1405 input_style = XIMPreeditPosition | XIMStatusNothing; 1414 input_style = XIMPreeditPosition | XIMStatusNothing;
… …
1417 input_style = XIMPreeditNothing | XIMStatusNothing; 1426 input_style = XIMPreeditNothing | XIMStatusNothing;
1418 1427
1419 for (j = 0; j < xim_styles->count_styles; j++) 1428 for (j = 0; j < xim_styles->count_styles; j++)
1420 if (input_style == xim_styles->supported_styles[j]) 1429 if (input_style == xim_styles->supported_styles[j])
1421 { 1430 {
1422 rxvt_freecommastring (s); 1431 rxvt_free_strsplit (s);
1423 1432
1424 found = 1; 1433 found = 1;
1425 goto foundpet; 1434 goto foundpet;
1426 } 1435 }
1427 1436
1428 } 1437 }
1429 1438
1430 rxvt_freecommastring (s); 1439 rxvt_free_strsplit (s);
1431 } 1440 }
1432 1441
1433foundpet: 1442foundpet:
1434 1443
1435 XFree (xim_styles); 1444 XFree (xim_styles);
… …
1514 NULL); 1523 NULL);
1515 } 1524 }
1516#if ENABLE_XIM_ONTHESPOT 1525#if ENABLE_XIM_ONTHESPOT
1517 else if (input_style & XIMPreeditCallbacks) 1526 else if (input_style & XIMPreeditCallbacks)
1518 { 1527 {
1528 XIMCallback xcb[4];
1529
1519 im_set_position (spot); 1530 im_set_position (spot);
1520 1531
1521 xcb[0].client_data = (XPointer)this; xcb[0].callback = (XIMProc)xim_preedit_start; 1532 xcb[0].client_data = (XPointer)this; xcb[0].callback = (XIMProc)xim_preedit_start;
1522 xcb[1].client_data = (XPointer)this; xcb[1].callback = (XIMProc)xim_preedit_done; 1533 xcb[1].client_data = (XPointer)this; xcb[1].callback = (XIMProc)xim_preedit_done;
1523 xcb[2].client_data = (XPointer)this; xcb[2].callback = (XIMProc)xim_preedit_draw; 1534 xcb[2].client_data = (XPointer)this; xcb[2].callback = (XIMProc)xim_preedit_draw;
… …
1538#endif 1549#endif
1539 1550
1540 Input_Context = XCreateIC (xim, 1551 Input_Context = XCreateIC (xim,
1541 XNInputStyle, input_style, 1552 XNInputStyle, input_style,
1542 XNClientWindow, vt, 1553 XNClientWindow, vt,
1543 XNFocusWindow, parent[0], 1554 XNFocusWindow, parent,
1544 preedit_attr ? XNPreeditAttributes : NULL, 1555 preedit_attr ? XNPreeditAttributes : NULL,
1545 preedit_attr, 1556 preedit_attr,
1546 status_attr ? XNStatusAttributes : NULL, 1557 status_attr ? XNStatusAttributes : NULL,
1547 status_attr, NULL); 1558 status_attr, NULL);
1548 1559
… …
1561 // unfortunately, only the focus window is used by XIM, hard to fix 1572 // unfortunately, only the focus window is used by XIM, hard to fix
1562 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL)) 1573 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL))
1563 vt_select_input (); 1574 vt_select_input ();
1564#endif 1575#endif
1565 1576
1566 IMSetPosition (); 1577 im_set_position ();
1567 1578
1568 return true; 1579 return true;
1569} 1580}
1570 1581
1571void 1582void
… …
1581 im_destroy (); 1592 im_destroy ();
1582 1593
1583 if (Input_Context) 1594 if (Input_Context)
1584 return; 1595 return;
1585 1596
1586#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1587 if (rs[Rs_imLocale]) 1597 if (rs[Rs_imLocale])
1588 SET_LOCALE (rs[Rs_imLocale]); 1598 SET_LOCALE (rs[Rs_imLocale]);
1589#endif
1590 1599
1591 p = rs[Rs_inputMethod]; 1600 p = rs[Rs_inputMethod];
1592 if (p && *p) 1601 if (p && *p)
1593 { 1602 {
1594 bool found = false; 1603 bool found = false;
1595 1604
1596 s = rxvt_splitcommastring (p); 1605 s = rxvt_strsplit (',', p);
1597 1606
1598 for (i = 0; s[i]; i++) 1607 for (i = 0; s[i]; i++)
1599 { 1608 {
1600 if (*s[i]) 1609 if (*s[i])
1601 { 1610 {
1602 strcpy (buf, "@im="); 1611 strcpy (buf, "@im=");
1603 strncat (buf, s[i], IMBUFSIZ - 5); 1612 strncat (buf, s[i], IMBUFSIZ - 5);
1604 if (IM_get_IC (buf)) 1613 if (im_get_ic (buf))
1605 { 1614 {
1606 found = true; 1615 found = true;
1607 break; 1616 break;
1608 } 1617 }
1609 } 1618 }
1610 } 1619 }
1611 1620
1612 rxvt_freecommastring (s); 1621 rxvt_free_strsplit (s);
1613 1622
1614 if (found) 1623 if (found)
1615 goto done; 1624 goto done;
1616 } 1625 }
1617 1626
1618 /* try with XMODIFIERS env. var. */ 1627 /* try with XMODIFIERS env. var. */
1619 if (IM_get_IC ("")) 1628 if (im_get_ic (""))
1620 goto done; 1629 goto done;
1621 1630
1622 /* try with no modifiers base IF the user didn't specify an IM */ 1631 /* try with no modifiers base IF the user didn't specify an IM */
1623 if (IM_get_IC ("@im=none")) 1632 if (im_get_ic ("@im=none"))
1624 goto done; 1633 goto done;
1625 1634
1626done: 1635done:
1627#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1628 if (rs[Rs_imLocale]) 1636 if (rs[Rs_imLocale])
1629 SET_LOCALE (locale); 1637 SET_LOCALE (locale);
1630#endif
1631} 1638}
1632 1639
1633void 1640void
1634rxvt_term::IMSetPosition () 1641rxvt_term::im_set_position ()
1635{ 1642{
1636 XRectangle preedit_rect, status_rect, *needed_rect; 1643 XRectangle preedit_rect, status_rect, *needed_rect;
1637 XVaNestedList preedit_attr, status_attr; 1644 XVaNestedList preedit_attr, status_attr;
1638 1645
1639 if (!Input_Context 1646 if (!Input_Context
1640 || !focus 1647 || !focus
1641 || !(input_style & (XIMPreeditArea | XIMPreeditPosition)) 1648 || !(input_style & (XIMPreeditArea | XIMPreeditPosition))
1642 || !IMisRunning ()) 1649 || !im_is_running ())
1643 return; 1650 return;
1644 1651
1645 if (input_style & XIMPreeditPosition) 1652 if (input_style & XIMPreeditPosition)
1646 { 1653 {
1647 im_set_size (preedit_rect); 1654 im_set_size (preedit_rect);
… …
1677 1684
1678void 1685void
1679rxvt_term::get_window_origin (int &x, int &y) 1686rxvt_term::get_window_origin (int &x, int &y)
1680{ 1687{
1681 Window cr; 1688 Window cr;
1682 XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr); 1689 XTranslateCoordinates (dpy, parent, display->root, 0, 0, &x, &y, &cr);
1683/* fprintf (stderr, "origin is %+d%+d\n", x, y);*/
1684}
1685
1686Pixmap
1687rxvt_term::get_pixmap_property (int prop_id)
1688{
1689 if (prop_id > 0 && prop_id < NUM_XA)
1690 if (xa[prop_id])
1691 {
1692 int aformat;
1693 unsigned long nitems, bytes_after;
1694 Atom atype;
1695 unsigned char *prop = NULL;
1696 int result = XGetWindowProperty (dpy, display->root, xa[prop_id],
1697 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1698 &nitems, &bytes_after, &prop);
1699 if (result == Success && prop && atype == XA_PIXMAP)
1700 return *(Pixmap *)prop;
1701 }
1702
1703 return None;
1704} 1690}
1705 1691
1706#ifdef HAVE_BG_PIXMAP 1692#ifdef HAVE_BG_PIXMAP
1707# if TRACE_PIXMAPS
1708# undef update_background
1709void
1710rxvt_term::trace_update_background (const char *file, int line)
1711{
1712 fprintf (stderr, "%s:%d:update_background()\n", file, line);
1713 update_background ();
1714}
1715# endif
1716 1693
1717void 1694void
1718rxvt_term::update_background () 1695rxvt_term::update_background ()
1719{ 1696{
1720 if (update_background_ev.is_active ()) 1697 if (update_background_ev.is_active ())
1721 return; 1698 return;
1722 1699
1723 bgPixmap.invalidate ();
1724
1725 ev_tstamp to_wait = 0.5 - (ev::now () - bgPixmap.valid_since); 1700 ev_tstamp to_wait = 0.5 - (ev::now () - bg_valid_since);
1726 1701
1727 if (to_wait <= 0.) 1702 if (to_wait <= 0.)
1728 bgPixmap.render (); 1703 bg_render ();
1729 else 1704 else
1730 update_background_ev.start (to_wait); 1705 update_background_ev.start (to_wait);
1731} 1706}
1732 1707
1733void 1708void
1734rxvt_term::update_background_cb (ev::timer &w, int revents) 1709rxvt_term::update_background_cb (ev::timer &w, int revents)
1735{ 1710{
1736 make_current (); 1711 make_current ();
1737 1712
1738 update_background_ev.stop (); 1713 update_background_ev.stop ();
1739 bgPixmap.render (); 1714 bg_render ();
1740 refresh_check (); 1715 refresh_check ();
1741} 1716}
1742 1717
1743#endif /* HAVE_BG_PIXMAP */ 1718#endif /* HAVE_BG_PIXMAP */
1744 1719

Diff Legend

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