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.286 by root, Sun Dec 16 19:44:48 2007 UTC vs.
Revision 1.377 by root, Tue Jun 5 11:00:40 2012 UTC

… …
11 * Copyright (c) 1997 mj olesen <olesen@me.QueensU.CA> 11 * Copyright (c) 1997 mj olesen <olesen@me.QueensU.CA>
12 * - extensive modifications 12 * - extensive modifications
13 * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de> 13 * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de>
14 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com> 14 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com>
15 * - extensive modifications 15 * - extensive modifications
16 * Copyright (c) 2003-2007 Marc Lehmann <pcg@goof.com> 16 * Copyright (c) 2003-2010 Marc Lehmann <schmorp@schmorp.de>
17 * 17 *
18 * This program is free software; you can redistribute it and/or modify 18 * This program is free software; you can redistribute it and/or modify
19 * it under the terms of the GNU General Public License as published by 19 * it under the terms of the GNU General Public License as published by
20 * the Free Software Foundation; either version 2 of the License, or 20 * the Free Software Foundation; either version 2 of the License, or
21 * (at your option) any later version. 21 * (at your option) any later version.
… …
30 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 30 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
31 *---------------------------------------------------------------------*/ 31 *---------------------------------------------------------------------*/
32 32
33#include "../config.h" /* NECESSARY */ 33#include "../config.h" /* NECESSARY */
34#include "rxvt.h" /* NECESSARY */ 34#include "rxvt.h" /* NECESSARY */
35#include "init.h"
35#include "keyboard.h" 36#include "keyboard.h"
36#include "rxvtperl.h" 37#include "rxvtperl.h"
37 38
38#include <limits> 39#include <limits>
39 40
41#include <assert.h>
40#include <csignal> 42#include <signal.h>
41#include <cstring> 43#include <string.h>
42 44
43#include <termios.h> 45#include <termios.h>
44 46
45#ifdef HAVE_XSETLOCALE 47#ifdef HAVE_XSETLOCALE
46# define X_LOCALE 48# define X_LOCALE
47# include <X11/Xlocale.h> 49# include <X11/Xlocale.h>
48#else 50#else
49# ifdef HAVE_SETLOCALE
50# include <clocale> 51# include <locale.h>
51# endif 52#endif
52#endif
53 53
54struct termios rxvt_term::def_tio;
54vector<rxvt_term *> rxvt_term::termlist; 55vector<rxvt_term *> rxvt_term::termlist;
55 56
56// used to tell global functions which terminal instance is "active" 57// used to tell global functions which terminal instance is "active"
57rxvt_t rxvt_current_term; 58rxvt_t rxvt_current_term;
58 59
… …
93text_t rxvt_composite_vec::compose (unicode_t c1, unicode_t c2) 94text_t rxvt_composite_vec::compose (unicode_t c1, unicode_t c2)
94{ 95{
95 compose_char *cc; 96 compose_char *cc;
96 97
97 // break compose chains, as stupid readline really likes to duplicate 98 // break compose chains, as stupid readline really likes to duplicate
98 // composing characters for some reason near the end of a line. 99 // composing characters for some reason, near the end of a line.
99 cc = (*this)[c1]; 100 cc = (*this)[c1];
100 while (cc) 101 while (cc)
101 { 102 {
102 if (cc->c2 == c2) return c1; 103 if (cc->c2 == c2) return c1;
103 cc = (*this)[cc->c1]; 104 cc = (*this)[cc->c1];
104 } 105 }
105 106
106 // check to see wether this combination already exists otherwise 107 // check to see whether this combination already exists otherwise
107 for (cc = v.end (); cc-- > v.begin (); ) 108 for (cc = v.begin (); cc < v.end (); cc++)
108 {
109 if (cc->c1 == c1 && cc->c2 == c2) 109 if (cc->c1 == c1 && cc->c2 == c2)
110 return COMPOSE_LO + (cc - v.begin ()); 110 return COMPOSE_LO + (cc - v.begin ());
111 }
112 111
113 // allocate a new combination 112 // allocate a new combination
114 if (v.size () == COMPOSE_HI - COMPOSE_LO + 1) 113 if (v.size () == COMPOSE_HI - COMPOSE_LO + 1)
115 { 114 {
116 static int seen; 115 static int seen;
117 116
118 if (!seen++) 117 if (!seen++)
119 fprintf (stderr, "too many unrepresentable composite characters, try --enable-unicode3\n"); 118 rxvt_warn ("too many unrepresentable composite characters, try --enable-unicode3\n");
120 119
121 return REPLACEMENT_CHAR; 120 return REPLACEMENT_CHAR;
122 } 121 }
123 122
124 v.push_back (compose_char (c1, c2)); 123 v.push_back (compose_char (c1, c2));
… …
170#endif 169#endif
171#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 170#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
172 slip_wheel_ev.set <rxvt_term, &rxvt_term::slip_wheel_cb> (this); 171 slip_wheel_ev.set <rxvt_term, &rxvt_term::slip_wheel_cb> (this);
173#endif 172#endif
174#if ENABLE_TRANSPARENCY || ENABLE_PERL 173#if ENABLE_TRANSPARENCY || ENABLE_PERL
175 rootwin_ev.set <rxvt_term, &rxvt_term::x_cb> (this), 174 rootwin_ev.set <rxvt_term, &rxvt_term::rootwin_cb> (this),
176#endif 175#endif
177#ifdef HAVE_SCROLLBARS
178 scrollbar_ev.set <rxvt_term, &rxvt_term::x_cb> (this), 176 scrollbar_ev.set <rxvt_term, &rxvt_term::x_cb> (this),
179#endif
180#ifdef USE_XIM 177#if USE_XIM
181 im_ev.set <rxvt_term, &rxvt_term::im_cb> (this), 178 im_ev.set <rxvt_term, &rxvt_term::im_cb> (this),
182#endif 179#endif
183#ifdef POINTER_BLANK 180#ifdef POINTER_BLANK
184 pointer_ev.set <rxvt_term, &rxvt_term::pointer_cb> (this); 181 pointer_ev.set <rxvt_term, &rxvt_term::pointer_cb> (this);
185#endif 182#endif
… …
188#endif 185#endif
189 child_ev.set <rxvt_term, &rxvt_term::child_cb> (this); 186 child_ev.set <rxvt_term, &rxvt_term::child_cb> (this);
190 flush_ev.set <rxvt_term, &rxvt_term::flush_cb> (this); 187 flush_ev.set <rxvt_term, &rxvt_term::flush_cb> (this);
191 destroy_ev.set <rxvt_term, &rxvt_term::destroy_cb> (this); 188 destroy_ev.set <rxvt_term, &rxvt_term::destroy_cb> (this);
192 pty_ev.set <rxvt_term, &rxvt_term::pty_cb> (this); 189 pty_ev.set <rxvt_term, &rxvt_term::pty_cb> (this);
193 incr_ev.set <rxvt_term, &rxvt_term::incr_cb> (this);
194 termwin_ev.set <rxvt_term, &rxvt_term::x_cb> (this); 190 termwin_ev.set <rxvt_term, &rxvt_term::x_cb> (this);
195 vt_ev.set <rxvt_term, &rxvt_term::x_cb> (this); 191 vt_ev.set <rxvt_term, &rxvt_term::x_cb> (this);
196 192
197 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base; 193 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base;
198 194
… …
226 if (fontset[i] != fontset[0]) 222 if (fontset[i] != fontset[0])
227 delete fontset[i]; 223 delete fontset[i];
228#endif 224#endif
229 delete fontset[0]; 225 delete fontset[0];
230 226
227#ifdef HAVE_BG_PIXMAP
228 bg_destroy ();
229#endif
230
231 if (display) 231 if (display)
232 { 232 {
233 selection_clear (); 233 selection_clear ();
234 selection_clear (true);
234 235
235#ifdef USE_XIM 236#if USE_XIM
236 im_destroy (); 237 im_destroy ();
237#endif 238#endif
238#ifdef XTERM_SCROLLBAR 239 scrollBar.destroy ();
239 if (xscrollbarGC) XFreeGC (dpy, xscrollbarGC);
240 if (ShadowGC) XFreeGC (dpy, ShadowGC);
241#endif
242#ifdef PLAIN_SCROLLBAR
243 if (pscrollbarGC) XFreeGC (dpy, pscrollbarGC);
244#endif
245#ifdef NEXT_SCROLLBAR
246 if (blackGC) XFreeGC (dpy, blackGC);
247 if (whiteGC) XFreeGC (dpy, whiteGC);
248 if (grayGC) XFreeGC (dpy, grayGC);
249 if (darkGC) XFreeGC (dpy, darkGC);
250 if (stippleGC) XFreeGC (dpy, stippleGC);
251 if (dimple) XFreePixmap (dpy, dimple);
252 if (upArrow) XFreePixmap (dpy, upArrow);
253 if (downArrow) XFreePixmap (dpy, downArrow);
254 if (upArrowHi) XFreePixmap (dpy, upArrowHi);
255 if (downArrowHi) XFreePixmap (dpy, downArrowHi);
256#endif
257#ifdef RXVT_SCROLLBAR
258 if (topShadowGC) XFreeGC (dpy, topShadowGC);
259 if (botShadowGC) XFreeGC (dpy, botShadowGC);
260 if (scrollbarGC) XFreeGC (dpy, scrollbarGC);
261#endif
262 if (gc) XFreeGC (dpy, gc); 240 if (gc) XFreeGC (dpy, gc);
263 241
264 delete drawable; 242 delete drawable;
265 // destroy all windows 243 // destroy all windows
266 if (parent[0]) 244 if (parent)
267 XDestroyWindow (dpy, parent[0]); 245 XDestroyWindow (dpy, parent);
268 246
269 for (int i = 0; i < TOTAL_COLORS; i++) 247 for (int i = 0; i < TOTAL_COLORS; i++)
270 if (ISSET_PIXCOLOR (i)) 248 if (ISSET_PIXCOLOR (i))
271 { 249 {
272 pix_colors_focused [i].free (this); 250 pix_colors_focused [i].free (this);
… …
274 pix_colors_unfocused [i].free (this); 252 pix_colors_unfocused [i].free (this);
275#endif 253#endif
276 } 254 }
277 255
278 clear (); 256 clear ();
279 }
280 257
281 delete [] pix_colors_focused;
282#if OFF_FOCUS_FADING
283 delete [] pix_colors_unfocused;
284#endif
285
286#ifdef HAVE_BG_PIXMAP
287 bgPixmap.destroy ();
288#endif
289 display->flush (); /* ideally .put should do this */ 258 display->flush (); /* ideally .put should do this */
290 displays.put (display); 259 displays.put (display);
260 }
291 261
292 scr_release (); 262 scr_release ();
293 263
294 /* clear all resources */ 264 /* clear all resources */
295 for (int i = 0; i < allocated.size (); i++) 265 for (int i = 0; i < allocated.size (); i++)
296 free (allocated [i]); 266 free (allocated [i]);
297 267
298 free (selection.text); 268 free (selection.text);
299 // TODO: manage env vars in child only(!) 269 free (selection.clip_text);
300 free (env_display);
301 free (env_term);
302 free (locale); 270 free (locale);
303 free (v_buffer); 271 free (v_buffer);
304 free (incr_buf); 272
273 delete selection_req;
305 274
306 delete envv; 275 delete envv;
307 delete argv; 276 delete argv;
308 277
309#ifdef KEYSYM_RESOURCE 278#ifdef KEYSYM_RESOURCE
… …
341 if (display) 310 if (display)
342 { 311 {
343#if USE_XIM 312#if USE_XIM
344 im_ev.stop (display); 313 im_ev.stop (display);
345#endif 314#endif
346#if HAVE_SCROLLBARS
347 scrollbar_ev.stop (display); 315 scrollbar_ev.stop (display);
348#endif
349#if ENABLE_TRANSPARENCY || ENABLE_PERL 316#if ENABLE_TRANSPARENCY || ENABLE_PERL
350 rootwin_ev.stop (display); 317 rootwin_ev.stop (display);
351#endif 318#endif
352 incr_ev.stop ();
353 termwin_ev.stop (display); 319 termwin_ev.stop (display);
354 vt_ev.stop (display); 320 vt_ev.stop (display);
355 } 321 }
356 322
357 flush_ev.stop (); 323 flush_ev.stop ();
… …
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/*----------------------------------------------------------------------*/
478void
479rxvt_term::init (int argc, const char *const *argv, stringvec *envv)
480{
481 this->envv = envv;
482
483 SET_R (this);
484 set_locale ("");
485 set_environ (envv); // few things in X do not call setlocale :(
486
487 init_vars ();
488
489 init_secondary ();
490
491 const char **cmd_argv = init_resources (argc, argv);
492
493#ifdef KEYSYM_RESOURCE
494 keyboard->register_done ();
495#endif
496
497#ifdef HAVE_SCROLLBARS
498 if (option (Opt_scrollBar))
499 scrollBar.setIdle (); /* set existence for size calculations */
500#endif
501
502 pty = ptytty::create ();
503
504 create_windows (argc, argv);
505
506 init_xlocale ();
507
508 scr_reset (); // initialize screen
509
510#if 0
511 XSynchronize (dpy, True);
512#endif
513
514#ifdef HAVE_SCROLLBARS
515 if (option (Opt_scrollBar))
516 resize_scrollbar (); /* create and map scrollbar */
517#endif
518#ifdef HAVE_BG_PIXMAP
519 {
520 bgPixmap.set_target (this);
521
522#ifdef ENABLE_TRANSPARENCY
523 if (option (Opt_transparent))
524 {
525 bgPixmap.set_transparent ();
526#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 HOOK_INVOKE ((this, HOOK_START, DT_END));
576
577#if ENABLE_XEMBED
578 if (rs[Rs_embed])
579 {
580 long info[2] = { 0, XEMBED_MAPPED };
581
582 XChangeProperty (dpy, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
583 32, PropModeReplace, (unsigned char *)&info, 2);
584 }
585#endif
586
587 XMapWindow (dpy, vt);
588 XMapWindow (dpy, parent[0]);
589} 453}
590 454
591static struct sig_handlers 455static struct sig_handlers
592{ 456{
593 ev::sig sw_term, sw_int; 457 ev::sig sw_term, sw_int;
… …
610 rxvt_emergency_cleanup (); 474 rxvt_emergency_cleanup ();
611 w.stop (); 475 w.stop ();
612 kill (getpid (), w.signum); 476 kill (getpid (), w.signum);
613} 477}
614 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
615char **rxvt_environ; // startup environment 546char **rxvt_environ; // startup environment
616 547
617void 548void
618rxvt_init () 549rxvt_init ()
619{ 550{
620 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))));
621 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
622 if (!ev_default_loop (0)) 560 if (!ev_default_loop ())
623 rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n"); 561 rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n");
624 562
625 rxvt_environ = environ; 563 rxvt_environ = environ;
626 564
627 signal (SIGHUP, SIG_IGN); 565 signal (SIGHUP, SIG_IGN);
628 signal (SIGPIPE, SIG_IGN); 566 signal (SIGPIPE, SIG_IGN);
629 567
630 sig_handlers.sw_term.start (SIGTERM); ev_unref (); 568 sig_handlers.sw_term.start (SIGTERM); ev_unref ();
631 sig_handlers.sw_int.start (SIGINT); ev_unref (); 569 sig_handlers.sw_int.start (SIGINT); ev_unref ();
632
633 /* need to trap SIGURG for SVR4 (Unixware) rlogin */
634 /* signal (SIGURG, SIG_DFL); */
635 570
636 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); 571 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
637 // TODO: handle this with exceptions and tolerate the memory loss 572 // TODO: handle this with exceptions and tolerate the memory loss
638 XSetIOErrorHandler (rxvt_xioerror_handler); 573 XSetIOErrorHandler (rxvt_xioerror_handler);
639 574
640 XrmInitialize (); 575 XrmInitialize ();
641}
642 576
643/* ------------------------------------------------------------------------- * 577#if HAVE_PIXBUF
644 * MEMORY ALLOCATION WRAPPERS * 578 g_type_init ();
645 * ------------------------------------------------------------------------- */ 579#endif
646void *
647rxvt_malloc (size_t size)
648{
649 void *p = malloc (size);
650
651 if (!p)
652 rxvt_fatal ("memory allocation failure. aborting.\n");
653
654 return p;
655}
656
657void *
658rxvt_calloc (size_t number, size_t size)
659{
660 void *p = calloc (number, size);
661
662 if (!p)
663 rxvt_fatal ("memory allocation failure. aborting.\n");
664
665 return p;
666}
667
668void *
669rxvt_realloc (void *ptr, size_t size)
670{
671 void *p = realloc (ptr, size);
672
673 if (!p)
674 rxvt_fatal ("memory allocation failure. aborting.\n");
675
676 return p;
677} 580}
678 581
679/*----------------------------------------------------------------------*/ 582/*----------------------------------------------------------------------*/
680/* 583/*
681 * window size/position calculations for XSizeHint and other storage. 584 * window size/position calculations for XSizeHint and other storage.
… …
683 */ 586 */
684void 587void
685rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight) 588rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
686{ 589{
687 short recalc_x, recalc_y; 590 short recalc_x, recalc_y;
688 int x, y, sb_w, flags; 591 int x, y, flags;
689 unsigned int w, h; 592 unsigned int w, h;
690 unsigned int max_width, max_height; 593 unsigned int max_width, max_height;
691 594
692 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity; 595 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity;
693 szHint.win_gravity = NorthWestGravity; 596 szHint.win_gravity = NorthWestGravity;
… …
703 if (rs[Rs_geometry]) 606 if (rs[Rs_geometry])
704 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h); 607 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h);
705 608
706 if (flags & WidthValue) 609 if (flags & WidthValue)
707 { 610 {
611 if (!w)
612 rxvt_fatal ("illegal window geometry (width and height must be non-zero), aborting.\n");
613
708 ncol = clamp (w, 0, std::numeric_limits<int16_t>::max ()); 614 ncol = clamp (w, 1, std::numeric_limits<int16_t>::max ());
709 szHint.flags |= USSize; 615 szHint.flags |= USSize;
710 } 616 }
711 617
712 if (flags & HeightValue) 618 if (flags & HeightValue)
713 { 619 {
620 if (!h)
621 rxvt_fatal ("illegal window geometry (width and height must be non-zero), aborting.\n");
622
714 nrow = clamp (h, 0, std::numeric_limits<int16_t>::max ()); 623 nrow = clamp (h, 1, std::numeric_limits<int16_t>::max ());
715 szHint.flags |= USSize; 624 szHint.flags |= USSize;
716 } 625 }
717 626
718 if (flags & XValue) 627 if (flags & XValue)
719 { 628 {
… …
750 max_width = MAX_COLS * fwidth; 659 max_width = MAX_COLS * fwidth;
751 max_height = MAX_ROWS * fheight; 660 max_height = MAX_ROWS * fheight;
752 661
753 szHint.base_width = szHint.base_height = 2 * int_bwidth; 662 szHint.base_width = szHint.base_height = 2 * int_bwidth;
754 663
755 sb_w = 0;
756 window_vt_x = window_vt_y = int_bwidth; 664 window_vt_x = window_vt_y = int_bwidth;
757 665
758 if (scrollBar.state) 666 if (scrollBar.state)
759 { 667 {
760 sb_w = scrollbar_TotalWidth (); 668 int sb_w = scrollBar.total_width ();
761 szHint.base_width += sb_w; 669 szHint.base_width += sb_w;
762 670
763 if (!option (Opt_scrollBar_right)) 671 if (!option (Opt_scrollBar_right))
764 window_vt_x += sb_w; 672 window_vt_x += sb_w;
765 } 673 }
… …
789 { 697 {
790 min_it (height, max_height); 698 min_it (height, max_height);
791 szHint.height = szHint.base_height + height; 699 szHint.height = szHint.base_height + height;
792 } 700 }
793 701
794 if (scrollBar.state && option (Opt_scrollBar_right))
795 window_sb_x = szHint.width - sb_w;
796
797 if (recalc_x) 702 if (recalc_x)
798 szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth; 703 szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth;
799 704
800 if (recalc_y) 705 if (recalc_y)
801 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth; 706 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth;
802 707
803 ncol = width / fwidth; 708 ncol = width / fwidth;
804 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;
805} 719}
806 720
807/*----------------------------------------------------------------------*/ 721/*----------------------------------------------------------------------*/
808/* 722/*
809 * Tell the teletype handler what size the window is. 723 * Tell the teletype handler what size the window is.
… …
817 731
818 struct winsize ws; 732 struct winsize ws;
819 733
820 ws.ws_col = ncol; 734 ws.ws_col = ncol;
821 ws.ws_row = nrow; 735 ws.ws_row = nrow;
822 ws.ws_xpixel = width; 736 ws.ws_xpixel = vt_width;
823 ws.ws_ypixel = height; 737 ws.ws_ypixel = vt_height;
824 (void)ioctl (pty->pty, TIOCSWINSZ, &ws); 738 ioctl (pty->pty, TIOCSWINSZ, &ws);
825 739
826#if 0 740#if 0
827 // TIOCSWINSZ is supposed to do this automatically and correctly 741 // TIOCSWINSZ is supposed to do this automatically and correctly
828 if (cmd_pid) /* force through to the command */ 742 if (cmd_pid) /* force through to the command */
829 kill (-cmd_pid, SIGWINCH); 743 kill (-cmd_pid, SIGWINCH);
830#endif 744#endif
831} 745}
832 746
833/*----------------------------------------------------------------------*/ 747/*----------------------------------------------------------------------*/
834/* set_fonts () - load and set the various fonts 748/* load and set the various fonts */
835 *
836 * init = 1 - initialize
837 *
838 * fontname == FONT_UP - switch to bigger font
839 * fontname == FONT_DN - switch to smaller font
840 */
841bool 749bool
842rxvt_term::set_fonts () 750rxvt_term::set_fonts ()
843{ 751{
844 rxvt_fontset *fs = new rxvt_fontset (this); 752 rxvt_fontset *fs = new rxvt_fontset (this);
845 rxvt_fontprop prop; 753 rxvt_fontprop prop;
… …
859#endif 767#endif
860 768
861 delete fontset[0]; 769 delete fontset[0];
862 fontset[0] = fs; 770 fontset[0] = fs;
863 771
864 prop = (*fs)[1]->properties (); 772 prop = (*fs)[rxvt_fontset::firstFont]->properties ();
865 prop.height += lineSpace; 773 prop.width += letterSpace;
866 774
867 fs->set_prop (prop, false); 775 fs->set_prop (prop, false);
868 776
869 fwidth = prop.width; 777 fwidth = prop.width;
870 fheight = prop.height; 778 fheight = prop.height + lineSpace;
871 fbase = prop.ascent; 779 fbase = prop.ascent;
872 780
873 for (int style = 1; style < 4; style++) 781 for (int style = 1; style < 4; style++)
874 { 782 {
875#if ENABLE_STYLES 783#if ENABLE_STYLES
… …
901#else 809#else
902 fontset[style] = fontset[0]; 810 fontset[style] = fontset[0];
903#endif 811#endif
904 } 812 }
905 813
906 if (parent[0]) 814 if (parent)
907 { 815 {
908 resize_all_windows (0, 0, 0); 816 resize_all_windows (0, 0, 0);
909 scr_remap_chars (); 817 scr_remap_chars ();
910 scr_touch (true); 818 scr_touch (true);
911 } 819 }
… …
914} 822}
915 823
916void 824void
917rxvt_term::set_string_property (Atom prop, const char *str, int len) 825rxvt_term::set_string_property (Atom prop, const char *str, int len)
918{ 826{
919 XChangeProperty (dpy, parent[0], 827 XChangeProperty (dpy, parent,
920 prop, XA_STRING, 8, PropModeReplace, 828 prop, XA_STRING, 8, PropModeReplace,
921 (const unsigned char *)str, len >= 0 ? len : strlen (str)); 829 (const unsigned char *)str, len >= 0 ? len : strlen (str));
922} 830}
923 831
924void 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
925rxvt_term::set_utf8_property (Atom prop, const char *str, int len) 845rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
926{ 846{
927 wchar_t *ws = rxvt_mbstowcs (str, len); 847 wchar_t *ws = rxvt_mbstowcs (str, len);
928 char *s = rxvt_wcstoutf8 (ws); 848 char *s = rxvt_wcstoutf8 (ws);
929 849
930 XChangeProperty (dpy, parent[0], 850 XChangeProperty (dpy, parent,
931 prop, xa[XA_UTF8_STRING], 8, PropModeReplace, 851 prop, xa[XA_UTF8_STRING], 8, PropModeReplace,
932 (const unsigned char *)s, strlen (s)); 852 (const unsigned char *)s, strlen (s));
933 853
934 free (s); 854 free (s);
935 free (ws); 855 free (ws);
… …
939/*----------------------------------------------------------------------*/ 859/*----------------------------------------------------------------------*/
940/* xterm sequences - title, iconName, color (exptl) */ 860/* xterm sequences - title, iconName, color (exptl) */
941void 861void
942rxvt_term::set_title (const char *str) 862rxvt_term::set_title (const char *str)
943{ 863{
944 set_string_property (XA_WM_NAME, str); 864 set_mbstring_property (XA_WM_NAME, str);
945#if ENABLE_EWMH 865#if ENABLE_EWMH
946 set_utf8_property (xa[XA_NET_WM_NAME], str); 866 set_utf8_property (xa[XA_NET_WM_NAME], str);
947#endif 867#endif
948} 868}
949 869
950void 870void
951rxvt_term::set_icon_name (const char *str) 871rxvt_term::set_icon_name (const char *str)
952{ 872{
953 set_string_property (XA_WM_ICON_NAME, str); 873 set_mbstring_property (XA_WM_ICON_NAME, str);
954#if ENABLE_EWMH 874#if ENABLE_EWMH
955 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str); 875 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str);
956#endif 876#endif
957} 877}
958 878
959void 879void
960rxvt_term::set_window_color (int idx, const char *color) 880rxvt_term::set_window_color (int idx, const char *color)
961{ 881{
962#ifdef XTERM_COLOR_CHANGE 882#ifdef XTERM_COLOR_CHANGE
963 rxvt_color xcol; 883 rxvt_color xcol;
964 int i;
965 884
966 if (color == NULL || *color == '\0') 885 if (color == NULL || *color == '\0')
967 return; 886 return;
968 887
969 color = strdup (color); 888 color = strdup (color);
… …
971 rs[Rs_color + idx] = color; 890 rs[Rs_color + idx] = color;
972 891
973 /* handle color aliases */ 892 /* handle color aliases */
974 if (isdigit (*color)) 893 if (isdigit (*color))
975 { 894 {
976 i = atoi (color); 895 int i = atoi (color);
977 896
978 if (i >= 8 && i <= 15) 897 if (i >= 8 && i <= 15)
979 { 898 {
980 /* bright colors */ 899 /* bright colors */
981 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i - 8]; 900 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i - 8];
… …
1026 945
1027/*----------------------------------------------------------------------*/ 946/*----------------------------------------------------------------------*/
1028/* 947/*
1029 * 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
1030 */ 949 */
1031void 950char *
1032rxvt_term::set_colorfgbg () 951rxvt_term::get_colorfgbg ()
1033{ 952{
1034 unsigned int i; 953 unsigned int i;
1035 const char *xpmb = ""; 954 const char *xpmb = "";
1036 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1]; 955 char fstr[] = "default";
956 char bstr[] = "default";
957 char *env_colorfgbg;
1037 958
1038 strcpy (fstr, "default");
1039 strcpy (bstr, "default");
1040 for (i = Color_Black; i <= Color_White; i++) 959 for (i = Color_Black; i <= Color_White; i++)
1041 if (pix_colors[Color_fg] == pix_colors[i]) 960 if (pix_colors[Color_fg] == pix_colors[i])
1042 { 961 {
1043 sprintf (fstr, "%d", (i - Color_Black)); 962 sprintf (fstr, "%d", i - Color_Black);
1044 break; 963 break;
1045 } 964 }
1046 965
1047 for (i = Color_Black; i <= Color_White; i++) 966 for (i = Color_Black; i <= Color_White; i++)
1048 if (pix_colors[Color_bg] == pix_colors[i]) 967 if (pix_colors[Color_bg] == pix_colors[i])
1049 { 968 {
1050 sprintf (bstr, "%d", (i - Color_Black)); 969 sprintf (bstr, "%d", i - Color_Black);
1051#ifdef BG_IMAGE_FROM_FILE 970#if BG_IMAGE_FROM_FILE
1052 xpmb = "default;"; 971 xpmb = "default;";
1053#endif 972#endif
1054 break; 973 break;
1055 } 974 }
1056 975
976 env_colorfgbg = (char *)rxvt_malloc (sizeof ("COLORFGBG=default;default;bg"));
1057 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;
1058} 979}
1059 980
1060/*----------------------------------------------------------------------*/ 981/*----------------------------------------------------------------------*/
1061 982
1062bool 983bool
… …
1085 int old_width = szHint.width; 1006 int old_width = szHint.width;
1086 int old_height = szHint.height; 1007 int old_height = szHint.height;
1087 1008
1088 window_calc (newwidth, newheight); 1009 window_calc (newwidth, newheight);
1089 1010
1090 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);
1091 XSetWMNormalHints (dpy, parent[0], &szHint); 1017 XSetWMNormalHints (dpy, parent, &szHint);
1018 szHint.flags |= PBaseSize | PResizeInc;
1019 }
1092 1020
1093 if (!ignoreparent) 1021 if (!ignoreparent)
1094 { 1022 {
1095#ifdef SMART_RESIZE 1023#ifdef SMART_RESIZE
1096 /* 1024 /*
… …
1100 int x, y, x1, y1; 1028 int x, y, x1, y1;
1101 int dx, dy; 1029 int dx, dy;
1102 unsigned int unused_w1, unused_h1, unused_b1, unused_d1; 1030 unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
1103 Window unused_cr; 1031 Window unused_cr;
1104 1032
1105 XTranslateCoordinates (dpy, parent[0], display->root, 1033 XTranslateCoordinates (dpy, parent, display->root,
1106 0, 0, &x, &y, &unused_cr); 1034 0, 0, &x, &y, &unused_cr);
1107 XGetGeometry (dpy, parent[0], &unused_cr, &x1, &y1, 1035 XGetGeometry (dpy, parent, &unused_cr, &x1, &y1,
1108 &unused_w1, &unused_h1, &unused_b1, &unused_d1); 1036 &unused_w1, &unused_h1, &unused_b1, &unused_d1);
1109 /* 1037 /*
1110 * 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
1111 * our position for handles and decorations. Counter it 1039 * our position for handles and decorations. Counter it
1112 */ 1040 */
… …
1129 if (y < y1) /* top half */ 1057 if (y < y1) /* top half */
1130 dy = 0; 1058 dy = 0;
1131 else if (y == y1) /* exact center */ 1059 else if (y == y1) /* exact center */
1132 dy /= 2; 1060 dy /= 2;
1133 1061
1134 XMoveResizeWindow (dpy, parent[0], x + dx, y + dy, 1062 XMoveResizeWindow (dpy, parent, x + dx, y + dy,
1135 szHint.width, szHint.height); 1063 szHint.width, szHint.height);
1136#else 1064#else
1137 XResizeWindow (dpy, parent[0], szHint.width, szHint.height); 1065 XResizeWindow (dpy, parent, szHint.width, szHint.height);
1138#endif 1066#endif
1139 } 1067 }
1068
1069 if (set_hint)
1070 XSetWMNormalHints (dpy, parent, &szHint);
1140 1071
1141 fix_screen = ncol != prev_ncol || nrow != prev_nrow; 1072 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
1142 1073
1143 if (fix_screen || newwidth != old_width || newheight != old_height) 1074 if (fix_screen || newwidth != old_width || newheight != old_height)
1144 { 1075 {
1145 if (scrollBar.state) 1076 if (scrollBar.state)
1146 { 1077 scrollBar.resize ();
1147 XMoveResizeWindow (dpy, scrollBar.win,
1148 window_sb_x, 0,
1149 scrollbar_TotalWidth (), szHint.height);
1150 resize_scrollbar ();
1151 }
1152 1078
1153 XMoveResizeWindow (dpy, vt, 1079 XMoveResizeWindow (dpy, vt,
1154 window_vt_x, window_vt_y, 1080 window_vt_x, window_vt_y,
1155 width, height); 1081 vt_width, vt_height);
1082
1083 HOOK_INVOKE ((this, HOOK_SIZE_CHANGE, DT_INT, newwidth, DT_INT, newheight, DT_END));
1156 1084
1157#ifdef HAVE_BG_PIXMAP 1085#ifdef HAVE_BG_PIXMAP
1158 if (bgPixmap.window_size_sensitive ()) 1086 if (bg_window_size_sensitive ())
1159 update_background (); 1087 update_background ();
1160#endif 1088#endif
1161
1162 scr_clear ();
1163 } 1089 }
1164 1090
1165 if (fix_screen || old_height == 0) 1091 if (fix_screen || old_height == 0)
1166 scr_reset (); 1092 scr_reset ();
1167 1093
1168 // TODO, with nvidia-8178, resizes kill the alpha channel, report if not fixed in newer version
1169 //scr_touch (false);
1170
1171#ifdef HAVE_BG_PIXMAP
1172// TODO: this don't seem to have any effect - do we still need it ? If so - in which case exactly ?
1173// if (bgPixmap.pixmap)
1174// scr_touch (false);
1175#endif
1176
1177#ifdef USE_XIM 1094#if USE_XIM
1178 IMSetPosition (); 1095 im_set_position ();
1179#endif 1096#endif
1180} 1097}
1181 1098
1182/* 1099/*
1183 * Set the width/height of the vt window in characters. Units are pixels. 1100 * Set the width/height of the vt window in characters. Units are pixels.
… …
1196 newwidth = wattr.width - szHint.base_width; 1113 newwidth = wattr.width - szHint.base_width;
1197 if (newheight == 0) 1114 if (newheight == 0)
1198 newheight = wattr.height - szHint.base_height; 1115 newheight = wattr.height - szHint.base_height;
1199 } 1116 }
1200 1117
1201 if (newwidth != width || newheight != height) 1118 if (newwidth != vt_width || newheight != vt_height)
1202 { 1119 {
1203 newwidth += szHint.base_width; 1120 newwidth += szHint.base_width;
1204 newheight += szHint.base_height; 1121 newheight += szHint.base_height;
1205 resize_all_windows (newwidth, newheight, 0); 1122 resize_all_windows (newwidth, newheight, 0);
1206 } 1123 }
1207} 1124}
1208 1125
1209/* -------------------------------------------------------------------- * 1126/* -------------------------------------------------------------------- *
1210 * - X INPUT METHOD ROUTINES - * 1127 * - X INPUT METHOD ROUTINES - *
1211 * -------------------------------------------------------------------- */ 1128 * -------------------------------------------------------------------- */
1212#ifdef USE_XIM 1129#if USE_XIM
1213 1130
1214void 1131void
1215rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg) 1132rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg)
1216{ 1133{
1217 fg = pix_colors [Color_fg]; 1134 fg = pix_colors [Color_fg];
… …
1244 status_rect.height = fheight; 1161 status_rect.height = fheight;
1245} 1162}
1246 1163
1247/* Checking whether input method is running. */ 1164/* Checking whether input method is running. */
1248bool 1165bool
1249rxvt_term::IMisRunning () 1166rxvt_term::im_is_running ()
1250{ 1167{
1251 char *p;
1252 Atom atom; 1168 Atom atom;
1253 Window win; 1169 Window win;
1254 char server[IMBUFSIZ]; 1170 char server[IMBUFSIZ];
1255 1171
1256 /* get current locale modifier */ 1172 /* get current locale modifier */
1257 if ((p = XSetLocaleModifiers (NULL)) != NULL) 1173 if (char *p = XSetLocaleModifiers (0))
1258 { 1174 {
1259 strcpy (server, "@server="); 1175 strcpy (server, "@server=");
1260 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */ 1176 strncat (server, p + 4, IMBUFSIZ - 9); /* skip "@im=" */
1261 1177
1262 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */ 1178 if (p = strchr (server + 1, '@')) /* first one only */
1263 *p = '\0'; 1179 *p = '\0';
1264 1180
1265 atom = XInternAtom (dpy, server, False); 1181 atom = XInternAtom (dpy, server, False);
1266 win = XGetSelectionOwner (dpy, atom); 1182 win = XGetSelectionOwner (dpy, atom);
1267 1183
1268 if (win != None) 1184 if (win != None)
1269 return True; 1185 return true;
1270 } 1186 }
1271 1187
1272 return False; 1188 return false;
1273} 1189}
1274 1190
1275void 1191void
1276rxvt_term::IMSendSpot () 1192rxvt_term::im_send_spot ()
1277{ 1193{
1278 XPoint nspot; 1194 XPoint nspot;
1279 XVaNestedList preedit_attr; 1195 XVaNestedList preedit_attr;
1280 1196
1281 if (!Input_Context 1197 if (!Input_Context
… …
1334 1250
1335 term->make_current (); 1251 term->make_current ();
1336 1252
1337 if (text) 1253 if (text)
1338 { 1254 {
1339 void *str; 1255 wchar_t *str;
1340 1256
1341 if (!text->encoding_is_wchar && text->string.multi_byte) 1257 if (!text->encoding_is_wchar && text->string.multi_byte)
1342 { 1258 {
1343 // of course, X makes it ugly again 1259 // of course, X makes it ugly again
1344 if (term->rs[Rs_imLocale]) 1260 if (term->rs[Rs_imLocale])
1345 SET_LOCALE (term->rs[Rs_imLocale]); 1261 SET_LOCALE (term->rs[Rs_imLocale]);
1346 1262
1347 str = rxvt_temp_buf ((text->length + 1) * sizeof (wchar_t)); 1263 str = rxvt_temp_buf<wchar_t> (text->length + 1);
1348 mbstowcs ((wchar_t *)str, text->string.multi_byte, text->length + 1); 1264 mbstowcs (str, text->string.multi_byte, text->length + 1);
1349 1265
1350 if (term->rs[Rs_imLocale]) 1266 if (term->rs[Rs_imLocale])
1351 SET_LOCALE (term->locale); 1267 SET_LOCALE (term->locale);
1352 } 1268 }
1353 else 1269 else
1354 str = (void *)text->string.wide_char; 1270 str = text->string.wide_char;
1355 1271
1356 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW, 1272 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
1357 DT_INT, call_data->caret, 1273 DT_INT, call_data->caret,
1358 DT_INT, call_data->chg_first, 1274 DT_INT, call_data->chg_first,
1359 DT_INT, call_data->chg_length, 1275 DT_INT, call_data->chg_length,
… …
1387/* 1303/*
1388 * Try to open a XIM with the current modifiers, then see if we can 1304 * Try to open a XIM with the current modifiers, then see if we can
1389 * open a suitable preedit type 1305 * open a suitable preedit type
1390 */ 1306 */
1391bool 1307bool
1392rxvt_term::IM_get_IC (const char *modifiers) 1308rxvt_term::im_get_ic (const char *modifiers)
1393{ 1309{
1394 int i, j, found; 1310 int i, j, found;
1395 XIM xim; 1311 XIM xim;
1396 XPoint spot; 1312 XPoint spot;
1397 XRectangle rect, status_rect, needed_rect; 1313 XRectangle rect, status_rect, needed_rect;
1398 unsigned long fg, bg; 1314 unsigned long fg, bg;
1399 const char *p; 1315 const char *p;
1400 char **s; 1316 char **s;
1401 XIMStyles *xim_styles; 1317 XIMStyles *xim_styles;
1402#ifdef ENABLE_XIM_ONTHESPOT
1403 XIMCallback xcb[4];
1404#endif
1405 1318
1406 set_environ (envv); 1319 set_environ (envv);
1407 1320
1408 if (! ((p = XSetLocaleModifiers (modifiers)) && *p)) 1321 if (! ((p = XSetLocaleModifiers (modifiers)) && *p))
1409 return false; 1322 return false;
… …
1430 p = pet[pi]; 1343 p = pet[pi];
1431 1344
1432 if (!p) 1345 if (!p)
1433 continue; 1346 continue;
1434 1347
1435 s = rxvt_splitcommastring (p); 1348 s = rxvt_strsplit (',', p);
1436 1349
1437 for (i = found = 0; !found && s[i]; i++) 1350 for (i = found = 0; !found && s[i]; i++)
1438 { 1351 {
1439 if (!strcmp (s[i], "OverTheSpot")) 1352 if (!strcmp (s[i], "OverTheSpot"))
1440 input_style = XIMPreeditPosition | XIMStatusNothing; 1353 input_style = XIMPreeditPosition | XIMStatusNothing;
… …
1452 input_style = XIMPreeditNothing | XIMStatusNothing; 1365 input_style = XIMPreeditNothing | XIMStatusNothing;
1453 1366
1454 for (j = 0; j < xim_styles->count_styles; j++) 1367 for (j = 0; j < xim_styles->count_styles; j++)
1455 if (input_style == xim_styles->supported_styles[j]) 1368 if (input_style == xim_styles->supported_styles[j])
1456 { 1369 {
1457 rxvt_freecommastring (s); 1370 rxvt_free_strsplit (s);
1458 1371
1459 found = 1; 1372 found = 1;
1460 goto foundpet; 1373 goto foundpet;
1461 } 1374 }
1462 1375
1463 } 1376 }
1464 1377
1465 rxvt_freecommastring (s); 1378 rxvt_free_strsplit (s);
1466 } 1379 }
1467 1380
1468foundpet: 1381foundpet:
1469 1382
1470 XFree (xim_styles); 1383 XFree (xim_styles);
… …
1549 NULL); 1462 NULL);
1550 } 1463 }
1551#if ENABLE_XIM_ONTHESPOT 1464#if ENABLE_XIM_ONTHESPOT
1552 else if (input_style & XIMPreeditCallbacks) 1465 else if (input_style & XIMPreeditCallbacks)
1553 { 1466 {
1467 XIMCallback xcb[4];
1468
1554 im_set_position (spot); 1469 im_set_position (spot);
1555 1470
1556 xcb[0].client_data = (XPointer)this; xcb[0].callback = (XIMProc)xim_preedit_start; 1471 xcb[0].client_data = (XPointer)this; xcb[0].callback = (XIMProc)xim_preedit_start;
1557 xcb[1].client_data = (XPointer)this; xcb[1].callback = (XIMProc)xim_preedit_done; 1472 xcb[1].client_data = (XPointer)this; xcb[1].callback = (XIMProc)xim_preedit_done;
1558 xcb[2].client_data = (XPointer)this; xcb[2].callback = (XIMProc)xim_preedit_draw; 1473 xcb[2].client_data = (XPointer)this; xcb[2].callback = (XIMProc)xim_preedit_draw;
… …
1573#endif 1488#endif
1574 1489
1575 Input_Context = XCreateIC (xim, 1490 Input_Context = XCreateIC (xim,
1576 XNInputStyle, input_style, 1491 XNInputStyle, input_style,
1577 XNClientWindow, vt, 1492 XNClientWindow, vt,
1578 XNFocusWindow, parent[0], 1493 XNFocusWindow, parent,
1579 preedit_attr ? XNPreeditAttributes : NULL, 1494 preedit_attr ? XNPreeditAttributes : NULL,
1580 preedit_attr, 1495 preedit_attr,
1581 status_attr ? XNStatusAttributes : NULL, 1496 status_attr ? XNStatusAttributes : NULL,
1582 status_attr, NULL); 1497 status_attr, NULL);
1583 1498
… …
1596 // unfortunately, only the focus window is used by XIM, hard to fix 1511 // unfortunately, only the focus window is used by XIM, hard to fix
1597 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL)) 1512 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL))
1598 vt_select_input (); 1513 vt_select_input ();
1599#endif 1514#endif
1600 1515
1601 IMSetPosition (); 1516 im_set_position ();
1602 1517
1603 return true; 1518 return true;
1604} 1519}
1605 1520
1606void 1521void
… …
1616 im_destroy (); 1531 im_destroy ();
1617 1532
1618 if (Input_Context) 1533 if (Input_Context)
1619 return; 1534 return;
1620 1535
1621#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1622 if (rs[Rs_imLocale]) 1536 if (rs[Rs_imLocale])
1623 SET_LOCALE (rs[Rs_imLocale]); 1537 SET_LOCALE (rs[Rs_imLocale]);
1624#endif
1625 1538
1626 p = rs[Rs_inputMethod]; 1539 p = rs[Rs_inputMethod];
1627 if (p && *p) 1540 if (p && *p)
1628 { 1541 {
1629 bool found = false; 1542 bool found = false;
1630 1543
1631 s = rxvt_splitcommastring (p); 1544 s = rxvt_strsplit (',', p);
1632 1545
1633 for (i = 0; s[i]; i++) 1546 for (i = 0; s[i]; i++)
1634 { 1547 {
1635 if (*s[i]) 1548 if (*s[i])
1636 { 1549 {
1637 strcpy (buf, "@im="); 1550 strcpy (buf, "@im=");
1638 strncat (buf, s[i], IMBUFSIZ - 5); 1551 strncat (buf, s[i], IMBUFSIZ - 5);
1639 if (IM_get_IC (buf)) 1552 if (im_get_ic (buf))
1640 { 1553 {
1641 found = true; 1554 found = true;
1642 break; 1555 break;
1643 } 1556 }
1644 } 1557 }
1645 } 1558 }
1646 1559
1647 rxvt_freecommastring (s); 1560 rxvt_free_strsplit (s);
1648 1561
1649 if (found) 1562 if (found)
1650 goto done; 1563 goto done;
1651 } 1564 }
1652 1565
1653 /* try with XMODIFIERS env. var. */ 1566 /* try with XMODIFIERS env. var. */
1654 if (IM_get_IC ("")) 1567 if (im_get_ic (""))
1655 goto done; 1568 goto done;
1656 1569
1657 /* try with no modifiers base IF the user didn't specify an IM */ 1570 /* try with no modifiers base IF the user didn't specify an IM */
1658 if (IM_get_IC ("@im=none")) 1571 if (im_get_ic ("@im=none"))
1659 goto done; 1572 goto done;
1660 1573
1661done: 1574done:
1662#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1663 if (rs[Rs_imLocale]) 1575 if (rs[Rs_imLocale])
1664 SET_LOCALE (locale); 1576 SET_LOCALE (locale);
1665#endif
1666} 1577}
1667 1578
1668void 1579void
1669rxvt_term::IMSetPosition () 1580rxvt_term::im_set_position ()
1670{ 1581{
1671 XRectangle preedit_rect, status_rect, *needed_rect; 1582 XRectangle preedit_rect, status_rect, *needed_rect;
1672 XVaNestedList preedit_attr, status_attr; 1583 XVaNestedList preedit_attr, status_attr;
1673 1584
1674 if (!Input_Context 1585 if (!Input_Context
1675 || !focus 1586 || !focus
1676 || !(input_style & (XIMPreeditArea | XIMPreeditPosition)) 1587 || !(input_style & (XIMPreeditArea | XIMPreeditPosition))
1677 || !IMisRunning ()) 1588 || !im_is_running ())
1678 return; 1589 return;
1679 1590
1680 if (input_style & XIMPreeditPosition) 1591 if (input_style & XIMPreeditPosition)
1681 { 1592 {
1682 im_set_size (preedit_rect); 1593 im_set_size (preedit_rect);
… …
1712 1623
1713void 1624void
1714rxvt_term::get_window_origin (int &x, int &y) 1625rxvt_term::get_window_origin (int &x, int &y)
1715{ 1626{
1716 Window cr; 1627 Window cr;
1717 XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr); 1628 XTranslateCoordinates (dpy, parent, display->root, 0, 0, &x, &y, &cr);
1718/* fprintf( stderr, "origin is %+d%+d\n", x, y);*/
1719}
1720
1721Pixmap
1722rxvt_term::get_pixmap_property (int prop_id)
1723{
1724 if (prop_id > 0 && prop_id < NUM_XA)
1725 if (xa[prop_id])
1726 {
1727 int aformat;
1728 unsigned long nitems, bytes_after;
1729 Atom atype;
1730 unsigned char *prop = NULL;
1731 int result = XGetWindowProperty (dpy, display->root, xa[prop_id],
1732 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1733 &nitems, &bytes_after, &prop);
1734 if (result == Success && prop && atype == XA_PIXMAP)
1735 {
1736 return *(Pixmap *)prop;
1737 }
1738 }
1739 return None;
1740} 1629}
1741 1630
1742#ifdef HAVE_BG_PIXMAP 1631#ifdef HAVE_BG_PIXMAP
1743# if TRACE_PIXMAPS
1744# undef update_background
1745int rxvt_term::trace_update_background (const char *file, int line)
1746{
1747 fprintf (stderr, "%s:%d:update_background()\n", file, line);
1748 update_background ();
1749}
1750# endif
1751 1632
1752int 1633void
1753rxvt_term::update_background () 1634rxvt_term::update_background ()
1754{ 1635{
1636 if (update_background_ev.is_active ())
1637 return;
1638
1755 bgPixmap.invalidate (); 1639 bg_invalidate ();
1756 1640
1757 /* no chance of real time refresh if we are blurring! */ 1641 if (!mapped)
1758 if (bgPixmap.invalid_since + 0.5 < ev::now () && !(bgPixmap.flags & bgPixmap_t::blurNeeded)) 1642 return;
1643
1644 ev_tstamp to_wait = 0.5 - (ev::now () - bg_valid_since);
1645
1646 if (to_wait <= 0.)
1759 bgPixmap.render (); 1647 bg_render ();
1760 else 1648 else
1761 {
1762 update_background_ev.stop ();
1763
1764 if (!bgPixmap.need_client_side_rendering ())
1765 update_background_ev.start (.05); 1649 update_background_ev.start (to_wait);
1766 else if (bgPixmap.flags & bgPixmap_t::blurNeeded)
1767 update_background_ev.start (.20); /* very slow !!! */
1768 else
1769 update_background_ev.start (.07);
1770 }
1771
1772 return 0;
1773} 1650}
1774 1651
1775void 1652void
1776rxvt_term::update_background_cb (ev::timer &w, int revents) 1653rxvt_term::update_background_cb (ev::timer &w, int revents)
1777{ 1654{
1778 make_current (); 1655 make_current ();
1656
1657 update_background_ev.stop ();
1779 bgPixmap.render (); 1658 bg_render ();
1780 refresh_check (); 1659 refresh_check ();
1781} 1660}
1782 1661
1783#endif /* HAVE_BG_PIXMAP */ 1662#endif /* HAVE_BG_PIXMAP */
1784 1663

Diff Legend

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