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

Comparing rxvt-unicode/src/main.C (file contents):
Revision 1.298 by root, Sat Jan 12 22:13:46 2008 UTC vs.
Revision 1.364 by sf-exg, Mon Jan 9 15:30:17 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 <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));
172 slip_wheel_ev.set <rxvt_term, &rxvt_term::slip_wheel_cb> (this); 173 slip_wheel_ev.set <rxvt_term, &rxvt_term::slip_wheel_cb> (this);
173#endif 174#endif
174#if ENABLE_TRANSPARENCY || ENABLE_PERL 175#if ENABLE_TRANSPARENCY || ENABLE_PERL
175 rootwin_ev.set <rxvt_term, &rxvt_term::rootwin_cb> (this), 176 rootwin_ev.set <rxvt_term, &rxvt_term::rootwin_cb> (this),
176#endif 177#endif
177#ifdef HAVE_SCROLLBARS
178 scrollbar_ev.set <rxvt_term, &rxvt_term::x_cb> (this), 178 scrollbar_ev.set <rxvt_term, &rxvt_term::x_cb> (this),
179#endif
180#ifdef USE_XIM 179#ifdef USE_XIM
181 im_ev.set <rxvt_term, &rxvt_term::im_cb> (this), 180 im_ev.set <rxvt_term, &rxvt_term::im_cb> (this),
182#endif 181#endif
183#ifdef POINTER_BLANK 182#ifdef POINTER_BLANK
184 pointer_ev.set <rxvt_term, &rxvt_term::pointer_cb> (this); 183 pointer_ev.set <rxvt_term, &rxvt_term::pointer_cb> (this);
188#endif 187#endif
189 child_ev.set <rxvt_term, &rxvt_term::child_cb> (this); 188 child_ev.set <rxvt_term, &rxvt_term::child_cb> (this);
190 flush_ev.set <rxvt_term, &rxvt_term::flush_cb> (this); 189 flush_ev.set <rxvt_term, &rxvt_term::flush_cb> (this);
191 destroy_ev.set <rxvt_term, &rxvt_term::destroy_cb> (this); 190 destroy_ev.set <rxvt_term, &rxvt_term::destroy_cb> (this);
192 pty_ev.set <rxvt_term, &rxvt_term::pty_cb> (this); 191 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); 192 termwin_ev.set <rxvt_term, &rxvt_term::x_cb> (this);
195 vt_ev.set <rxvt_term, &rxvt_term::x_cb> (this); 193 vt_ev.set <rxvt_term, &rxvt_term::x_cb> (this);
196 194
197 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base; 195 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base;
198 196
226 if (fontset[i] != fontset[0]) 224 if (fontset[i] != fontset[0])
227 delete fontset[i]; 225 delete fontset[i];
228#endif 226#endif
229 delete fontset[0]; 227 delete fontset[0];
230 228
229#ifdef HAVE_BG_PIXMAP
230 bg_destroy ();
231#endif
232
231 if (display) 233 if (display)
232 { 234 {
233 selection_clear (); 235 selection_clear ();
236 selection_clear (true);
234 237
235#ifdef USE_XIM 238#ifdef USE_XIM
236 im_destroy (); 239 im_destroy ();
237#endif 240#endif
238#ifdef XTERM_SCROLLBAR 241 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); 242 if (gc) XFreeGC (dpy, gc);
263 243
264 delete drawable; 244 delete drawable;
265 // destroy all windows 245 // destroy all windows
266 if (parent[0]) 246 if (parent)
267 XDestroyWindow (dpy, parent[0]); 247 XDestroyWindow (dpy, parent);
268 248
269 for (int i = 0; i < TOTAL_COLORS; i++) 249 for (int i = 0; i < TOTAL_COLORS; i++)
270 if (ISSET_PIXCOLOR (i)) 250 if (ISSET_PIXCOLOR (i))
271 { 251 {
272 pix_colors_focused [i].free (this); 252 pix_colors_focused [i].free (this);
274 pix_colors_unfocused [i].free (this); 254 pix_colors_unfocused [i].free (this);
275#endif 255#endif
276 } 256 }
277 257
278 clear (); 258 clear ();
279 }
280 259
281#ifdef HAVE_BG_PIXMAP
282 bgPixmap.destroy ();
283#endif
284 display->flush (); /* ideally .put should do this */ 260 display->flush (); /* ideally .put should do this */
285 displays.put (display); 261 displays.put (display);
262 }
286 263
287 scr_release (); 264 scr_release ();
288 265
289 /* clear all resources */ 266 /* clear all resources */
290 for (int i = 0; i < allocated.size (); i++) 267 for (int i = 0; i < allocated.size (); i++)
291 free (allocated [i]); 268 free (allocated [i]);
292 269
293 free (selection.text); 270 free (selection.text);
294 // TODO: manage env vars in child only(!) 271 free (selection.clip_text);
295 free (env_display);
296 free (env_term);
297 free (locale); 272 free (locale);
298 free (v_buffer); 273 free (v_buffer);
299 free (incr_buf); 274
275 delete selection_req;
300 276
301 delete envv; 277 delete envv;
302 delete argv; 278 delete argv;
303 279
304#ifdef KEYSYM_RESOURCE 280#ifdef KEYSYM_RESOURCE
336 if (display) 312 if (display)
337 { 313 {
338#if USE_XIM 314#if USE_XIM
339 im_ev.stop (display); 315 im_ev.stop (display);
340#endif 316#endif
341#if HAVE_SCROLLBARS
342 scrollbar_ev.stop (display); 317 scrollbar_ev.stop (display);
343#endif
344#if ENABLE_TRANSPARENCY || ENABLE_PERL 318#if ENABLE_TRANSPARENCY || ENABLE_PERL
345 rootwin_ev.stop (display); 319 rootwin_ev.stop (display);
346#endif 320#endif
347 incr_ev.stop ();
348 termwin_ev.stop (display); 321 termwin_ev.stop (display);
349 vt_ev.stop (display); 322 vt_ev.stop (display);
350 } 323 }
351 324
352 flush_ev.stop (); 325 flush_ev.stop ();
374rxvt_term::destroy_cb (ev::idle &w, int revents) 347rxvt_term::destroy_cb (ev::idle &w, int revents)
375{ 348{
376 make_current (); 349 make_current ();
377 350
378 delete this; 351 delete this;
352}
353
354void
355rxvt_term::set_option (uint8_t opt, bool set)
356{
357 if (!opt)
358 return;
359
360 uint8_t mask = 1 << (opt & 7);
361 uint8_t &val = options [opt >> 3];
362
363 val = val & ~mask | (set ? mask : 0);
379} 364}
380 365
381/*----------------------------------------------------------------------*/ 366/*----------------------------------------------------------------------*/
382/* 367/*
383 * Exit gracefully, clearing the utmp entry and restoring tty attributes 368 * Exit gracefully, clearing the utmp entry and restoring tty attributes
397print_x_error (Display *dpy, XErrorEvent *event) 382print_x_error (Display *dpy, XErrorEvent *event)
398{ 383{
399 char buffer[BUFSIZ]; 384 char buffer[BUFSIZ];
400 char mesg[BUFSIZ]; 385 char mesg[BUFSIZ];
401 char number[32]; 386 char number[32];
402 char *mtype = "XlibMessage"; 387 const char mtype[] = "XlibMessage";
403 XGetErrorText(dpy, event->error_code, buffer, BUFSIZ); 388 XGetErrorText(dpy, event->error_code, buffer, BUFSIZ);
404 XGetErrorDatabaseText(dpy, mtype, "XError", "X Error", mesg, BUFSIZ); 389 XGetErrorDatabaseText(dpy, mtype, "XError", "X Error", mesg, BUFSIZ);
405 rxvt_warn ("An X Error occured, trying to continue after report.\n"); 390 rxvt_warn ("An X Error occurred, trying to continue after report.\n");
406 rxvt_warn ("%s: %s\n", mesg, buffer); 391 rxvt_warn ("%s: %s\n", mesg, buffer);
407 XGetErrorDatabaseText(dpy, mtype, "MajorCode", "Request Major code %d", mesg, BUFSIZ); 392 XGetErrorDatabaseText(dpy, mtype, "MajorCode", "Request Major code %d", mesg, BUFSIZ);
408 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->request_code); 393 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->request_code);
409 sprintf(number, "%d", event->request_code); 394 sprintf(number, "%d", event->request_code);
410 XGetErrorDatabaseText(dpy, "XRequest", number, "", buffer, BUFSIZ); 395 XGetErrorDatabaseText(dpy, "XRequest", number, "", buffer, BUFSIZ);
411 rxvt_warn ("(which is %s)\n", buffer); 396 rxvt_warn ("(which is %s)\n", buffer);
412 if (event->request_code >= 128) { 397 if (event->request_code >= 128) {
413 XGetErrorDatabaseText(dpy, mtype, "MinorCode", "Request Minor code %d", 398 XGetErrorDatabaseText(dpy, mtype, "MinorCode", "Request Minor code %d",
414 mesg, BUFSIZ); 399 mesg, BUFSIZ);
415 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->minor_code); 400 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->minor_code);
416 } 401 }
417 if ((event->error_code == BadWindow) || 402 if ((event->error_code == BadWindow) ||
418 (event->error_code == BadPixmap) || 403 (event->error_code == BadPixmap) ||
419 (event->error_code == BadCursor) || 404 (event->error_code == BadCursor) ||
420 (event->error_code == BadFont) || 405 (event->error_code == BadFont) ||
421 (event->error_code == BadDrawable) || 406 (event->error_code == BadDrawable) ||
422 (event->error_code == BadColor) || 407 (event->error_code == BadColor) ||
423 (event->error_code == BadGC) || 408 (event->error_code == BadGC) ||
424 (event->error_code == BadIDChoice) || 409 (event->error_code == BadIDChoice) ||
425 (event->error_code == BadValue) || 410 (event->error_code == BadValue) ||
426 (event->error_code == BadAtom)) { 411 (event->error_code == BadAtom)) {
427 if (event->error_code == BadValue) 412 if (event->error_code == BadValue)
428 XGetErrorDatabaseText(dpy, mtype, "Value", "Value 0x%x", 413 XGetErrorDatabaseText(dpy, mtype, "Value", "Value 0x%x",
429 mesg, BUFSIZ); 414 mesg, BUFSIZ);
430 else if (event->error_code == BadAtom) 415 else if (event->error_code == BadAtom)
431 XGetErrorDatabaseText(dpy, mtype, "AtomID", "AtomID 0x%x", 416 XGetErrorDatabaseText(dpy, mtype, "AtomID", "AtomID 0x%x",
432 mesg, BUFSIZ); 417 mesg, BUFSIZ);
433 else 418 else
434 XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x", 419 XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x",
435 mesg, BUFSIZ); 420 mesg, BUFSIZ);
436 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid); 421 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid);
437 } 422 }
438 XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d", 423 XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d",
439 mesg, BUFSIZ); 424 mesg, BUFSIZ);
440 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial); 425 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial);
441} 426}
442#endif 427#endif
443 428
444int 429int
467 DisplayString (display)); 452 DisplayString (display));
468 rxvt_emergency_cleanup (); 453 rxvt_emergency_cleanup ();
469 _exit (EXIT_FAILURE); 454 _exit (EXIT_FAILURE);
470} 455}
471 456
472/*----------------------------------------------------------------------*/
473void
474rxvt_term::init (int argc, const char *const *argv, stringvec *envv)
475{
476 this->envv = envv;
477
478 SET_R (this);
479 set_locale ("");
480 set_environ (envv); // few things in X do not call setlocale :(
481
482 init_vars ();
483
484 init_secondary ();
485
486 const char **cmd_argv = init_resources (argc, argv);
487
488#ifdef KEYSYM_RESOURCE
489 keyboard->register_done ();
490#endif
491
492#ifdef HAVE_SCROLLBARS
493 if (option (Opt_scrollBar))
494 scrollBar.setIdle (); /* set existence for size calculations */
495#endif
496
497 pty = ptytty::create ();
498
499 create_windows (argc, argv);
500
501 init_xlocale ();
502
503 scr_reset (); // initialize screen
504
505#if 0
506 XSynchronize (dpy, True);
507#endif
508
509#ifdef HAVE_SCROLLBARS
510 if (option (Opt_scrollBar))
511 resize_scrollbar (); /* create and map scrollbar */
512#endif
513#ifdef HAVE_BG_PIXMAP
514 {
515 bgPixmap.set_target (this);
516
517#ifdef ENABLE_TRANSPARENCY
518 if (option (Opt_transparent))
519 {
520 bgPixmap.set_transparent ();
521
522#ifdef HAVE_AFTERIMAGE
523 if (rs [Rs_blurradius])
524 bgPixmap.set_blur_radius (rs [Rs_blurradius]);
525#endif
526 if (ISSET_PIXCOLOR (Color_tint))
527 bgPixmap.set_tint (pix_colors_focused [Color_tint]);
528
529 if (rs [Rs_shade])
530 bgPixmap.set_shade (rs [Rs_shade]);
531
532 bgPixmap.set_root_pixmap ();
533 XSelectInput (dpy, display->root, PropertyChangeMask);
534 rootwin_ev.start (display, display->root);
535 }
536#endif
537
538#ifdef BG_IMAGE_FROM_FILE
539 if (rs[Rs_backgroundPixmap])
540 {
541 const char *p = rs[Rs_backgroundPixmap];
542
543 if ((p = strchr (p, ';')) != 0)
544 {
545 p++;
546 bgPixmap.set_geometry (p);
547 }
548 else
549 bgPixmap.set_defaultGeometry ();
550
551 if (bgPixmap.set_file (rs[Rs_backgroundPixmap]))
552 if (!bgPixmap.window_position_sensitive ())
553 update_background ();
554 }
555#endif
556 }
557#endif
558
559#if ENABLE_PERL
560 rootwin_ev.start (display, display->root);
561#endif
562
563 set_colorfgbg ();
564
565 init_command (cmd_argv);
566
567 free (cmd_argv);
568
569 if (pty->pty >= 0)
570 pty_ev.start (pty->pty, ev::READ);
571
572 HOOK_INVOKE ((this, HOOK_START, DT_END));
573
574#if ENABLE_XEMBED
575 if (rs[Rs_embed])
576 {
577 long info[2] = { 0, XEMBED_MAPPED };
578
579 XChangeProperty (dpy, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
580 32, PropModeReplace, (unsigned char *)&info, 2);
581 }
582#endif
583
584 XMapWindow (dpy, vt);
585 XMapWindow (dpy, parent[0]);
586
587 refresh_check ();
588}
589
590static struct sig_handlers 457static struct sig_handlers
591{ 458{
592 ev::sig sw_term, sw_int; 459 ev::sig sw_term, sw_int;
593 460
594 /* 461 /*
609 rxvt_emergency_cleanup (); 476 rxvt_emergency_cleanup ();
610 w.stop (); 477 w.stop ();
611 kill (getpid (), w.signum); 478 kill (getpid (), w.signum);
612} 479}
613 480
481static void
482rxvt_get_ttymode (struct termios *tio)
483{
484 if (tcgetattr (STDIN_FILENO, tio) < 0)
485 memset (tio, 0, sizeof (struct termios));
486
487 for (int i = 0; i < NCCS; i++)
488 tio->c_cc[i] = VDISABLE;
489
490 tio->c_cc[VINTR] = CINTR;
491 tio->c_cc[VQUIT] = CQUIT;
492 tio->c_cc[VERASE] = CERASE;
493#ifdef VERASE2
494 tio->c_cc[VERASE2] = CERASE2;
495#endif
496 tio->c_cc[VKILL] = CKILL;
497 tio->c_cc[VEOF] = CEOF;
498 tio->c_cc[VSTART] = CSTART;
499 tio->c_cc[VSTOP] = CSTOP;
500 tio->c_cc[VSUSP] = CSUSP;
501# ifdef VDSUSP
502 tio->c_cc[VDSUSP] = CDSUSP;
503# endif
504# ifdef VREPRINT
505 tio->c_cc[VREPRINT] = CRPRNT;
506# endif
507# ifdef VDISCRD
508 tio->c_cc[VDISCRD] = CFLUSH;
509# endif
510# ifdef VWERSE
511 tio->c_cc[VWERSE] = CWERASE;
512# endif
513# ifdef VLNEXT
514 tio->c_cc[VLNEXT] = CLNEXT;
515# endif
516# ifdef VSTATUS
517 tio->c_cc[VSTATUS] = CSTATUS;
518# endif
519
520# if VMIN != VEOF
521 tio->c_cc[VMIN] = 1;
522# endif
523# if VTIME != VEOL
524 tio->c_cc[VTIME] = 0;
525# endif
526
527 /* input modes */
528 tio->c_iflag = (BRKINT | IGNPAR | ICRNL
529# ifdef IMAXBEL
530 | IMAXBEL
531# endif
532 | IXON);
533
534 /* output modes */
535 tio->c_oflag = (OPOST | ONLCR);
536
537 /* control modes */
538 tio->c_cflag = (CS8 | CREAD);
539
540 /* local modes */
541 tio->c_lflag = (ISIG | ICANON | IEXTEN | ECHO
542# if defined (ECHOCTL) && defined (ECHOKE)
543 | ECHOCTL | ECHOKE
544# endif
545 | ECHOE | ECHOK);
546}
547
614char **rxvt_environ; // startup environment 548char **rxvt_environ; // startup environment
615 549
616void 550void
617rxvt_init () 551rxvt_init ()
618{ 552{
619 ptytty::init (); 553 assert (("fontMask must not overlap other RS masks",
554 0 == (RS_fontMask & (RS_Sel | RS_baseattrMask | RS_customMask | RS_bgMask | RS_fgMask))));
620 555
556 rxvt_get_ttymode (&rxvt_term::def_tio);
557
558 // get rid of stdin/stdout as we don't need them, to free resources
559 dup2 (STDERR_FILENO, STDIN_FILENO);
560 dup2 (STDERR_FILENO, STDOUT_FILENO);
561
621 if (!ev_default_loop (0)) 562 if (!ev_default_loop ())
622 rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n"); 563 rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n");
623 564
624 rxvt_environ = environ; 565 rxvt_environ = environ;
625 566
626 signal (SIGHUP, SIG_IGN); 567 signal (SIGHUP, SIG_IGN);
627 signal (SIGPIPE, SIG_IGN); 568 signal (SIGPIPE, SIG_IGN);
628 569
629 sig_handlers.sw_term.start (SIGTERM); ev_unref (); 570 sig_handlers.sw_term.start (SIGTERM); ev_unref ();
630 sig_handlers.sw_int.start (SIGINT); ev_unref (); 571 sig_handlers.sw_int.start (SIGINT); ev_unref ();
631
632 /* need to trap SIGURG for SVR4 (Unixware) rlogin */
633 /* signal (SIGURG, SIG_DFL); */
634 572
635 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); 573 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
636 // TODO: handle this with exceptions and tolerate the memory loss 574 // TODO: handle this with exceptions and tolerate the memory loss
637 XSetIOErrorHandler (rxvt_xioerror_handler); 575 XSetIOErrorHandler (rxvt_xioerror_handler);
638 576
646 */ 584 */
647void 585void
648rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight) 586rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
649{ 587{
650 short recalc_x, recalc_y; 588 short recalc_x, recalc_y;
651 int x, y, sb_w, flags; 589 int x, y, flags;
652 unsigned int w, h; 590 unsigned int w, h;
653 unsigned int max_width, max_height; 591 unsigned int max_width, max_height;
654 592
655 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity; 593 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity;
656 szHint.win_gravity = NorthWestGravity; 594 szHint.win_gravity = NorthWestGravity;
666 if (rs[Rs_geometry]) 604 if (rs[Rs_geometry])
667 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h); 605 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h);
668 606
669 if (flags & WidthValue) 607 if (flags & WidthValue)
670 { 608 {
609 if (!w)
610 rxvt_fatal ("illegal window geometry (width and height must be non-zero), aborting.\n");
611
671 ncol = clamp (w, 0, std::numeric_limits<int16_t>::max ()); 612 ncol = clamp (w, 1, std::numeric_limits<int16_t>::max ());
672 szHint.flags |= USSize; 613 szHint.flags |= USSize;
673 } 614 }
674 615
675 if (flags & HeightValue) 616 if (flags & HeightValue)
676 { 617 {
618 if (!h)
619 rxvt_fatal ("illegal window geometry (width and height must be non-zero), aborting.\n");
620
677 nrow = clamp (h, 0, std::numeric_limits<int16_t>::max ()); 621 nrow = clamp (h, 1, std::numeric_limits<int16_t>::max ());
678 szHint.flags |= USSize; 622 szHint.flags |= USSize;
679 } 623 }
680 624
681 if (flags & XValue) 625 if (flags & XValue)
682 { 626 {
713 max_width = MAX_COLS * fwidth; 657 max_width = MAX_COLS * fwidth;
714 max_height = MAX_ROWS * fheight; 658 max_height = MAX_ROWS * fheight;
715 659
716 szHint.base_width = szHint.base_height = 2 * int_bwidth; 660 szHint.base_width = szHint.base_height = 2 * int_bwidth;
717 661
718 sb_w = 0;
719 window_vt_x = window_vt_y = int_bwidth; 662 window_vt_x = window_vt_y = int_bwidth;
720 663
721 if (scrollBar.state) 664 if (scrollBar.state)
722 { 665 {
723 sb_w = scrollbar_TotalWidth (); 666 int sb_w = scrollBar.total_width ();
724 szHint.base_width += sb_w; 667 szHint.base_width += sb_w;
725 668
726 if (!option (Opt_scrollBar_right)) 669 if (!option (Opt_scrollBar_right))
727 window_vt_x += sb_w; 670 window_vt_x += sb_w;
728 } 671 }
752 { 695 {
753 min_it (height, max_height); 696 min_it (height, max_height);
754 szHint.height = szHint.base_height + height; 697 szHint.height = szHint.base_height + height;
755 } 698 }
756 699
757 if (scrollBar.state && option (Opt_scrollBar_right))
758 window_sb_x = szHint.width - sb_w;
759
760 if (recalc_x) 700 if (recalc_x)
761 szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth; 701 szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth;
762 702
763 if (recalc_y) 703 if (recalc_y)
764 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth; 704 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth;
765 705
766 ncol = width / fwidth; 706 ncol = width / fwidth;
767 nrow = height / fheight; 707 nrow = height / fheight;
708
709 // When the size of the vt window is not a multiple of the cell
710 // size, i.e., when the wm does not honour our size hints, there are
711 // extra areas not covered by the terminal screen. Such gaps, when a
712 // bg pixmap is set, would have to be cleared manually to properly
713 // refresh the background. We take the simpler route and shrink the
714 // vt window so as to avoid creating gaps.
715 width = ncol * fwidth;
716 height = nrow * fheight;
768} 717}
769 718
770/*----------------------------------------------------------------------*/ 719/*----------------------------------------------------------------------*/
771/* 720/*
772 * Tell the teletype handler what size the window is. 721 * Tell the teletype handler what size the window is.
782 731
783 ws.ws_col = ncol; 732 ws.ws_col = ncol;
784 ws.ws_row = nrow; 733 ws.ws_row = nrow;
785 ws.ws_xpixel = width; 734 ws.ws_xpixel = width;
786 ws.ws_ypixel = height; 735 ws.ws_ypixel = height;
787 (void)ioctl (pty->pty, TIOCSWINSZ, &ws); 736 ioctl (pty->pty, TIOCSWINSZ, &ws);
788 737
789#if 0 738#if 0
790 // TIOCSWINSZ is supposed to do this automatically and correctly 739 // TIOCSWINSZ is supposed to do this automatically and correctly
791 if (cmd_pid) /* force through to the command */ 740 if (cmd_pid) /* force through to the command */
792 kill (-cmd_pid, SIGWINCH); 741 kill (-cmd_pid, SIGWINCH);
793#endif 742#endif
794} 743}
795 744
796/*----------------------------------------------------------------------*/ 745/*----------------------------------------------------------------------*/
797/* set_fonts () - load and set the various fonts 746/* load and set the various fonts */
798 *
799 * init = 1 - initialize
800 *
801 * fontname == FONT_UP - switch to bigger font
802 * fontname == FONT_DN - switch to smaller font
803 */
804bool 747bool
805rxvt_term::set_fonts () 748rxvt_term::set_fonts ()
806{ 749{
807 rxvt_fontset *fs = new rxvt_fontset (this); 750 rxvt_fontset *fs = new rxvt_fontset (this);
808 rxvt_fontprop prop; 751 rxvt_fontprop prop;
822#endif 765#endif
823 766
824 delete fontset[0]; 767 delete fontset[0];
825 fontset[0] = fs; 768 fontset[0] = fs;
826 769
827 prop = (*fs)[1]->properties (); 770 prop = (*fs)[rxvt_fontset::firstFont]->properties ();
828 prop.height += lineSpace; 771 prop.height += lineSpace;
772 prop.width += letterSpace;
829 773
830 fs->set_prop (prop, false); 774 fs->set_prop (prop, false);
831 775
832 fwidth = prop.width; 776 fwidth = prop.width;
833 fheight = prop.height; 777 fheight = prop.height;
864#else 808#else
865 fontset[style] = fontset[0]; 809 fontset[style] = fontset[0];
866#endif 810#endif
867 } 811 }
868 812
869 if (parent[0]) 813 if (parent)
870 { 814 {
871 resize_all_windows (0, 0, 0); 815 resize_all_windows (0, 0, 0);
872 scr_remap_chars (); 816 scr_remap_chars ();
873 scr_touch (true); 817 scr_touch (true);
874 } 818 }
877} 821}
878 822
879void 823void
880rxvt_term::set_string_property (Atom prop, const char *str, int len) 824rxvt_term::set_string_property (Atom prop, const char *str, int len)
881{ 825{
882 XChangeProperty (dpy, parent[0], 826 XChangeProperty (dpy, parent,
883 prop, XA_STRING, 8, PropModeReplace, 827 prop, XA_STRING, 8, PropModeReplace,
884 (const unsigned char *)str, len >= 0 ? len : strlen (str)); 828 (const unsigned char *)str, len >= 0 ? len : strlen (str));
885} 829}
886 830
887void 831void
832rxvt_term::set_mbstring_property (Atom prop, const char *str, int len)
833{
834 XTextProperty ct;
835
836 if (XmbTextListToTextProperty (dpy, (char **)&str, 1, XStdICCTextStyle, &ct) >= 0)
837 {
838 XSetTextProperty (dpy, parent, &ct, prop);
839 XFree (ct.value);
840 }
841}
842
843void
888rxvt_term::set_utf8_property (Atom prop, const char *str, int len) 844rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
889{ 845{
890 wchar_t *ws = rxvt_mbstowcs (str, len); 846 wchar_t *ws = rxvt_mbstowcs (str, len);
891 char *s = rxvt_wcstoutf8 (ws); 847 char *s = rxvt_wcstoutf8 (ws);
892 848
893 XChangeProperty (dpy, parent[0], 849 XChangeProperty (dpy, parent,
894 prop, xa[XA_UTF8_STRING], 8, PropModeReplace, 850 prop, xa[XA_UTF8_STRING], 8, PropModeReplace,
895 (const unsigned char *)s, strlen (s)); 851 (const unsigned char *)s, strlen (s));
896 852
897 free (s); 853 free (s);
898 free (ws); 854 free (ws);
902/*----------------------------------------------------------------------*/ 858/*----------------------------------------------------------------------*/
903/* xterm sequences - title, iconName, color (exptl) */ 859/* xterm sequences - title, iconName, color (exptl) */
904void 860void
905rxvt_term::set_title (const char *str) 861rxvt_term::set_title (const char *str)
906{ 862{
907 set_string_property (XA_WM_NAME, str); 863 set_mbstring_property (XA_WM_NAME, str);
908#if ENABLE_EWMH 864#if ENABLE_EWMH
909 set_utf8_property (xa[XA_NET_WM_NAME], str); 865 set_utf8_property (xa[XA_NET_WM_NAME], str);
910#endif 866#endif
911} 867}
912 868
913void 869void
914rxvt_term::set_icon_name (const char *str) 870rxvt_term::set_icon_name (const char *str)
915{ 871{
916 set_string_property (XA_WM_ICON_NAME, str); 872 set_mbstring_property (XA_WM_ICON_NAME, str);
917#if ENABLE_EWMH 873#if ENABLE_EWMH
918 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str); 874 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str);
919#endif 875#endif
920} 876}
921 877
922void 878void
923rxvt_term::set_window_color (int idx, const char *color) 879rxvt_term::set_window_color (int idx, const char *color)
924{ 880{
925#ifdef XTERM_COLOR_CHANGE 881#ifdef XTERM_COLOR_CHANGE
926 rxvt_color xcol; 882 rxvt_color xcol;
927 int i;
928 883
929 if (color == NULL || *color == '\0') 884 if (color == NULL || *color == '\0')
930 return; 885 return;
931 886
932 color = strdup (color); 887 color = strdup (color);
934 rs[Rs_color + idx] = color; 889 rs[Rs_color + idx] = color;
935 890
936 /* handle color aliases */ 891 /* handle color aliases */
937 if (isdigit (*color)) 892 if (isdigit (*color))
938 { 893 {
939 i = atoi (color); 894 int i = atoi (color);
940 895
941 if (i >= 8 && i <= 15) 896 if (i >= 8 && i <= 15)
942 { 897 {
943 /* bright colors */ 898 /* bright colors */
944 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i - 8]; 899 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i - 8];
994void 949void
995rxvt_term::set_colorfgbg () 950rxvt_term::set_colorfgbg ()
996{ 951{
997 unsigned int i; 952 unsigned int i;
998 const char *xpmb = ""; 953 const char *xpmb = "";
999 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1]; 954 char fstr[] = "default";
955 char bstr[] = "default";
1000 956
1001 strcpy (fstr, "default");
1002 strcpy (bstr, "default");
1003 for (i = Color_Black; i <= Color_White; i++) 957 for (i = Color_Black; i <= Color_White; i++)
1004 if (pix_colors[Color_fg] == pix_colors[i]) 958 if (pix_colors[Color_fg] == pix_colors[i])
1005 { 959 {
1006 sprintf (fstr, "%d", (i - Color_Black)); 960 sprintf (fstr, "%d", i - Color_Black);
1007 break; 961 break;
1008 } 962 }
1009 963
1010 for (i = Color_Black; i <= Color_White; i++) 964 for (i = Color_Black; i <= Color_White; i++)
1011 if (pix_colors[Color_bg] == pix_colors[i]) 965 if (pix_colors[Color_bg] == pix_colors[i])
1012 { 966 {
1013 sprintf (bstr, "%d", (i - Color_Black)); 967 sprintf (bstr, "%d", i - Color_Black);
1014#ifdef BG_IMAGE_FROM_FILE 968#ifdef BG_IMAGE_FROM_FILE
1015 xpmb = "default;"; 969 xpmb = "default;";
1016#endif 970#endif
1017 break; 971 break;
1018 } 972 }
1048 int old_width = szHint.width; 1002 int old_width = szHint.width;
1049 int old_height = szHint.height; 1003 int old_height = szHint.height;
1050 1004
1051 window_calc (newwidth, newheight); 1005 window_calc (newwidth, newheight);
1052 1006
1053 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);
1054 XSetWMNormalHints (dpy, parent[0], &szHint); 1013 XSetWMNormalHints (dpy, parent, &szHint);
1014 szHint.flags |= PBaseSize | PResizeInc;
1015 }
1055 1016
1056 if (!ignoreparent) 1017 if (!ignoreparent)
1057 { 1018 {
1058#ifdef SMART_RESIZE 1019#ifdef SMART_RESIZE
1059 /* 1020 /*
1063 int x, y, x1, y1; 1024 int x, y, x1, y1;
1064 int dx, dy; 1025 int dx, dy;
1065 unsigned int unused_w1, unused_h1, unused_b1, unused_d1; 1026 unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
1066 Window unused_cr; 1027 Window unused_cr;
1067 1028
1068 XTranslateCoordinates (dpy, parent[0], display->root, 1029 XTranslateCoordinates (dpy, parent, display->root,
1069 0, 0, &x, &y, &unused_cr); 1030 0, 0, &x, &y, &unused_cr);
1070 XGetGeometry (dpy, parent[0], &unused_cr, &x1, &y1, 1031 XGetGeometry (dpy, parent, &unused_cr, &x1, &y1,
1071 &unused_w1, &unused_h1, &unused_b1, &unused_d1); 1032 &unused_w1, &unused_h1, &unused_b1, &unused_d1);
1072 /* 1033 /*
1073 * 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
1074 * our position for handles and decorations. Counter it 1035 * our position for handles and decorations. Counter it
1075 */ 1036 */
1092 if (y < y1) /* top half */ 1053 if (y < y1) /* top half */
1093 dy = 0; 1054 dy = 0;
1094 else if (y == y1) /* exact center */ 1055 else if (y == y1) /* exact center */
1095 dy /= 2; 1056 dy /= 2;
1096 1057
1097 XMoveResizeWindow (dpy, parent[0], x + dx, y + dy, 1058 XMoveResizeWindow (dpy, parent, x + dx, y + dy,
1098 szHint.width, szHint.height); 1059 szHint.width, szHint.height);
1099#else 1060#else
1100 XResizeWindow (dpy, parent[0], szHint.width, szHint.height); 1061 XResizeWindow (dpy, parent, szHint.width, szHint.height);
1101#endif 1062#endif
1102 } 1063 }
1064
1065 if (set_hint)
1066 XSetWMNormalHints (dpy, parent, &szHint);
1103 1067
1104 fix_screen = ncol != prev_ncol || nrow != prev_nrow; 1068 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
1105 1069
1106 if (fix_screen || newwidth != old_width || newheight != old_height) 1070 if (fix_screen || newwidth != old_width || newheight != old_height)
1107 { 1071 {
1108 if (scrollBar.state) 1072 if (scrollBar.state)
1109 { 1073 scrollBar.resize ();
1110 XMoveResizeWindow (dpy, scrollBar.win,
1111 window_sb_x, 0,
1112 scrollbar_TotalWidth (), szHint.height);
1113 resize_scrollbar ();
1114 }
1115 1074
1116 XMoveResizeWindow (dpy, vt, 1075 XMoveResizeWindow (dpy, vt,
1117 window_vt_x, window_vt_y, 1076 window_vt_x, window_vt_y,
1118 width, height); 1077 width, height);
1119 1078
1120#ifdef HAVE_BG_PIXMAP 1079#ifdef HAVE_BG_PIXMAP
1121 if (bgPixmap.window_size_sensitive ()) 1080 if (bg_window_size_sensitive ())
1122 update_background (); 1081 update_background ();
1123#endif 1082#endif
1124
1125 scr_clear ();
1126 } 1083 }
1127 1084
1128 if (fix_screen || old_height == 0) 1085 if (fix_screen || old_height == 0)
1129 scr_reset (); 1086 scr_reset ();
1130 1087
1131 // TODO, with nvidia-8178, resizes kill the alpha channel, report if not fixed in newer version
1132 //scr_touch (false);
1133
1134#ifdef HAVE_BG_PIXMAP
1135// TODO: this don't seem to have any effect - do we still need it ? If so - in which case exactly ?
1136// if (bgPixmap.pixmap)
1137// scr_touch (false);
1138#endif
1139
1140#ifdef USE_XIM 1088#ifdef USE_XIM
1141 IMSetPosition (); 1089 im_set_position ();
1142#endif 1090#endif
1143} 1091}
1144 1092
1145/* 1093/*
1146 * 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.
1207 status_rect.height = fheight; 1155 status_rect.height = fheight;
1208} 1156}
1209 1157
1210/* Checking whether input method is running. */ 1158/* Checking whether input method is running. */
1211bool 1159bool
1212rxvt_term::IMisRunning () 1160rxvt_term::im_is_running ()
1213{ 1161{
1214 char *p;
1215 Atom atom; 1162 Atom atom;
1216 Window win; 1163 Window win;
1217 char server[IMBUFSIZ]; 1164 char server[IMBUFSIZ];
1218 1165
1219 /* get current locale modifier */ 1166 /* get current locale modifier */
1220 if ((p = XSetLocaleModifiers (NULL)) != NULL) 1167 if (char *p = XSetLocaleModifiers (0))
1221 { 1168 {
1222 strcpy (server, "@server="); 1169 strcpy (server, "@server=");
1223 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */ 1170 strncat (server, p + 4, IMBUFSIZ - 9); /* skip "@im=" */
1224 1171
1225 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */ 1172 if (p = strchr (server + 1, '@')) /* first one only */
1226 *p = '\0'; 1173 *p = '\0';
1227 1174
1228 atom = XInternAtom (dpy, server, False); 1175 atom = XInternAtom (dpy, server, False);
1229 win = XGetSelectionOwner (dpy, atom); 1176 win = XGetSelectionOwner (dpy, atom);
1230 1177
1231 if (win != None) 1178 if (win != None)
1232 return True; 1179 return true;
1233 } 1180 }
1234 1181
1235 return False; 1182 return false;
1236} 1183}
1237 1184
1238void 1185void
1239rxvt_term::IMSendSpot () 1186rxvt_term::im_send_spot ()
1240{ 1187{
1241 XPoint nspot; 1188 XPoint nspot;
1242 XVaNestedList preedit_attr; 1189 XVaNestedList preedit_attr;
1243 1190
1244 if (!Input_Context 1191 if (!Input_Context
1297 1244
1298 term->make_current (); 1245 term->make_current ();
1299 1246
1300 if (text) 1247 if (text)
1301 { 1248 {
1302 void *str; 1249 wchar_t *str;
1303 1250
1304 if (!text->encoding_is_wchar && text->string.multi_byte) 1251 if (!text->encoding_is_wchar && text->string.multi_byte)
1305 { 1252 {
1306 // of course, X makes it ugly again 1253 // of course, X makes it ugly again
1307 if (term->rs[Rs_imLocale]) 1254 if (term->rs[Rs_imLocale])
1308 SET_LOCALE (term->rs[Rs_imLocale]); 1255 SET_LOCALE (term->rs[Rs_imLocale]);
1309 1256
1310 str = rxvt_temp_buf ((text->length + 1) * sizeof (wchar_t)); 1257 str = rxvt_temp_buf<wchar_t> (text->length + 1);
1311 mbstowcs ((wchar_t *)str, text->string.multi_byte, text->length + 1); 1258 mbstowcs (str, text->string.multi_byte, text->length + 1);
1312 1259
1313 if (term->rs[Rs_imLocale]) 1260 if (term->rs[Rs_imLocale])
1314 SET_LOCALE (term->locale); 1261 SET_LOCALE (term->locale);
1315 } 1262 }
1316 else 1263 else
1317 str = (void *)text->string.wide_char; 1264 str = text->string.wide_char;
1318 1265
1319 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW, 1266 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
1320 DT_INT, call_data->caret, 1267 DT_INT, call_data->caret,
1321 DT_INT, call_data->chg_first, 1268 DT_INT, call_data->chg_first,
1322 DT_INT, call_data->chg_length, 1269 DT_INT, call_data->chg_length,
1350/* 1297/*
1351 * 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
1352 * open a suitable preedit type 1299 * open a suitable preedit type
1353 */ 1300 */
1354bool 1301bool
1355rxvt_term::IM_get_IC (const char *modifiers) 1302rxvt_term::im_get_ic (const char *modifiers)
1356{ 1303{
1357 int i, j, found; 1304 int i, j, found;
1358 XIM xim; 1305 XIM xim;
1359 XPoint spot; 1306 XPoint spot;
1360 XRectangle rect, status_rect, needed_rect; 1307 XRectangle rect, status_rect, needed_rect;
1361 unsigned long fg, bg; 1308 unsigned long fg, bg;
1362 const char *p; 1309 const char *p;
1363 char **s; 1310 char **s;
1364 XIMStyles *xim_styles; 1311 XIMStyles *xim_styles;
1365#ifdef ENABLE_XIM_ONTHESPOT
1366 XIMCallback xcb[4];
1367#endif
1368 1312
1369 set_environ (envv); 1313 set_environ (envv);
1370 1314
1371 if (! ((p = XSetLocaleModifiers (modifiers)) && *p)) 1315 if (! ((p = XSetLocaleModifiers (modifiers)) && *p))
1372 return false; 1316 return false;
1393 p = pet[pi]; 1337 p = pet[pi];
1394 1338
1395 if (!p) 1339 if (!p)
1396 continue; 1340 continue;
1397 1341
1398 s = rxvt_splitcommastring (p); 1342 s = rxvt_strsplit (',', p);
1399 1343
1400 for (i = found = 0; !found && s[i]; i++) 1344 for (i = found = 0; !found && s[i]; i++)
1401 { 1345 {
1402 if (!strcmp (s[i], "OverTheSpot")) 1346 if (!strcmp (s[i], "OverTheSpot"))
1403 input_style = XIMPreeditPosition | XIMStatusNothing; 1347 input_style = XIMPreeditPosition | XIMStatusNothing;
1415 input_style = XIMPreeditNothing | XIMStatusNothing; 1359 input_style = XIMPreeditNothing | XIMStatusNothing;
1416 1360
1417 for (j = 0; j < xim_styles->count_styles; j++) 1361 for (j = 0; j < xim_styles->count_styles; j++)
1418 if (input_style == xim_styles->supported_styles[j]) 1362 if (input_style == xim_styles->supported_styles[j])
1419 { 1363 {
1420 rxvt_freecommastring (s); 1364 rxvt_free_strsplit (s);
1421 1365
1422 found = 1; 1366 found = 1;
1423 goto foundpet; 1367 goto foundpet;
1424 } 1368 }
1425 1369
1426 } 1370 }
1427 1371
1428 rxvt_freecommastring (s); 1372 rxvt_free_strsplit (s);
1429 } 1373 }
1430 1374
1431foundpet: 1375foundpet:
1432 1376
1433 XFree (xim_styles); 1377 XFree (xim_styles);
1512 NULL); 1456 NULL);
1513 } 1457 }
1514#if ENABLE_XIM_ONTHESPOT 1458#if ENABLE_XIM_ONTHESPOT
1515 else if (input_style & XIMPreeditCallbacks) 1459 else if (input_style & XIMPreeditCallbacks)
1516 { 1460 {
1461 XIMCallback xcb[4];
1462
1517 im_set_position (spot); 1463 im_set_position (spot);
1518 1464
1519 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;
1520 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;
1521 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;
1536#endif 1482#endif
1537 1483
1538 Input_Context = XCreateIC (xim, 1484 Input_Context = XCreateIC (xim,
1539 XNInputStyle, input_style, 1485 XNInputStyle, input_style,
1540 XNClientWindow, vt, 1486 XNClientWindow, vt,
1541 XNFocusWindow, parent[0], 1487 XNFocusWindow, parent,
1542 preedit_attr ? XNPreeditAttributes : NULL, 1488 preedit_attr ? XNPreeditAttributes : NULL,
1543 preedit_attr, 1489 preedit_attr,
1544 status_attr ? XNStatusAttributes : NULL, 1490 status_attr ? XNStatusAttributes : NULL,
1545 status_attr, NULL); 1491 status_attr, NULL);
1546 1492
1559 // 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
1560 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL)) 1506 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL))
1561 vt_select_input (); 1507 vt_select_input ();
1562#endif 1508#endif
1563 1509
1564 IMSetPosition (); 1510 im_set_position ();
1565 1511
1566 return true; 1512 return true;
1567} 1513}
1568 1514
1569void 1515void
1589 p = rs[Rs_inputMethod]; 1535 p = rs[Rs_inputMethod];
1590 if (p && *p) 1536 if (p && *p)
1591 { 1537 {
1592 bool found = false; 1538 bool found = false;
1593 1539
1594 s = rxvt_splitcommastring (p); 1540 s = rxvt_strsplit (',', p);
1595 1541
1596 for (i = 0; s[i]; i++) 1542 for (i = 0; s[i]; i++)
1597 { 1543 {
1598 if (*s[i]) 1544 if (*s[i])
1599 { 1545 {
1600 strcpy (buf, "@im="); 1546 strcpy (buf, "@im=");
1601 strncat (buf, s[i], IMBUFSIZ - 5); 1547 strncat (buf, s[i], IMBUFSIZ - 5);
1602 if (IM_get_IC (buf)) 1548 if (im_get_ic (buf))
1603 { 1549 {
1604 found = true; 1550 found = true;
1605 break; 1551 break;
1606 } 1552 }
1607 } 1553 }
1608 } 1554 }
1609 1555
1610 rxvt_freecommastring (s); 1556 rxvt_free_strsplit (s);
1611 1557
1612 if (found) 1558 if (found)
1613 goto done; 1559 goto done;
1614 } 1560 }
1615 1561
1616 /* try with XMODIFIERS env. var. */ 1562 /* try with XMODIFIERS env. var. */
1617 if (IM_get_IC ("")) 1563 if (im_get_ic (""))
1618 goto done; 1564 goto done;
1619 1565
1620 /* try with no modifiers base IF the user didn't specify an IM */ 1566 /* try with no modifiers base IF the user didn't specify an IM */
1621 if (IM_get_IC ("@im=none")) 1567 if (im_get_ic ("@im=none"))
1622 goto done; 1568 goto done;
1623 1569
1624done: 1570done:
1625#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE) 1571#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1626 if (rs[Rs_imLocale]) 1572 if (rs[Rs_imLocale])
1627 SET_LOCALE (locale); 1573 SET_LOCALE (locale);
1628#endif 1574#endif
1629} 1575}
1630 1576
1631void 1577void
1632rxvt_term::IMSetPosition () 1578rxvt_term::im_set_position ()
1633{ 1579{
1634 XRectangle preedit_rect, status_rect, *needed_rect; 1580 XRectangle preedit_rect, status_rect, *needed_rect;
1635 XVaNestedList preedit_attr, status_attr; 1581 XVaNestedList preedit_attr, status_attr;
1636 1582
1637 if (!Input_Context 1583 if (!Input_Context
1638 || !focus 1584 || !focus
1639 || !(input_style & (XIMPreeditArea | XIMPreeditPosition)) 1585 || !(input_style & (XIMPreeditArea | XIMPreeditPosition))
1640 || !IMisRunning ()) 1586 || !im_is_running ())
1641 return; 1587 return;
1642 1588
1643 if (input_style & XIMPreeditPosition) 1589 if (input_style & XIMPreeditPosition)
1644 { 1590 {
1645 im_set_size (preedit_rect); 1591 im_set_size (preedit_rect);
1675 1621
1676void 1622void
1677rxvt_term::get_window_origin (int &x, int &y) 1623rxvt_term::get_window_origin (int &x, int &y)
1678{ 1624{
1679 Window cr; 1625 Window cr;
1680 XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr); 1626 XTranslateCoordinates (dpy, parent, display->root, 0, 0, &x, &y, &cr);
1681/* fprintf (stderr, "origin is %+d%+d\n", x, y);*/
1682} 1627}
1683 1628
1684Pixmap 1629Pixmap
1685rxvt_term::get_pixmap_property (int prop_id) 1630rxvt_term::get_pixmap_property (Atom property)
1686{ 1631{
1687 if (prop_id > 0 && prop_id < NUM_XA) 1632 Pixmap pixmap = None;
1688 if (xa[prop_id]) 1633
1689 {
1690 int aformat; 1634 int aformat;
1691 unsigned long nitems, bytes_after; 1635 unsigned long nitems, bytes_after;
1692 Atom atype; 1636 Atom atype;
1693 unsigned char *prop = NULL; 1637 unsigned char *prop;
1694 int result = XGetWindowProperty (dpy, display->root, xa[prop_id], 1638 int result = XGetWindowProperty (dpy, display->root, property,
1695 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 1639 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1696 &nitems, &bytes_after, &prop); 1640 &nitems, &bytes_after, &prop);
1697 if (result == Success && prop && atype == XA_PIXMAP) 1641 if (result == Success)
1642 {
1643 if (atype == XA_PIXMAP)
1698 return *(Pixmap *)prop; 1644 pixmap = *(Pixmap *)prop;
1645 XFree (prop);
1699 } 1646 }
1700 1647
1701 return None; 1648 return pixmap;
1702} 1649}
1703 1650
1704#ifdef HAVE_BG_PIXMAP 1651#ifdef HAVE_BG_PIXMAP
1705# if TRACE_PIXMAPS
1706# undef update_background
1707void
1708rxvt_term::trace_update_background (const char *file, int line)
1709{
1710 fprintf (stderr, "%s:%d:update_background()\n", file, line);
1711 update_background ();
1712}
1713# endif
1714 1652
1715void 1653void
1716rxvt_term::update_background () 1654rxvt_term::update_background ()
1717{ 1655{
1718 if (update_background_ev.is_active ()) 1656 if (update_background_ev.is_active ())
1719 return; 1657 return;
1720 1658
1721 bgPixmap.invalidate (); 1659 bg_invalidate ();
1722 1660
1661 if (!mapped)
1662 return;
1663
1723 ev_tstamp to_wait = 0.5 - (ev::now () - bgPixmap.valid_since); 1664 ev_tstamp to_wait = 0.5 - (ev::now () - bg_valid_since);
1724 1665
1725 if (to_wait <= 0.) 1666 if (to_wait <= 0.)
1726 bgPixmap.render (); 1667 bg_render ();
1727 else 1668 else
1728 update_background_ev.start (to_wait); 1669 update_background_ev.start (to_wait);
1729} 1670}
1730 1671
1731void 1672void
1732rxvt_term::update_background_cb (ev::timer &w, int revents) 1673rxvt_term::update_background_cb (ev::timer &w, int revents)
1733{ 1674{
1734 make_current (); 1675 make_current ();
1735 1676
1736 update_background_ev.stop (); 1677 update_background_ev.stop ();
1737 bgPixmap.render (); 1678 bg_render ();
1738 refresh_check (); 1679 refresh_check ();
1739} 1680}
1740 1681
1741#endif /* HAVE_BG_PIXMAP */ 1682#endif /* HAVE_BG_PIXMAP */
1742 1683

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines