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.293 by ayin, Fri Dec 28 14:57:04 2007 UTC vs.
Revision 1.373 by root, Mon May 28 16:40:03 2012 UTC

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

Diff Legend

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