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.279 by ayin, Wed Dec 12 09:33:48 2007 UTC vs.
Revision 1.374 by root, Sun Jun 3 10:42:34 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-2006 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#ifdef 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
186#ifndef NO_BELL 183#ifndef NO_BELL
187 bell_ev.set <rxvt_term, &rxvt_term::bell_cb> (this); 184 bell_ev.set <rxvt_term, &rxvt_term::bell_cb> (this);
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 prepare_ev.set <rxvt_term, &rxvt_term::prepare_cb> (this);
191 flush_ev.set <rxvt_term, &rxvt_term::flush_cb> (this); 187 flush_ev.set <rxvt_term, &rxvt_term::flush_cb> (this);
192 destroy_ev.set <rxvt_term, &rxvt_term::destroy_cb> (this); 188 destroy_ev.set <rxvt_term, &rxvt_term::destroy_cb> (this);
193 pty_ev.set <rxvt_term, &rxvt_term::pty_cb> (this); 189 pty_ev.set <rxvt_term, &rxvt_term::pty_cb> (this);
194 incr_ev.set <rxvt_term, &rxvt_term::incr_cb> (this);
195 termwin_ev.set <rxvt_term, &rxvt_term::x_cb> (this); 190 termwin_ev.set <rxvt_term, &rxvt_term::x_cb> (this);
196 vt_ev.set <rxvt_term, &rxvt_term::x_cb> (this); 191 vt_ev.set <rxvt_term, &rxvt_term::x_cb> (this);
197 192
198 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base; 193 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base;
199 194
… …
227 if (fontset[i] != fontset[0]) 222 if (fontset[i] != fontset[0])
228 delete fontset[i]; 223 delete fontset[i];
229#endif 224#endif
230 delete fontset[0]; 225 delete fontset[0];
231 226
227#ifdef HAVE_BG_PIXMAP
228 bg_destroy ();
229#endif
230
232 if (display) 231 if (display)
233 { 232 {
234 selection_clear (); 233 selection_clear ();
234 selection_clear (true);
235 235
236#ifdef USE_XIM 236#ifdef USE_XIM
237 im_destroy (); 237 im_destroy ();
238#endif 238#endif
239#ifdef XTERM_SCROLLBAR 239 scrollBar.destroy ();
240 if (xscrollbarGC) XFreeGC (dpy, xscrollbarGC);
241 if (ShadowGC) XFreeGC (dpy, ShadowGC);
242#endif
243#ifdef PLAIN_SCROLLBAR
244 if (pscrollbarGC) XFreeGC (dpy, pscrollbarGC);
245#endif
246#ifdef NEXT_SCROLLBAR
247 if (blackGC) XFreeGC (dpy, blackGC);
248 if (whiteGC) XFreeGC (dpy, whiteGC);
249 if (grayGC) XFreeGC (dpy, grayGC);
250 if (darkGC) XFreeGC (dpy, darkGC);
251 if (stippleGC) XFreeGC (dpy, stippleGC);
252 if (dimple) XFreePixmap (dpy, dimple);
253 if (upArrow) XFreePixmap (dpy, upArrow);
254 if (downArrow) XFreePixmap (dpy, downArrow);
255 if (upArrowHi) XFreePixmap (dpy, upArrowHi);
256 if (downArrowHi) XFreePixmap (dpy, downArrowHi);
257#endif
258#ifdef RXVT_SCROLLBAR
259 if (topShadowGC) XFreeGC (dpy, topShadowGC);
260 if (botShadowGC) XFreeGC (dpy, botShadowGC);
261 if (scrollbarGC) XFreeGC (dpy, scrollbarGC);
262#endif
263 if (gc) XFreeGC (dpy, gc); 240 if (gc) XFreeGC (dpy, gc);
264 241
265 delete drawable; 242 delete drawable;
266 // destroy all windows 243 // destroy all windows
267 if (parent[0]) 244 if (parent)
268 XDestroyWindow (dpy, parent[0]); 245 XDestroyWindow (dpy, parent);
269 246
270 for (int i = 0; i < TOTAL_COLORS; i++) 247 for (int i = 0; i < TOTAL_COLORS; i++)
271 if (ISSET_PIXCOLOR (i)) 248 if (ISSET_PIXCOLOR (i))
272 { 249 {
273 pix_colors_focused [i].free (this); 250 pix_colors_focused [i].free (this);
… …
275 pix_colors_unfocused [i].free (this); 252 pix_colors_unfocused [i].free (this);
276#endif 253#endif
277 } 254 }
278 255
279 clear (); 256 clear ();
280 }
281 257
282 delete [] pix_colors_focused; 258 display->flush (); /* ideally .put should do this */
283#if OFF_FOCUS_FADING
284 delete [] pix_colors_unfocused;
285#endif
286
287#ifdef HAVE_BG_PIXMAP
288 bgPixmap.destroy ();
289#endif
290 displays.put (display); 259 displays.put (display);
260 }
291 261
292 scr_release (); 262 scr_release ();
293 263
294 /* clear all resources */ 264 /* clear all resources */
295 for (int i = 0; i < allocated.size (); i++) 265 for (int i = 0; i < allocated.size (); i++)
296 free (allocated [i]); 266 free (allocated [i]);
297 267
298 free (selection.text); 268 free (selection.text);
299 // TODO: manage env vars in child only(!) 269 free (selection.clip_text);
300 free (env_display);
301 free (env_term);
302 free (locale); 270 free (locale);
303 free (v_buffer); 271 free (v_buffer);
304 free (incr_buf); 272
273 delete selection_req;
305 274
306 delete envv; 275 delete envv;
307 delete argv; 276 delete argv;
308 277
309#ifdef KEYSYM_RESOURCE 278#ifdef KEYSYM_RESOURCE
… …
327} 296}
328 297
329void 298void
330rxvt_term::destroy () 299rxvt_term::destroy ()
331{ 300{
332 if (ev_is_active (&destroy_ev)) 301 if (destroy_ev.is_active ())
333 return; 302 return;
334 303
335 HOOK_INVOKE ((this, HOOK_DESTROY, DT_END)); 304 HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));
336 305
337#if ENABLE_OVERLAY 306#if ENABLE_OVERLAY
… …
341 if (display) 310 if (display)
342 { 311 {
343#if USE_XIM 312#if USE_XIM
344 im_ev.stop (display); 313 im_ev.stop (display);
345#endif 314#endif
346#if HAVE_SCROLLBARS
347 scrollbar_ev.stop (display); 315 scrollbar_ev.stop (display);
348#endif
349#if ENABLE_TRANSPARENCY || ENABLE_PERL 316#if ENABLE_TRANSPARENCY || ENABLE_PERL
350 rootwin_ev.stop (display); 317 rootwin_ev.stop (display);
351#endif 318#endif
352 incr_ev.stop ();
353 termwin_ev.stop (display); 319 termwin_ev.stop (display);
354 vt_ev.stop (display); 320 vt_ev.stop (display);
355 } 321 }
356 322
357 prepare_ev.stop (); 323 flush_ev.stop ();
358 pty_ev.stop (); 324 pty_ev.stop ();
359#ifdef CURSOR_BLINK 325#ifdef CURSOR_BLINK
360 cursor_blink_ev.stop (); 326 cursor_blink_ev.stop ();
361#endif 327#endif
362#ifdef TEXT_BLINK 328#ifdef TEXT_BLINK
… …
379rxvt_term::destroy_cb (ev::idle &w, int revents) 345rxvt_term::destroy_cb (ev::idle &w, int revents)
380{ 346{
381 make_current (); 347 make_current ();
382 348
383 delete this; 349 delete this;
350}
351
352void
353rxvt_term::set_option (uint8_t opt, bool set) NOTHROW
354{
355 if (!opt)
356 return;
357
358 uint8_t mask = 1 << (opt & 7);
359 uint8_t &val = options [opt >> 3];
360
361 val = val & ~mask | (set ? mask : 0);
384} 362}
385 363
386/*----------------------------------------------------------------------*/ 364/*----------------------------------------------------------------------*/
387/* 365/*
388 * Exit gracefully, clearing the utmp entry and restoring tty attributes 366 * Exit gracefully, clearing the utmp entry and restoring tty attributes
… …
396 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++) 374 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)
397 (*t)->emergency_cleanup (); 375 (*t)->emergency_cleanup ();
398} 376}
399 377
400#if !ENABLE_MINIMAL 378#if !ENABLE_MINIMAL
401static void 379static void ecb_cold
402print_x_error (Display *dpy, XErrorEvent *event) 380print_x_error (Display *dpy, XErrorEvent *event)
403{ 381{
404 char buffer[BUFSIZ]; 382 char buffer[BUFSIZ];
405 char mesg[BUFSIZ]; 383 char mesg[BUFSIZ];
406 char number[32]; 384 char number[32];
407 char *mtype = "XlibMessage"; 385 const char mtype[] = "XlibMessage";
408 XGetErrorText(dpy, event->error_code, buffer, BUFSIZ); 386 XGetErrorText(dpy, event->error_code, buffer, BUFSIZ);
409 XGetErrorDatabaseText(dpy, mtype, "XError", "X Error", mesg, BUFSIZ); 387 XGetErrorDatabaseText(dpy, mtype, "XError", "X Error", mesg, BUFSIZ);
410 rxvt_warn ("An X Error occured, trying to continue after report.\n"); 388 rxvt_warn ("An X Error occurred, trying to continue after report.\n");
411 rxvt_warn ("%s: %s\n", mesg, buffer); 389 rxvt_warn ("%s: %s\n", mesg, buffer);
412 XGetErrorDatabaseText(dpy, mtype, "MajorCode", "Request Major code %d", mesg, BUFSIZ); 390 XGetErrorDatabaseText(dpy, mtype, "MajorCode", "Request Major code %d", mesg, BUFSIZ);
413 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->request_code); 391 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->request_code);
414 sprintf(number, "%d", event->request_code); 392 sprintf(number, "%d", event->request_code);
415 XGetErrorDatabaseText(dpy, "XRequest", number, "", buffer, BUFSIZ); 393 XGetErrorDatabaseText(dpy, "XRequest", number, "", buffer, BUFSIZ);
416 rxvt_warn ("(which is %s)\n", buffer); 394 rxvt_warn ("(which is %s)\n", buffer);
417 if (event->request_code >= 128) { 395 if (event->request_code >= 128) {
418 XGetErrorDatabaseText(dpy, mtype, "MinorCode", "Request Minor code %d", 396 XGetErrorDatabaseText(dpy, mtype, "MinorCode", "Request Minor code %d",
419 mesg, BUFSIZ); 397 mesg, BUFSIZ);
420 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->minor_code); 398 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->minor_code);
421 } 399 }
422 if ((event->error_code == BadWindow) || 400 if ((event->error_code == BadWindow) ||
423 (event->error_code == BadPixmap) || 401 (event->error_code == BadPixmap) ||
424 (event->error_code == BadCursor) || 402 (event->error_code == BadCursor) ||
425 (event->error_code == BadFont) || 403 (event->error_code == BadFont) ||
426 (event->error_code == BadDrawable) || 404 (event->error_code == BadDrawable) ||
427 (event->error_code == BadColor) || 405 (event->error_code == BadColor) ||
428 (event->error_code == BadGC) || 406 (event->error_code == BadGC) ||
429 (event->error_code == BadIDChoice) || 407 (event->error_code == BadIDChoice) ||
430 (event->error_code == BadValue) || 408 (event->error_code == BadValue) ||
431 (event->error_code == BadAtom)) { 409 (event->error_code == BadAtom)) {
432 if (event->error_code == BadValue) 410 if (event->error_code == BadValue)
433 XGetErrorDatabaseText(dpy, mtype, "Value", "Value 0x%x", 411 XGetErrorDatabaseText(dpy, mtype, "Value", "Value 0x%x",
434 mesg, BUFSIZ); 412 mesg, BUFSIZ);
435 else if (event->error_code == BadAtom) 413 else if (event->error_code == BadAtom)
436 XGetErrorDatabaseText(dpy, mtype, "AtomID", "AtomID 0x%x", 414 XGetErrorDatabaseText(dpy, mtype, "AtomID", "AtomID 0x%x",
437 mesg, BUFSIZ); 415 mesg, BUFSIZ);
438 else 416 else
439 XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x", 417 XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x",
440 mesg, BUFSIZ); 418 mesg, BUFSIZ);
441 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid); 419 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid);
442 } 420 }
443 XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d", 421 XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d",
444 mesg, BUFSIZ); 422 mesg, BUFSIZ);
445 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial); 423 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial);
446} 424}
447#endif 425#endif
448 426
449int 427int ecb_cold
450rxvt_xerror_handler (Display *display, XErrorEvent *event) 428rxvt_xerror_handler (Display *display, XErrorEvent *event)
451{ 429{
452 if (GET_R->allowedxerror == -1) 430 if (GET_R->allowedxerror == -1)
453 GET_R->allowedxerror = event->error_code; 431 GET_R->allowedxerror = event->error_code;
454 else 432 else
… …
463 } 441 }
464 442
465 return 0; 443 return 0;
466} 444}
467 445
468int 446int ecb_cold
469rxvt_xioerror_handler (Display *display) 447rxvt_xioerror_handler (Display *display)
470{ 448{
471 rxvt_warn ("X connection to '%s' broken, unable to recover, exiting.\n", 449 rxvt_warn ("X connection to '%s' broken, unable to recover, exiting.\n",
472 DisplayString (display)); 450 DisplayString (display));
473 rxvt_emergency_cleanup (); 451 rxvt_emergency_cleanup ();
474 _exit (EXIT_FAILURE); 452 _exit (EXIT_FAILURE);
475}
476
477/*----------------------------------------------------------------------*/
478bool
479rxvt_term::init (int argc, const char *const *argv, stringvec *envv)
480{
481 this->envv = envv;
482
483 SET_R (this);
484 set_locale ("");
485 set_environ (envv); // few things in X do not call setlocale :(
486
487 init_vars ();
488
489 init_secondary ();
490
491 const char **cmd_argv = init_resources (argc, argv);
492
493#ifdef KEYSYM_RESOURCE
494 keyboard->register_done ();
495#endif
496
497#ifdef HAVE_SCROLLBARS
498 if (option (Opt_scrollBar))
499 scrollBar.setIdle (); /* set existence for size calculations */
500#endif
501
502 pty = ptytty::create ();
503
504 create_windows (argc, argv);
505
506 init_xlocale ();
507
508 scr_reset (); // initialize screen
509
510#if 0
511 XSynchronize (dpy, True);
512#endif
513
514#ifdef HAVE_SCROLLBARS
515 if (option (Opt_scrollBar))
516 resize_scrollbar (); /* create and map scrollbar */
517#endif
518#ifdef HAVE_BG_PIXMAP
519 {
520 bgPixmap.set_target (this);
521
522#ifdef ENABLE_TRANSPARENCY
523 if (option (Opt_transparent))
524 {
525 bgPixmap.set_transparent ();
526#ifdef HAVE_AFTERIMAGE
527 if (rs [Rs_blurradius])
528 bgPixmap.set_blur_radius (rs [Rs_blurradius]);
529#endif
530 if (ISSET_PIXCOLOR (Color_tint))
531 bgPixmap.set_tint (pix_colors_focused [Color_tint]);
532 if (rs [Rs_shade])
533 bgPixmap.set_shade (rs [Rs_shade]);
534
535 bgPixmap.set_root_pixmap ();
536 XSelectInput (dpy, display->root, PropertyChangeMask);
537 rootwin_ev.start (display, display->root);
538 }
539#endif
540
541#ifdef BG_IMAGE_FROM_FILE
542 if (rs[Rs_backgroundPixmap] != NULL)
543 {
544 const char *p = rs[Rs_backgroundPixmap];
545
546 if ((p = strchr (p, ';')) != NULL)
547 {
548 p++;
549 bgPixmap.set_geometry (p);
550 }
551 else
552 bgPixmap.set_defaultGeometry ();
553
554 if (bgPixmap.set_file (rs[Rs_backgroundPixmap]))
555 if (!bgPixmap.window_position_sensitive ())
556 update_background ();
557 }
558#endif
559 }
560#endif
561
562#if ENABLE_PERL
563 rootwin_ev.start (display, display->root);
564#endif
565
566 set_colorfgbg ();
567
568 init_command (cmd_argv);
569
570 free (cmd_argv);
571
572 if (pty->pty >= 0)
573 pty_ev.start (pty->pty, ev::READ);
574
575 prepare_ev.start ();
576
577 HOOK_INVOKE ((this, HOOK_START, DT_END));
578
579#if ENABLE_XEMBED
580 if (rs[Rs_embed])
581 {
582 long info[2] = { 0, XEMBED_MAPPED };
583
584 XChangeProperty (dpy, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
585 32, PropModeReplace, (unsigned char *)&info, 2);
586 }
587#endif
588
589 XMapWindow (dpy, vt);
590 XMapWindow (dpy, parent[0]);
591
592 return true;
593} 453}
594 454
595static struct sig_handlers 455static struct sig_handlers
596{ 456{
597 ev::sig sw_term, sw_int; 457 ev::sig sw_term, sw_int;
… …
614 rxvt_emergency_cleanup (); 474 rxvt_emergency_cleanup ();
615 w.stop (); 475 w.stop ();
616 kill (getpid (), w.signum); 476 kill (getpid (), w.signum);
617} 477}
618 478
479static void
480rxvt_get_ttymode (struct termios *tio)
481{
482 if (tcgetattr (STDIN_FILENO, tio) < 0)
483 memset (tio, 0, sizeof (struct termios));
484
485 for (int i = 0; i < NCCS; i++)
486 tio->c_cc[i] = VDISABLE;
487
488 tio->c_cc[VINTR] = CINTR;
489 tio->c_cc[VQUIT] = CQUIT;
490 tio->c_cc[VERASE] = CERASE;
491#ifdef VERASE2
492 tio->c_cc[VERASE2] = CERASE2;
493#endif
494 tio->c_cc[VKILL] = CKILL;
495 tio->c_cc[VEOF] = CEOF;
496 tio->c_cc[VSTART] = CSTART;
497 tio->c_cc[VSTOP] = CSTOP;
498 tio->c_cc[VSUSP] = CSUSP;
499# ifdef VDSUSP
500 tio->c_cc[VDSUSP] = CDSUSP;
501# endif
502# ifdef VREPRINT
503 tio->c_cc[VREPRINT] = CRPRNT;
504# endif
505# ifdef VDISCRD
506 tio->c_cc[VDISCRD] = CFLUSH;
507# endif
508# ifdef VWERSE
509 tio->c_cc[VWERSE] = CWERASE;
510# endif
511# ifdef VLNEXT
512 tio->c_cc[VLNEXT] = CLNEXT;
513# endif
514# ifdef VSTATUS
515 tio->c_cc[VSTATUS] = CSTATUS;
516# endif
517
518# if VMIN != VEOF
519 tio->c_cc[VMIN] = 1;
520# endif
521# if VTIME != VEOL
522 tio->c_cc[VTIME] = 0;
523# endif
524
525 /* input modes */
526 tio->c_iflag = (BRKINT | IGNPAR | ICRNL
527# ifdef IMAXBEL
528 | IMAXBEL
529# endif
530 | IXON);
531
532 /* output modes */
533 tio->c_oflag = (OPOST | ONLCR);
534
535 /* control modes */
536 tio->c_cflag = (CS8 | CREAD);
537
538 /* local modes */
539 tio->c_lflag = (ISIG | ICANON | IEXTEN | ECHO
540# if defined (ECHOCTL) && defined (ECHOKE)
541 | ECHOCTL | ECHOKE
542# endif
543 | ECHOE | ECHOK);
544}
545
619char **rxvt_environ; // startup environment 546char **rxvt_environ; // startup environment
620 547
621void 548void
622rxvt_init () 549rxvt_init ()
623{ 550{
624 ptytty::init (); 551 assert (("fontMask must not overlap other RS masks",
552 0 == (RS_fontMask & (RS_Sel | RS_baseattrMask | RS_customMask | RS_bgMask | RS_fgMask))));
625 553
554 rxvt_get_ttymode (&rxvt_term::def_tio);
555
556 // get rid of stdin/stdout as we don't need them, to free resources
557 dup2 (STDERR_FILENO, STDIN_FILENO);
558 dup2 (STDERR_FILENO, STDOUT_FILENO);
559
626 if (!ev_default_loop (0)) 560 if (!ev_default_loop ())
627 rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n"); 561 rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n");
628 562
629 rxvt_environ = environ; 563 rxvt_environ = environ;
630 564
631 signal (SIGHUP, SIG_IGN); 565 signal (SIGHUP, SIG_IGN);
632 signal (SIGPIPE, SIG_IGN); 566 signal (SIGPIPE, SIG_IGN);
633 567
634 sig_handlers.sw_term.start (SIGTERM); ev_unref (); 568 sig_handlers.sw_term.start (SIGTERM); ev_unref ();
635 sig_handlers.sw_int.start (SIGINT); ev_unref (); 569 sig_handlers.sw_int.start (SIGINT); ev_unref ();
636
637 /* need to trap SIGURG for SVR4 (Unixware) rlogin */
638 /* signal (SIGURG, SIG_DFL); */
639 570
640 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); 571 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
641 // TODO: handle this with exceptions and tolerate the memory loss 572 // TODO: handle this with exceptions and tolerate the memory loss
642 XSetIOErrorHandler (rxvt_xioerror_handler); 573 XSetIOErrorHandler (rxvt_xioerror_handler);
643 574
644 XrmInitialize (); 575 XrmInitialize ();
645}
646 576
647/* ------------------------------------------------------------------------- * 577#ifdef HAVE_PIXBUF
648 * MEMORY ALLOCATION WRAPPERS * 578 g_type_init ();
649 * ------------------------------------------------------------------------- */ 579#endif
650void *
651rxvt_malloc (size_t size)
652{
653 void *p = malloc (size);
654
655 if (!p)
656 rxvt_fatal ("memory allocation failure. aborting.\n");
657
658 return p;
659}
660
661void *
662rxvt_calloc (size_t number, size_t size)
663{
664 void *p = calloc (number, size);
665
666 if (!p)
667 rxvt_fatal ("memory allocation failure. aborting.\n");
668
669 return p;
670}
671
672void *
673rxvt_realloc (void *ptr, size_t size)
674{
675 void *p = realloc (ptr, size);
676
677 if (!p)
678 rxvt_fatal ("memory allocation failure. aborting.\n");
679
680 return p;
681} 580}
682 581
683/*----------------------------------------------------------------------*/ 582/*----------------------------------------------------------------------*/
684/* 583/*
685 * window size/position calculations for XSizeHint and other storage. 584 * window size/position calculations for XSizeHint and other storage.
… …
687 */ 586 */
688void 587void
689rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight) 588rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
690{ 589{
691 short recalc_x, recalc_y; 590 short recalc_x, recalc_y;
692 int x, y, sb_w, flags; 591 int x, y, flags;
693 unsigned int w, h; 592 unsigned int w, h;
694 unsigned int max_width, max_height; 593 unsigned int max_width, max_height;
695 594
696 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity; 595 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity;
697 szHint.win_gravity = NorthWestGravity; 596 szHint.win_gravity = NorthWestGravity;
… …
707 if (rs[Rs_geometry]) 606 if (rs[Rs_geometry])
708 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h); 607 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h);
709 608
710 if (flags & WidthValue) 609 if (flags & WidthValue)
711 { 610 {
611 if (!w)
612 rxvt_fatal ("illegal window geometry (width and height must be non-zero), aborting.\n");
613
712 ncol = clamp (w, 0, std::numeric_limits<int16_t>::max ()); 614 ncol = clamp (w, 1, std::numeric_limits<int16_t>::max ());
713 szHint.flags |= USSize; 615 szHint.flags |= USSize;
714 } 616 }
715 617
716 if (flags & HeightValue) 618 if (flags & HeightValue)
717 { 619 {
620 if (!h)
621 rxvt_fatal ("illegal window geometry (width and height must be non-zero), aborting.\n");
622
718 nrow = clamp (h, 0, std::numeric_limits<int16_t>::max ()); 623 nrow = clamp (h, 1, std::numeric_limits<int16_t>::max ());
719 szHint.flags |= USSize; 624 szHint.flags |= USSize;
720 } 625 }
721 626
722 if (flags & XValue) 627 if (flags & XValue)
723 { 628 {
… …
754 max_width = MAX_COLS * fwidth; 659 max_width = MAX_COLS * fwidth;
755 max_height = MAX_ROWS * fheight; 660 max_height = MAX_ROWS * fheight;
756 661
757 szHint.base_width = szHint.base_height = 2 * int_bwidth; 662 szHint.base_width = szHint.base_height = 2 * int_bwidth;
758 663
759 sb_w = 0;
760 window_vt_x = window_vt_y = int_bwidth; 664 window_vt_x = window_vt_y = int_bwidth;
761 665
762 if (scrollBar.state) 666 if (scrollBar.state)
763 { 667 {
764 sb_w = scrollbar_TotalWidth (); 668 int sb_w = scrollBar.total_width ();
765 szHint.base_width += sb_w; 669 szHint.base_width += sb_w;
766 670
767 if (!option (Opt_scrollBar_right)) 671 if (!option (Opt_scrollBar_right))
768 window_vt_x += sb_w; 672 window_vt_x += sb_w;
769 } 673 }
… …
793 { 697 {
794 min_it (height, max_height); 698 min_it (height, max_height);
795 szHint.height = szHint.base_height + height; 699 szHint.height = szHint.base_height + height;
796 } 700 }
797 701
798 if (scrollBar.state && option (Opt_scrollBar_right))
799 window_sb_x = szHint.width - sb_w;
800
801 if (recalc_x) 702 if (recalc_x)
802 szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth; 703 szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth;
803 704
804 if (recalc_y) 705 if (recalc_y)
805 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth; 706 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth;
806 707
807 ncol = width / fwidth; 708 ncol = width / fwidth;
808 nrow = height / fheight; 709 nrow = height / fheight;
710
711 // When the size of the vt window is not a multiple of the cell
712 // size, i.e., when the wm does not honour our size hints, there are
713 // extra areas not covered by the terminal screen. Such gaps, when a
714 // bg pixmap is set, would have to be cleared manually to properly
715 // refresh the background. We take the simpler route and shrink the
716 // vt window so as to avoid creating gaps.
717 vt_width = ncol * fwidth;
718 vt_height = nrow * fheight;
809} 719}
810 720
811/*----------------------------------------------------------------------*/ 721/*----------------------------------------------------------------------*/
812/* 722/*
813 * Tell the teletype handler what size the window is. 723 * Tell the teletype handler what size the window is.
… …
821 731
822 struct winsize ws; 732 struct winsize ws;
823 733
824 ws.ws_col = ncol; 734 ws.ws_col = ncol;
825 ws.ws_row = nrow; 735 ws.ws_row = nrow;
826 ws.ws_xpixel = width; 736 ws.ws_xpixel = vt_width;
827 ws.ws_ypixel = height; 737 ws.ws_ypixel = vt_height;
828 (void)ioctl (pty->pty, TIOCSWINSZ, &ws); 738 ioctl (pty->pty, TIOCSWINSZ, &ws);
829 739
830#if 0 740#if 0
831 // TIOCSWINSZ is supposed to do this automatically and correctly 741 // TIOCSWINSZ is supposed to do this automatically and correctly
832 if (cmd_pid) /* force through to the command */ 742 if (cmd_pid) /* force through to the command */
833 kill (-cmd_pid, SIGWINCH); 743 kill (-cmd_pid, SIGWINCH);
834#endif 744#endif
835} 745}
836 746
837/*----------------------------------------------------------------------*/ 747/*----------------------------------------------------------------------*/
838/* set_fonts () - load and set the various fonts 748/* load and set the various fonts */
839 *
840 * init = 1 - initialize
841 *
842 * fontname == FONT_UP - switch to bigger font
843 * fontname == FONT_DN - switch to smaller font
844 */
845bool 749bool
846rxvt_term::set_fonts () 750rxvt_term::set_fonts ()
847{ 751{
848 rxvt_fontset *fs = new rxvt_fontset (this); 752 rxvt_fontset *fs = new rxvt_fontset (this);
849 rxvt_fontprop prop; 753 rxvt_fontprop prop;
… …
863#endif 767#endif
864 768
865 delete fontset[0]; 769 delete fontset[0];
866 fontset[0] = fs; 770 fontset[0] = fs;
867 771
868 prop = (*fs)[1]->properties (); 772 prop = (*fs)[rxvt_fontset::firstFont]->properties ();
869 prop.height += lineSpace; 773 prop.width += letterSpace;
870 774
871 fs->set_prop (prop, false); 775 fs->set_prop (prop, false);
872 776
873 fwidth = prop.width; 777 fwidth = prop.width;
874 fheight = prop.height; 778 fheight = prop.height + lineSpace;
875 fbase = prop.ascent; 779 fbase = prop.ascent;
876 780
877 for (int style = 1; style < 4; style++) 781 for (int style = 1; style < 4; style++)
878 { 782 {
879#if ENABLE_STYLES 783#if ENABLE_STYLES
… …
905#else 809#else
906 fontset[style] = fontset[0]; 810 fontset[style] = fontset[0];
907#endif 811#endif
908 } 812 }
909 813
910 if (parent[0]) 814 if (parent)
911 { 815 {
912 resize_all_windows (0, 0, 0); 816 resize_all_windows (0, 0, 0);
913 scr_remap_chars (); 817 scr_remap_chars ();
914 scr_touch (true); 818 scr_touch (true);
915 } 819 }
… …
918} 822}
919 823
920void 824void
921rxvt_term::set_string_property (Atom prop, const char *str, int len) 825rxvt_term::set_string_property (Atom prop, const char *str, int len)
922{ 826{
923 XChangeProperty (dpy, parent[0], 827 XChangeProperty (dpy, parent,
924 prop, XA_STRING, 8, PropModeReplace, 828 prop, XA_STRING, 8, PropModeReplace,
925 (const unsigned char *)str, len >= 0 ? len : strlen (str)); 829 (const unsigned char *)str, len >= 0 ? len : strlen (str));
926} 830}
927 831
928void 832void
833rxvt_term::set_mbstring_property (Atom prop, const char *str, int len)
834{
835 XTextProperty ct;
836
837 if (XmbTextListToTextProperty (dpy, (char **)&str, 1, XStdICCTextStyle, &ct) >= 0)
838 {
839 XSetTextProperty (dpy, parent, &ct, prop);
840 XFree (ct.value);
841 }
842}
843
844void
929rxvt_term::set_utf8_property (Atom prop, const char *str, int len) 845rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
930{ 846{
931 wchar_t *ws = rxvt_mbstowcs (str, len); 847 wchar_t *ws = rxvt_mbstowcs (str, len);
932 char *s = rxvt_wcstoutf8 (ws); 848 char *s = rxvt_wcstoutf8 (ws);
933 849
934 XChangeProperty (dpy, parent[0], 850 XChangeProperty (dpy, parent,
935 prop, xa[XA_UTF8_STRING], 8, PropModeReplace, 851 prop, xa[XA_UTF8_STRING], 8, PropModeReplace,
936 (const unsigned char *)s, strlen (s)); 852 (const unsigned char *)s, strlen (s));
937 853
938 free (s); 854 free (s);
939 free (ws); 855 free (ws);
… …
943/*----------------------------------------------------------------------*/ 859/*----------------------------------------------------------------------*/
944/* xterm sequences - title, iconName, color (exptl) */ 860/* xterm sequences - title, iconName, color (exptl) */
945void 861void
946rxvt_term::set_title (const char *str) 862rxvt_term::set_title (const char *str)
947{ 863{
948 set_string_property (XA_WM_NAME, str); 864 set_mbstring_property (XA_WM_NAME, str);
949#if ENABLE_EWMH 865#if ENABLE_EWMH
950 set_utf8_property (xa[XA_NET_WM_NAME], str); 866 set_utf8_property (xa[XA_NET_WM_NAME], str);
951#endif 867#endif
952} 868}
953 869
954void 870void
955rxvt_term::set_icon_name (const char *str) 871rxvt_term::set_icon_name (const char *str)
956{ 872{
957 set_string_property (XA_WM_ICON_NAME, str); 873 set_mbstring_property (XA_WM_ICON_NAME, str);
958#if ENABLE_EWMH 874#if ENABLE_EWMH
959 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str); 875 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str);
960#endif 876#endif
961} 877}
962 878
963void 879void
964rxvt_term::set_window_color (int idx, const char *color) 880rxvt_term::set_window_color (int idx, const char *color)
965{ 881{
966#ifdef XTERM_COLOR_CHANGE 882#ifdef XTERM_COLOR_CHANGE
967 rxvt_color xcol; 883 rxvt_color xcol;
968 int i;
969 884
970 if (color == NULL || *color == '\0') 885 if (color == NULL || *color == '\0')
971 return; 886 return;
972 887
973 color = strdup (color); 888 color = strdup (color);
… …
975 rs[Rs_color + idx] = color; 890 rs[Rs_color + idx] = color;
976 891
977 /* handle color aliases */ 892 /* handle color aliases */
978 if (isdigit (*color)) 893 if (isdigit (*color))
979 { 894 {
980 i = atoi (color); 895 int i = atoi (color);
981 896
982 if (i >= 8 && i <= 15) 897 if (i >= 8 && i <= 15)
983 { 898 {
984 /* bright colors */ 899 /* bright colors */
985 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i - 8]; 900 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i - 8];
… …
1030 945
1031/*----------------------------------------------------------------------*/ 946/*----------------------------------------------------------------------*/
1032/* 947/*
1033 * find if fg/bg matches any of the normal (low-intensity) colors 948 * find if fg/bg matches any of the normal (low-intensity) colors
1034 */ 949 */
1035void 950char *
1036rxvt_term::set_colorfgbg () 951rxvt_term::get_colorfgbg ()
1037{ 952{
1038 unsigned int i; 953 unsigned int i;
1039 const char *xpmb = ""; 954 const char *xpmb = "";
1040 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1]; 955 char fstr[] = "default";
956 char bstr[] = "default";
957 char *env_colorfgbg;
1041 958
1042 strcpy (fstr, "default");
1043 strcpy (bstr, "default");
1044 for (i = Color_Black; i <= Color_White; i++) 959 for (i = Color_Black; i <= Color_White; i++)
1045 if (pix_colors[Color_fg] == pix_colors[i]) 960 if (pix_colors[Color_fg] == pix_colors[i])
1046 { 961 {
1047 sprintf (fstr, "%d", (i - Color_Black)); 962 sprintf (fstr, "%d", i - Color_Black);
1048 break; 963 break;
1049 } 964 }
1050 965
1051 for (i = Color_Black; i <= Color_White; i++) 966 for (i = Color_Black; i <= Color_White; i++)
1052 if (pix_colors[Color_bg] == pix_colors[i]) 967 if (pix_colors[Color_bg] == pix_colors[i])
1053 { 968 {
1054 sprintf (bstr, "%d", (i - Color_Black)); 969 sprintf (bstr, "%d", i - Color_Black);
1055#ifdef BG_IMAGE_FROM_FILE 970#ifdef BG_IMAGE_FROM_FILE
1056 xpmb = "default;"; 971 xpmb = "default;";
1057#endif 972#endif
1058 break; 973 break;
1059 } 974 }
1060 975
976 env_colorfgbg = (char *)rxvt_malloc (sizeof ("COLORFGBG=default;default;bg"));
1061 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr); 977 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr);
978 return env_colorfgbg;
1062} 979}
1063 980
1064/*----------------------------------------------------------------------*/ 981/*----------------------------------------------------------------------*/
1065 982
1066bool 983bool
… …
1089 int old_width = szHint.width; 1006 int old_width = szHint.width;
1090 int old_height = szHint.height; 1007 int old_height = szHint.height;
1091 1008
1092 window_calc (newwidth, newheight); 1009 window_calc (newwidth, newheight);
1093 1010
1094 if (!HOOK_INVOKE ((this, HOOK_RESIZE_ALL_WINDOWS, DT_INT, newwidth, DT_INT, newheight, DT_END))) 1011 bool set_hint = !HOOK_INVOKE ((this, HOOK_RESIZE_ALL_WINDOWS, DT_INT, newwidth, DT_INT, newheight, DT_END));
1012
1013 // to avoid races between us and the wm, we clear the incremental size hints around the xresizewindow
1014 if (set_hint)
1015 {
1016 szHint.flags &= ~(PBaseSize | PResizeInc);
1095 XSetWMNormalHints (dpy, parent[0], &szHint); 1017 XSetWMNormalHints (dpy, parent, &szHint);
1018 szHint.flags |= PBaseSize | PResizeInc;
1019 }
1096 1020
1097 if (!ignoreparent) 1021 if (!ignoreparent)
1098 { 1022 {
1099#ifdef SMART_RESIZE 1023#ifdef SMART_RESIZE
1100 /* 1024 /*
… …
1104 int x, y, x1, y1; 1028 int x, y, x1, y1;
1105 int dx, dy; 1029 int dx, dy;
1106 unsigned int unused_w1, unused_h1, unused_b1, unused_d1; 1030 unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
1107 Window unused_cr; 1031 Window unused_cr;
1108 1032
1109 XTranslateCoordinates (dpy, parent[0], display->root, 1033 XTranslateCoordinates (dpy, parent, display->root,
1110 0, 0, &x, &y, &unused_cr); 1034 0, 0, &x, &y, &unused_cr);
1111 XGetGeometry (dpy, parent[0], &unused_cr, &x1, &y1, 1035 XGetGeometry (dpy, parent, &unused_cr, &x1, &y1,
1112 &unused_w1, &unused_h1, &unused_b1, &unused_d1); 1036 &unused_w1, &unused_h1, &unused_b1, &unused_d1);
1113 /* 1037 /*
1114 * if display->root isn't the parent window, a WM will probably have offset 1038 * if display->root isn't the parent window, a WM will probably have offset
1115 * our position for handles and decorations. Counter it 1039 * our position for handles and decorations. Counter it
1116 */ 1040 */
… …
1133 if (y < y1) /* top half */ 1057 if (y < y1) /* top half */
1134 dy = 0; 1058 dy = 0;
1135 else if (y == y1) /* exact center */ 1059 else if (y == y1) /* exact center */
1136 dy /= 2; 1060 dy /= 2;
1137 1061
1138 XMoveResizeWindow (dpy, parent[0], x + dx, y + dy, 1062 XMoveResizeWindow (dpy, parent, x + dx, y + dy,
1139 szHint.width, szHint.height); 1063 szHint.width, szHint.height);
1140#else 1064#else
1141 XResizeWindow (dpy, parent[0], szHint.width, szHint.height); 1065 XResizeWindow (dpy, parent, szHint.width, szHint.height);
1142#endif 1066#endif
1143 } 1067 }
1068
1069 if (set_hint)
1070 XSetWMNormalHints (dpy, parent, &szHint);
1144 1071
1145 fix_screen = ncol != prev_ncol || nrow != prev_nrow; 1072 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
1146 1073
1147 if (fix_screen || newwidth != old_width || newheight != old_height) 1074 if (fix_screen || newwidth != old_width || newheight != old_height)
1148 { 1075 {
1149 if (scrollBar.state) 1076 if (scrollBar.state)
1150 { 1077 scrollBar.resize ();
1151 XMoveResizeWindow (dpy, scrollBar.win,
1152 window_sb_x, 0,
1153 scrollbar_TotalWidth (), szHint.height);
1154 resize_scrollbar ();
1155 }
1156 1078
1157 XMoveResizeWindow (dpy, vt, 1079 XMoveResizeWindow (dpy, vt,
1158 window_vt_x, window_vt_y, 1080 window_vt_x, window_vt_y,
1159 width, height); 1081 vt_width, vt_height);
1160 1082
1161#ifdef HAVE_BG_PIXMAP 1083#ifdef HAVE_BG_PIXMAP
1162 if (bgPixmap.window_size_sensitive ()) 1084 if (bg_window_size_sensitive ())
1163 update_background (); 1085 update_background ();
1164#endif 1086#endif
1165
1166 scr_clear ();
1167 } 1087 }
1168 1088
1169 if (fix_screen || old_height == 0) 1089 if (fix_screen || old_height == 0)
1170 scr_reset (); 1090 scr_reset ();
1171 1091
1172 // TODO, with nvidia-8178, resizes kill the alpha channel, report if not fixed in newer version
1173 //scr_touch (false);
1174
1175#ifdef HAVE_BG_PIXMAP
1176// TODO: this don't seem to have any effect - do we still need it ? If so - in which case exactly ?
1177// if (bgPixmap.pixmap)
1178// scr_touch (false);
1179#endif
1180
1181#ifdef USE_XIM 1092#ifdef USE_XIM
1182 IMSetPosition (); 1093 im_set_position ();
1183#endif 1094#endif
1184} 1095}
1185 1096
1186/* 1097/*
1187 * Set the width/height of the vt window in characters. Units are pixels. 1098 * Set the width/height of the vt window in characters. Units are pixels.
… …
1200 newwidth = wattr.width - szHint.base_width; 1111 newwidth = wattr.width - szHint.base_width;
1201 if (newheight == 0) 1112 if (newheight == 0)
1202 newheight = wattr.height - szHint.base_height; 1113 newheight = wattr.height - szHint.base_height;
1203 } 1114 }
1204 1115
1205 if (newwidth != width || newheight != height) 1116 if (newwidth != vt_width || newheight != vt_height)
1206 { 1117 {
1207 newwidth += szHint.base_width; 1118 newwidth += szHint.base_width;
1208 newheight += szHint.base_height; 1119 newheight += szHint.base_height;
1209 resize_all_windows (newwidth, newheight, 0); 1120 resize_all_windows (newwidth, newheight, 0);
1210 } 1121 }
… …
1248 status_rect.height = fheight; 1159 status_rect.height = fheight;
1249} 1160}
1250 1161
1251/* Checking whether input method is running. */ 1162/* Checking whether input method is running. */
1252bool 1163bool
1253rxvt_term::IMisRunning () 1164rxvt_term::im_is_running ()
1254{ 1165{
1255 char *p;
1256 Atom atom; 1166 Atom atom;
1257 Window win; 1167 Window win;
1258 char server[IMBUFSIZ]; 1168 char server[IMBUFSIZ];
1259 1169
1260 /* get current locale modifier */ 1170 /* get current locale modifier */
1261 if ((p = XSetLocaleModifiers (NULL)) != NULL) 1171 if (char *p = XSetLocaleModifiers (0))
1262 { 1172 {
1263 strcpy (server, "@server="); 1173 strcpy (server, "@server=");
1264 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */ 1174 strncat (server, p + 4, IMBUFSIZ - 9); /* skip "@im=" */
1265 1175
1266 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */ 1176 if (p = strchr (server + 1, '@')) /* first one only */
1267 *p = '\0'; 1177 *p = '\0';
1268 1178
1269 atom = XInternAtom (dpy, server, False); 1179 atom = XInternAtom (dpy, server, False);
1270 win = XGetSelectionOwner (dpy, atom); 1180 win = XGetSelectionOwner (dpy, atom);
1271 1181
1272 if (win != None) 1182 if (win != None)
1273 return True; 1183 return true;
1274 } 1184 }
1275 1185
1276 return False; 1186 return false;
1277} 1187}
1278 1188
1279void 1189void
1280rxvt_term::IMSendSpot () 1190rxvt_term::im_send_spot ()
1281{ 1191{
1282 XPoint nspot; 1192 XPoint nspot;
1283 XVaNestedList preedit_attr; 1193 XVaNestedList preedit_attr;
1284 1194
1285 if (!Input_Context 1195 if (!Input_Context
… …
1338 1248
1339 term->make_current (); 1249 term->make_current ();
1340 1250
1341 if (text) 1251 if (text)
1342 { 1252 {
1343 void *str; 1253 wchar_t *str;
1344 1254
1345 if (!text->encoding_is_wchar && text->string.multi_byte) 1255 if (!text->encoding_is_wchar && text->string.multi_byte)
1346 { 1256 {
1347 // of course, X makes it ugly again 1257 // of course, X makes it ugly again
1348 if (term->rs[Rs_imLocale]) 1258 if (term->rs[Rs_imLocale])
1349 SET_LOCALE (term->rs[Rs_imLocale]); 1259 SET_LOCALE (term->rs[Rs_imLocale]);
1350 1260
1351 str = rxvt_temp_buf ((text->length + 1) * sizeof (wchar_t)); 1261 str = rxvt_temp_buf<wchar_t> (text->length + 1);
1352 mbstowcs ((wchar_t *)str, text->string.multi_byte, text->length + 1); 1262 mbstowcs (str, text->string.multi_byte, text->length + 1);
1353 1263
1354 if (term->rs[Rs_imLocale]) 1264 if (term->rs[Rs_imLocale])
1355 SET_LOCALE (term->locale); 1265 SET_LOCALE (term->locale);
1356 } 1266 }
1357 else 1267 else
1358 str = (void *)text->string.wide_char; 1268 str = text->string.wide_char;
1359 1269
1360 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW, 1270 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
1361 DT_INT, call_data->caret, 1271 DT_INT, call_data->caret,
1362 DT_INT, call_data->chg_first, 1272 DT_INT, call_data->chg_first,
1363 DT_INT, call_data->chg_length, 1273 DT_INT, call_data->chg_length,
… …
1391/* 1301/*
1392 * Try to open a XIM with the current modifiers, then see if we can 1302 * Try to open a XIM with the current modifiers, then see if we can
1393 * open a suitable preedit type 1303 * open a suitable preedit type
1394 */ 1304 */
1395bool 1305bool
1396rxvt_term::IM_get_IC (const char *modifiers) 1306rxvt_term::im_get_ic (const char *modifiers)
1397{ 1307{
1398 int i, j, found; 1308 int i, j, found;
1399 XIM xim; 1309 XIM xim;
1400 XPoint spot; 1310 XPoint spot;
1401 XRectangle rect, status_rect, needed_rect; 1311 XRectangle rect, status_rect, needed_rect;
1402 unsigned long fg, bg; 1312 unsigned long fg, bg;
1403 const char *p; 1313 const char *p;
1404 char **s; 1314 char **s;
1405 XIMStyles *xim_styles; 1315 XIMStyles *xim_styles;
1406#ifdef ENABLE_XIM_ONTHESPOT
1407 XIMCallback xcb[4];
1408#endif
1409 1316
1410 set_environ (envv); 1317 set_environ (envv);
1411 1318
1412 if (! ((p = XSetLocaleModifiers (modifiers)) && *p)) 1319 if (! ((p = XSetLocaleModifiers (modifiers)) && *p))
1413 return false; 1320 return false;
… …
1434 p = pet[pi]; 1341 p = pet[pi];
1435 1342
1436 if (!p) 1343 if (!p)
1437 continue; 1344 continue;
1438 1345
1439 s = rxvt_splitcommastring (p); 1346 s = rxvt_strsplit (',', p);
1440 1347
1441 for (i = found = 0; !found && s[i]; i++) 1348 for (i = found = 0; !found && s[i]; i++)
1442 { 1349 {
1443 if (!strcmp (s[i], "OverTheSpot")) 1350 if (!strcmp (s[i], "OverTheSpot"))
1444 input_style = XIMPreeditPosition | XIMStatusNothing; 1351 input_style = XIMPreeditPosition | XIMStatusNothing;
… …
1456 input_style = XIMPreeditNothing | XIMStatusNothing; 1363 input_style = XIMPreeditNothing | XIMStatusNothing;
1457 1364
1458 for (j = 0; j < xim_styles->count_styles; j++) 1365 for (j = 0; j < xim_styles->count_styles; j++)
1459 if (input_style == xim_styles->supported_styles[j]) 1366 if (input_style == xim_styles->supported_styles[j])
1460 { 1367 {
1461 rxvt_freecommastring (s); 1368 rxvt_free_strsplit (s);
1462 1369
1463 found = 1; 1370 found = 1;
1464 goto foundpet; 1371 goto foundpet;
1465 } 1372 }
1466 1373
1467 } 1374 }
1468 1375
1469 rxvt_freecommastring (s); 1376 rxvt_free_strsplit (s);
1470 } 1377 }
1471 1378
1472foundpet: 1379foundpet:
1473 1380
1474 XFree (xim_styles); 1381 XFree (xim_styles);
… …
1553 NULL); 1460 NULL);
1554 } 1461 }
1555#if ENABLE_XIM_ONTHESPOT 1462#if ENABLE_XIM_ONTHESPOT
1556 else if (input_style & XIMPreeditCallbacks) 1463 else if (input_style & XIMPreeditCallbacks)
1557 { 1464 {
1465 XIMCallback xcb[4];
1466
1558 im_set_position (spot); 1467 im_set_position (spot);
1559 1468
1560 xcb[0].client_data = (XPointer)this; xcb[0].callback = (XIMProc)xim_preedit_start; 1469 xcb[0].client_data = (XPointer)this; xcb[0].callback = (XIMProc)xim_preedit_start;
1561 xcb[1].client_data = (XPointer)this; xcb[1].callback = (XIMProc)xim_preedit_done; 1470 xcb[1].client_data = (XPointer)this; xcb[1].callback = (XIMProc)xim_preedit_done;
1562 xcb[2].client_data = (XPointer)this; xcb[2].callback = (XIMProc)xim_preedit_draw; 1471 xcb[2].client_data = (XPointer)this; xcb[2].callback = (XIMProc)xim_preedit_draw;
… …
1577#endif 1486#endif
1578 1487
1579 Input_Context = XCreateIC (xim, 1488 Input_Context = XCreateIC (xim,
1580 XNInputStyle, input_style, 1489 XNInputStyle, input_style,
1581 XNClientWindow, vt, 1490 XNClientWindow, vt,
1582 XNFocusWindow, parent[0], 1491 XNFocusWindow, parent,
1583 preedit_attr ? XNPreeditAttributes : NULL, 1492 preedit_attr ? XNPreeditAttributes : NULL,
1584 preedit_attr, 1493 preedit_attr,
1585 status_attr ? XNStatusAttributes : NULL, 1494 status_attr ? XNStatusAttributes : NULL,
1586 status_attr, NULL); 1495 status_attr, NULL);
1587 1496
… …
1600 // unfortunately, only the focus window is used by XIM, hard to fix 1509 // unfortunately, only the focus window is used by XIM, hard to fix
1601 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL)) 1510 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL))
1602 vt_select_input (); 1511 vt_select_input ();
1603#endif 1512#endif
1604 1513
1605 IMSetPosition (); 1514 im_set_position ();
1606 1515
1607 return true; 1516 return true;
1608} 1517}
1609 1518
1610void 1519void
… …
1620 im_destroy (); 1529 im_destroy ();
1621 1530
1622 if (Input_Context) 1531 if (Input_Context)
1623 return; 1532 return;
1624 1533
1625#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1626 if (rs[Rs_imLocale]) 1534 if (rs[Rs_imLocale])
1627 SET_LOCALE (rs[Rs_imLocale]); 1535 SET_LOCALE (rs[Rs_imLocale]);
1628#endif
1629 1536
1630 p = rs[Rs_inputMethod]; 1537 p = rs[Rs_inputMethod];
1631 if (p && *p) 1538 if (p && *p)
1632 { 1539 {
1633 bool found = false; 1540 bool found = false;
1634 1541
1635 s = rxvt_splitcommastring (p); 1542 s = rxvt_strsplit (',', p);
1636 1543
1637 for (i = 0; s[i]; i++) 1544 for (i = 0; s[i]; i++)
1638 { 1545 {
1639 if (*s[i]) 1546 if (*s[i])
1640 { 1547 {
1641 strcpy (buf, "@im="); 1548 strcpy (buf, "@im=");
1642 strncat (buf, s[i], IMBUFSIZ - 5); 1549 strncat (buf, s[i], IMBUFSIZ - 5);
1643 if (IM_get_IC (buf)) 1550 if (im_get_ic (buf))
1644 { 1551 {
1645 found = true; 1552 found = true;
1646 break; 1553 break;
1647 } 1554 }
1648 } 1555 }
1649 } 1556 }
1650 1557
1651 rxvt_freecommastring (s); 1558 rxvt_free_strsplit (s);
1652 1559
1653 if (found) 1560 if (found)
1654 goto done; 1561 goto done;
1655 } 1562 }
1656 1563
1657 /* try with XMODIFIERS env. var. */ 1564 /* try with XMODIFIERS env. var. */
1658 if (IM_get_IC ("")) 1565 if (im_get_ic (""))
1659 goto done; 1566 goto done;
1660 1567
1661 /* try with no modifiers base IF the user didn't specify an IM */ 1568 /* try with no modifiers base IF the user didn't specify an IM */
1662 if (IM_get_IC ("@im=none")) 1569 if (im_get_ic ("@im=none"))
1663 goto done; 1570 goto done;
1664 1571
1665done: 1572done:
1666#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1667 if (rs[Rs_imLocale]) 1573 if (rs[Rs_imLocale])
1668 SET_LOCALE (locale); 1574 SET_LOCALE (locale);
1669#endif
1670} 1575}
1671 1576
1672void 1577void
1673rxvt_term::IMSetPosition () 1578rxvt_term::im_set_position ()
1674{ 1579{
1675 XRectangle preedit_rect, status_rect, *needed_rect; 1580 XRectangle preedit_rect, status_rect, *needed_rect;
1676 XVaNestedList preedit_attr, status_attr; 1581 XVaNestedList preedit_attr, status_attr;
1677 1582
1678 if (!Input_Context 1583 if (!Input_Context
1679 || !focus 1584 || !focus
1680 || !(input_style & (XIMPreeditArea | XIMPreeditPosition)) 1585 || !(input_style & (XIMPreeditArea | XIMPreeditPosition))
1681 || !IMisRunning ()) 1586 || !im_is_running ())
1682 return; 1587 return;
1683 1588
1684 if (input_style & XIMPreeditPosition) 1589 if (input_style & XIMPreeditPosition)
1685 { 1590 {
1686 im_set_size (preedit_rect); 1591 im_set_size (preedit_rect);
… …
1716 1621
1717void 1622void
1718rxvt_term::get_window_origin (int &x, int &y) 1623rxvt_term::get_window_origin (int &x, int &y)
1719{ 1624{
1720 Window cr; 1625 Window cr;
1721 XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr); 1626 XTranslateCoordinates (dpy, parent, display->root, 0, 0, &x, &y, &cr);
1722/* fprintf( stderr, "origin is %+d%+d\n", x, y);*/
1723} 1627}
1724 1628
1725Pixmap 1629Pixmap
1726rxvt_term::get_pixmap_property (int prop_id) 1630rxvt_term::get_pixmap_property (Atom property)
1727{ 1631{
1728 if (prop_id > 0 && prop_id < NUM_XA) 1632 Pixmap pixmap = None;
1729 if (xa[prop_id]) 1633
1730 {
1731 int aformat; 1634 int aformat;
1732 unsigned long nitems, bytes_after; 1635 unsigned long nitems, bytes_after;
1733 Atom atype; 1636 Atom atype;
1734 unsigned char *prop = NULL; 1637 unsigned char *prop;
1735 int result = XGetWindowProperty (dpy, display->root, xa[prop_id], 1638 int result = XGetWindowProperty (dpy, display->root, property,
1736 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 1639 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1737 &nitems, &bytes_after, &prop); 1640 &nitems, &bytes_after, &prop);
1738 if (result == Success && prop && atype == XA_PIXMAP) 1641 if (result == Success)
1739 { 1642 {
1740 return *(Pixmap *)prop; 1643 if (atype == XA_PIXMAP)
1741 } 1644 pixmap = *(Pixmap *)prop;
1645 XFree (prop);
1742 } 1646 }
1743 return None; 1647
1648 return pixmap;
1744} 1649}
1745 1650
1746#ifdef HAVE_BG_PIXMAP 1651#ifdef HAVE_BG_PIXMAP
1747# if TRACE_PIXMAPS
1748# undef update_background
1749int rxvt_term::trace_update_background (const char *file, int line)
1750{
1751 fprintf (stderr, "%s:%d:update_background()\n", file, line);
1752 update_background ();
1753}
1754# endif
1755 1652
1756int 1653void
1757rxvt_term::update_background () 1654rxvt_term::update_background ()
1758{ 1655{
1656 if (update_background_ev.is_active ())
1657 return;
1658
1759 bgPixmap.invalidate (); 1659 bg_invalidate ();
1760 1660
1761 /* no chance of real time refresh if we are blurring! */ 1661 if (!mapped)
1762 if (bgPixmap.invalid_since + 0.5 < ev::now () && !(bgPixmap.flags & bgPixmap_t::blurNeeded)) 1662 return;
1663
1664 ev_tstamp to_wait = 0.5 - (ev::now () - bg_valid_since);
1665
1666 if (to_wait <= 0.)
1763 bgPixmap.render (); 1667 bg_render ();
1764 else 1668 else
1765 {
1766 update_background_ev.stop ();
1767
1768 if (!bgPixmap.need_client_side_rendering())
1769 update_background_ev.start (.05); 1669 update_background_ev.start (to_wait);
1770 else if (bgPixmap.flags & bgPixmap_t::blurNeeded)
1771 update_background_ev.start (.20); /* very slow !!! */
1772 else
1773 update_background_ev.start (.07);
1774 }
1775
1776 return 0;
1777} 1670}
1778 1671
1779void 1672void
1780rxvt_term::update_background_cb (ev::timer &w, int revents) 1673rxvt_term::update_background_cb (ev::timer &w, int revents)
1781{ 1674{
1675 make_current ();
1676
1677 update_background_ev.stop ();
1782 bgPixmap.render (); 1678 bg_render ();
1679 refresh_check ();
1783} 1680}
1784 1681
1785#endif /* HAVE_BG_PIXMAP */ 1682#endif /* HAVE_BG_PIXMAP */
1786 1683
1787/*----------------------- end-of-file (C source) -----------------------*/ 1684/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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