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.299 by sasha, Tue Jan 15 23:21:18 2008 UTC vs.
Revision 1.365 by sf-exg, Mon Jan 9 15:45:45 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 bgPixmap.invalidate ();
517
518#ifdef ENABLE_TRANSPARENCY
519 if (option (Opt_transparent))
520 {
521 bgPixmap.set_transparent ();
522
523#ifdef HAVE_AFTERIMAGE
524 if (rs [Rs_blurradius])
525 bgPixmap.set_blur_radius (rs [Rs_blurradius]);
526#endif
527 if (ISSET_PIXCOLOR (Color_tint))
528 bgPixmap.set_tint (pix_colors_focused [Color_tint]);
529
530 if (rs [Rs_shade])
531 bgPixmap.set_shade (rs [Rs_shade]);
532
533 bgPixmap.set_root_pixmap ();
534 XSelectInput (dpy, display->root, PropertyChangeMask);
535 rootwin_ev.start (display, display->root);
536 }
537#endif
538
539#ifdef BG_IMAGE_FROM_FILE
540 if (rs[Rs_backgroundPixmap])
541 {
542 const char *p = rs[Rs_backgroundPixmap];
543
544 if ((p = strchr (p, ';')) != 0)
545 {
546 p++;
547 bgPixmap.set_geometry (p);
548 }
549 else
550 bgPixmap.set_defaultGeometry ();
551
552 if (bgPixmap.set_file (rs[Rs_backgroundPixmap]))
553 if (!bgPixmap.window_position_sensitive ())
554 update_background ();
555 }
556#endif
557 }
558#endif
559
560#if ENABLE_PERL
561 rootwin_ev.start (display, display->root);
562#endif
563
564 set_colorfgbg ();
565
566 init_command (cmd_argv);
567
568 free (cmd_argv);
569
570 if (pty->pty >= 0)
571 pty_ev.start (pty->pty, ev::READ);
572
573 HOOK_INVOKE ((this, HOOK_START, DT_END));
574
575#if ENABLE_XEMBED
576 if (rs[Rs_embed])
577 {
578 long info[2] = { 0, XEMBED_MAPPED };
579
580 XChangeProperty (dpy, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
581 32, PropModeReplace, (unsigned char *)&info, 2);
582 }
583#endif
584
585 XMapWindow (dpy, vt);
586 XMapWindow (dpy, parent[0]);
587
588 refresh_check ();
589}
590
591static struct sig_handlers 457static struct sig_handlers
592{ 458{
593 ev::sig sw_term, sw_int; 459 ev::sig sw_term, sw_int;
594 460
595 /* 461 /*
… …
610 rxvt_emergency_cleanup (); 476 rxvt_emergency_cleanup ();
611 w.stop (); 477 w.stop ();
612 kill (getpid (), w.signum); 478 kill (getpid (), w.signum);
613} 479}
614 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
615char **rxvt_environ; // startup environment 548char **rxvt_environ; // startup environment
616 549
617void 550void
618rxvt_init () 551rxvt_init ()
619{ 552{
620 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))));
621 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
622 if (!ev_default_loop (0)) 562 if (!ev_default_loop ())
623 rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n"); 563 rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n");
624 564
625 rxvt_environ = environ; 565 rxvt_environ = environ;
626 566
627 signal (SIGHUP, SIG_IGN); 567 signal (SIGHUP, SIG_IGN);
628 signal (SIGPIPE, SIG_IGN); 568 signal (SIGPIPE, SIG_IGN);
629 569
630 sig_handlers.sw_term.start (SIGTERM); ev_unref (); 570 sig_handlers.sw_term.start (SIGTERM); ev_unref ();
631 sig_handlers.sw_int.start (SIGINT); ev_unref (); 571 sig_handlers.sw_int.start (SIGINT); ev_unref ();
632
633 /* need to trap SIGURG for SVR4 (Unixware) rlogin */
634 /* signal (SIGURG, SIG_DFL); */
635 572
636 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); 573 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
637 // TODO: handle this with exceptions and tolerate the memory loss 574 // TODO: handle this with exceptions and tolerate the memory loss
638 XSetIOErrorHandler (rxvt_xioerror_handler); 575 XSetIOErrorHandler (rxvt_xioerror_handler);
639 576
… …
647 */ 584 */
648void 585void
649rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight) 586rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
650{ 587{
651 short recalc_x, recalc_y; 588 short recalc_x, recalc_y;
652 int x, y, sb_w, flags; 589 int x, y, flags;
653 unsigned int w, h; 590 unsigned int w, h;
654 unsigned int max_width, max_height; 591 unsigned int max_width, max_height;
655 592
656 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity; 593 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity;
657 szHint.win_gravity = NorthWestGravity; 594 szHint.win_gravity = NorthWestGravity;
… …
667 if (rs[Rs_geometry]) 604 if (rs[Rs_geometry])
668 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h); 605 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h);
669 606
670 if (flags & WidthValue) 607 if (flags & WidthValue)
671 { 608 {
609 if (!w)
610 rxvt_fatal ("illegal window geometry (width and height must be non-zero), aborting.\n");
611
672 ncol = clamp (w, 0, std::numeric_limits<int16_t>::max ()); 612 ncol = clamp (w, 1, std::numeric_limits<int16_t>::max ());
673 szHint.flags |= USSize; 613 szHint.flags |= USSize;
674 } 614 }
675 615
676 if (flags & HeightValue) 616 if (flags & HeightValue)
677 { 617 {
618 if (!h)
619 rxvt_fatal ("illegal window geometry (width and height must be non-zero), aborting.\n");
620
678 nrow = clamp (h, 0, std::numeric_limits<int16_t>::max ()); 621 nrow = clamp (h, 1, std::numeric_limits<int16_t>::max ());
679 szHint.flags |= USSize; 622 szHint.flags |= USSize;
680 } 623 }
681 624
682 if (flags & XValue) 625 if (flags & XValue)
683 { 626 {
… …
714 max_width = MAX_COLS * fwidth; 657 max_width = MAX_COLS * fwidth;
715 max_height = MAX_ROWS * fheight; 658 max_height = MAX_ROWS * fheight;
716 659
717 szHint.base_width = szHint.base_height = 2 * int_bwidth; 660 szHint.base_width = szHint.base_height = 2 * int_bwidth;
718 661
719 sb_w = 0;
720 window_vt_x = window_vt_y = int_bwidth; 662 window_vt_x = window_vt_y = int_bwidth;
721 663
722 if (scrollBar.state) 664 if (scrollBar.state)
723 { 665 {
724 sb_w = scrollbar_TotalWidth (); 666 int sb_w = scrollBar.total_width ();
725 szHint.base_width += sb_w; 667 szHint.base_width += sb_w;
726 668
727 if (!option (Opt_scrollBar_right)) 669 if (!option (Opt_scrollBar_right))
728 window_vt_x += sb_w; 670 window_vt_x += sb_w;
729 } 671 }
… …
753 { 695 {
754 min_it (height, max_height); 696 min_it (height, max_height);
755 szHint.height = szHint.base_height + height; 697 szHint.height = szHint.base_height + height;
756 } 698 }
757 699
758 if (scrollBar.state && option (Opt_scrollBar_right))
759 window_sb_x = szHint.width - sb_w;
760
761 if (recalc_x) 700 if (recalc_x)
762 szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth; 701 szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth;
763 702
764 if (recalc_y) 703 if (recalc_y)
765 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth; 704 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth;
766 705
767 ncol = width / fwidth; 706 ncol = width / fwidth;
768 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;
769} 717}
770 718
771/*----------------------------------------------------------------------*/ 719/*----------------------------------------------------------------------*/
772/* 720/*
773 * Tell the teletype handler what size the window is. 721 * Tell the teletype handler what size the window is.
… …
783 731
784 ws.ws_col = ncol; 732 ws.ws_col = ncol;
785 ws.ws_row = nrow; 733 ws.ws_row = nrow;
786 ws.ws_xpixel = width; 734 ws.ws_xpixel = width;
787 ws.ws_ypixel = height; 735 ws.ws_ypixel = height;
788 (void)ioctl (pty->pty, TIOCSWINSZ, &ws); 736 ioctl (pty->pty, TIOCSWINSZ, &ws);
789 737
790#if 0 738#if 0
791 // TIOCSWINSZ is supposed to do this automatically and correctly 739 // TIOCSWINSZ is supposed to do this automatically and correctly
792 if (cmd_pid) /* force through to the command */ 740 if (cmd_pid) /* force through to the command */
793 kill (-cmd_pid, SIGWINCH); 741 kill (-cmd_pid, SIGWINCH);
794#endif 742#endif
795} 743}
796 744
797/*----------------------------------------------------------------------*/ 745/*----------------------------------------------------------------------*/
798/* set_fonts () - load and set the various fonts 746/* load and set the various fonts */
799 *
800 * init = 1 - initialize
801 *
802 * fontname == FONT_UP - switch to bigger font
803 * fontname == FONT_DN - switch to smaller font
804 */
805bool 747bool
806rxvt_term::set_fonts () 748rxvt_term::set_fonts ()
807{ 749{
808 rxvt_fontset *fs = new rxvt_fontset (this); 750 rxvt_fontset *fs = new rxvt_fontset (this);
809 rxvt_fontprop prop; 751 rxvt_fontprop prop;
… …
823#endif 765#endif
824 766
825 delete fontset[0]; 767 delete fontset[0];
826 fontset[0] = fs; 768 fontset[0] = fs;
827 769
828 prop = (*fs)[1]->properties (); 770 prop = (*fs)[rxvt_fontset::firstFont]->properties ();
829 prop.height += lineSpace; 771 prop.height += lineSpace;
772 prop.width += letterSpace;
830 773
831 fs->set_prop (prop, false); 774 fs->set_prop (prop, false);
832 775
833 fwidth = prop.width; 776 fwidth = prop.width;
834 fheight = prop.height; 777 fheight = prop.height;
… …
865#else 808#else
866 fontset[style] = fontset[0]; 809 fontset[style] = fontset[0];
867#endif 810#endif
868 } 811 }
869 812
870 if (parent[0]) 813 if (parent)
871 { 814 {
872 resize_all_windows (0, 0, 0); 815 resize_all_windows (0, 0, 0);
873 scr_remap_chars (); 816 scr_remap_chars ();
874 scr_touch (true); 817 scr_touch (true);
875 } 818 }
… …
878} 821}
879 822
880void 823void
881rxvt_term::set_string_property (Atom prop, const char *str, int len) 824rxvt_term::set_string_property (Atom prop, const char *str, int len)
882{ 825{
883 XChangeProperty (dpy, parent[0], 826 XChangeProperty (dpy, parent,
884 prop, XA_STRING, 8, PropModeReplace, 827 prop, XA_STRING, 8, PropModeReplace,
885 (const unsigned char *)str, len >= 0 ? len : strlen (str)); 828 (const unsigned char *)str, len >= 0 ? len : strlen (str));
886} 829}
887 830
888void 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
889rxvt_term::set_utf8_property (Atom prop, const char *str, int len) 844rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
890{ 845{
891 wchar_t *ws = rxvt_mbstowcs (str, len); 846 wchar_t *ws = rxvt_mbstowcs (str, len);
892 char *s = rxvt_wcstoutf8 (ws); 847 char *s = rxvt_wcstoutf8 (ws);
893 848
894 XChangeProperty (dpy, parent[0], 849 XChangeProperty (dpy, parent,
895 prop, xa[XA_UTF8_STRING], 8, PropModeReplace, 850 prop, xa[XA_UTF8_STRING], 8, PropModeReplace,
896 (const unsigned char *)s, strlen (s)); 851 (const unsigned char *)s, strlen (s));
897 852
898 free (s); 853 free (s);
899 free (ws); 854 free (ws);
… …
903/*----------------------------------------------------------------------*/ 858/*----------------------------------------------------------------------*/
904/* xterm sequences - title, iconName, color (exptl) */ 859/* xterm sequences - title, iconName, color (exptl) */
905void 860void
906rxvt_term::set_title (const char *str) 861rxvt_term::set_title (const char *str)
907{ 862{
908 set_string_property (XA_WM_NAME, str); 863 set_mbstring_property (XA_WM_NAME, str);
909#if ENABLE_EWMH 864#if ENABLE_EWMH
910 set_utf8_property (xa[XA_NET_WM_NAME], str); 865 set_utf8_property (xa[XA_NET_WM_NAME], str);
911#endif 866#endif
912} 867}
913 868
914void 869void
915rxvt_term::set_icon_name (const char *str) 870rxvt_term::set_icon_name (const char *str)
916{ 871{
917 set_string_property (XA_WM_ICON_NAME, str); 872 set_mbstring_property (XA_WM_ICON_NAME, str);
918#if ENABLE_EWMH 873#if ENABLE_EWMH
919 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str); 874 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str);
920#endif 875#endif
921} 876}
922 877
923void 878void
924rxvt_term::set_window_color (int idx, const char *color) 879rxvt_term::set_window_color (int idx, const char *color)
925{ 880{
926#ifdef XTERM_COLOR_CHANGE 881#ifdef XTERM_COLOR_CHANGE
927 rxvt_color xcol; 882 rxvt_color xcol;
928 int i;
929 883
930 if (color == NULL || *color == '\0') 884 if (color == NULL || *color == '\0')
931 return; 885 return;
932 886
933 color = strdup (color); 887 color = strdup (color);
… …
935 rs[Rs_color + idx] = color; 889 rs[Rs_color + idx] = color;
936 890
937 /* handle color aliases */ 891 /* handle color aliases */
938 if (isdigit (*color)) 892 if (isdigit (*color))
939 { 893 {
940 i = atoi (color); 894 int i = atoi (color);
941 895
942 if (i >= 8 && i <= 15) 896 if (i >= 8 && i <= 15)
943 { 897 {
944 /* bright colors */ 898 /* bright colors */
945 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i - 8]; 899 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i - 8];
… …
990 944
991/*----------------------------------------------------------------------*/ 945/*----------------------------------------------------------------------*/
992/* 946/*
993 * find if fg/bg matches any of the normal (low-intensity) colors 947 * find if fg/bg matches any of the normal (low-intensity) colors
994 */ 948 */
995void 949char *
996rxvt_term::set_colorfgbg () 950rxvt_term::get_colorfgbg ()
997{ 951{
998 unsigned int i; 952 unsigned int i;
999 const char *xpmb = ""; 953 const char *xpmb = "";
1000 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1]; 954 char fstr[] = "default";
955 char bstr[] = "default";
956 char *env_colorfgbg;
1001 957
1002 strcpy (fstr, "default");
1003 strcpy (bstr, "default");
1004 for (i = Color_Black; i <= Color_White; i++) 958 for (i = Color_Black; i <= Color_White; i++)
1005 if (pix_colors[Color_fg] == pix_colors[i]) 959 if (pix_colors[Color_fg] == pix_colors[i])
1006 { 960 {
1007 sprintf (fstr, "%d", (i - Color_Black)); 961 sprintf (fstr, "%d", i - Color_Black);
1008 break; 962 break;
1009 } 963 }
1010 964
1011 for (i = Color_Black; i <= Color_White; i++) 965 for (i = Color_Black; i <= Color_White; i++)
1012 if (pix_colors[Color_bg] == pix_colors[i]) 966 if (pix_colors[Color_bg] == pix_colors[i])
1013 { 967 {
1014 sprintf (bstr, "%d", (i - Color_Black)); 968 sprintf (bstr, "%d", i - Color_Black);
1015#ifdef BG_IMAGE_FROM_FILE 969#ifdef BG_IMAGE_FROM_FILE
1016 xpmb = "default;"; 970 xpmb = "default;";
1017#endif 971#endif
1018 break; 972 break;
1019 } 973 }
1020 974
975 env_colorfgbg = (char *)rxvt_malloc (sizeof ("COLORFGBG=default;default;bg"));
1021 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr); 976 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr);
977 return env_colorfgbg;
1022} 978}
1023 979
1024/*----------------------------------------------------------------------*/ 980/*----------------------------------------------------------------------*/
1025 981
1026bool 982bool
… …
1049 int old_width = szHint.width; 1005 int old_width = szHint.width;
1050 int old_height = szHint.height; 1006 int old_height = szHint.height;
1051 1007
1052 window_calc (newwidth, newheight); 1008 window_calc (newwidth, newheight);
1053 1009
1054 if (!HOOK_INVOKE ((this, HOOK_RESIZE_ALL_WINDOWS, DT_INT, newwidth, DT_INT, newheight, DT_END))) 1010 bool set_hint = !HOOK_INVOKE ((this, HOOK_RESIZE_ALL_WINDOWS, DT_INT, newwidth, DT_INT, newheight, DT_END));
1011
1012 // to avoid races between us and the wm, we clear the incremental size hints around the xresizewindow
1013 if (set_hint)
1014 {
1015 szHint.flags &= ~(PBaseSize | PResizeInc);
1055 XSetWMNormalHints (dpy, parent[0], &szHint); 1016 XSetWMNormalHints (dpy, parent, &szHint);
1017 szHint.flags |= PBaseSize | PResizeInc;
1018 }
1056 1019
1057 if (!ignoreparent) 1020 if (!ignoreparent)
1058 { 1021 {
1059#ifdef SMART_RESIZE 1022#ifdef SMART_RESIZE
1060 /* 1023 /*
… …
1064 int x, y, x1, y1; 1027 int x, y, x1, y1;
1065 int dx, dy; 1028 int dx, dy;
1066 unsigned int unused_w1, unused_h1, unused_b1, unused_d1; 1029 unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
1067 Window unused_cr; 1030 Window unused_cr;
1068 1031
1069 XTranslateCoordinates (dpy, parent[0], display->root, 1032 XTranslateCoordinates (dpy, parent, display->root,
1070 0, 0, &x, &y, &unused_cr); 1033 0, 0, &x, &y, &unused_cr);
1071 XGetGeometry (dpy, parent[0], &unused_cr, &x1, &y1, 1034 XGetGeometry (dpy, parent, &unused_cr, &x1, &y1,
1072 &unused_w1, &unused_h1, &unused_b1, &unused_d1); 1035 &unused_w1, &unused_h1, &unused_b1, &unused_d1);
1073 /* 1036 /*
1074 * if display->root isn't the parent window, a WM will probably have offset 1037 * if display->root isn't the parent window, a WM will probably have offset
1075 * our position for handles and decorations. Counter it 1038 * our position for handles and decorations. Counter it
1076 */ 1039 */
… …
1093 if (y < y1) /* top half */ 1056 if (y < y1) /* top half */
1094 dy = 0; 1057 dy = 0;
1095 else if (y == y1) /* exact center */ 1058 else if (y == y1) /* exact center */
1096 dy /= 2; 1059 dy /= 2;
1097 1060
1098 XMoveResizeWindow (dpy, parent[0], x + dx, y + dy, 1061 XMoveResizeWindow (dpy, parent, x + dx, y + dy,
1099 szHint.width, szHint.height); 1062 szHint.width, szHint.height);
1100#else 1063#else
1101 XResizeWindow (dpy, parent[0], szHint.width, szHint.height); 1064 XResizeWindow (dpy, parent, szHint.width, szHint.height);
1102#endif 1065#endif
1103 } 1066 }
1067
1068 if (set_hint)
1069 XSetWMNormalHints (dpy, parent, &szHint);
1104 1070
1105 fix_screen = ncol != prev_ncol || nrow != prev_nrow; 1071 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
1106 1072
1107 if (fix_screen || newwidth != old_width || newheight != old_height) 1073 if (fix_screen || newwidth != old_width || newheight != old_height)
1108 { 1074 {
1109 if (scrollBar.state) 1075 if (scrollBar.state)
1110 { 1076 scrollBar.resize ();
1111 XMoveResizeWindow (dpy, scrollBar.win,
1112 window_sb_x, 0,
1113 scrollbar_TotalWidth (), szHint.height);
1114 resize_scrollbar ();
1115 }
1116 1077
1117 XMoveResizeWindow (dpy, vt, 1078 XMoveResizeWindow (dpy, vt,
1118 window_vt_x, window_vt_y, 1079 window_vt_x, window_vt_y,
1119 width, height); 1080 width, height);
1120 1081
1121#ifdef HAVE_BG_PIXMAP 1082#ifdef HAVE_BG_PIXMAP
1122 if (bgPixmap.window_size_sensitive ()) 1083 if (bg_window_size_sensitive ())
1123 update_background (); 1084 update_background ();
1124#endif 1085#endif
1125
1126 scr_clear ();
1127 } 1086 }
1128 1087
1129 if (fix_screen || old_height == 0) 1088 if (fix_screen || old_height == 0)
1130 scr_reset (); 1089 scr_reset ();
1131 1090
1132 // TODO, with nvidia-8178, resizes kill the alpha channel, report if not fixed in newer version
1133 //scr_touch (false);
1134
1135#ifdef HAVE_BG_PIXMAP
1136// TODO: this don't seem to have any effect - do we still need it ? If so - in which case exactly ?
1137// if (bgPixmap.pixmap)
1138// scr_touch (false);
1139#endif
1140
1141#ifdef USE_XIM 1091#ifdef USE_XIM
1142 IMSetPosition (); 1092 im_set_position ();
1143#endif 1093#endif
1144} 1094}
1145 1095
1146/* 1096/*
1147 * Set the width/height of the vt window in characters. Units are pixels. 1097 * Set the width/height of the vt window in characters. Units are pixels.
… …
1208 status_rect.height = fheight; 1158 status_rect.height = fheight;
1209} 1159}
1210 1160
1211/* Checking whether input method is running. */ 1161/* Checking whether input method is running. */
1212bool 1162bool
1213rxvt_term::IMisRunning () 1163rxvt_term::im_is_running ()
1214{ 1164{
1215 char *p;
1216 Atom atom; 1165 Atom atom;
1217 Window win; 1166 Window win;
1218 char server[IMBUFSIZ]; 1167 char server[IMBUFSIZ];
1219 1168
1220 /* get current locale modifier */ 1169 /* get current locale modifier */
1221 if ((p = XSetLocaleModifiers (NULL)) != NULL) 1170 if (char *p = XSetLocaleModifiers (0))
1222 { 1171 {
1223 strcpy (server, "@server="); 1172 strcpy (server, "@server=");
1224 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */ 1173 strncat (server, p + 4, IMBUFSIZ - 9); /* skip "@im=" */
1225 1174
1226 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */ 1175 if (p = strchr (server + 1, '@')) /* first one only */
1227 *p = '\0'; 1176 *p = '\0';
1228 1177
1229 atom = XInternAtom (dpy, server, False); 1178 atom = XInternAtom (dpy, server, False);
1230 win = XGetSelectionOwner (dpy, atom); 1179 win = XGetSelectionOwner (dpy, atom);
1231 1180
1232 if (win != None) 1181 if (win != None)
1233 return True; 1182 return true;
1234 } 1183 }
1235 1184
1236 return False; 1185 return false;
1237} 1186}
1238 1187
1239void 1188void
1240rxvt_term::IMSendSpot () 1189rxvt_term::im_send_spot ()
1241{ 1190{
1242 XPoint nspot; 1191 XPoint nspot;
1243 XVaNestedList preedit_attr; 1192 XVaNestedList preedit_attr;
1244 1193
1245 if (!Input_Context 1194 if (!Input_Context
… …
1298 1247
1299 term->make_current (); 1248 term->make_current ();
1300 1249
1301 if (text) 1250 if (text)
1302 { 1251 {
1303 void *str; 1252 wchar_t *str;
1304 1253
1305 if (!text->encoding_is_wchar && text->string.multi_byte) 1254 if (!text->encoding_is_wchar && text->string.multi_byte)
1306 { 1255 {
1307 // of course, X makes it ugly again 1256 // of course, X makes it ugly again
1308 if (term->rs[Rs_imLocale]) 1257 if (term->rs[Rs_imLocale])
1309 SET_LOCALE (term->rs[Rs_imLocale]); 1258 SET_LOCALE (term->rs[Rs_imLocale]);
1310 1259
1311 str = rxvt_temp_buf ((text->length + 1) * sizeof (wchar_t)); 1260 str = rxvt_temp_buf<wchar_t> (text->length + 1);
1312 mbstowcs ((wchar_t *)str, text->string.multi_byte, text->length + 1); 1261 mbstowcs (str, text->string.multi_byte, text->length + 1);
1313 1262
1314 if (term->rs[Rs_imLocale]) 1263 if (term->rs[Rs_imLocale])
1315 SET_LOCALE (term->locale); 1264 SET_LOCALE (term->locale);
1316 } 1265 }
1317 else 1266 else
1318 str = (void *)text->string.wide_char; 1267 str = text->string.wide_char;
1319 1268
1320 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW, 1269 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
1321 DT_INT, call_data->caret, 1270 DT_INT, call_data->caret,
1322 DT_INT, call_data->chg_first, 1271 DT_INT, call_data->chg_first,
1323 DT_INT, call_data->chg_length, 1272 DT_INT, call_data->chg_length,
… …
1351/* 1300/*
1352 * Try to open a XIM with the current modifiers, then see if we can 1301 * Try to open a XIM with the current modifiers, then see if we can
1353 * open a suitable preedit type 1302 * open a suitable preedit type
1354 */ 1303 */
1355bool 1304bool
1356rxvt_term::IM_get_IC (const char *modifiers) 1305rxvt_term::im_get_ic (const char *modifiers)
1357{ 1306{
1358 int i, j, found; 1307 int i, j, found;
1359 XIM xim; 1308 XIM xim;
1360 XPoint spot; 1309 XPoint spot;
1361 XRectangle rect, status_rect, needed_rect; 1310 XRectangle rect, status_rect, needed_rect;
1362 unsigned long fg, bg; 1311 unsigned long fg, bg;
1363 const char *p; 1312 const char *p;
1364 char **s; 1313 char **s;
1365 XIMStyles *xim_styles; 1314 XIMStyles *xim_styles;
1366#ifdef ENABLE_XIM_ONTHESPOT
1367 XIMCallback xcb[4];
1368#endif
1369 1315
1370 set_environ (envv); 1316 set_environ (envv);
1371 1317
1372 if (! ((p = XSetLocaleModifiers (modifiers)) && *p)) 1318 if (! ((p = XSetLocaleModifiers (modifiers)) && *p))
1373 return false; 1319 return false;
… …
1394 p = pet[pi]; 1340 p = pet[pi];
1395 1341
1396 if (!p) 1342 if (!p)
1397 continue; 1343 continue;
1398 1344
1399 s = rxvt_splitcommastring (p); 1345 s = rxvt_strsplit (',', p);
1400 1346
1401 for (i = found = 0; !found && s[i]; i++) 1347 for (i = found = 0; !found && s[i]; i++)
1402 { 1348 {
1403 if (!strcmp (s[i], "OverTheSpot")) 1349 if (!strcmp (s[i], "OverTheSpot"))
1404 input_style = XIMPreeditPosition | XIMStatusNothing; 1350 input_style = XIMPreeditPosition | XIMStatusNothing;
… …
1416 input_style = XIMPreeditNothing | XIMStatusNothing; 1362 input_style = XIMPreeditNothing | XIMStatusNothing;
1417 1363
1418 for (j = 0; j < xim_styles->count_styles; j++) 1364 for (j = 0; j < xim_styles->count_styles; j++)
1419 if (input_style == xim_styles->supported_styles[j]) 1365 if (input_style == xim_styles->supported_styles[j])
1420 { 1366 {
1421 rxvt_freecommastring (s); 1367 rxvt_free_strsplit (s);
1422 1368
1423 found = 1; 1369 found = 1;
1424 goto foundpet; 1370 goto foundpet;
1425 } 1371 }
1426 1372
1427 } 1373 }
1428 1374
1429 rxvt_freecommastring (s); 1375 rxvt_free_strsplit (s);
1430 } 1376 }
1431 1377
1432foundpet: 1378foundpet:
1433 1379
1434 XFree (xim_styles); 1380 XFree (xim_styles);
… …
1513 NULL); 1459 NULL);
1514 } 1460 }
1515#if ENABLE_XIM_ONTHESPOT 1461#if ENABLE_XIM_ONTHESPOT
1516 else if (input_style & XIMPreeditCallbacks) 1462 else if (input_style & XIMPreeditCallbacks)
1517 { 1463 {
1464 XIMCallback xcb[4];
1465
1518 im_set_position (spot); 1466 im_set_position (spot);
1519 1467
1520 xcb[0].client_data = (XPointer)this; xcb[0].callback = (XIMProc)xim_preedit_start; 1468 xcb[0].client_data = (XPointer)this; xcb[0].callback = (XIMProc)xim_preedit_start;
1521 xcb[1].client_data = (XPointer)this; xcb[1].callback = (XIMProc)xim_preedit_done; 1469 xcb[1].client_data = (XPointer)this; xcb[1].callback = (XIMProc)xim_preedit_done;
1522 xcb[2].client_data = (XPointer)this; xcb[2].callback = (XIMProc)xim_preedit_draw; 1470 xcb[2].client_data = (XPointer)this; xcb[2].callback = (XIMProc)xim_preedit_draw;
… …
1537#endif 1485#endif
1538 1486
1539 Input_Context = XCreateIC (xim, 1487 Input_Context = XCreateIC (xim,
1540 XNInputStyle, input_style, 1488 XNInputStyle, input_style,
1541 XNClientWindow, vt, 1489 XNClientWindow, vt,
1542 XNFocusWindow, parent[0], 1490 XNFocusWindow, parent,
1543 preedit_attr ? XNPreeditAttributes : NULL, 1491 preedit_attr ? XNPreeditAttributes : NULL,
1544 preedit_attr, 1492 preedit_attr,
1545 status_attr ? XNStatusAttributes : NULL, 1493 status_attr ? XNStatusAttributes : NULL,
1546 status_attr, NULL); 1494 status_attr, NULL);
1547 1495
… …
1560 // unfortunately, only the focus window is used by XIM, hard to fix 1508 // unfortunately, only the focus window is used by XIM, hard to fix
1561 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL)) 1509 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL))
1562 vt_select_input (); 1510 vt_select_input ();
1563#endif 1511#endif
1564 1512
1565 IMSetPosition (); 1513 im_set_position ();
1566 1514
1567 return true; 1515 return true;
1568} 1516}
1569 1517
1570void 1518void
… …
1590 p = rs[Rs_inputMethod]; 1538 p = rs[Rs_inputMethod];
1591 if (p && *p) 1539 if (p && *p)
1592 { 1540 {
1593 bool found = false; 1541 bool found = false;
1594 1542
1595 s = rxvt_splitcommastring (p); 1543 s = rxvt_strsplit (',', p);
1596 1544
1597 for (i = 0; s[i]; i++) 1545 for (i = 0; s[i]; i++)
1598 { 1546 {
1599 if (*s[i]) 1547 if (*s[i])
1600 { 1548 {
1601 strcpy (buf, "@im="); 1549 strcpy (buf, "@im=");
1602 strncat (buf, s[i], IMBUFSIZ - 5); 1550 strncat (buf, s[i], IMBUFSIZ - 5);
1603 if (IM_get_IC (buf)) 1551 if (im_get_ic (buf))
1604 { 1552 {
1605 found = true; 1553 found = true;
1606 break; 1554 break;
1607 } 1555 }
1608 } 1556 }
1609 } 1557 }
1610 1558
1611 rxvt_freecommastring (s); 1559 rxvt_free_strsplit (s);
1612 1560
1613 if (found) 1561 if (found)
1614 goto done; 1562 goto done;
1615 } 1563 }
1616 1564
1617 /* try with XMODIFIERS env. var. */ 1565 /* try with XMODIFIERS env. var. */
1618 if (IM_get_IC ("")) 1566 if (im_get_ic (""))
1619 goto done; 1567 goto done;
1620 1568
1621 /* try with no modifiers base IF the user didn't specify an IM */ 1569 /* try with no modifiers base IF the user didn't specify an IM */
1622 if (IM_get_IC ("@im=none")) 1570 if (im_get_ic ("@im=none"))
1623 goto done; 1571 goto done;
1624 1572
1625done: 1573done:
1626#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE) 1574#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1627 if (rs[Rs_imLocale]) 1575 if (rs[Rs_imLocale])
1628 SET_LOCALE (locale); 1576 SET_LOCALE (locale);
1629#endif 1577#endif
1630} 1578}
1631 1579
1632void 1580void
1633rxvt_term::IMSetPosition () 1581rxvt_term::im_set_position ()
1634{ 1582{
1635 XRectangle preedit_rect, status_rect, *needed_rect; 1583 XRectangle preedit_rect, status_rect, *needed_rect;
1636 XVaNestedList preedit_attr, status_attr; 1584 XVaNestedList preedit_attr, status_attr;
1637 1585
1638 if (!Input_Context 1586 if (!Input_Context
1639 || !focus 1587 || !focus
1640 || !(input_style & (XIMPreeditArea | XIMPreeditPosition)) 1588 || !(input_style & (XIMPreeditArea | XIMPreeditPosition))
1641 || !IMisRunning ()) 1589 || !im_is_running ())
1642 return; 1590 return;
1643 1591
1644 if (input_style & XIMPreeditPosition) 1592 if (input_style & XIMPreeditPosition)
1645 { 1593 {
1646 im_set_size (preedit_rect); 1594 im_set_size (preedit_rect);
… …
1676 1624
1677void 1625void
1678rxvt_term::get_window_origin (int &x, int &y) 1626rxvt_term::get_window_origin (int &x, int &y)
1679{ 1627{
1680 Window cr; 1628 Window cr;
1681 XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr); 1629 XTranslateCoordinates (dpy, parent, display->root, 0, 0, &x, &y, &cr);
1682/* fprintf (stderr, "origin is %+d%+d\n", x, y);*/
1683} 1630}
1684 1631
1685Pixmap 1632Pixmap
1686rxvt_term::get_pixmap_property (int prop_id) 1633rxvt_term::get_pixmap_property (Atom property)
1687{ 1634{
1688 if (prop_id > 0 && prop_id < NUM_XA) 1635 Pixmap pixmap = None;
1689 if (xa[prop_id]) 1636
1690 {
1691 int aformat; 1637 int aformat;
1692 unsigned long nitems, bytes_after; 1638 unsigned long nitems, bytes_after;
1693 Atom atype; 1639 Atom atype;
1694 unsigned char *prop = NULL; 1640 unsigned char *prop;
1695 int result = XGetWindowProperty (dpy, display->root, xa[prop_id], 1641 int result = XGetWindowProperty (dpy, display->root, property,
1696 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 1642 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1697 &nitems, &bytes_after, &prop); 1643 &nitems, &bytes_after, &prop);
1698 if (result == Success && prop && atype == XA_PIXMAP) 1644 if (result == Success)
1645 {
1646 if (atype == XA_PIXMAP)
1699 return *(Pixmap *)prop; 1647 pixmap = *(Pixmap *)prop;
1648 XFree (prop);
1700 } 1649 }
1701 1650
1702 return None; 1651 return pixmap;
1703} 1652}
1704 1653
1705#ifdef HAVE_BG_PIXMAP 1654#ifdef HAVE_BG_PIXMAP
1706# if TRACE_PIXMAPS
1707# undef update_background
1708void
1709rxvt_term::trace_update_background (const char *file, int line)
1710{
1711 fprintf (stderr, "%s:%d:update_background()\n", file, line);
1712 update_background ();
1713}
1714# endif
1715 1655
1716void 1656void
1717rxvt_term::update_background () 1657rxvt_term::update_background ()
1718{ 1658{
1719 if (update_background_ev.is_active ()) 1659 if (update_background_ev.is_active ())
1720 return; 1660 return;
1721 1661
1722 bgPixmap.invalidate (); 1662 bg_invalidate ();
1723 1663
1664 if (!mapped)
1665 return;
1666
1724 ev_tstamp to_wait = 0.5 - (ev::now () - bgPixmap.valid_since); 1667 ev_tstamp to_wait = 0.5 - (ev::now () - bg_valid_since);
1725 1668
1726 if (to_wait <= 0.) 1669 if (to_wait <= 0.)
1727 bgPixmap.render (); 1670 bg_render ();
1728 else 1671 else
1729 update_background_ev.start (to_wait); 1672 update_background_ev.start (to_wait);
1730} 1673}
1731 1674
1732void 1675void
1733rxvt_term::update_background_cb (ev::timer &w, int revents) 1676rxvt_term::update_background_cb (ev::timer &w, int revents)
1734{ 1677{
1735 make_current (); 1678 make_current ();
1736 1679
1737 update_background_ev.stop (); 1680 update_background_ev.stop ();
1738 bgPixmap.render (); 1681 bg_render ();
1739 refresh_check (); 1682 refresh_check ();
1740} 1683}
1741 1684
1742#endif /* HAVE_BG_PIXMAP */ 1685#endif /* HAVE_BG_PIXMAP */
1743 1686

Diff Legend

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