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

Diff Legend

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