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

Comparing rxvt-unicode/src/main.C (file contents):
Revision 1.298 by root, Sat Jan 12 22:13:46 2008 UTC vs.
Revision 1.383 by sf-exg, Wed Aug 29 09:43:42 2012 UTC

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

Diff Legend

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