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.372 by sf-exg, Sat Jan 28 15:18:29 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 <assert.h>
40#include <csignal> 42#include <signal.h>
41#include <cstring> 43#include <string.h>
42 44
43#include <termios.h> 45#include <termios.h>
44 46
45#ifdef HAVE_XSETLOCALE 47#ifdef HAVE_XSETLOCALE
46# define X_LOCALE 48# define X_LOCALE
47# include <X11/Xlocale.h> 49# include <X11/Xlocale.h>
48#else 50#else
49# ifdef HAVE_SETLOCALE
50# include <clocale> 51# include <locale.h>
51# endif 52#endif
52#endif
53 53
54struct termios rxvt_term::def_tio;
54vector<rxvt_term *> rxvt_term::termlist; 55vector<rxvt_term *> rxvt_term::termlist;
55 56
56// used to tell global functions which terminal instance is "active" 57// used to tell global functions which terminal instance is "active"
57rxvt_t rxvt_current_term; 58rxvt_t rxvt_current_term;
58 59
… …
93text_t rxvt_composite_vec::compose (unicode_t c1, unicode_t c2) 94text_t rxvt_composite_vec::compose (unicode_t c1, unicode_t c2)
94{ 95{
95 compose_char *cc; 96 compose_char *cc;
96 97
97 // break compose chains, as stupid readline really likes to duplicate 98 // break compose chains, as stupid readline really likes to duplicate
98 // composing characters for some reason near the end of a line. 99 // composing characters for some reason, near the end of a line.
99 cc = (*this)[c1]; 100 cc = (*this)[c1];
100 while (cc) 101 while (cc)
101 { 102 {
102 if (cc->c2 == c2) return c1; 103 if (cc->c2 == c2) return c1;
103 cc = (*this)[cc->c1]; 104 cc = (*this)[cc->c1];
104 } 105 }
105 106
106 // check to see wether this combination already exists otherwise 107 // check to see whether this combination already exists otherwise
107 for (cc = v.end (); cc-- > v.begin (); ) 108 for (cc = v.begin (); cc < v.end (); cc++)
108 {
109 if (cc->c1 == c1 && cc->c2 == c2) 109 if (cc->c1 == c1 && cc->c2 == c2)
110 return COMPOSE_LO + (cc - v.begin ()); 110 return COMPOSE_LO + (cc - v.begin ());
111 }
112 111
113 // allocate a new combination 112 // allocate a new combination
114 if (v.size () == COMPOSE_HI - COMPOSE_LO + 1) 113 if (v.size () == COMPOSE_HI - COMPOSE_LO + 1)
115 { 114 {
116 static int seen; 115 static int seen;
117 116
118 if (!seen++) 117 if (!seen++)
119 fprintf (stderr, "too many unrepresentable composite characters, try --enable-unicode3\n"); 118 rxvt_warn ("too many unrepresentable composite characters, try --enable-unicode3\n");
120 119
121 return REPLACEMENT_CHAR; 120 return REPLACEMENT_CHAR;
122 } 121 }
123 122
124 v.push_back (compose_char (c1, c2)); 123 v.push_back (compose_char (c1, c2));
… …
172 slip_wheel_ev.set <rxvt_term, &rxvt_term::slip_wheel_cb> (this); 171 slip_wheel_ev.set <rxvt_term, &rxvt_term::slip_wheel_cb> (this);
173#endif 172#endif
174#if ENABLE_TRANSPARENCY || ENABLE_PERL 173#if ENABLE_TRANSPARENCY || ENABLE_PERL
175 rootwin_ev.set <rxvt_term, &rxvt_term::rootwin_cb> (this), 174 rootwin_ev.set <rxvt_term, &rxvt_term::rootwin_cb> (this),
176#endif 175#endif
177#ifdef HAVE_SCROLLBARS
178 scrollbar_ev.set <rxvt_term, &rxvt_term::x_cb> (this), 176 scrollbar_ev.set <rxvt_term, &rxvt_term::x_cb> (this),
179#endif
180#ifdef USE_XIM 177#ifdef USE_XIM
181 im_ev.set <rxvt_term, &rxvt_term::im_cb> (this), 178 im_ev.set <rxvt_term, &rxvt_term::im_cb> (this),
182#endif 179#endif
183#ifdef POINTER_BLANK 180#ifdef POINTER_BLANK
184 pointer_ev.set <rxvt_term, &rxvt_term::pointer_cb> (this); 181 pointer_ev.set <rxvt_term, &rxvt_term::pointer_cb> (this);
… …
188#endif 185#endif
189 child_ev.set <rxvt_term, &rxvt_term::child_cb> (this); 186 child_ev.set <rxvt_term, &rxvt_term::child_cb> (this);
190 flush_ev.set <rxvt_term, &rxvt_term::flush_cb> (this); 187 flush_ev.set <rxvt_term, &rxvt_term::flush_cb> (this);
191 destroy_ev.set <rxvt_term, &rxvt_term::destroy_cb> (this); 188 destroy_ev.set <rxvt_term, &rxvt_term::destroy_cb> (this);
192 pty_ev.set <rxvt_term, &rxvt_term::pty_cb> (this); 189 pty_ev.set <rxvt_term, &rxvt_term::pty_cb> (this);
193 incr_ev.set <rxvt_term, &rxvt_term::incr_cb> (this);
194 termwin_ev.set <rxvt_term, &rxvt_term::x_cb> (this); 190 termwin_ev.set <rxvt_term, &rxvt_term::x_cb> (this);
195 vt_ev.set <rxvt_term, &rxvt_term::x_cb> (this); 191 vt_ev.set <rxvt_term, &rxvt_term::x_cb> (this);
196 192
197 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base; 193 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base;
198 194
… …
227 delete fontset[i]; 223 delete fontset[i];
228#endif 224#endif
229 delete fontset[0]; 225 delete fontset[0];
230 226
231#ifdef HAVE_BG_PIXMAP 227#ifdef HAVE_BG_PIXMAP
232 bgPixmap.destroy (); 228 bg_destroy ();
233#endif 229#endif
234 230
235 if (display) 231 if (display)
236 { 232 {
237 selection_clear (); 233 selection_clear ();
234 selection_clear (true);
238 235
239#ifdef USE_XIM 236#ifdef USE_XIM
240 im_destroy (); 237 im_destroy ();
241#endif 238#endif
242#ifdef XTERM_SCROLLBAR 239 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); 240 if (gc) XFreeGC (dpy, gc);
267 241
268 delete drawable; 242 delete drawable;
269 // destroy all windows 243 // destroy all windows
270 if (parent[0]) 244 if (parent)
271 XDestroyWindow (dpy, parent[0]); 245 XDestroyWindow (dpy, parent);
272 246
273 for (int i = 0; i < TOTAL_COLORS; i++) 247 for (int i = 0; i < TOTAL_COLORS; i++)
274 if (ISSET_PIXCOLOR (i)) 248 if (ISSET_PIXCOLOR (i))
275 { 249 {
276 pix_colors_focused [i].free (this); 250 pix_colors_focused [i].free (this);
… …
290 /* clear all resources */ 264 /* clear all resources */
291 for (int i = 0; i < allocated.size (); i++) 265 for (int i = 0; i < allocated.size (); i++)
292 free (allocated [i]); 266 free (allocated [i]);
293 267
294 free (selection.text); 268 free (selection.text);
295 // TODO: manage env vars in child only(!) 269 free (selection.clip_text);
296 free (env_display);
297 free (env_term);
298 free (locale); 270 free (locale);
299 free (v_buffer); 271 free (v_buffer);
300 free (incr_buf); 272
273 delete selection_req;
301 274
302 delete envv; 275 delete envv;
303 delete argv; 276 delete argv;
304 277
305#ifdef KEYSYM_RESOURCE 278#ifdef KEYSYM_RESOURCE
… …
337 if (display) 310 if (display)
338 { 311 {
339#if USE_XIM 312#if USE_XIM
340 im_ev.stop (display); 313 im_ev.stop (display);
341#endif 314#endif
342#if HAVE_SCROLLBARS
343 scrollbar_ev.stop (display); 315 scrollbar_ev.stop (display);
344#endif
345#if ENABLE_TRANSPARENCY || ENABLE_PERL 316#if ENABLE_TRANSPARENCY || ENABLE_PERL
346 rootwin_ev.stop (display); 317 rootwin_ev.stop (display);
347#endif 318#endif
348 incr_ev.stop ();
349 termwin_ev.stop (display); 319 termwin_ev.stop (display);
350 vt_ev.stop (display); 320 vt_ev.stop (display);
351 } 321 }
352 322
353 flush_ev.stop (); 323 flush_ev.stop ();
… …
375rxvt_term::destroy_cb (ev::idle &w, int revents) 345rxvt_term::destroy_cb (ev::idle &w, int revents)
376{ 346{
377 make_current (); 347 make_current ();
378 348
379 delete this; 349 delete this;
350}
351
352void
353rxvt_term::set_option (uint8_t opt, bool set) NOTHROW
354{
355 if (!opt)
356 return;
357
358 uint8_t mask = 1 << (opt & 7);
359 uint8_t &val = options [opt >> 3];
360
361 val = val & ~mask | (set ? mask : 0);
380} 362}
381 363
382/*----------------------------------------------------------------------*/ 364/*----------------------------------------------------------------------*/
383/* 365/*
384 * Exit gracefully, clearing the utmp entry and restoring tty attributes 366 * Exit gracefully, clearing the utmp entry and restoring tty attributes
… …
398print_x_error (Display *dpy, XErrorEvent *event) 380print_x_error (Display *dpy, XErrorEvent *event)
399{ 381{
400 char buffer[BUFSIZ]; 382 char buffer[BUFSIZ];
401 char mesg[BUFSIZ]; 383 char mesg[BUFSIZ];
402 char number[32]; 384 char number[32];
403 char *mtype = "XlibMessage"; 385 const char mtype[] = "XlibMessage";
404 XGetErrorText(dpy, event->error_code, buffer, BUFSIZ); 386 XGetErrorText(dpy, event->error_code, buffer, BUFSIZ);
405 XGetErrorDatabaseText(dpy, mtype, "XError", "X Error", mesg, BUFSIZ); 387 XGetErrorDatabaseText(dpy, mtype, "XError", "X Error", mesg, BUFSIZ);
406 rxvt_warn ("An X Error occured, trying to continue after report.\n"); 388 rxvt_warn ("An X Error occurred, trying to continue after report.\n");
407 rxvt_warn ("%s: %s\n", mesg, buffer); 389 rxvt_warn ("%s: %s\n", mesg, buffer);
408 XGetErrorDatabaseText(dpy, mtype, "MajorCode", "Request Major code %d", mesg, BUFSIZ); 390 XGetErrorDatabaseText(dpy, mtype, "MajorCode", "Request Major code %d", mesg, BUFSIZ);
409 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->request_code); 391 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->request_code);
410 sprintf(number, "%d", event->request_code); 392 sprintf(number, "%d", event->request_code);
411 XGetErrorDatabaseText(dpy, "XRequest", number, "", buffer, BUFSIZ); 393 XGetErrorDatabaseText(dpy, "XRequest", number, "", buffer, BUFSIZ);
412 rxvt_warn ("(which is %s)\n", buffer); 394 rxvt_warn ("(which is %s)\n", buffer);
413 if (event->request_code >= 128) { 395 if (event->request_code >= 128) {
414 XGetErrorDatabaseText(dpy, mtype, "MinorCode", "Request Minor code %d", 396 XGetErrorDatabaseText(dpy, mtype, "MinorCode", "Request Minor code %d",
415 mesg, BUFSIZ); 397 mesg, BUFSIZ);
416 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->minor_code); 398 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->minor_code);
417 } 399 }
418 if ((event->error_code == BadWindow) || 400 if ((event->error_code == BadWindow) ||
419 (event->error_code == BadPixmap) || 401 (event->error_code == BadPixmap) ||
420 (event->error_code == BadCursor) || 402 (event->error_code == BadCursor) ||
421 (event->error_code == BadFont) || 403 (event->error_code == BadFont) ||
422 (event->error_code == BadDrawable) || 404 (event->error_code == BadDrawable) ||
423 (event->error_code == BadColor) || 405 (event->error_code == BadColor) ||
424 (event->error_code == BadGC) || 406 (event->error_code == BadGC) ||
425 (event->error_code == BadIDChoice) || 407 (event->error_code == BadIDChoice) ||
426 (event->error_code == BadValue) || 408 (event->error_code == BadValue) ||
427 (event->error_code == BadAtom)) { 409 (event->error_code == BadAtom)) {
428 if (event->error_code == BadValue) 410 if (event->error_code == BadValue)
429 XGetErrorDatabaseText(dpy, mtype, "Value", "Value 0x%x", 411 XGetErrorDatabaseText(dpy, mtype, "Value", "Value 0x%x",
430 mesg, BUFSIZ); 412 mesg, BUFSIZ);
431 else if (event->error_code == BadAtom) 413 else if (event->error_code == BadAtom)
432 XGetErrorDatabaseText(dpy, mtype, "AtomID", "AtomID 0x%x", 414 XGetErrorDatabaseText(dpy, mtype, "AtomID", "AtomID 0x%x",
433 mesg, BUFSIZ); 415 mesg, BUFSIZ);
434 else 416 else
435 XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x", 417 XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x",
436 mesg, BUFSIZ); 418 mesg, BUFSIZ);
437 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid); 419 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid);
438 } 420 }
439 XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d", 421 XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d",
440 mesg, BUFSIZ); 422 mesg, BUFSIZ);
441 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial); 423 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial);
442} 424}
443#endif 425#endif
444 426
445int 427int
… …
492 rxvt_emergency_cleanup (); 474 rxvt_emergency_cleanup ();
493 w.stop (); 475 w.stop ();
494 kill (getpid (), w.signum); 476 kill (getpid (), w.signum);
495} 477}
496 478
479static void
480rxvt_get_ttymode (struct termios *tio)
481{
482 if (tcgetattr (STDIN_FILENO, tio) < 0)
483 memset (tio, 0, sizeof (struct termios));
484
485 for (int i = 0; i < NCCS; i++)
486 tio->c_cc[i] = VDISABLE;
487
488 tio->c_cc[VINTR] = CINTR;
489 tio->c_cc[VQUIT] = CQUIT;
490 tio->c_cc[VERASE] = CERASE;
491#ifdef VERASE2
492 tio->c_cc[VERASE2] = CERASE2;
493#endif
494 tio->c_cc[VKILL] = CKILL;
495 tio->c_cc[VEOF] = CEOF;
496 tio->c_cc[VSTART] = CSTART;
497 tio->c_cc[VSTOP] = CSTOP;
498 tio->c_cc[VSUSP] = CSUSP;
499# ifdef VDSUSP
500 tio->c_cc[VDSUSP] = CDSUSP;
501# endif
502# ifdef VREPRINT
503 tio->c_cc[VREPRINT] = CRPRNT;
504# endif
505# ifdef VDISCRD
506 tio->c_cc[VDISCRD] = CFLUSH;
507# endif
508# ifdef VWERSE
509 tio->c_cc[VWERSE] = CWERASE;
510# endif
511# ifdef VLNEXT
512 tio->c_cc[VLNEXT] = CLNEXT;
513# endif
514# ifdef VSTATUS
515 tio->c_cc[VSTATUS] = CSTATUS;
516# endif
517
518# if VMIN != VEOF
519 tio->c_cc[VMIN] = 1;
520# endif
521# if VTIME != VEOL
522 tio->c_cc[VTIME] = 0;
523# endif
524
525 /* input modes */
526 tio->c_iflag = (BRKINT | IGNPAR | ICRNL
527# ifdef IMAXBEL
528 | IMAXBEL
529# endif
530 | IXON);
531
532 /* output modes */
533 tio->c_oflag = (OPOST | ONLCR);
534
535 /* control modes */
536 tio->c_cflag = (CS8 | CREAD);
537
538 /* local modes */
539 tio->c_lflag = (ISIG | ICANON | IEXTEN | ECHO
540# if defined (ECHOCTL) && defined (ECHOKE)
541 | ECHOCTL | ECHOKE
542# endif
543 | ECHOE | ECHOK);
544}
545
497char **rxvt_environ; // startup environment 546char **rxvt_environ; // startup environment
498 547
499void 548void
500rxvt_init () 549rxvt_init ()
501{ 550{
502 ptytty::init (); 551 assert (("fontMask must not overlap other RS masks",
552 0 == (RS_fontMask & (RS_Sel | RS_baseattrMask | RS_customMask | RS_bgMask | RS_fgMask))));
503 553
554 rxvt_get_ttymode (&rxvt_term::def_tio);
555
556 // get rid of stdin/stdout as we don't need them, to free resources
557 dup2 (STDERR_FILENO, STDIN_FILENO);
558 dup2 (STDERR_FILENO, STDOUT_FILENO);
559
504 if (!ev_default_loop (0)) 560 if (!ev_default_loop ())
505 rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n"); 561 rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n");
506 562
507 rxvt_environ = environ; 563 rxvt_environ = environ;
508 564
509 signal (SIGHUP, SIG_IGN); 565 signal (SIGHUP, SIG_IGN);
510 signal (SIGPIPE, SIG_IGN); 566 signal (SIGPIPE, SIG_IGN);
511 567
512 sig_handlers.sw_term.start (SIGTERM); ev_unref (); 568 sig_handlers.sw_term.start (SIGTERM); ev_unref ();
513 sig_handlers.sw_int.start (SIGINT); ev_unref (); 569 sig_handlers.sw_int.start (SIGINT); ev_unref ();
514
515 /* need to trap SIGURG for SVR4 (Unixware) rlogin */
516 /* signal (SIGURG, SIG_DFL); */
517 570
518 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); 571 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
519 // TODO: handle this with exceptions and tolerate the memory loss 572 // TODO: handle this with exceptions and tolerate the memory loss
520 XSetIOErrorHandler (rxvt_xioerror_handler); 573 XSetIOErrorHandler (rxvt_xioerror_handler);
521 574
… …
529 */ 582 */
530void 583void
531rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight) 584rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
532{ 585{
533 short recalc_x, recalc_y; 586 short recalc_x, recalc_y;
534 int x, y, sb_w, flags; 587 int x, y, flags;
535 unsigned int w, h; 588 unsigned int w, h;
536 unsigned int max_width, max_height; 589 unsigned int max_width, max_height;
537 590
538 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity; 591 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity;
539 szHint.win_gravity = NorthWestGravity; 592 szHint.win_gravity = NorthWestGravity;
… …
549 if (rs[Rs_geometry]) 602 if (rs[Rs_geometry])
550 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h); 603 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h);
551 604
552 if (flags & WidthValue) 605 if (flags & WidthValue)
553 { 606 {
607 if (!w)
608 rxvt_fatal ("illegal window geometry (width and height must be non-zero), aborting.\n");
609
554 ncol = clamp (w, 0, std::numeric_limits<int16_t>::max ()); 610 ncol = clamp (w, 1, std::numeric_limits<int16_t>::max ());
555 szHint.flags |= USSize; 611 szHint.flags |= USSize;
556 } 612 }
557 613
558 if (flags & HeightValue) 614 if (flags & HeightValue)
559 { 615 {
616 if (!h)
617 rxvt_fatal ("illegal window geometry (width and height must be non-zero), aborting.\n");
618
560 nrow = clamp (h, 0, std::numeric_limits<int16_t>::max ()); 619 nrow = clamp (h, 1, std::numeric_limits<int16_t>::max ());
561 szHint.flags |= USSize; 620 szHint.flags |= USSize;
562 } 621 }
563 622
564 if (flags & XValue) 623 if (flags & XValue)
565 { 624 {
… …
596 max_width = MAX_COLS * fwidth; 655 max_width = MAX_COLS * fwidth;
597 max_height = MAX_ROWS * fheight; 656 max_height = MAX_ROWS * fheight;
598 657
599 szHint.base_width = szHint.base_height = 2 * int_bwidth; 658 szHint.base_width = szHint.base_height = 2 * int_bwidth;
600 659
601 sb_w = 0;
602 window_vt_x = window_vt_y = int_bwidth; 660 window_vt_x = window_vt_y = int_bwidth;
603 661
604 if (scrollBar.state) 662 if (scrollBar.state)
605 { 663 {
606 sb_w = scrollbar_TotalWidth (); 664 int sb_w = scrollBar.total_width ();
607 szHint.base_width += sb_w; 665 szHint.base_width += sb_w;
608 666
609 if (!option (Opt_scrollBar_right)) 667 if (!option (Opt_scrollBar_right))
610 window_vt_x += sb_w; 668 window_vt_x += sb_w;
611 } 669 }
… …
635 { 693 {
636 min_it (height, max_height); 694 min_it (height, max_height);
637 szHint.height = szHint.base_height + height; 695 szHint.height = szHint.base_height + height;
638 } 696 }
639 697
640 if (scrollBar.state && option (Opt_scrollBar_right))
641 window_sb_x = szHint.width - sb_w;
642
643 if (recalc_x) 698 if (recalc_x)
644 szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth; 699 szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth;
645 700
646 if (recalc_y) 701 if (recalc_y)
647 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth; 702 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth;
648 703
649 ncol = width / fwidth; 704 ncol = width / fwidth;
650 nrow = height / fheight; 705 nrow = height / fheight;
706
707 // When the size of the vt window is not a multiple of the cell
708 // size, i.e., when the wm does not honour our size hints, there are
709 // extra areas not covered by the terminal screen. Such gaps, when a
710 // bg pixmap is set, would have to be cleared manually to properly
711 // refresh the background. We take the simpler route and shrink the
712 // vt window so as to avoid creating gaps.
713 vt_width = ncol * fwidth;
714 vt_height = nrow * fheight;
651} 715}
652 716
653/*----------------------------------------------------------------------*/ 717/*----------------------------------------------------------------------*/
654/* 718/*
655 * Tell the teletype handler what size the window is. 719 * Tell the teletype handler what size the window is.
… …
663 727
664 struct winsize ws; 728 struct winsize ws;
665 729
666 ws.ws_col = ncol; 730 ws.ws_col = ncol;
667 ws.ws_row = nrow; 731 ws.ws_row = nrow;
668 ws.ws_xpixel = width; 732 ws.ws_xpixel = vt_width;
669 ws.ws_ypixel = height; 733 ws.ws_ypixel = vt_height;
670 (void)ioctl (pty->pty, TIOCSWINSZ, &ws); 734 ioctl (pty->pty, TIOCSWINSZ, &ws);
671 735
672#if 0 736#if 0
673 // TIOCSWINSZ is supposed to do this automatically and correctly 737 // TIOCSWINSZ is supposed to do this automatically and correctly
674 if (cmd_pid) /* force through to the command */ 738 if (cmd_pid) /* force through to the command */
675 kill (-cmd_pid, SIGWINCH); 739 kill (-cmd_pid, SIGWINCH);
676#endif 740#endif
677} 741}
678 742
679/*----------------------------------------------------------------------*/ 743/*----------------------------------------------------------------------*/
680/* set_fonts () - load and set the various fonts 744/* 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 745bool
688rxvt_term::set_fonts () 746rxvt_term::set_fonts ()
689{ 747{
690 rxvt_fontset *fs = new rxvt_fontset (this); 748 rxvt_fontset *fs = new rxvt_fontset (this);
691 rxvt_fontprop prop; 749 rxvt_fontprop prop;
… …
705#endif 763#endif
706 764
707 delete fontset[0]; 765 delete fontset[0];
708 fontset[0] = fs; 766 fontset[0] = fs;
709 767
710 prop = (*fs)[1]->properties (); 768 prop = (*fs)[rxvt_fontset::firstFont]->properties ();
711 prop.height += lineSpace; 769 prop.width += letterSpace;
712 770
713 fs->set_prop (prop, false); 771 fs->set_prop (prop, false);
714 772
715 fwidth = prop.width; 773 fwidth = prop.width;
716 fheight = prop.height; 774 fheight = prop.height + lineSpace;
717 fbase = prop.ascent; 775 fbase = prop.ascent;
718 776
719 for (int style = 1; style < 4; style++) 777 for (int style = 1; style < 4; style++)
720 { 778 {
721#if ENABLE_STYLES 779#if ENABLE_STYLES
… …
747#else 805#else
748 fontset[style] = fontset[0]; 806 fontset[style] = fontset[0];
749#endif 807#endif
750 } 808 }
751 809
752 if (parent[0]) 810 if (parent)
753 { 811 {
754 resize_all_windows (0, 0, 0); 812 resize_all_windows (0, 0, 0);
755 scr_remap_chars (); 813 scr_remap_chars ();
756 scr_touch (true); 814 scr_touch (true);
757 } 815 }
… …
760} 818}
761 819
762void 820void
763rxvt_term::set_string_property (Atom prop, const char *str, int len) 821rxvt_term::set_string_property (Atom prop, const char *str, int len)
764{ 822{
765 XChangeProperty (dpy, parent[0], 823 XChangeProperty (dpy, parent,
766 prop, XA_STRING, 8, PropModeReplace, 824 prop, XA_STRING, 8, PropModeReplace,
767 (const unsigned char *)str, len >= 0 ? len : strlen (str)); 825 (const unsigned char *)str, len >= 0 ? len : strlen (str));
768} 826}
769 827
770void 828void
829rxvt_term::set_mbstring_property (Atom prop, const char *str, int len)
830{
831 XTextProperty ct;
832
833 if (XmbTextListToTextProperty (dpy, (char **)&str, 1, XStdICCTextStyle, &ct) >= 0)
834 {
835 XSetTextProperty (dpy, parent, &ct, prop);
836 XFree (ct.value);
837 }
838}
839
840void
771rxvt_term::set_utf8_property (Atom prop, const char *str, int len) 841rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
772{ 842{
773 wchar_t *ws = rxvt_mbstowcs (str, len); 843 wchar_t *ws = rxvt_mbstowcs (str, len);
774 char *s = rxvt_wcstoutf8 (ws); 844 char *s = rxvt_wcstoutf8 (ws);
775 845
776 XChangeProperty (dpy, parent[0], 846 XChangeProperty (dpy, parent,
777 prop, xa[XA_UTF8_STRING], 8, PropModeReplace, 847 prop, xa[XA_UTF8_STRING], 8, PropModeReplace,
778 (const unsigned char *)s, strlen (s)); 848 (const unsigned char *)s, strlen (s));
779 849
780 free (s); 850 free (s);
781 free (ws); 851 free (ws);
… …
785/*----------------------------------------------------------------------*/ 855/*----------------------------------------------------------------------*/
786/* xterm sequences - title, iconName, color (exptl) */ 856/* xterm sequences - title, iconName, color (exptl) */
787void 857void
788rxvt_term::set_title (const char *str) 858rxvt_term::set_title (const char *str)
789{ 859{
790 set_string_property (XA_WM_NAME, str); 860 set_mbstring_property (XA_WM_NAME, str);
791#if ENABLE_EWMH 861#if ENABLE_EWMH
792 set_utf8_property (xa[XA_NET_WM_NAME], str); 862 set_utf8_property (xa[XA_NET_WM_NAME], str);
793#endif 863#endif
794} 864}
795 865
796void 866void
797rxvt_term::set_icon_name (const char *str) 867rxvt_term::set_icon_name (const char *str)
798{ 868{
799 set_string_property (XA_WM_ICON_NAME, str); 869 set_mbstring_property (XA_WM_ICON_NAME, str);
800#if ENABLE_EWMH 870#if ENABLE_EWMH
801 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str); 871 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str);
802#endif 872#endif
803} 873}
804 874
805void 875void
806rxvt_term::set_window_color (int idx, const char *color) 876rxvt_term::set_window_color (int idx, const char *color)
807{ 877{
808#ifdef XTERM_COLOR_CHANGE 878#ifdef XTERM_COLOR_CHANGE
809 rxvt_color xcol; 879 rxvt_color xcol;
810 int i;
811 880
812 if (color == NULL || *color == '\0') 881 if (color == NULL || *color == '\0')
813 return; 882 return;
814 883
815 color = strdup (color); 884 color = strdup (color);
… …
817 rs[Rs_color + idx] = color; 886 rs[Rs_color + idx] = color;
818 887
819 /* handle color aliases */ 888 /* handle color aliases */
820 if (isdigit (*color)) 889 if (isdigit (*color))
821 { 890 {
822 i = atoi (color); 891 int i = atoi (color);
823 892
824 if (i >= 8 && i <= 15) 893 if (i >= 8 && i <= 15)
825 { 894 {
826 /* bright colors */ 895 /* bright colors */
827 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i - 8]; 896 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i - 8];
… …
872 941
873/*----------------------------------------------------------------------*/ 942/*----------------------------------------------------------------------*/
874/* 943/*
875 * find if fg/bg matches any of the normal (low-intensity) colors 944 * find if fg/bg matches any of the normal (low-intensity) colors
876 */ 945 */
877void 946char *
878rxvt_term::set_colorfgbg () 947rxvt_term::get_colorfgbg ()
879{ 948{
880 unsigned int i; 949 unsigned int i;
881 const char *xpmb = ""; 950 const char *xpmb = "";
882 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1]; 951 char fstr[] = "default";
952 char bstr[] = "default";
953 char *env_colorfgbg;
883 954
884 strcpy (fstr, "default");
885 strcpy (bstr, "default");
886 for (i = Color_Black; i <= Color_White; i++) 955 for (i = Color_Black; i <= Color_White; i++)
887 if (pix_colors[Color_fg] == pix_colors[i]) 956 if (pix_colors[Color_fg] == pix_colors[i])
888 { 957 {
889 sprintf (fstr, "%d", (i - Color_Black)); 958 sprintf (fstr, "%d", i - Color_Black);
890 break; 959 break;
891 } 960 }
892 961
893 for (i = Color_Black; i <= Color_White; i++) 962 for (i = Color_Black; i <= Color_White; i++)
894 if (pix_colors[Color_bg] == pix_colors[i]) 963 if (pix_colors[Color_bg] == pix_colors[i])
895 { 964 {
896 sprintf (bstr, "%d", (i - Color_Black)); 965 sprintf (bstr, "%d", i - Color_Black);
897#ifdef BG_IMAGE_FROM_FILE 966#ifdef BG_IMAGE_FROM_FILE
898 xpmb = "default;"; 967 xpmb = "default;";
899#endif 968#endif
900 break; 969 break;
901 } 970 }
902 971
972 env_colorfgbg = (char *)rxvt_malloc (sizeof ("COLORFGBG=default;default;bg"));
903 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr); 973 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr);
974 return env_colorfgbg;
904} 975}
905 976
906/*----------------------------------------------------------------------*/ 977/*----------------------------------------------------------------------*/
907 978
908bool 979bool
… …
931 int old_width = szHint.width; 1002 int old_width = szHint.width;
932 int old_height = szHint.height; 1003 int old_height = szHint.height;
933 1004
934 window_calc (newwidth, newheight); 1005 window_calc (newwidth, newheight);
935 1006
936 if (!HOOK_INVOKE ((this, HOOK_RESIZE_ALL_WINDOWS, DT_INT, newwidth, DT_INT, newheight, DT_END))) 1007 bool set_hint = !HOOK_INVOKE ((this, HOOK_RESIZE_ALL_WINDOWS, DT_INT, newwidth, DT_INT, newheight, DT_END));
1008
1009 // to avoid races between us and the wm, we clear the incremental size hints around the xresizewindow
1010 if (set_hint)
1011 {
1012 szHint.flags &= ~(PBaseSize | PResizeInc);
937 XSetWMNormalHints (dpy, parent[0], &szHint); 1013 XSetWMNormalHints (dpy, parent, &szHint);
1014 szHint.flags |= PBaseSize | PResizeInc;
1015 }
938 1016
939 if (!ignoreparent) 1017 if (!ignoreparent)
940 { 1018 {
941#ifdef SMART_RESIZE 1019#ifdef SMART_RESIZE
942 /* 1020 /*
… …
946 int x, y, x1, y1; 1024 int x, y, x1, y1;
947 int dx, dy; 1025 int dx, dy;
948 unsigned int unused_w1, unused_h1, unused_b1, unused_d1; 1026 unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
949 Window unused_cr; 1027 Window unused_cr;
950 1028
951 XTranslateCoordinates (dpy, parent[0], display->root, 1029 XTranslateCoordinates (dpy, parent, display->root,
952 0, 0, &x, &y, &unused_cr); 1030 0, 0, &x, &y, &unused_cr);
953 XGetGeometry (dpy, parent[0], &unused_cr, &x1, &y1, 1031 XGetGeometry (dpy, parent, &unused_cr, &x1, &y1,
954 &unused_w1, &unused_h1, &unused_b1, &unused_d1); 1032 &unused_w1, &unused_h1, &unused_b1, &unused_d1);
955 /* 1033 /*
956 * if display->root isn't the parent window, a WM will probably have offset 1034 * if display->root isn't the parent window, a WM will probably have offset
957 * our position for handles and decorations. Counter it 1035 * our position for handles and decorations. Counter it
958 */ 1036 */
… …
975 if (y < y1) /* top half */ 1053 if (y < y1) /* top half */
976 dy = 0; 1054 dy = 0;
977 else if (y == y1) /* exact center */ 1055 else if (y == y1) /* exact center */
978 dy /= 2; 1056 dy /= 2;
979 1057
980 XMoveResizeWindow (dpy, parent[0], x + dx, y + dy, 1058 XMoveResizeWindow (dpy, parent, x + dx, y + dy,
981 szHint.width, szHint.height); 1059 szHint.width, szHint.height);
982#else 1060#else
983 XResizeWindow (dpy, parent[0], szHint.width, szHint.height); 1061 XResizeWindow (dpy, parent, szHint.width, szHint.height);
984#endif 1062#endif
985 } 1063 }
1064
1065 if (set_hint)
1066 XSetWMNormalHints (dpy, parent, &szHint);
986 1067
987 fix_screen = ncol != prev_ncol || nrow != prev_nrow; 1068 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
988 1069
989 if (fix_screen || newwidth != old_width || newheight != old_height) 1070 if (fix_screen || newwidth != old_width || newheight != old_height)
990 { 1071 {
991 if (scrollBar.state) 1072 if (scrollBar.state)
992 { 1073 scrollBar.resize ();
993 XMoveResizeWindow (dpy, scrollBar.win,
994 window_sb_x, 0,
995 scrollbar_TotalWidth (), szHint.height);
996 resize_scrollbar ();
997 }
998 1074
999 XMoveResizeWindow (dpy, vt, 1075 XMoveResizeWindow (dpy, vt,
1000 window_vt_x, window_vt_y, 1076 window_vt_x, window_vt_y,
1001 width, height); 1077 vt_width, vt_height);
1002 1078
1003#ifdef HAVE_BG_PIXMAP 1079#ifdef HAVE_BG_PIXMAP
1004 if (bgPixmap.window_size_sensitive ()) 1080 if (bg_window_size_sensitive ())
1005 update_background (); 1081 update_background ();
1006#endif 1082#endif
1007
1008 scr_clear ();
1009 } 1083 }
1010 1084
1011 if (fix_screen || old_height == 0) 1085 if (fix_screen || old_height == 0)
1012 scr_reset (); 1086 scr_reset ();
1013 1087
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 1088#ifdef USE_XIM
1024 IMSetPosition (); 1089 im_set_position ();
1025#endif 1090#endif
1026} 1091}
1027 1092
1028/* 1093/*
1029 * Set the width/height of the vt window in characters. Units are pixels. 1094 * Set the width/height of the vt window in characters. Units are pixels.
… …
1042 newwidth = wattr.width - szHint.base_width; 1107 newwidth = wattr.width - szHint.base_width;
1043 if (newheight == 0) 1108 if (newheight == 0)
1044 newheight = wattr.height - szHint.base_height; 1109 newheight = wattr.height - szHint.base_height;
1045 } 1110 }
1046 1111
1047 if (newwidth != width || newheight != height) 1112 if (newwidth != vt_width || newheight != vt_height)
1048 { 1113 {
1049 newwidth += szHint.base_width; 1114 newwidth += szHint.base_width;
1050 newheight += szHint.base_height; 1115 newheight += szHint.base_height;
1051 resize_all_windows (newwidth, newheight, 0); 1116 resize_all_windows (newwidth, newheight, 0);
1052 } 1117 }
… …
1090 status_rect.height = fheight; 1155 status_rect.height = fheight;
1091} 1156}
1092 1157
1093/* Checking whether input method is running. */ 1158/* Checking whether input method is running. */
1094bool 1159bool
1095rxvt_term::IMisRunning () 1160rxvt_term::im_is_running ()
1096{ 1161{
1097 char *p;
1098 Atom atom; 1162 Atom atom;
1099 Window win; 1163 Window win;
1100 char server[IMBUFSIZ]; 1164 char server[IMBUFSIZ];
1101 1165
1102 /* get current locale modifier */ 1166 /* get current locale modifier */
1103 if ((p = XSetLocaleModifiers (NULL)) != NULL) 1167 if (char *p = XSetLocaleModifiers (0))
1104 { 1168 {
1105 strcpy (server, "@server="); 1169 strcpy (server, "@server=");
1106 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */ 1170 strncat (server, p + 4, IMBUFSIZ - 9); /* skip "@im=" */
1107 1171
1108 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */ 1172 if (p = strchr (server + 1, '@')) /* first one only */
1109 *p = '\0'; 1173 *p = '\0';
1110 1174
1111 atom = XInternAtom (dpy, server, False); 1175 atom = XInternAtom (dpy, server, False);
1112 win = XGetSelectionOwner (dpy, atom); 1176 win = XGetSelectionOwner (dpy, atom);
1113 1177
1114 if (win != None) 1178 if (win != None)
1115 return True; 1179 return true;
1116 } 1180 }
1117 1181
1118 return False; 1182 return false;
1119} 1183}
1120 1184
1121void 1185void
1122rxvt_term::IMSendSpot () 1186rxvt_term::im_send_spot ()
1123{ 1187{
1124 XPoint nspot; 1188 XPoint nspot;
1125 XVaNestedList preedit_attr; 1189 XVaNestedList preedit_attr;
1126 1190
1127 if (!Input_Context 1191 if (!Input_Context
… …
1180 1244
1181 term->make_current (); 1245 term->make_current ();
1182 1246
1183 if (text) 1247 if (text)
1184 { 1248 {
1185 void *str; 1249 wchar_t *str;
1186 1250
1187 if (!text->encoding_is_wchar && text->string.multi_byte) 1251 if (!text->encoding_is_wchar && text->string.multi_byte)
1188 { 1252 {
1189 // of course, X makes it ugly again 1253 // of course, X makes it ugly again
1190 if (term->rs[Rs_imLocale]) 1254 if (term->rs[Rs_imLocale])
1191 SET_LOCALE (term->rs[Rs_imLocale]); 1255 SET_LOCALE (term->rs[Rs_imLocale]);
1192 1256
1193 str = rxvt_temp_buf ((text->length + 1) * sizeof (wchar_t)); 1257 str = rxvt_temp_buf<wchar_t> (text->length + 1);
1194 mbstowcs ((wchar_t *)str, text->string.multi_byte, text->length + 1); 1258 mbstowcs (str, text->string.multi_byte, text->length + 1);
1195 1259
1196 if (term->rs[Rs_imLocale]) 1260 if (term->rs[Rs_imLocale])
1197 SET_LOCALE (term->locale); 1261 SET_LOCALE (term->locale);
1198 } 1262 }
1199 else 1263 else
1200 str = (void *)text->string.wide_char; 1264 str = text->string.wide_char;
1201 1265
1202 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW, 1266 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
1203 DT_INT, call_data->caret, 1267 DT_INT, call_data->caret,
1204 DT_INT, call_data->chg_first, 1268 DT_INT, call_data->chg_first,
1205 DT_INT, call_data->chg_length, 1269 DT_INT, call_data->chg_length,
… …
1233/* 1297/*
1234 * Try to open a XIM with the current modifiers, then see if we can 1298 * Try to open a XIM with the current modifiers, then see if we can
1235 * open a suitable preedit type 1299 * open a suitable preedit type
1236 */ 1300 */
1237bool 1301bool
1238rxvt_term::IM_get_IC (const char *modifiers) 1302rxvt_term::im_get_ic (const char *modifiers)
1239{ 1303{
1240 int i, j, found; 1304 int i, j, found;
1241 XIM xim; 1305 XIM xim;
1242 XPoint spot; 1306 XPoint spot;
1243 XRectangle rect, status_rect, needed_rect; 1307 XRectangle rect, status_rect, needed_rect;
1244 unsigned long fg, bg; 1308 unsigned long fg, bg;
1245 const char *p; 1309 const char *p;
1246 char **s; 1310 char **s;
1247 XIMStyles *xim_styles; 1311 XIMStyles *xim_styles;
1248#ifdef ENABLE_XIM_ONTHESPOT
1249 XIMCallback xcb[4];
1250#endif
1251 1312
1252 set_environ (envv); 1313 set_environ (envv);
1253 1314
1254 if (! ((p = XSetLocaleModifiers (modifiers)) && *p)) 1315 if (! ((p = XSetLocaleModifiers (modifiers)) && *p))
1255 return false; 1316 return false;
… …
1276 p = pet[pi]; 1337 p = pet[pi];
1277 1338
1278 if (!p) 1339 if (!p)
1279 continue; 1340 continue;
1280 1341
1281 s = rxvt_splitcommastring (p); 1342 s = rxvt_strsplit (',', p);
1282 1343
1283 for (i = found = 0; !found && s[i]; i++) 1344 for (i = found = 0; !found && s[i]; i++)
1284 { 1345 {
1285 if (!strcmp (s[i], "OverTheSpot")) 1346 if (!strcmp (s[i], "OverTheSpot"))
1286 input_style = XIMPreeditPosition | XIMStatusNothing; 1347 input_style = XIMPreeditPosition | XIMStatusNothing;
… …
1298 input_style = XIMPreeditNothing | XIMStatusNothing; 1359 input_style = XIMPreeditNothing | XIMStatusNothing;
1299 1360
1300 for (j = 0; j < xim_styles->count_styles; j++) 1361 for (j = 0; j < xim_styles->count_styles; j++)
1301 if (input_style == xim_styles->supported_styles[j]) 1362 if (input_style == xim_styles->supported_styles[j])
1302 { 1363 {
1303 rxvt_freecommastring (s); 1364 rxvt_free_strsplit (s);
1304 1365
1305 found = 1; 1366 found = 1;
1306 goto foundpet; 1367 goto foundpet;
1307 } 1368 }
1308 1369
1309 } 1370 }
1310 1371
1311 rxvt_freecommastring (s); 1372 rxvt_free_strsplit (s);
1312 } 1373 }
1313 1374
1314foundpet: 1375foundpet:
1315 1376
1316 XFree (xim_styles); 1377 XFree (xim_styles);
… …
1395 NULL); 1456 NULL);
1396 } 1457 }
1397#if ENABLE_XIM_ONTHESPOT 1458#if ENABLE_XIM_ONTHESPOT
1398 else if (input_style & XIMPreeditCallbacks) 1459 else if (input_style & XIMPreeditCallbacks)
1399 { 1460 {
1461 XIMCallback xcb[4];
1462
1400 im_set_position (spot); 1463 im_set_position (spot);
1401 1464
1402 xcb[0].client_data = (XPointer)this; xcb[0].callback = (XIMProc)xim_preedit_start; 1465 xcb[0].client_data = (XPointer)this; xcb[0].callback = (XIMProc)xim_preedit_start;
1403 xcb[1].client_data = (XPointer)this; xcb[1].callback = (XIMProc)xim_preedit_done; 1466 xcb[1].client_data = (XPointer)this; xcb[1].callback = (XIMProc)xim_preedit_done;
1404 xcb[2].client_data = (XPointer)this; xcb[2].callback = (XIMProc)xim_preedit_draw; 1467 xcb[2].client_data = (XPointer)this; xcb[2].callback = (XIMProc)xim_preedit_draw;
… …
1419#endif 1482#endif
1420 1483
1421 Input_Context = XCreateIC (xim, 1484 Input_Context = XCreateIC (xim,
1422 XNInputStyle, input_style, 1485 XNInputStyle, input_style,
1423 XNClientWindow, vt, 1486 XNClientWindow, vt,
1424 XNFocusWindow, parent[0], 1487 XNFocusWindow, parent,
1425 preedit_attr ? XNPreeditAttributes : NULL, 1488 preedit_attr ? XNPreeditAttributes : NULL,
1426 preedit_attr, 1489 preedit_attr,
1427 status_attr ? XNStatusAttributes : NULL, 1490 status_attr ? XNStatusAttributes : NULL,
1428 status_attr, NULL); 1491 status_attr, NULL);
1429 1492
… …
1442 // unfortunately, only the focus window is used by XIM, hard to fix 1505 // unfortunately, only the focus window is used by XIM, hard to fix
1443 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL)) 1506 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL))
1444 vt_select_input (); 1507 vt_select_input ();
1445#endif 1508#endif
1446 1509
1447 IMSetPosition (); 1510 im_set_position ();
1448 1511
1449 return true; 1512 return true;
1450} 1513}
1451 1514
1452void 1515void
… …
1462 im_destroy (); 1525 im_destroy ();
1463 1526
1464 if (Input_Context) 1527 if (Input_Context)
1465 return; 1528 return;
1466 1529
1467#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1468 if (rs[Rs_imLocale]) 1530 if (rs[Rs_imLocale])
1469 SET_LOCALE (rs[Rs_imLocale]); 1531 SET_LOCALE (rs[Rs_imLocale]);
1470#endif
1471 1532
1472 p = rs[Rs_inputMethod]; 1533 p = rs[Rs_inputMethod];
1473 if (p && *p) 1534 if (p && *p)
1474 { 1535 {
1475 bool found = false; 1536 bool found = false;
1476 1537
1477 s = rxvt_splitcommastring (p); 1538 s = rxvt_strsplit (',', p);
1478 1539
1479 for (i = 0; s[i]; i++) 1540 for (i = 0; s[i]; i++)
1480 { 1541 {
1481 if (*s[i]) 1542 if (*s[i])
1482 { 1543 {
1483 strcpy (buf, "@im="); 1544 strcpy (buf, "@im=");
1484 strncat (buf, s[i], IMBUFSIZ - 5); 1545 strncat (buf, s[i], IMBUFSIZ - 5);
1485 if (IM_get_IC (buf)) 1546 if (im_get_ic (buf))
1486 { 1547 {
1487 found = true; 1548 found = true;
1488 break; 1549 break;
1489 } 1550 }
1490 } 1551 }
1491 } 1552 }
1492 1553
1493 rxvt_freecommastring (s); 1554 rxvt_free_strsplit (s);
1494 1555
1495 if (found) 1556 if (found)
1496 goto done; 1557 goto done;
1497 } 1558 }
1498 1559
1499 /* try with XMODIFIERS env. var. */ 1560 /* try with XMODIFIERS env. var. */
1500 if (IM_get_IC ("")) 1561 if (im_get_ic (""))
1501 goto done; 1562 goto done;
1502 1563
1503 /* try with no modifiers base IF the user didn't specify an IM */ 1564 /* try with no modifiers base IF the user didn't specify an IM */
1504 if (IM_get_IC ("@im=none")) 1565 if (im_get_ic ("@im=none"))
1505 goto done; 1566 goto done;
1506 1567
1507done: 1568done:
1508#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1509 if (rs[Rs_imLocale]) 1569 if (rs[Rs_imLocale])
1510 SET_LOCALE (locale); 1570 SET_LOCALE (locale);
1511#endif
1512} 1571}
1513 1572
1514void 1573void
1515rxvt_term::IMSetPosition () 1574rxvt_term::im_set_position ()
1516{ 1575{
1517 XRectangle preedit_rect, status_rect, *needed_rect; 1576 XRectangle preedit_rect, status_rect, *needed_rect;
1518 XVaNestedList preedit_attr, status_attr; 1577 XVaNestedList preedit_attr, status_attr;
1519 1578
1520 if (!Input_Context 1579 if (!Input_Context
1521 || !focus 1580 || !focus
1522 || !(input_style & (XIMPreeditArea | XIMPreeditPosition)) 1581 || !(input_style & (XIMPreeditArea | XIMPreeditPosition))
1523 || !IMisRunning ()) 1582 || !im_is_running ())
1524 return; 1583 return;
1525 1584
1526 if (input_style & XIMPreeditPosition) 1585 if (input_style & XIMPreeditPosition)
1527 { 1586 {
1528 im_set_size (preedit_rect); 1587 im_set_size (preedit_rect);
… …
1558 1617
1559void 1618void
1560rxvt_term::get_window_origin (int &x, int &y) 1619rxvt_term::get_window_origin (int &x, int &y)
1561{ 1620{
1562 Window cr; 1621 Window cr;
1563 XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr); 1622 XTranslateCoordinates (dpy, parent, display->root, 0, 0, &x, &y, &cr);
1564/* fprintf (stderr, "origin is %+d%+d\n", x, y);*/
1565} 1623}
1566 1624
1567Pixmap 1625Pixmap
1568rxvt_term::get_pixmap_property (int prop_id) 1626rxvt_term::get_pixmap_property (Atom property)
1569{ 1627{
1570 if (prop_id > 0 && prop_id < NUM_XA) 1628 Pixmap pixmap = None;
1571 if (xa[prop_id]) 1629
1572 {
1573 int aformat; 1630 int aformat;
1574 unsigned long nitems, bytes_after; 1631 unsigned long nitems, bytes_after;
1575 Atom atype; 1632 Atom atype;
1576 unsigned char *prop = NULL; 1633 unsigned char *prop;
1577 int result = XGetWindowProperty (dpy, display->root, xa[prop_id], 1634 int result = XGetWindowProperty (dpy, display->root, property,
1578 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 1635 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1579 &nitems, &bytes_after, &prop); 1636 &nitems, &bytes_after, &prop);
1580 if (result == Success && prop && atype == XA_PIXMAP) 1637 if (result == Success)
1638 {
1639 if (atype == XA_PIXMAP)
1581 return *(Pixmap *)prop; 1640 pixmap = *(Pixmap *)prop;
1641 XFree (prop);
1582 } 1642 }
1583 1643
1584 return None; 1644 return pixmap;
1585} 1645}
1586 1646
1587#ifdef HAVE_BG_PIXMAP 1647#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 1648
1598void 1649void
1599rxvt_term::update_background () 1650rxvt_term::update_background ()
1600{ 1651{
1601 if (update_background_ev.is_active ()) 1652 if (update_background_ev.is_active ())
1602 return; 1653 return;
1603 1654
1604 bgPixmap.invalidate (); 1655 bg_invalidate ();
1605 1656
1657 if (!mapped)
1658 return;
1659
1606 ev_tstamp to_wait = 0.5 - (ev::now () - bgPixmap.valid_since); 1660 ev_tstamp to_wait = 0.5 - (ev::now () - bg_valid_since);
1607 1661
1608 if (to_wait <= 0.) 1662 if (to_wait <= 0.)
1609 bgPixmap.render (); 1663 bg_render ();
1610 else 1664 else
1611 update_background_ev.start (to_wait); 1665 update_background_ev.start (to_wait);
1612} 1666}
1613 1667
1614void 1668void
1615rxvt_term::update_background_cb (ev::timer &w, int revents) 1669rxvt_term::update_background_cb (ev::timer &w, int revents)
1616{ 1670{
1617 make_current (); 1671 make_current ();
1618 1672
1619 update_background_ev.stop (); 1673 update_background_ev.stop ();
1620 bgPixmap.render (); 1674 bg_render ();
1621 refresh_check (); 1675 refresh_check ();
1622} 1676}
1623 1677
1624#endif /* HAVE_BG_PIXMAP */ 1678#endif /* HAVE_BG_PIXMAP */
1625 1679

Diff Legend

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