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.302 by root, Fri Jan 25 16:04:57 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-2008 Marc Lehmann <pcg@goof.com> 16 * Copyright (c) 2003-2010 Marc Lehmann <schmorp@schmorp.de>
17 * 17 *
18 * This program is free software; you can redistribute it and/or modify 18 * This program is free software; you can redistribute it and/or modify
19 * it under the terms of the GNU General Public License as published by 19 * it under the terms of the GNU General Public License as published by
20 * the Free Software Foundation; either version 2 of the License, or 20 * the Free Software Foundation; either version 2 of the License, or
21 * (at your option) any later version. 21 * (at your option) any later version.
… …
30 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 30 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
31 *---------------------------------------------------------------------*/ 31 *---------------------------------------------------------------------*/
32 32
33#include "../config.h" /* NECESSARY */ 33#include "../config.h" /* NECESSARY */
34#include "rxvt.h" /* NECESSARY */ 34#include "rxvt.h" /* NECESSARY */
35#include "init.h"
35#include "keyboard.h" 36#include "keyboard.h"
36#include "rxvtperl.h" 37#include "rxvtperl.h"
37 38
38#include <limits> 39#include <limits>
39 40
41#include <cassert>
40#include <csignal> 42#include <csignal>
41#include <cstring> 43#include <cstring>
42 44
43#include <termios.h> 45#include <termios.h>
44 46
… …
49# ifdef HAVE_SETLOCALE 51# ifdef HAVE_SETLOCALE
50# include <clocale> 52# include <clocale>
51# endif 53# endif
52#endif 54#endif
53 55
56struct termios rxvt_term::def_tio;
54vector<rxvt_term *> rxvt_term::termlist; 57vector<rxvt_term *> rxvt_term::termlist;
55 58
56// used to tell global functions which terminal instance is "active" 59// used to tell global functions which terminal instance is "active"
57rxvt_t rxvt_current_term; 60rxvt_t rxvt_current_term;
58 61
… …
93text_t rxvt_composite_vec::compose (unicode_t c1, unicode_t c2) 96text_t rxvt_composite_vec::compose (unicode_t c1, unicode_t c2)
94{ 97{
95 compose_char *cc; 98 compose_char *cc;
96 99
97 // break compose chains, as stupid readline really likes to duplicate 100 // break compose chains, as stupid readline really likes to duplicate
98 // composing characters for some reason near the end of a line. 101 // composing characters for some reason, near the end of a line.
99 cc = (*this)[c1]; 102 cc = (*this)[c1];
100 while (cc) 103 while (cc)
101 { 104 {
102 if (cc->c2 == c2) return c1; 105 if (cc->c2 == c2) return c1;
103 cc = (*this)[cc->c1]; 106 cc = (*this)[cc->c1];
104 } 107 }
105 108
106 // check to see wether this combination already exists otherwise 109 // check to see whether this combination already exists otherwise
107 for (cc = v.end (); cc-- > v.begin (); ) 110 for (cc = v.begin (); cc < v.end (); cc++)
108 {
109 if (cc->c1 == c1 && cc->c2 == c2) 111 if (cc->c1 == c1 && cc->c2 == c2)
110 return COMPOSE_LO + (cc - v.begin ()); 112 return COMPOSE_LO + (cc - v.begin ());
111 }
112 113
113 // allocate a new combination 114 // allocate a new combination
114 if (v.size () == COMPOSE_HI - COMPOSE_LO + 1) 115 if (v.size () == COMPOSE_HI - COMPOSE_LO + 1)
115 { 116 {
116 static int seen; 117 static int seen;
117 118
118 if (!seen++) 119 if (!seen++)
119 fprintf (stderr, "too many unrepresentable composite characters, try --enable-unicode3\n"); 120 rxvt_warn ("too many unrepresentable composite characters, try --enable-unicode3\n");
120 121
121 return REPLACEMENT_CHAR; 122 return REPLACEMENT_CHAR;
122 } 123 }
123 124
124 v.push_back (compose_char (c1, c2)); 125 v.push_back (compose_char (c1, c2));
… …
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
… …
227 delete fontset[i]; 225 delete fontset[i];
228#endif 226#endif
229 delete fontset[0]; 227 delete fontset[0];
230 228
231#ifdef HAVE_BG_PIXMAP 229#ifdef HAVE_BG_PIXMAP
232 bgPixmap.destroy (); 230 bg_destroy ();
233#endif 231#endif
234 232
235 if (display) 233 if (display)
236 { 234 {
237 selection_clear (); 235 selection_clear ();
236 selection_clear (true);
238 237
239#ifdef USE_XIM 238#ifdef USE_XIM
240 im_destroy (); 239 im_destroy ();
241#endif 240#endif
242#ifdef XTERM_SCROLLBAR 241 scrollBar.destroy ();
243 if (xscrollbarGC) XFreeGC (dpy, xscrollbarGC);
244 if (ShadowGC) XFreeGC (dpy, ShadowGC);
245#endif
246#ifdef PLAIN_SCROLLBAR
247 if (pscrollbarGC) XFreeGC (dpy, pscrollbarGC);
248#endif
249#ifdef NEXT_SCROLLBAR
250 if (blackGC) XFreeGC (dpy, blackGC);
251 if (whiteGC) XFreeGC (dpy, whiteGC);
252 if (grayGC) XFreeGC (dpy, grayGC);
253 if (darkGC) XFreeGC (dpy, darkGC);
254 if (stippleGC) XFreeGC (dpy, stippleGC);
255 if (dimple) XFreePixmap (dpy, dimple);
256 if (upArrow) XFreePixmap (dpy, upArrow);
257 if (downArrow) XFreePixmap (dpy, downArrow);
258 if (upArrowHi) XFreePixmap (dpy, upArrowHi);
259 if (downArrowHi) XFreePixmap (dpy, downArrowHi);
260#endif
261#ifdef RXVT_SCROLLBAR
262 if (topShadowGC) XFreeGC (dpy, topShadowGC);
263 if (botShadowGC) XFreeGC (dpy, botShadowGC);
264 if (scrollbarGC) XFreeGC (dpy, scrollbarGC);
265#endif
266 if (gc) XFreeGC (dpy, gc); 242 if (gc) XFreeGC (dpy, gc);
267 243
268 delete drawable; 244 delete drawable;
269 // destroy all windows 245 // destroy all windows
270 if (parent[0]) 246 if (parent)
271 XDestroyWindow (dpy, parent[0]); 247 XDestroyWindow (dpy, parent);
272 248
273 for (int i = 0; i < TOTAL_COLORS; i++) 249 for (int i = 0; i < TOTAL_COLORS; i++)
274 if (ISSET_PIXCOLOR (i)) 250 if (ISSET_PIXCOLOR (i))
275 { 251 {
276 pix_colors_focused [i].free (this); 252 pix_colors_focused [i].free (this);
… …
290 /* clear all resources */ 266 /* clear all resources */
291 for (int i = 0; i < allocated.size (); i++) 267 for (int i = 0; i < allocated.size (); i++)
292 free (allocated [i]); 268 free (allocated [i]);
293 269
294 free (selection.text); 270 free (selection.text);
295 // TODO: manage env vars in child only(!) 271 free (selection.clip_text);
296 free (env_display);
297 free (env_term);
298 free (locale); 272 free (locale);
299 free (v_buffer); 273 free (v_buffer);
300 free (incr_buf); 274
275 delete selection_req;
301 276
302 delete envv; 277 delete envv;
303 delete argv; 278 delete argv;
304 279
305#ifdef KEYSYM_RESOURCE 280#ifdef KEYSYM_RESOURCE
… …
337 if (display) 312 if (display)
338 { 313 {
339#if USE_XIM 314#if USE_XIM
340 im_ev.stop (display); 315 im_ev.stop (display);
341#endif 316#endif
342#if HAVE_SCROLLBARS
343 scrollbar_ev.stop (display); 317 scrollbar_ev.stop (display);
344#endif
345#if ENABLE_TRANSPARENCY || ENABLE_PERL 318#if ENABLE_TRANSPARENCY || ENABLE_PERL
346 rootwin_ev.stop (display); 319 rootwin_ev.stop (display);
347#endif 320#endif
348 incr_ev.stop ();
349 termwin_ev.stop (display); 321 termwin_ev.stop (display);
350 vt_ev.stop (display); 322 vt_ev.stop (display);
351 } 323 }
352 324
353 flush_ev.stop (); 325 flush_ev.stop ();
… …
375rxvt_term::destroy_cb (ev::idle &w, int revents) 347rxvt_term::destroy_cb (ev::idle &w, int revents)
376{ 348{
377 make_current (); 349 make_current ();
378 350
379 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);
380} 364}
381 365
382/*----------------------------------------------------------------------*/ 366/*----------------------------------------------------------------------*/
383/* 367/*
384 * Exit gracefully, clearing the utmp entry and restoring tty attributes 368 * Exit gracefully, clearing the utmp entry and restoring tty attributes
… …
398print_x_error (Display *dpy, XErrorEvent *event) 382print_x_error (Display *dpy, XErrorEvent *event)
399{ 383{
400 char buffer[BUFSIZ]; 384 char buffer[BUFSIZ];
401 char mesg[BUFSIZ]; 385 char mesg[BUFSIZ];
402 char number[32]; 386 char number[32];
403 char *mtype = "XlibMessage"; 387 const char mtype[] = "XlibMessage";
404 XGetErrorText(dpy, event->error_code, buffer, BUFSIZ); 388 XGetErrorText(dpy, event->error_code, buffer, BUFSIZ);
405 XGetErrorDatabaseText(dpy, mtype, "XError", "X Error", mesg, BUFSIZ); 389 XGetErrorDatabaseText(dpy, mtype, "XError", "X Error", mesg, BUFSIZ);
406 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");
407 rxvt_warn ("%s: %s\n", mesg, buffer); 391 rxvt_warn ("%s: %s\n", mesg, buffer);
408 XGetErrorDatabaseText(dpy, mtype, "MajorCode", "Request Major code %d", mesg, BUFSIZ); 392 XGetErrorDatabaseText(dpy, mtype, "MajorCode", "Request Major code %d", mesg, BUFSIZ);
409 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->request_code); 393 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->request_code);
410 sprintf(number, "%d", event->request_code); 394 sprintf(number, "%d", event->request_code);
411 XGetErrorDatabaseText(dpy, "XRequest", number, "", buffer, BUFSIZ); 395 XGetErrorDatabaseText(dpy, "XRequest", number, "", buffer, BUFSIZ);
412 rxvt_warn ("(which is %s)\n", buffer); 396 rxvt_warn ("(which is %s)\n", buffer);
413 if (event->request_code >= 128) { 397 if (event->request_code >= 128) {
414 XGetErrorDatabaseText(dpy, mtype, "MinorCode", "Request Minor code %d", 398 XGetErrorDatabaseText(dpy, mtype, "MinorCode", "Request Minor code %d",
415 mesg, BUFSIZ); 399 mesg, BUFSIZ);
416 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->minor_code); 400 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->minor_code);
417 } 401 }
418 if ((event->error_code == BadWindow) || 402 if ((event->error_code == BadWindow) ||
419 (event->error_code == BadPixmap) || 403 (event->error_code == BadPixmap) ||
420 (event->error_code == BadCursor) || 404 (event->error_code == BadCursor) ||
421 (event->error_code == BadFont) || 405 (event->error_code == BadFont) ||
422 (event->error_code == BadDrawable) || 406 (event->error_code == BadDrawable) ||
423 (event->error_code == BadColor) || 407 (event->error_code == BadColor) ||
424 (event->error_code == BadGC) || 408 (event->error_code == BadGC) ||
425 (event->error_code == BadIDChoice) || 409 (event->error_code == BadIDChoice) ||
426 (event->error_code == BadValue) || 410 (event->error_code == BadValue) ||
427 (event->error_code == BadAtom)) { 411 (event->error_code == BadAtom)) {
428 if (event->error_code == BadValue) 412 if (event->error_code == BadValue)
429 XGetErrorDatabaseText(dpy, mtype, "Value", "Value 0x%x", 413 XGetErrorDatabaseText(dpy, mtype, "Value", "Value 0x%x",
430 mesg, BUFSIZ); 414 mesg, BUFSIZ);
431 else if (event->error_code == BadAtom) 415 else if (event->error_code == BadAtom)
432 XGetErrorDatabaseText(dpy, mtype, "AtomID", "AtomID 0x%x", 416 XGetErrorDatabaseText(dpy, mtype, "AtomID", "AtomID 0x%x",
433 mesg, BUFSIZ); 417 mesg, BUFSIZ);
434 else 418 else
435 XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x", 419 XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x",
436 mesg, BUFSIZ); 420 mesg, BUFSIZ);
437 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid); 421 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid);
438 } 422 }
439 XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d", 423 XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d",
440 mesg, BUFSIZ); 424 mesg, BUFSIZ);
441 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial); 425 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial);
442} 426}
443#endif 427#endif
444 428
445int 429int
… …
492 rxvt_emergency_cleanup (); 476 rxvt_emergency_cleanup ();
493 w.stop (); 477 w.stop ();
494 kill (getpid (), w.signum); 478 kill (getpid (), w.signum);
495} 479}
496 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
497char **rxvt_environ; // startup environment 548char **rxvt_environ; // startup environment
498 549
499void 550void
500rxvt_init () 551rxvt_init ()
501{ 552{
502 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))));
503 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
504 if (!ev_default_loop (0)) 562 if (!ev_default_loop ())
505 rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n"); 563 rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n");
506 564
507 rxvt_environ = environ; 565 rxvt_environ = environ;
508 566
509 signal (SIGHUP, SIG_IGN); 567 signal (SIGHUP, SIG_IGN);
510 signal (SIGPIPE, SIG_IGN); 568 signal (SIGPIPE, SIG_IGN);
511 569
512 sig_handlers.sw_term.start (SIGTERM); ev_unref (); 570 sig_handlers.sw_term.start (SIGTERM); ev_unref ();
513 sig_handlers.sw_int.start (SIGINT); ev_unref (); 571 sig_handlers.sw_int.start (SIGINT); ev_unref ();
514
515 /* need to trap SIGURG for SVR4 (Unixware) rlogin */
516 /* signal (SIGURG, SIG_DFL); */
517 572
518 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); 573 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
519 // TODO: handle this with exceptions and tolerate the memory loss 574 // TODO: handle this with exceptions and tolerate the memory loss
520 XSetIOErrorHandler (rxvt_xioerror_handler); 575 XSetIOErrorHandler (rxvt_xioerror_handler);
521 576
… …
529 */ 584 */
530void 585void
531rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight) 586rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
532{ 587{
533 short recalc_x, recalc_y; 588 short recalc_x, recalc_y;
534 int x, y, sb_w, flags; 589 int x, y, flags;
535 unsigned int w, h; 590 unsigned int w, h;
536 unsigned int max_width, max_height; 591 unsigned int max_width, max_height;
537 592
538 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity; 593 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity;
539 szHint.win_gravity = NorthWestGravity; 594 szHint.win_gravity = NorthWestGravity;
… …
549 if (rs[Rs_geometry]) 604 if (rs[Rs_geometry])
550 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h); 605 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h);
551 606
552 if (flags & WidthValue) 607 if (flags & WidthValue)
553 { 608 {
609 if (!w)
610 rxvt_fatal ("illegal window geometry (width and height must be non-zero), aborting.\n");
611
554 ncol = clamp (w, 0, std::numeric_limits<int16_t>::max ()); 612 ncol = clamp (w, 1, std::numeric_limits<int16_t>::max ());
555 szHint.flags |= USSize; 613 szHint.flags |= USSize;
556 } 614 }
557 615
558 if (flags & HeightValue) 616 if (flags & HeightValue)
559 { 617 {
618 if (!h)
619 rxvt_fatal ("illegal window geometry (width and height must be non-zero), aborting.\n");
620
560 nrow = clamp (h, 0, std::numeric_limits<int16_t>::max ()); 621 nrow = clamp (h, 1, std::numeric_limits<int16_t>::max ());
561 szHint.flags |= USSize; 622 szHint.flags |= USSize;
562 } 623 }
563 624
564 if (flags & XValue) 625 if (flags & XValue)
565 { 626 {
… …
596 max_width = MAX_COLS * fwidth; 657 max_width = MAX_COLS * fwidth;
597 max_height = MAX_ROWS * fheight; 658 max_height = MAX_ROWS * fheight;
598 659
599 szHint.base_width = szHint.base_height = 2 * int_bwidth; 660 szHint.base_width = szHint.base_height = 2 * int_bwidth;
600 661
601 sb_w = 0;
602 window_vt_x = window_vt_y = int_bwidth; 662 window_vt_x = window_vt_y = int_bwidth;
603 663
604 if (scrollBar.state) 664 if (scrollBar.state)
605 { 665 {
606 sb_w = scrollbar_TotalWidth (); 666 int sb_w = scrollBar.total_width ();
607 szHint.base_width += sb_w; 667 szHint.base_width += sb_w;
608 668
609 if (!option (Opt_scrollBar_right)) 669 if (!option (Opt_scrollBar_right))
610 window_vt_x += sb_w; 670 window_vt_x += sb_w;
611 } 671 }
… …
635 { 695 {
636 min_it (height, max_height); 696 min_it (height, max_height);
637 szHint.height = szHint.base_height + height; 697 szHint.height = szHint.base_height + height;
638 } 698 }
639 699
640 if (scrollBar.state && option (Opt_scrollBar_right))
641 window_sb_x = szHint.width - sb_w;
642
643 if (recalc_x) 700 if (recalc_x)
644 szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth; 701 szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth;
645 702
646 if (recalc_y) 703 if (recalc_y)
647 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth; 704 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth;
648 705
649 ncol = width / fwidth; 706 ncol = width / fwidth;
650 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;
651} 717}
652 718
653/*----------------------------------------------------------------------*/ 719/*----------------------------------------------------------------------*/
654/* 720/*
655 * Tell the teletype handler what size the window is. 721 * Tell the teletype handler what size the window is.
… …
665 731
666 ws.ws_col = ncol; 732 ws.ws_col = ncol;
667 ws.ws_row = nrow; 733 ws.ws_row = nrow;
668 ws.ws_xpixel = width; 734 ws.ws_xpixel = width;
669 ws.ws_ypixel = height; 735 ws.ws_ypixel = height;
670 (void)ioctl (pty->pty, TIOCSWINSZ, &ws); 736 ioctl (pty->pty, TIOCSWINSZ, &ws);
671 737
672#if 0 738#if 0
673 // TIOCSWINSZ is supposed to do this automatically and correctly 739 // TIOCSWINSZ is supposed to do this automatically and correctly
674 if (cmd_pid) /* force through to the command */ 740 if (cmd_pid) /* force through to the command */
675 kill (-cmd_pid, SIGWINCH); 741 kill (-cmd_pid, SIGWINCH);
676#endif 742#endif
677} 743}
678 744
679/*----------------------------------------------------------------------*/ 745/*----------------------------------------------------------------------*/
680/* set_fonts () - load and set the various fonts 746/* load and set the various fonts */
681 *
682 * init = 1 - initialize
683 *
684 * fontname == FONT_UP - switch to bigger font
685 * fontname == FONT_DN - switch to smaller font
686 */
687bool 747bool
688rxvt_term::set_fonts () 748rxvt_term::set_fonts ()
689{ 749{
690 rxvt_fontset *fs = new rxvt_fontset (this); 750 rxvt_fontset *fs = new rxvt_fontset (this);
691 rxvt_fontprop prop; 751 rxvt_fontprop prop;
… …
705#endif 765#endif
706 766
707 delete fontset[0]; 767 delete fontset[0];
708 fontset[0] = fs; 768 fontset[0] = fs;
709 769
710 prop = (*fs)[1]->properties (); 770 prop = (*fs)[rxvt_fontset::firstFont]->properties ();
711 prop.height += lineSpace; 771 prop.height += lineSpace;
772 prop.width += letterSpace;
712 773
713 fs->set_prop (prop, false); 774 fs->set_prop (prop, false);
714 775
715 fwidth = prop.width; 776 fwidth = prop.width;
716 fheight = prop.height; 777 fheight = prop.height;
… …
747#else 808#else
748 fontset[style] = fontset[0]; 809 fontset[style] = fontset[0];
749#endif 810#endif
750 } 811 }
751 812
752 if (parent[0]) 813 if (parent)
753 { 814 {
754 resize_all_windows (0, 0, 0); 815 resize_all_windows (0, 0, 0);
755 scr_remap_chars (); 816 scr_remap_chars ();
756 scr_touch (true); 817 scr_touch (true);
757 } 818 }
… …
760} 821}
761 822
762void 823void
763rxvt_term::set_string_property (Atom prop, const char *str, int len) 824rxvt_term::set_string_property (Atom prop, const char *str, int len)
764{ 825{
765 XChangeProperty (dpy, parent[0], 826 XChangeProperty (dpy, parent,
766 prop, XA_STRING, 8, PropModeReplace, 827 prop, XA_STRING, 8, PropModeReplace,
767 (const unsigned char *)str, len >= 0 ? len : strlen (str)); 828 (const unsigned char *)str, len >= 0 ? len : strlen (str));
768} 829}
769 830
770void 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
771rxvt_term::set_utf8_property (Atom prop, const char *str, int len) 844rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
772{ 845{
773 wchar_t *ws = rxvt_mbstowcs (str, len); 846 wchar_t *ws = rxvt_mbstowcs (str, len);
774 char *s = rxvt_wcstoutf8 (ws); 847 char *s = rxvt_wcstoutf8 (ws);
775 848
776 XChangeProperty (dpy, parent[0], 849 XChangeProperty (dpy, parent,
777 prop, xa[XA_UTF8_STRING], 8, PropModeReplace, 850 prop, xa[XA_UTF8_STRING], 8, PropModeReplace,
778 (const unsigned char *)s, strlen (s)); 851 (const unsigned char *)s, strlen (s));
779 852
780 free (s); 853 free (s);
781 free (ws); 854 free (ws);
… …
785/*----------------------------------------------------------------------*/ 858/*----------------------------------------------------------------------*/
786/* xterm sequences - title, iconName, color (exptl) */ 859/* xterm sequences - title, iconName, color (exptl) */
787void 860void
788rxvt_term::set_title (const char *str) 861rxvt_term::set_title (const char *str)
789{ 862{
790 set_string_property (XA_WM_NAME, str); 863 set_mbstring_property (XA_WM_NAME, str);
791#if ENABLE_EWMH 864#if ENABLE_EWMH
792 set_utf8_property (xa[XA_NET_WM_NAME], str); 865 set_utf8_property (xa[XA_NET_WM_NAME], str);
793#endif 866#endif
794} 867}
795 868
796void 869void
797rxvt_term::set_icon_name (const char *str) 870rxvt_term::set_icon_name (const char *str)
798{ 871{
799 set_string_property (XA_WM_ICON_NAME, str); 872 set_mbstring_property (XA_WM_ICON_NAME, str);
800#if ENABLE_EWMH 873#if ENABLE_EWMH
801 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str); 874 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str);
802#endif 875#endif
803} 876}
804 877
805void 878void
806rxvt_term::set_window_color (int idx, const char *color) 879rxvt_term::set_window_color (int idx, const char *color)
807{ 880{
808#ifdef XTERM_COLOR_CHANGE 881#ifdef XTERM_COLOR_CHANGE
809 rxvt_color xcol; 882 rxvt_color xcol;
810 int i;
811 883
812 if (color == NULL || *color == '\0') 884 if (color == NULL || *color == '\0')
813 return; 885 return;
814 886
815 color = strdup (color); 887 color = strdup (color);
… …
817 rs[Rs_color + idx] = color; 889 rs[Rs_color + idx] = color;
818 890
819 /* handle color aliases */ 891 /* handle color aliases */
820 if (isdigit (*color)) 892 if (isdigit (*color))
821 { 893 {
822 i = atoi (color); 894 int i = atoi (color);
823 895
824 if (i >= 8 && i <= 15) 896 if (i >= 8 && i <= 15)
825 { 897 {
826 /* bright colors */ 898 /* bright colors */
827 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i - 8]; 899 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i - 8];
… …
872 944
873/*----------------------------------------------------------------------*/ 945/*----------------------------------------------------------------------*/
874/* 946/*
875 * 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
876 */ 948 */
877void 949char *
878rxvt_term::set_colorfgbg () 950rxvt_term::get_colorfgbg ()
879{ 951{
880 unsigned int i; 952 unsigned int i;
881 const char *xpmb = ""; 953 const char *xpmb = "";
882 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1]; 954 char fstr[] = "default";
955 char bstr[] = "default";
956 char *env_colorfgbg;
883 957
884 strcpy (fstr, "default");
885 strcpy (bstr, "default");
886 for (i = Color_Black; i <= Color_White; i++) 958 for (i = Color_Black; i <= Color_White; i++)
887 if (pix_colors[Color_fg] == pix_colors[i]) 959 if (pix_colors[Color_fg] == pix_colors[i])
888 { 960 {
889 sprintf (fstr, "%d", (i - Color_Black)); 961 sprintf (fstr, "%d", i - Color_Black);
890 break; 962 break;
891 } 963 }
892 964
893 for (i = Color_Black; i <= Color_White; i++) 965 for (i = Color_Black; i <= Color_White; i++)
894 if (pix_colors[Color_bg] == pix_colors[i]) 966 if (pix_colors[Color_bg] == pix_colors[i])
895 { 967 {
896 sprintf (bstr, "%d", (i - Color_Black)); 968 sprintf (bstr, "%d", i - Color_Black);
897#ifdef BG_IMAGE_FROM_FILE 969#ifdef BG_IMAGE_FROM_FILE
898 xpmb = "default;"; 970 xpmb = "default;";
899#endif 971#endif
900 break; 972 break;
901 } 973 }
902 974
975 env_colorfgbg = (char *)rxvt_malloc (sizeof ("COLORFGBG=default;default;bg"));
903 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;
904} 978}
905 979
906/*----------------------------------------------------------------------*/ 980/*----------------------------------------------------------------------*/
907 981
908bool 982bool
… …
931 int old_width = szHint.width; 1005 int old_width = szHint.width;
932 int old_height = szHint.height; 1006 int old_height = szHint.height;
933 1007
934 window_calc (newwidth, newheight); 1008 window_calc (newwidth, newheight);
935 1009
936 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);
937 XSetWMNormalHints (dpy, parent[0], &szHint); 1016 XSetWMNormalHints (dpy, parent, &szHint);
1017 szHint.flags |= PBaseSize | PResizeInc;
1018 }
938 1019
939 if (!ignoreparent) 1020 if (!ignoreparent)
940 { 1021 {
941#ifdef SMART_RESIZE 1022#ifdef SMART_RESIZE
942 /* 1023 /*
… …
946 int x, y, x1, y1; 1027 int x, y, x1, y1;
947 int dx, dy; 1028 int dx, dy;
948 unsigned int unused_w1, unused_h1, unused_b1, unused_d1; 1029 unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
949 Window unused_cr; 1030 Window unused_cr;
950 1031
951 XTranslateCoordinates (dpy, parent[0], display->root, 1032 XTranslateCoordinates (dpy, parent, display->root,
952 0, 0, &x, &y, &unused_cr); 1033 0, 0, &x, &y, &unused_cr);
953 XGetGeometry (dpy, parent[0], &unused_cr, &x1, &y1, 1034 XGetGeometry (dpy, parent, &unused_cr, &x1, &y1,
954 &unused_w1, &unused_h1, &unused_b1, &unused_d1); 1035 &unused_w1, &unused_h1, &unused_b1, &unused_d1);
955 /* 1036 /*
956 * 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
957 * our position for handles and decorations. Counter it 1038 * our position for handles and decorations. Counter it
958 */ 1039 */
… …
975 if (y < y1) /* top half */ 1056 if (y < y1) /* top half */
976 dy = 0; 1057 dy = 0;
977 else if (y == y1) /* exact center */ 1058 else if (y == y1) /* exact center */
978 dy /= 2; 1059 dy /= 2;
979 1060
980 XMoveResizeWindow (dpy, parent[0], x + dx, y + dy, 1061 XMoveResizeWindow (dpy, parent, x + dx, y + dy,
981 szHint.width, szHint.height); 1062 szHint.width, szHint.height);
982#else 1063#else
983 XResizeWindow (dpy, parent[0], szHint.width, szHint.height); 1064 XResizeWindow (dpy, parent, szHint.width, szHint.height);
984#endif 1065#endif
985 } 1066 }
1067
1068 if (set_hint)
1069 XSetWMNormalHints (dpy, parent, &szHint);
986 1070
987 fix_screen = ncol != prev_ncol || nrow != prev_nrow; 1071 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
988 1072
989 if (fix_screen || newwidth != old_width || newheight != old_height) 1073 if (fix_screen || newwidth != old_width || newheight != old_height)
990 { 1074 {
991 if (scrollBar.state) 1075 if (scrollBar.state)
992 { 1076 scrollBar.resize ();
993 XMoveResizeWindow (dpy, scrollBar.win,
994 window_sb_x, 0,
995 scrollbar_TotalWidth (), szHint.height);
996 resize_scrollbar ();
997 }
998 1077
999 XMoveResizeWindow (dpy, vt, 1078 XMoveResizeWindow (dpy, vt,
1000 window_vt_x, window_vt_y, 1079 window_vt_x, window_vt_y,
1001 width, height); 1080 width, height);
1002 1081
1003#ifdef HAVE_BG_PIXMAP 1082#ifdef HAVE_BG_PIXMAP
1004 if (bgPixmap.window_size_sensitive ()) 1083 if (bg_window_size_sensitive ())
1005 update_background (); 1084 update_background ();
1006#endif 1085#endif
1007
1008 scr_clear ();
1009 } 1086 }
1010 1087
1011 if (fix_screen || old_height == 0) 1088 if (fix_screen || old_height == 0)
1012 scr_reset (); 1089 scr_reset ();
1013 1090
1014 // TODO, with nvidia-8178, resizes kill the alpha channel, report if not fixed in newer version
1015 //scr_touch (false);
1016
1017#ifdef HAVE_BG_PIXMAP
1018// TODO: this don't seem to have any effect - do we still need it ? If so - in which case exactly ?
1019// if (bgPixmap.pixmap)
1020// scr_touch (false);
1021#endif
1022
1023#ifdef USE_XIM 1091#ifdef USE_XIM
1024 IMSetPosition (); 1092 im_set_position ();
1025#endif 1093#endif
1026} 1094}
1027 1095
1028/* 1096/*
1029 * 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.
… …
1090 status_rect.height = fheight; 1158 status_rect.height = fheight;
1091} 1159}
1092 1160
1093/* Checking whether input method is running. */ 1161/* Checking whether input method is running. */
1094bool 1162bool
1095rxvt_term::IMisRunning () 1163rxvt_term::im_is_running ()
1096{ 1164{
1097 char *p;
1098 Atom atom; 1165 Atom atom;
1099 Window win; 1166 Window win;
1100 char server[IMBUFSIZ]; 1167 char server[IMBUFSIZ];
1101 1168
1102 /* get current locale modifier */ 1169 /* get current locale modifier */
1103 if ((p = XSetLocaleModifiers (NULL)) != NULL) 1170 if (char *p = XSetLocaleModifiers (0))
1104 { 1171 {
1105 strcpy (server, "@server="); 1172 strcpy (server, "@server=");
1106 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */ 1173 strncat (server, p + 4, IMBUFSIZ - 9); /* skip "@im=" */
1107 1174
1108 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */ 1175 if (p = strchr (server + 1, '@')) /* first one only */
1109 *p = '\0'; 1176 *p = '\0';
1110 1177
1111 atom = XInternAtom (dpy, server, False); 1178 atom = XInternAtom (dpy, server, False);
1112 win = XGetSelectionOwner (dpy, atom); 1179 win = XGetSelectionOwner (dpy, atom);
1113 1180
1114 if (win != None) 1181 if (win != None)
1115 return True; 1182 return true;
1116 } 1183 }
1117 1184
1118 return False; 1185 return false;
1119} 1186}
1120 1187
1121void 1188void
1122rxvt_term::IMSendSpot () 1189rxvt_term::im_send_spot ()
1123{ 1190{
1124 XPoint nspot; 1191 XPoint nspot;
1125 XVaNestedList preedit_attr; 1192 XVaNestedList preedit_attr;
1126 1193
1127 if (!Input_Context 1194 if (!Input_Context
… …
1180 1247
1181 term->make_current (); 1248 term->make_current ();
1182 1249
1183 if (text) 1250 if (text)
1184 { 1251 {
1185 void *str; 1252 wchar_t *str;
1186 1253
1187 if (!text->encoding_is_wchar && text->string.multi_byte) 1254 if (!text->encoding_is_wchar && text->string.multi_byte)
1188 { 1255 {
1189 // of course, X makes it ugly again 1256 // of course, X makes it ugly again
1190 if (term->rs[Rs_imLocale]) 1257 if (term->rs[Rs_imLocale])
1191 SET_LOCALE (term->rs[Rs_imLocale]); 1258 SET_LOCALE (term->rs[Rs_imLocale]);
1192 1259
1193 str = rxvt_temp_buf ((text->length + 1) * sizeof (wchar_t)); 1260 str = rxvt_temp_buf<wchar_t> (text->length + 1);
1194 mbstowcs ((wchar_t *)str, text->string.multi_byte, text->length + 1); 1261 mbstowcs (str, text->string.multi_byte, text->length + 1);
1195 1262
1196 if (term->rs[Rs_imLocale]) 1263 if (term->rs[Rs_imLocale])
1197 SET_LOCALE (term->locale); 1264 SET_LOCALE (term->locale);
1198 } 1265 }
1199 else 1266 else
1200 str = (void *)text->string.wide_char; 1267 str = text->string.wide_char;
1201 1268
1202 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW, 1269 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
1203 DT_INT, call_data->caret, 1270 DT_INT, call_data->caret,
1204 DT_INT, call_data->chg_first, 1271 DT_INT, call_data->chg_first,
1205 DT_INT, call_data->chg_length, 1272 DT_INT, call_data->chg_length,
… …
1233/* 1300/*
1234 * 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
1235 * open a suitable preedit type 1302 * open a suitable preedit type
1236 */ 1303 */
1237bool 1304bool
1238rxvt_term::IM_get_IC (const char *modifiers) 1305rxvt_term::im_get_ic (const char *modifiers)
1239{ 1306{
1240 int i, j, found; 1307 int i, j, found;
1241 XIM xim; 1308 XIM xim;
1242 XPoint spot; 1309 XPoint spot;
1243 XRectangle rect, status_rect, needed_rect; 1310 XRectangle rect, status_rect, needed_rect;
1244 unsigned long fg, bg; 1311 unsigned long fg, bg;
1245 const char *p; 1312 const char *p;
1246 char **s; 1313 char **s;
1247 XIMStyles *xim_styles; 1314 XIMStyles *xim_styles;
1248#ifdef ENABLE_XIM_ONTHESPOT
1249 XIMCallback xcb[4];
1250#endif
1251 1315
1252 set_environ (envv); 1316 set_environ (envv);
1253 1317
1254 if (! ((p = XSetLocaleModifiers (modifiers)) && *p)) 1318 if (! ((p = XSetLocaleModifiers (modifiers)) && *p))
1255 return false; 1319 return false;
… …
1276 p = pet[pi]; 1340 p = pet[pi];
1277 1341
1278 if (!p) 1342 if (!p)
1279 continue; 1343 continue;
1280 1344
1281 s = rxvt_splitcommastring (p); 1345 s = rxvt_strsplit (',', p);
1282 1346
1283 for (i = found = 0; !found && s[i]; i++) 1347 for (i = found = 0; !found && s[i]; i++)
1284 { 1348 {
1285 if (!strcmp (s[i], "OverTheSpot")) 1349 if (!strcmp (s[i], "OverTheSpot"))
1286 input_style = XIMPreeditPosition | XIMStatusNothing; 1350 input_style = XIMPreeditPosition | XIMStatusNothing;
… …
1298 input_style = XIMPreeditNothing | XIMStatusNothing; 1362 input_style = XIMPreeditNothing | XIMStatusNothing;
1299 1363
1300 for (j = 0; j < xim_styles->count_styles; j++) 1364 for (j = 0; j < xim_styles->count_styles; j++)
1301 if (input_style == xim_styles->supported_styles[j]) 1365 if (input_style == xim_styles->supported_styles[j])
1302 { 1366 {
1303 rxvt_freecommastring (s); 1367 rxvt_free_strsplit (s);
1304 1368
1305 found = 1; 1369 found = 1;
1306 goto foundpet; 1370 goto foundpet;
1307 } 1371 }
1308 1372
1309 } 1373 }
1310 1374
1311 rxvt_freecommastring (s); 1375 rxvt_free_strsplit (s);
1312 } 1376 }
1313 1377
1314foundpet: 1378foundpet:
1315 1379
1316 XFree (xim_styles); 1380 XFree (xim_styles);
… …
1395 NULL); 1459 NULL);
1396 } 1460 }
1397#if ENABLE_XIM_ONTHESPOT 1461#if ENABLE_XIM_ONTHESPOT
1398 else if (input_style & XIMPreeditCallbacks) 1462 else if (input_style & XIMPreeditCallbacks)
1399 { 1463 {
1464 XIMCallback xcb[4];
1465
1400 im_set_position (spot); 1466 im_set_position (spot);
1401 1467
1402 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;
1403 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;
1404 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;
… …
1419#endif 1485#endif
1420 1486
1421 Input_Context = XCreateIC (xim, 1487 Input_Context = XCreateIC (xim,
1422 XNInputStyle, input_style, 1488 XNInputStyle, input_style,
1423 XNClientWindow, vt, 1489 XNClientWindow, vt,
1424 XNFocusWindow, parent[0], 1490 XNFocusWindow, parent,
1425 preedit_attr ? XNPreeditAttributes : NULL, 1491 preedit_attr ? XNPreeditAttributes : NULL,
1426 preedit_attr, 1492 preedit_attr,
1427 status_attr ? XNStatusAttributes : NULL, 1493 status_attr ? XNStatusAttributes : NULL,
1428 status_attr, NULL); 1494 status_attr, NULL);
1429 1495
… …
1442 // 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
1443 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL)) 1509 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL))
1444 vt_select_input (); 1510 vt_select_input ();
1445#endif 1511#endif
1446 1512
1447 IMSetPosition (); 1513 im_set_position ();
1448 1514
1449 return true; 1515 return true;
1450} 1516}
1451 1517
1452void 1518void
… …
1472 p = rs[Rs_inputMethod]; 1538 p = rs[Rs_inputMethod];
1473 if (p && *p) 1539 if (p && *p)
1474 { 1540 {
1475 bool found = false; 1541 bool found = false;
1476 1542
1477 s = rxvt_splitcommastring (p); 1543 s = rxvt_strsplit (',', p);
1478 1544
1479 for (i = 0; s[i]; i++) 1545 for (i = 0; s[i]; i++)
1480 { 1546 {
1481 if (*s[i]) 1547 if (*s[i])
1482 { 1548 {
1483 strcpy (buf, "@im="); 1549 strcpy (buf, "@im=");
1484 strncat (buf, s[i], IMBUFSIZ - 5); 1550 strncat (buf, s[i], IMBUFSIZ - 5);
1485 if (IM_get_IC (buf)) 1551 if (im_get_ic (buf))
1486 { 1552 {
1487 found = true; 1553 found = true;
1488 break; 1554 break;
1489 } 1555 }
1490 } 1556 }
1491 } 1557 }
1492 1558
1493 rxvt_freecommastring (s); 1559 rxvt_free_strsplit (s);
1494 1560
1495 if (found) 1561 if (found)
1496 goto done; 1562 goto done;
1497 } 1563 }
1498 1564
1499 /* try with XMODIFIERS env. var. */ 1565 /* try with XMODIFIERS env. var. */
1500 if (IM_get_IC ("")) 1566 if (im_get_ic (""))
1501 goto done; 1567 goto done;
1502 1568
1503 /* 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 */
1504 if (IM_get_IC ("@im=none")) 1570 if (im_get_ic ("@im=none"))
1505 goto done; 1571 goto done;
1506 1572
1507done: 1573done:
1508#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE) 1574#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1509 if (rs[Rs_imLocale]) 1575 if (rs[Rs_imLocale])
1510 SET_LOCALE (locale); 1576 SET_LOCALE (locale);
1511#endif 1577#endif
1512} 1578}
1513 1579
1514void 1580void
1515rxvt_term::IMSetPosition () 1581rxvt_term::im_set_position ()
1516{ 1582{
1517 XRectangle preedit_rect, status_rect, *needed_rect; 1583 XRectangle preedit_rect, status_rect, *needed_rect;
1518 XVaNestedList preedit_attr, status_attr; 1584 XVaNestedList preedit_attr, status_attr;
1519 1585
1520 if (!Input_Context 1586 if (!Input_Context
1521 || !focus 1587 || !focus
1522 || !(input_style & (XIMPreeditArea | XIMPreeditPosition)) 1588 || !(input_style & (XIMPreeditArea | XIMPreeditPosition))
1523 || !IMisRunning ()) 1589 || !im_is_running ())
1524 return; 1590 return;
1525 1591
1526 if (input_style & XIMPreeditPosition) 1592 if (input_style & XIMPreeditPosition)
1527 { 1593 {
1528 im_set_size (preedit_rect); 1594 im_set_size (preedit_rect);
… …
1558 1624
1559void 1625void
1560rxvt_term::get_window_origin (int &x, int &y) 1626rxvt_term::get_window_origin (int &x, int &y)
1561{ 1627{
1562 Window cr; 1628 Window cr;
1563 XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr); 1629 XTranslateCoordinates (dpy, parent, display->root, 0, 0, &x, &y, &cr);
1564/* fprintf (stderr, "origin is %+d%+d\n", x, y);*/
1565} 1630}
1566 1631
1567Pixmap 1632Pixmap
1568rxvt_term::get_pixmap_property (int prop_id) 1633rxvt_term::get_pixmap_property (Atom property)
1569{ 1634{
1570 if (prop_id > 0 && prop_id < NUM_XA) 1635 Pixmap pixmap = None;
1571 if (xa[prop_id]) 1636
1572 {
1573 int aformat; 1637 int aformat;
1574 unsigned long nitems, bytes_after; 1638 unsigned long nitems, bytes_after;
1575 Atom atype; 1639 Atom atype;
1576 unsigned char *prop = NULL; 1640 unsigned char *prop;
1577 int result = XGetWindowProperty (dpy, display->root, xa[prop_id], 1641 int result = XGetWindowProperty (dpy, display->root, property,
1578 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 1642 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1579 &nitems, &bytes_after, &prop); 1643 &nitems, &bytes_after, &prop);
1580 if (result == Success && prop && atype == XA_PIXMAP) 1644 if (result == Success)
1645 {
1646 if (atype == XA_PIXMAP)
1581 return *(Pixmap *)prop; 1647 pixmap = *(Pixmap *)prop;
1648 XFree (prop);
1582 } 1649 }
1583 1650
1584 return None; 1651 return pixmap;
1585} 1652}
1586 1653
1587#ifdef HAVE_BG_PIXMAP 1654#ifdef HAVE_BG_PIXMAP
1588# if TRACE_PIXMAPS
1589# undef update_background
1590void
1591rxvt_term::trace_update_background (const char *file, int line)
1592{
1593 fprintf (stderr, "%s:%d:update_background()\n", file, line);
1594 update_background ();
1595}
1596# endif
1597 1655
1598void 1656void
1599rxvt_term::update_background () 1657rxvt_term::update_background ()
1600{ 1658{
1601 if (update_background_ev.is_active ()) 1659 if (update_background_ev.is_active ())
1602 return; 1660 return;
1603 1661
1604 bgPixmap.invalidate (); 1662 bg_invalidate ();
1605 1663
1664 if (!mapped)
1665 return;
1666
1606 ev_tstamp to_wait = 0.5 - (ev::now () - bgPixmap.valid_since); 1667 ev_tstamp to_wait = 0.5 - (ev::now () - bg_valid_since);
1607 1668
1608 if (to_wait <= 0.) 1669 if (to_wait <= 0.)
1609 bgPixmap.render (); 1670 bg_render ();
1610 else 1671 else
1611 update_background_ev.start (to_wait); 1672 update_background_ev.start (to_wait);
1612} 1673}
1613 1674
1614void 1675void
1615rxvt_term::update_background_cb (ev::timer &w, int revents) 1676rxvt_term::update_background_cb (ev::timer &w, int revents)
1616{ 1677{
1617 make_current (); 1678 make_current ();
1618 1679
1619 update_background_ev.stop (); 1680 update_background_ev.stop ();
1620 bgPixmap.render (); 1681 bg_render ();
1621 refresh_check (); 1682 refresh_check ();
1622} 1683}
1623 1684
1624#endif /* HAVE_BG_PIXMAP */ 1685#endif /* HAVE_BG_PIXMAP */
1625 1686

Diff Legend

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