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.316 by root, Sun Apr 26 01:51:20 2009 UTC vs.
Revision 1.362 by sf-exg, Tue Dec 6 11:29:52 2011 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-2008 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 <cassert>
40#include <csignal> 42#include <csignal>
41#include <cstring> 43#include <cstring>
42 44
43#include <termios.h> 45#include <termios.h>
44 46
… …
49# ifdef HAVE_SETLOCALE 51# ifdef HAVE_SETLOCALE
50# include <clocale> 52# include <clocale>
51# endif 53# endif
52#endif 54#endif
53 55
56struct termios rxvt_term::def_tio;
54vector<rxvt_term *> rxvt_term::termlist; 57vector<rxvt_term *> rxvt_term::termlist;
55 58
56// used to tell global functions which terminal instance is "active" 59// used to tell global functions which terminal instance is "active"
57rxvt_t rxvt_current_term; 60rxvt_t rxvt_current_term;
58 61
… …
93text_t rxvt_composite_vec::compose (unicode_t c1, unicode_t c2) 96text_t rxvt_composite_vec::compose (unicode_t c1, unicode_t c2)
94{ 97{
95 compose_char *cc; 98 compose_char *cc;
96 99
97 // break compose chains, as stupid readline really likes to duplicate 100 // break compose chains, as stupid readline really likes to duplicate
98 // composing characters for some reason near the end of a line. 101 // composing characters for some reason, near the end of a line.
99 cc = (*this)[c1]; 102 cc = (*this)[c1];
100 while (cc) 103 while (cc)
101 { 104 {
102 if (cc->c2 == c2) return c1; 105 if (cc->c2 == c2) return c1;
103 cc = (*this)[cc->c1]; 106 cc = (*this)[cc->c1];
104 } 107 }
105 108
106 // check to see wether this combination already exists otherwise 109 // check to see whether this combination already exists otherwise
107 for (cc = v.end (); cc-- > v.begin (); ) 110 for (cc = v.begin (); cc < v.end (); cc++)
108 {
109 if (cc->c1 == c1 && cc->c2 == c2) 111 if (cc->c1 == c1 && cc->c2 == c2)
110 return COMPOSE_LO + (cc - v.begin ()); 112 return COMPOSE_LO + (cc - v.begin ());
111 }
112 113
113 // allocate a new combination 114 // allocate a new combination
114 if (v.size () == COMPOSE_HI - COMPOSE_LO + 1) 115 if (v.size () == COMPOSE_HI - COMPOSE_LO + 1)
115 { 116 {
116 static int seen; 117 static int seen;
117 118
118 if (!seen++) 119 if (!seen++)
119 fprintf (stderr, "too many unrepresentable composite characters, try --enable-unicode3\n"); 120 rxvt_warn ("too many unrepresentable composite characters, try --enable-unicode3\n");
120 121
121 return REPLACEMENT_CHAR; 122 return REPLACEMENT_CHAR;
122 } 123 }
123 124
124 v.push_back (compose_char (c1, c2)); 125 v.push_back (compose_char (c1, c2));
… …
186#endif 187#endif
187 child_ev.set <rxvt_term, &rxvt_term::child_cb> (this); 188 child_ev.set <rxvt_term, &rxvt_term::child_cb> (this);
188 flush_ev.set <rxvt_term, &rxvt_term::flush_cb> (this); 189 flush_ev.set <rxvt_term, &rxvt_term::flush_cb> (this);
189 destroy_ev.set <rxvt_term, &rxvt_term::destroy_cb> (this); 190 destroy_ev.set <rxvt_term, &rxvt_term::destroy_cb> (this);
190 pty_ev.set <rxvt_term, &rxvt_term::pty_cb> (this); 191 pty_ev.set <rxvt_term, &rxvt_term::pty_cb> (this);
191 incr_ev.set <rxvt_term, &rxvt_term::incr_cb> (this);
192 termwin_ev.set <rxvt_term, &rxvt_term::x_cb> (this); 192 termwin_ev.set <rxvt_term, &rxvt_term::x_cb> (this);
193 vt_ev.set <rxvt_term, &rxvt_term::x_cb> (this); 193 vt_ev.set <rxvt_term, &rxvt_term::x_cb> (this);
194 194
195 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base; 195 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base;
196 196
197 termlist.push_back (this); 197 termlist.push_back (this);
198 198
199#ifdef KEYSYM_RESOURCE 199#ifdef KEYSYM_RESOURCE
200 keyboard = new keyboard_manager; 200 keyboard = new keyboard_manager;
201#endif 201#endif
202
203 // this->envv = 0;
202} 204}
203 205
204// clean up the most important stuff, do *not* call x or free mem etc. 206// clean up the most important stuff, do *not* call x or free mem etc.
205// for use before an emergency exit 207// for use before an emergency exit
206void 208void
… …
225 delete fontset[i]; 227 delete fontset[i];
226#endif 228#endif
227 delete fontset[0]; 229 delete fontset[0];
228 230
229#ifdef HAVE_BG_PIXMAP 231#ifdef HAVE_BG_PIXMAP
230 bgPixmap.destroy (); 232 bg_destroy ();
231#endif
232#ifdef HAVE_AFTERIMAGE
233 if (asv)
234 destroy_asvisual (asv, 0);
235 if (asimman)
236 destroy_image_manager (asimman, 0);
237#endif 233#endif
238 234
239 if (display) 235 if (display)
240 { 236 {
241 selection_clear (); 237 selection_clear ();
238 selection_clear (true);
242 239
243#ifdef USE_XIM 240#ifdef USE_XIM
244 im_destroy (); 241 im_destroy ();
245#endif 242#endif
246 scrollBar.destroy (); 243 scrollBar.destroy ();
247 if (gc) XFreeGC (dpy, gc); 244 if (gc) XFreeGC (dpy, gc);
248 245
249 delete drawable; 246 delete drawable;
250 // destroy all windows 247 // destroy all windows
251 if (parent[0]) 248 if (parent)
252 XDestroyWindow (dpy, parent[0]); 249 XDestroyWindow (dpy, parent);
253 250
254 for (int i = 0; i < TOTAL_COLORS; i++) 251 for (int i = 0; i < TOTAL_COLORS; i++)
255 if (ISSET_PIXCOLOR (i)) 252 if (ISSET_PIXCOLOR (i))
256 { 253 {
257 pix_colors_focused [i].free (this); 254 pix_colors_focused [i].free (this);
… …
271 /* clear all resources */ 268 /* clear all resources */
272 for (int i = 0; i < allocated.size (); i++) 269 for (int i = 0; i < allocated.size (); i++)
273 free (allocated [i]); 270 free (allocated [i]);
274 271
275 free (selection.text); 272 free (selection.text);
273 free (selection.clip_text);
276 // TODO: manage env vars in child only(!) 274 // TODO: manage env vars in child only(!)
277 free (env_display); 275 free (env_display);
278 free (env_term); 276 free (env_term);
279 free (locale); 277 free (locale);
280 free (v_buffer); 278 free (v_buffer);
281 free (incr_buf); 279
280 delete selection_req;
282 281
283 delete envv; 282 delete envv;
284 delete argv; 283 delete argv;
285 284
286#ifdef KEYSYM_RESOURCE 285#ifdef KEYSYM_RESOURCE
… …
322#endif 321#endif
323 scrollbar_ev.stop (display); 322 scrollbar_ev.stop (display);
324#if ENABLE_TRANSPARENCY || ENABLE_PERL 323#if ENABLE_TRANSPARENCY || ENABLE_PERL
325 rootwin_ev.stop (display); 324 rootwin_ev.stop (display);
326#endif 325#endif
327 incr_ev.stop ();
328 termwin_ev.stop (display); 326 termwin_ev.stop (display);
329 vt_ev.stop (display); 327 vt_ev.stop (display);
330 } 328 }
331 329
332 flush_ev.stop (); 330 flush_ev.stop ();
… …
354rxvt_term::destroy_cb (ev::idle &w, int revents) 352rxvt_term::destroy_cb (ev::idle &w, int revents)
355{ 353{
356 make_current (); 354 make_current ();
357 355
358 delete this; 356 delete this;
357}
358
359void
360rxvt_term::set_option (uint8_t opt, bool set)
361{
362 if (!opt)
363 return;
364
365 uint8_t mask = 1 << (opt & 7);
366 uint8_t &val = options [opt >> 3];
367
368 val = val & ~mask | (set ? mask : 0);
359} 369}
360 370
361/*----------------------------------------------------------------------*/ 371/*----------------------------------------------------------------------*/
362/* 372/*
363 * Exit gracefully, clearing the utmp entry and restoring tty attributes 373 * Exit gracefully, clearing the utmp entry and restoring tty attributes
… …
377print_x_error (Display *dpy, XErrorEvent *event) 387print_x_error (Display *dpy, XErrorEvent *event)
378{ 388{
379 char buffer[BUFSIZ]; 389 char buffer[BUFSIZ];
380 char mesg[BUFSIZ]; 390 char mesg[BUFSIZ];
381 char number[32]; 391 char number[32];
382 char *mtype = "XlibMessage"; 392 const char mtype[] = "XlibMessage";
383 XGetErrorText(dpy, event->error_code, buffer, BUFSIZ); 393 XGetErrorText(dpy, event->error_code, buffer, BUFSIZ);
384 XGetErrorDatabaseText(dpy, mtype, "XError", "X Error", mesg, BUFSIZ); 394 XGetErrorDatabaseText(dpy, mtype, "XError", "X Error", mesg, BUFSIZ);
385 rxvt_warn ("An X Error occured, trying to continue after report.\n"); 395 rxvt_warn ("An X Error occurred, trying to continue after report.\n");
386 rxvt_warn ("%s: %s\n", mesg, buffer); 396 rxvt_warn ("%s: %s\n", mesg, buffer);
387 XGetErrorDatabaseText(dpy, mtype, "MajorCode", "Request Major code %d", mesg, BUFSIZ); 397 XGetErrorDatabaseText(dpy, mtype, "MajorCode", "Request Major code %d", mesg, BUFSIZ);
388 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->request_code); 398 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->request_code);
389 sprintf(number, "%d", event->request_code); 399 sprintf(number, "%d", event->request_code);
390 XGetErrorDatabaseText(dpy, "XRequest", number, "", buffer, BUFSIZ); 400 XGetErrorDatabaseText(dpy, "XRequest", number, "", buffer, BUFSIZ);
391 rxvt_warn ("(which is %s)\n", buffer); 401 rxvt_warn ("(which is %s)\n", buffer);
392 if (event->request_code >= 128) { 402 if (event->request_code >= 128) {
393 XGetErrorDatabaseText(dpy, mtype, "MinorCode", "Request Minor code %d", 403 XGetErrorDatabaseText(dpy, mtype, "MinorCode", "Request Minor code %d",
394 mesg, BUFSIZ); 404 mesg, BUFSIZ);
395 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->minor_code); 405 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->minor_code);
396 } 406 }
397 if ((event->error_code == BadWindow) || 407 if ((event->error_code == BadWindow) ||
398 (event->error_code == BadPixmap) || 408 (event->error_code == BadPixmap) ||
399 (event->error_code == BadCursor) || 409 (event->error_code == BadCursor) ||
400 (event->error_code == BadFont) || 410 (event->error_code == BadFont) ||
401 (event->error_code == BadDrawable) || 411 (event->error_code == BadDrawable) ||
402 (event->error_code == BadColor) || 412 (event->error_code == BadColor) ||
403 (event->error_code == BadGC) || 413 (event->error_code == BadGC) ||
404 (event->error_code == BadIDChoice) || 414 (event->error_code == BadIDChoice) ||
405 (event->error_code == BadValue) || 415 (event->error_code == BadValue) ||
406 (event->error_code == BadAtom)) { 416 (event->error_code == BadAtom)) {
407 if (event->error_code == BadValue) 417 if (event->error_code == BadValue)
408 XGetErrorDatabaseText(dpy, mtype, "Value", "Value 0x%x", 418 XGetErrorDatabaseText(dpy, mtype, "Value", "Value 0x%x",
409 mesg, BUFSIZ); 419 mesg, BUFSIZ);
410 else if (event->error_code == BadAtom) 420 else if (event->error_code == BadAtom)
411 XGetErrorDatabaseText(dpy, mtype, "AtomID", "AtomID 0x%x", 421 XGetErrorDatabaseText(dpy, mtype, "AtomID", "AtomID 0x%x",
412 mesg, BUFSIZ); 422 mesg, BUFSIZ);
413 else 423 else
414 XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x", 424 XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x",
415 mesg, BUFSIZ); 425 mesg, BUFSIZ);
416 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid); 426 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid);
417 } 427 }
418 XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d", 428 XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d",
419 mesg, BUFSIZ); 429 mesg, BUFSIZ);
420 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial); 430 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial);
421} 431}
422#endif 432#endif
423 433
424int 434int
… …
471 rxvt_emergency_cleanup (); 481 rxvt_emergency_cleanup ();
472 w.stop (); 482 w.stop ();
473 kill (getpid (), w.signum); 483 kill (getpid (), w.signum);
474} 484}
475 485
486static void
487rxvt_get_ttymode (struct termios *tio)
488{
489 if (tcgetattr (STDIN_FILENO, tio) < 0)
490 memset (tio, 0, sizeof (struct termios));
491
492 for (int i = 0; i < NCCS; i++)
493 tio->c_cc[i] = VDISABLE;
494
495 tio->c_cc[VINTR] = CINTR;
496 tio->c_cc[VQUIT] = CQUIT;
497 tio->c_cc[VERASE] = CERASE;
498#ifdef VERASE2
499 tio->c_cc[VERASE2] = CERASE2;
500#endif
501 tio->c_cc[VKILL] = CKILL;
502 tio->c_cc[VEOF] = CEOF;
503 tio->c_cc[VSTART] = CSTART;
504 tio->c_cc[VSTOP] = CSTOP;
505 tio->c_cc[VSUSP] = CSUSP;
506# ifdef VDSUSP
507 tio->c_cc[VDSUSP] = CDSUSP;
508# endif
509# ifdef VREPRINT
510 tio->c_cc[VREPRINT] = CRPRNT;
511# endif
512# ifdef VDISCRD
513 tio->c_cc[VDISCRD] = CFLUSH;
514# endif
515# ifdef VWERSE
516 tio->c_cc[VWERSE] = CWERASE;
517# endif
518# ifdef VLNEXT
519 tio->c_cc[VLNEXT] = CLNEXT;
520# endif
521# ifdef VSTATUS
522 tio->c_cc[VSTATUS] = CSTATUS;
523# endif
524
525# if VMIN != VEOF
526 tio->c_cc[VMIN] = 1;
527# endif
528# if VTIME != VEOL
529 tio->c_cc[VTIME] = 0;
530# endif
531
532 /* input modes */
533 tio->c_iflag = (BRKINT | IGNPAR | ICRNL
534# ifdef IMAXBEL
535 | IMAXBEL
536# endif
537 | IXON);
538
539 /* output modes */
540 tio->c_oflag = (OPOST | ONLCR);
541
542 /* control modes */
543 tio->c_cflag = (CS8 | CREAD);
544
545 /* local modes */
546 tio->c_lflag = (ISIG | ICANON | IEXTEN | ECHO
547# if defined (ECHOCTL) && defined (ECHOKE)
548 | ECHOCTL | ECHOKE
549# endif
550 | ECHOE | ECHOK);
551}
552
476char **rxvt_environ; // startup environment 553char **rxvt_environ; // startup environment
477 554
478void 555void
479rxvt_init () 556rxvt_init ()
480{ 557{
481 ptytty::init (); 558 assert (("fontMask must not overlap other RS masks",
559 0 == (RS_fontMask & (RS_Sel | RS_baseattrMask | RS_customMask | RS_bgMask | RS_fgMask))));
482 560
561 rxvt_get_ttymode (&rxvt_term::def_tio);
562
563 // get rid of stdin/stdout as we don't need them, to free resources
564 dup2 (STDERR_FILENO, STDIN_FILENO);
565 dup2 (STDERR_FILENO, STDOUT_FILENO);
566
483 if (!ev_default_loop (0)) 567 if (!ev_default_loop ())
484 rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n"); 568 rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n");
485 569
486 rxvt_environ = environ; 570 rxvt_environ = environ;
487 571
488 signal (SIGHUP, SIG_IGN); 572 signal (SIGHUP, SIG_IGN);
489 signal (SIGPIPE, SIG_IGN); 573 signal (SIGPIPE, SIG_IGN);
490 574
491 sig_handlers.sw_term.start (SIGTERM); ev_unref (); 575 sig_handlers.sw_term.start (SIGTERM); ev_unref ();
492 sig_handlers.sw_int.start (SIGINT); ev_unref (); 576 sig_handlers.sw_int.start (SIGINT); ev_unref ();
493
494 /* need to trap SIGURG for SVR4 (Unixware) rlogin */
495 /* signal (SIGURG, SIG_DFL); */
496 577
497 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); 578 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
498 // TODO: handle this with exceptions and tolerate the memory loss 579 // TODO: handle this with exceptions and tolerate the memory loss
499 XSetIOErrorHandler (rxvt_xioerror_handler); 580 XSetIOErrorHandler (rxvt_xioerror_handler);
500 581
… …
627 if (recalc_y) 708 if (recalc_y)
628 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth; 709 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth;
629 710
630 ncol = width / fwidth; 711 ncol = width / fwidth;
631 nrow = height / fheight; 712 nrow = height / fheight;
713
714 // When the size of the vt window is not a multiple of the cell
715 // size, i.e., when the wm does not honour our size hints, there are
716 // extra areas not covered by the terminal screen. Such gaps, when a
717 // bg pixmap is set, would have to be cleared manually to properly
718 // refresh the background. We take the simpler route and shrink the
719 // vt window so as to avoid creating gaps.
720 width = ncol * fwidth;
721 height = nrow * fheight;
632} 722}
633 723
634/*----------------------------------------------------------------------*/ 724/*----------------------------------------------------------------------*/
635/* 725/*
636 * Tell the teletype handler what size the window is. 726 * Tell the teletype handler what size the window is.
… …
646 736
647 ws.ws_col = ncol; 737 ws.ws_col = ncol;
648 ws.ws_row = nrow; 738 ws.ws_row = nrow;
649 ws.ws_xpixel = width; 739 ws.ws_xpixel = width;
650 ws.ws_ypixel = height; 740 ws.ws_ypixel = height;
651 (void)ioctl (pty->pty, TIOCSWINSZ, &ws); 741 ioctl (pty->pty, TIOCSWINSZ, &ws);
652 742
653#if 0 743#if 0
654 // TIOCSWINSZ is supposed to do this automatically and correctly 744 // TIOCSWINSZ is supposed to do this automatically and correctly
655 if (cmd_pid) /* force through to the command */ 745 if (cmd_pid) /* force through to the command */
656 kill (-cmd_pid, SIGWINCH); 746 kill (-cmd_pid, SIGWINCH);
657#endif 747#endif
658} 748}
659 749
660/*----------------------------------------------------------------------*/ 750/*----------------------------------------------------------------------*/
661/* set_fonts () - load and set the various fonts 751/* load and set the various fonts */
662 *
663 * init = 1 - initialize
664 *
665 * fontname == FONT_UP - switch to bigger font
666 * fontname == FONT_DN - switch to smaller font
667 */
668bool 752bool
669rxvt_term::set_fonts () 753rxvt_term::set_fonts ()
670{ 754{
671 rxvt_fontset *fs = new rxvt_fontset (this); 755 rxvt_fontset *fs = new rxvt_fontset (this);
672 rxvt_fontprop prop; 756 rxvt_fontprop prop;
… …
686#endif 770#endif
687 771
688 delete fontset[0]; 772 delete fontset[0];
689 fontset[0] = fs; 773 fontset[0] = fs;
690 774
691 prop = (*fs)[1]->properties (); 775 prop = (*fs)[rxvt_fontset::firstFont]->properties ();
692 prop.height += lineSpace; 776 prop.height += lineSpace;
777 prop.width += letterSpace;
693 778
694 fs->set_prop (prop, false); 779 fs->set_prop (prop, false);
695 780
696 fwidth = prop.width; 781 fwidth = prop.width;
697 fheight = prop.height; 782 fheight = prop.height;
… …
728#else 813#else
729 fontset[style] = fontset[0]; 814 fontset[style] = fontset[0];
730#endif 815#endif
731 } 816 }
732 817
733 if (parent[0]) 818 if (parent)
734 { 819 {
735 resize_all_windows (0, 0, 0); 820 resize_all_windows (0, 0, 0);
736 scr_remap_chars (); 821 scr_remap_chars ();
737 scr_touch (true); 822 scr_touch (true);
738 } 823 }
… …
741} 826}
742 827
743void 828void
744rxvt_term::set_string_property (Atom prop, const char *str, int len) 829rxvt_term::set_string_property (Atom prop, const char *str, int len)
745{ 830{
746 XChangeProperty (dpy, parent[0], 831 XChangeProperty (dpy, parent,
747 prop, XA_STRING, 8, PropModeReplace, 832 prop, XA_STRING, 8, PropModeReplace,
748 (const unsigned char *)str, len >= 0 ? len : strlen (str)); 833 (const unsigned char *)str, len >= 0 ? len : strlen (str));
749} 834}
750 835
751void 836void
837rxvt_term::set_mbstring_property (Atom prop, const char *str, int len)
838{
839 XTextProperty ct;
840
841 if (XmbTextListToTextProperty (dpy, (char **)&str, 1, XStdICCTextStyle, &ct) >= 0)
842 {
843 XSetTextProperty (dpy, parent, &ct, prop);
844 XFree (ct.value);
845 }
846}
847
848void
752rxvt_term::set_utf8_property (Atom prop, const char *str, int len) 849rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
753{ 850{
754 wchar_t *ws = rxvt_mbstowcs (str, len); 851 wchar_t *ws = rxvt_mbstowcs (str, len);
755 char *s = rxvt_wcstoutf8 (ws); 852 char *s = rxvt_wcstoutf8 (ws);
756 853
757 XChangeProperty (dpy, parent[0], 854 XChangeProperty (dpy, parent,
758 prop, xa[XA_UTF8_STRING], 8, PropModeReplace, 855 prop, xa[XA_UTF8_STRING], 8, PropModeReplace,
759 (const unsigned char *)s, strlen (s)); 856 (const unsigned char *)s, strlen (s));
760 857
761 free (s); 858 free (s);
762 free (ws); 859 free (ws);
… …
766/*----------------------------------------------------------------------*/ 863/*----------------------------------------------------------------------*/
767/* xterm sequences - title, iconName, color (exptl) */ 864/* xterm sequences - title, iconName, color (exptl) */
768void 865void
769rxvt_term::set_title (const char *str) 866rxvt_term::set_title (const char *str)
770{ 867{
771 set_string_property (XA_WM_NAME, str); 868 set_mbstring_property (XA_WM_NAME, str);
772#if ENABLE_EWMH 869#if ENABLE_EWMH
773 set_utf8_property (xa[XA_NET_WM_NAME], str); 870 set_utf8_property (xa[XA_NET_WM_NAME], str);
774#endif 871#endif
775} 872}
776 873
777void 874void
778rxvt_term::set_icon_name (const char *str) 875rxvt_term::set_icon_name (const char *str)
779{ 876{
780 set_string_property (XA_WM_ICON_NAME, str); 877 set_mbstring_property (XA_WM_ICON_NAME, str);
781#if ENABLE_EWMH 878#if ENABLE_EWMH
782 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str); 879 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str);
783#endif 880#endif
784} 881}
785 882
… …
857void 954void
858rxvt_term::set_colorfgbg () 955rxvt_term::set_colorfgbg ()
859{ 956{
860 unsigned int i; 957 unsigned int i;
861 const char *xpmb = ""; 958 const char *xpmb = "";
862 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1]; 959 char fstr[] = "default";
960 char bstr[] = "default";
863 961
864 strcpy (fstr, "default");
865 strcpy (bstr, "default");
866 for (i = Color_Black; i <= Color_White; i++) 962 for (i = Color_Black; i <= Color_White; i++)
867 if (pix_colors[Color_fg] == pix_colors[i]) 963 if (pix_colors[Color_fg] == pix_colors[i])
868 { 964 {
869 sprintf (fstr, "%d", (i - Color_Black)); 965 sprintf (fstr, "%d", i - Color_Black);
870 break; 966 break;
871 } 967 }
872 968
873 for (i = Color_Black; i <= Color_White; i++) 969 for (i = Color_Black; i <= Color_White; i++)
874 if (pix_colors[Color_bg] == pix_colors[i]) 970 if (pix_colors[Color_bg] == pix_colors[i])
875 { 971 {
876 sprintf (bstr, "%d", (i - Color_Black)); 972 sprintf (bstr, "%d", i - Color_Black);
877#ifdef BG_IMAGE_FROM_FILE 973#ifdef BG_IMAGE_FROM_FILE
878 xpmb = "default;"; 974 xpmb = "default;";
879#endif 975#endif
880 break; 976 break;
881 } 977 }
… …
917 1013
918 // to avoid races between us and the wm, we clear the incremental size hints around the xresizewindow 1014 // to avoid races between us and the wm, we clear the incremental size hints around the xresizewindow
919 if (set_hint) 1015 if (set_hint)
920 { 1016 {
921 szHint.flags &= ~(PBaseSize | PResizeInc); 1017 szHint.flags &= ~(PBaseSize | PResizeInc);
922 XSetWMNormalHints (dpy, parent[0], &szHint); 1018 XSetWMNormalHints (dpy, parent, &szHint);
923 szHint.flags |= PBaseSize | PResizeInc; 1019 szHint.flags |= PBaseSize | PResizeInc;
924 } 1020 }
925 1021
926 if (!ignoreparent) 1022 if (!ignoreparent)
927 { 1023 {
… …
933 int x, y, x1, y1; 1029 int x, y, x1, y1;
934 int dx, dy; 1030 int dx, dy;
935 unsigned int unused_w1, unused_h1, unused_b1, unused_d1; 1031 unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
936 Window unused_cr; 1032 Window unused_cr;
937 1033
938 XTranslateCoordinates (dpy, parent[0], display->root, 1034 XTranslateCoordinates (dpy, parent, display->root,
939 0, 0, &x, &y, &unused_cr); 1035 0, 0, &x, &y, &unused_cr);
940 XGetGeometry (dpy, parent[0], &unused_cr, &x1, &y1, 1036 XGetGeometry (dpy, parent, &unused_cr, &x1, &y1,
941 &unused_w1, &unused_h1, &unused_b1, &unused_d1); 1037 &unused_w1, &unused_h1, &unused_b1, &unused_d1);
942 /* 1038 /*
943 * if display->root isn't the parent window, a WM will probably have offset 1039 * if display->root isn't the parent window, a WM will probably have offset
944 * our position for handles and decorations. Counter it 1040 * our position for handles and decorations. Counter it
945 */ 1041 */
… …
962 if (y < y1) /* top half */ 1058 if (y < y1) /* top half */
963 dy = 0; 1059 dy = 0;
964 else if (y == y1) /* exact center */ 1060 else if (y == y1) /* exact center */
965 dy /= 2; 1061 dy /= 2;
966 1062
967 XMoveResizeWindow (dpy, parent[0], x + dx, y + dy, 1063 XMoveResizeWindow (dpy, parent, x + dx, y + dy,
968 szHint.width, szHint.height); 1064 szHint.width, szHint.height);
969#else 1065#else
970 XResizeWindow (dpy, parent[0], szHint.width, szHint.height); 1066 XResizeWindow (dpy, parent, szHint.width, szHint.height);
971#endif 1067#endif
972 } 1068 }
973 1069
974 if (set_hint) 1070 if (set_hint)
975 XSetWMNormalHints (dpy, parent[0], &szHint); 1071 XSetWMNormalHints (dpy, parent, &szHint);
976 1072
977 fix_screen = ncol != prev_ncol || nrow != prev_nrow; 1073 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
978 1074
979 if (fix_screen || newwidth != old_width || newheight != old_height) 1075 if (fix_screen || newwidth != old_width || newheight != old_height)
980 { 1076 {
… …
984 XMoveResizeWindow (dpy, vt, 1080 XMoveResizeWindow (dpy, vt,
985 window_vt_x, window_vt_y, 1081 window_vt_x, window_vt_y,
986 width, height); 1082 width, height);
987 1083
988#ifdef HAVE_BG_PIXMAP 1084#ifdef HAVE_BG_PIXMAP
989 if (bgPixmap.window_size_sensitive ()) 1085 if (bg_window_size_sensitive ())
990 update_background (); 1086 update_background ();
991#endif 1087#endif
992 } 1088 }
993 1089
994 if (fix_screen || old_height == 0) 1090 if (fix_screen || old_height == 0)
995 scr_reset (); 1091 scr_reset ();
996 1092
997 // TODO, with nvidia-8178, resizes kill the alpha channel, report if not fixed in newer version
998 //scr_touch (false);
999
1000#ifdef HAVE_BG_PIXMAP
1001// TODO: this don't seem to have any effect - do we still need it ? If so - in which case exactly ?
1002// if (bgPixmap.pixmap)
1003// scr_touch (false);
1004#endif
1005
1006#ifdef USE_XIM 1093#ifdef USE_XIM
1007 IMSetPosition (); 1094 im_set_position ();
1008#endif 1095#endif
1009} 1096}
1010 1097
1011/* 1098/*
1012 * Set the width/height of the vt window in characters. Units are pixels. 1099 * Set the width/height of the vt window in characters. Units are pixels.
… …
1073 status_rect.height = fheight; 1160 status_rect.height = fheight;
1074} 1161}
1075 1162
1076/* Checking whether input method is running. */ 1163/* Checking whether input method is running. */
1077bool 1164bool
1078rxvt_term::IMisRunning () 1165rxvt_term::im_is_running ()
1079{ 1166{
1080 Atom atom; 1167 Atom atom;
1081 Window win; 1168 Window win;
1082 char server[IMBUFSIZ]; 1169 char server[IMBUFSIZ];
1083 1170
… …
1092 1179
1093 atom = XInternAtom (dpy, server, False); 1180 atom = XInternAtom (dpy, server, False);
1094 win = XGetSelectionOwner (dpy, atom); 1181 win = XGetSelectionOwner (dpy, atom);
1095 1182
1096 if (win != None) 1183 if (win != None)
1097 return True; 1184 return true;
1098 } 1185 }
1099 1186
1100 return False; 1187 return false;
1101} 1188}
1102 1189
1103void 1190void
1104rxvt_term::IMSendSpot () 1191rxvt_term::im_send_spot ()
1105{ 1192{
1106 XPoint nspot; 1193 XPoint nspot;
1107 XVaNestedList preedit_attr; 1194 XVaNestedList preedit_attr;
1108 1195
1109 if (!Input_Context 1196 if (!Input_Context
… …
1162 1249
1163 term->make_current (); 1250 term->make_current ();
1164 1251
1165 if (text) 1252 if (text)
1166 { 1253 {
1167 void *str; 1254 wchar_t *str;
1168 1255
1169 if (!text->encoding_is_wchar && text->string.multi_byte) 1256 if (!text->encoding_is_wchar && text->string.multi_byte)
1170 { 1257 {
1171 // of course, X makes it ugly again 1258 // of course, X makes it ugly again
1172 if (term->rs[Rs_imLocale]) 1259 if (term->rs[Rs_imLocale])
1173 SET_LOCALE (term->rs[Rs_imLocale]); 1260 SET_LOCALE (term->rs[Rs_imLocale]);
1174 1261
1175 str = rxvt_temp_buf ((text->length + 1) * sizeof (wchar_t)); 1262 str = rxvt_temp_buf<wchar_t> (text->length + 1);
1176 mbstowcs ((wchar_t *)str, text->string.multi_byte, text->length + 1); 1263 mbstowcs (str, text->string.multi_byte, text->length + 1);
1177 1264
1178 if (term->rs[Rs_imLocale]) 1265 if (term->rs[Rs_imLocale])
1179 SET_LOCALE (term->locale); 1266 SET_LOCALE (term->locale);
1180 } 1267 }
1181 else 1268 else
1182 str = (void *)text->string.wide_char; 1269 str = text->string.wide_char;
1183 1270
1184 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW, 1271 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
1185 DT_INT, call_data->caret, 1272 DT_INT, call_data->caret,
1186 DT_INT, call_data->chg_first, 1273 DT_INT, call_data->chg_first,
1187 DT_INT, call_data->chg_length, 1274 DT_INT, call_data->chg_length,
… …
1215/* 1302/*
1216 * Try to open a XIM with the current modifiers, then see if we can 1303 * Try to open a XIM with the current modifiers, then see if we can
1217 * open a suitable preedit type 1304 * open a suitable preedit type
1218 */ 1305 */
1219bool 1306bool
1220rxvt_term::IM_get_IC (const char *modifiers) 1307rxvt_term::im_get_ic (const char *modifiers)
1221{ 1308{
1222 int i, j, found; 1309 int i, j, found;
1223 XIM xim; 1310 XIM xim;
1224 XPoint spot; 1311 XPoint spot;
1225 XRectangle rect, status_rect, needed_rect; 1312 XRectangle rect, status_rect, needed_rect;
1226 unsigned long fg, bg; 1313 unsigned long fg, bg;
1227 const char *p; 1314 const char *p;
1228 char **s; 1315 char **s;
1229 XIMStyles *xim_styles; 1316 XIMStyles *xim_styles;
1230#ifdef ENABLE_XIM_ONTHESPOT
1231 XIMCallback xcb[4];
1232#endif
1233 1317
1234 set_environ (envv); 1318 set_environ (envv);
1235 1319
1236 if (! ((p = XSetLocaleModifiers (modifiers)) && *p)) 1320 if (! ((p = XSetLocaleModifiers (modifiers)) && *p))
1237 return false; 1321 return false;
… …
1258 p = pet[pi]; 1342 p = pet[pi];
1259 1343
1260 if (!p) 1344 if (!p)
1261 continue; 1345 continue;
1262 1346
1263 s = rxvt_splitcommastring (p); 1347 s = rxvt_strsplit (',', p);
1264 1348
1265 for (i = found = 0; !found && s[i]; i++) 1349 for (i = found = 0; !found && s[i]; i++)
1266 { 1350 {
1267 if (!strcmp (s[i], "OverTheSpot")) 1351 if (!strcmp (s[i], "OverTheSpot"))
1268 input_style = XIMPreeditPosition | XIMStatusNothing; 1352 input_style = XIMPreeditPosition | XIMStatusNothing;
… …
1280 input_style = XIMPreeditNothing | XIMStatusNothing; 1364 input_style = XIMPreeditNothing | XIMStatusNothing;
1281 1365
1282 for (j = 0; j < xim_styles->count_styles; j++) 1366 for (j = 0; j < xim_styles->count_styles; j++)
1283 if (input_style == xim_styles->supported_styles[j]) 1367 if (input_style == xim_styles->supported_styles[j])
1284 { 1368 {
1285 rxvt_freecommastring (s); 1369 rxvt_free_strsplit (s);
1286 1370
1287 found = 1; 1371 found = 1;
1288 goto foundpet; 1372 goto foundpet;
1289 } 1373 }
1290 1374
1291 } 1375 }
1292 1376
1293 rxvt_freecommastring (s); 1377 rxvt_free_strsplit (s);
1294 } 1378 }
1295 1379
1296foundpet: 1380foundpet:
1297 1381
1298 XFree (xim_styles); 1382 XFree (xim_styles);
… …
1377 NULL); 1461 NULL);
1378 } 1462 }
1379#if ENABLE_XIM_ONTHESPOT 1463#if ENABLE_XIM_ONTHESPOT
1380 else if (input_style & XIMPreeditCallbacks) 1464 else if (input_style & XIMPreeditCallbacks)
1381 { 1465 {
1466 XIMCallback xcb[4];
1467
1382 im_set_position (spot); 1468 im_set_position (spot);
1383 1469
1384 xcb[0].client_data = (XPointer)this; xcb[0].callback = (XIMProc)xim_preedit_start; 1470 xcb[0].client_data = (XPointer)this; xcb[0].callback = (XIMProc)xim_preedit_start;
1385 xcb[1].client_data = (XPointer)this; xcb[1].callback = (XIMProc)xim_preedit_done; 1471 xcb[1].client_data = (XPointer)this; xcb[1].callback = (XIMProc)xim_preedit_done;
1386 xcb[2].client_data = (XPointer)this; xcb[2].callback = (XIMProc)xim_preedit_draw; 1472 xcb[2].client_data = (XPointer)this; xcb[2].callback = (XIMProc)xim_preedit_draw;
… …
1401#endif 1487#endif
1402 1488
1403 Input_Context = XCreateIC (xim, 1489 Input_Context = XCreateIC (xim,
1404 XNInputStyle, input_style, 1490 XNInputStyle, input_style,
1405 XNClientWindow, vt, 1491 XNClientWindow, vt,
1406 XNFocusWindow, parent[0], 1492 XNFocusWindow, parent,
1407 preedit_attr ? XNPreeditAttributes : NULL, 1493 preedit_attr ? XNPreeditAttributes : NULL,
1408 preedit_attr, 1494 preedit_attr,
1409 status_attr ? XNStatusAttributes : NULL, 1495 status_attr ? XNStatusAttributes : NULL,
1410 status_attr, NULL); 1496 status_attr, NULL);
1411 1497
… …
1424 // unfortunately, only the focus window is used by XIM, hard to fix 1510 // unfortunately, only the focus window is used by XIM, hard to fix
1425 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL)) 1511 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL))
1426 vt_select_input (); 1512 vt_select_input ();
1427#endif 1513#endif
1428 1514
1429 IMSetPosition (); 1515 im_set_position ();
1430 1516
1431 return true; 1517 return true;
1432} 1518}
1433 1519
1434void 1520void
… …
1454 p = rs[Rs_inputMethod]; 1540 p = rs[Rs_inputMethod];
1455 if (p && *p) 1541 if (p && *p)
1456 { 1542 {
1457 bool found = false; 1543 bool found = false;
1458 1544
1459 s = rxvt_splitcommastring (p); 1545 s = rxvt_strsplit (',', p);
1460 1546
1461 for (i = 0; s[i]; i++) 1547 for (i = 0; s[i]; i++)
1462 { 1548 {
1463 if (*s[i]) 1549 if (*s[i])
1464 { 1550 {
1465 strcpy (buf, "@im="); 1551 strcpy (buf, "@im=");
1466 strncat (buf, s[i], IMBUFSIZ - 5); 1552 strncat (buf, s[i], IMBUFSIZ - 5);
1467 if (IM_get_IC (buf)) 1553 if (im_get_ic (buf))
1468 { 1554 {
1469 found = true; 1555 found = true;
1470 break; 1556 break;
1471 } 1557 }
1472 } 1558 }
1473 } 1559 }
1474 1560
1475 rxvt_freecommastring (s); 1561 rxvt_free_strsplit (s);
1476 1562
1477 if (found) 1563 if (found)
1478 goto done; 1564 goto done;
1479 } 1565 }
1480 1566
1481 /* try with XMODIFIERS env. var. */ 1567 /* try with XMODIFIERS env. var. */
1482 if (IM_get_IC ("")) 1568 if (im_get_ic (""))
1483 goto done; 1569 goto done;
1484 1570
1485 /* try with no modifiers base IF the user didn't specify an IM */ 1571 /* try with no modifiers base IF the user didn't specify an IM */
1486 if (IM_get_IC ("@im=none")) 1572 if (im_get_ic ("@im=none"))
1487 goto done; 1573 goto done;
1488 1574
1489done: 1575done:
1490#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE) 1576#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1491 if (rs[Rs_imLocale]) 1577 if (rs[Rs_imLocale])
1492 SET_LOCALE (locale); 1578 SET_LOCALE (locale);
1493#endif 1579#endif
1494} 1580}
1495 1581
1496void 1582void
1497rxvt_term::IMSetPosition () 1583rxvt_term::im_set_position ()
1498{ 1584{
1499 XRectangle preedit_rect, status_rect, *needed_rect; 1585 XRectangle preedit_rect, status_rect, *needed_rect;
1500 XVaNestedList preedit_attr, status_attr; 1586 XVaNestedList preedit_attr, status_attr;
1501 1587
1502 if (!Input_Context 1588 if (!Input_Context
1503 || !focus 1589 || !focus
1504 || !(input_style & (XIMPreeditArea | XIMPreeditPosition)) 1590 || !(input_style & (XIMPreeditArea | XIMPreeditPosition))
1505 || !IMisRunning ()) 1591 || !im_is_running ())
1506 return; 1592 return;
1507 1593
1508 if (input_style & XIMPreeditPosition) 1594 if (input_style & XIMPreeditPosition)
1509 { 1595 {
1510 im_set_size (preedit_rect); 1596 im_set_size (preedit_rect);
… …
1540 1626
1541void 1627void
1542rxvt_term::get_window_origin (int &x, int &y) 1628rxvt_term::get_window_origin (int &x, int &y)
1543{ 1629{
1544 Window cr; 1630 Window cr;
1545 XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr); 1631 XTranslateCoordinates (dpy, parent, display->root, 0, 0, &x, &y, &cr);
1546/* fprintf (stderr, "origin is %+d%+d\n", x, y);*/
1547} 1632}
1548 1633
1549Pixmap 1634Pixmap
1550rxvt_term::get_pixmap_property (int prop_id) 1635rxvt_term::get_pixmap_property (Atom property)
1551{ 1636{
1552 if (prop_id > 0 && prop_id < NUM_XA) 1637 Pixmap pixmap = None;
1553 if (xa[prop_id]) 1638
1554 {
1555 int aformat; 1639 int aformat;
1556 unsigned long nitems, bytes_after; 1640 unsigned long nitems, bytes_after;
1557 Atom atype; 1641 Atom atype;
1558 unsigned char *prop = NULL; 1642 unsigned char *prop;
1559 int result = XGetWindowProperty (dpy, display->root, xa[prop_id], 1643 int result = XGetWindowProperty (dpy, display->root, property,
1560 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 1644 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1561 &nitems, &bytes_after, &prop); 1645 &nitems, &bytes_after, &prop);
1562 if (result == Success && prop && atype == XA_PIXMAP) 1646 if (result == Success)
1647 {
1648 if (atype == XA_PIXMAP)
1563 return *(Pixmap *)prop; 1649 pixmap = *(Pixmap *)prop;
1650 XFree (prop);
1564 } 1651 }
1565 1652
1566 return None; 1653 return pixmap;
1567} 1654}
1568 1655
1569#ifdef HAVE_BG_PIXMAP 1656#ifdef HAVE_BG_PIXMAP
1570# if TRACE_PIXMAPS
1571# undef update_background
1572void
1573rxvt_term::trace_update_background (const char *file, int line)
1574{
1575 fprintf (stderr, "%s:%d:update_background()\n", file, line);
1576 update_background ();
1577}
1578# endif
1579 1657
1580void 1658void
1581rxvt_term::update_background () 1659rxvt_term::update_background ()
1582{ 1660{
1583 if (update_background_ev.is_active ()) 1661 if (update_background_ev.is_active ())
1584 return; 1662 return;
1585 1663
1586 bgPixmap.invalidate (); 1664 bg_invalidate ();
1587 1665
1666 if (!mapped)
1667 return;
1668
1588 ev_tstamp to_wait = 0.5 - (ev::now () - bgPixmap.valid_since); 1669 ev_tstamp to_wait = 0.5 - (ev::now () - bg_valid_since);
1589 1670
1590 if (to_wait <= 0.) 1671 if (to_wait <= 0.)
1591 bgPixmap.render (); 1672 bg_render ();
1592 else 1673 else
1593 update_background_ev.start (to_wait); 1674 update_background_ev.start (to_wait);
1594} 1675}
1595 1676
1596void 1677void
1597rxvt_term::update_background_cb (ev::timer &w, int revents) 1678rxvt_term::update_background_cb (ev::timer &w, int revents)
1598{ 1679{
1599 make_current (); 1680 make_current ();
1600 1681
1601 update_background_ev.stop (); 1682 update_background_ev.stop ();
1602 bgPixmap.render (); 1683 bg_render ();
1603 refresh_check (); 1684 refresh_check ();
1604} 1685}
1605 1686
1606#endif /* HAVE_BG_PIXMAP */ 1687#endif /* HAVE_BG_PIXMAP */
1607 1688

Diff Legend

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