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.309 by root, Wed Feb 27 01:02:33 2008 UTC vs.
Revision 1.374 by root, Sun Jun 3 10:42:34 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));
… …
186#endif 185#endif
187 child_ev.set <rxvt_term, &rxvt_term::child_cb> (this); 186 child_ev.set <rxvt_term, &rxvt_term::child_cb> (this);
188 flush_ev.set <rxvt_term, &rxvt_term::flush_cb> (this); 187 flush_ev.set <rxvt_term, &rxvt_term::flush_cb> (this);
189 destroy_ev.set <rxvt_term, &rxvt_term::destroy_cb> (this); 188 destroy_ev.set <rxvt_term, &rxvt_term::destroy_cb> (this);
190 pty_ev.set <rxvt_term, &rxvt_term::pty_cb> (this); 189 pty_ev.set <rxvt_term, &rxvt_term::pty_cb> (this);
191 incr_ev.set <rxvt_term, &rxvt_term::incr_cb> (this);
192 termwin_ev.set <rxvt_term, &rxvt_term::x_cb> (this); 190 termwin_ev.set <rxvt_term, &rxvt_term::x_cb> (this);
193 vt_ev.set <rxvt_term, &rxvt_term::x_cb> (this); 191 vt_ev.set <rxvt_term, &rxvt_term::x_cb> (this);
194 192
195 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base; 193 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base;
196 194
… …
225 delete fontset[i]; 223 delete fontset[i];
226#endif 224#endif
227 delete fontset[0]; 225 delete fontset[0];
228 226
229#ifdef HAVE_BG_PIXMAP 227#ifdef HAVE_BG_PIXMAP
230 bgPixmap.destroy (); 228 bg_destroy ();
231#endif 229#endif
232 230
233 if (display) 231 if (display)
234 { 232 {
235 selection_clear (); 233 selection_clear ();
234 selection_clear (true);
236 235
237#ifdef USE_XIM 236#ifdef USE_XIM
238 im_destroy (); 237 im_destroy ();
239#endif 238#endif
240 scrollBar.destroy (); 239 scrollBar.destroy ();
241 if (gc) XFreeGC (dpy, gc); 240 if (gc) XFreeGC (dpy, gc);
242 241
243 delete drawable; 242 delete drawable;
244 // destroy all windows 243 // destroy all windows
245 if (parent[0]) 244 if (parent)
246 XDestroyWindow (dpy, parent[0]); 245 XDestroyWindow (dpy, parent);
247 246
248 for (int i = 0; i < TOTAL_COLORS; i++) 247 for (int i = 0; i < TOTAL_COLORS; i++)
249 if (ISSET_PIXCOLOR (i)) 248 if (ISSET_PIXCOLOR (i))
250 { 249 {
251 pix_colors_focused [i].free (this); 250 pix_colors_focused [i].free (this);
… …
265 /* clear all resources */ 264 /* clear all resources */
266 for (int i = 0; i < allocated.size (); i++) 265 for (int i = 0; i < allocated.size (); i++)
267 free (allocated [i]); 266 free (allocated [i]);
268 267
269 free (selection.text); 268 free (selection.text);
270 // TODO: manage env vars in child only(!) 269 free (selection.clip_text);
271 free (env_display);
272 free (env_term);
273 free (locale); 270 free (locale);
274 free (v_buffer); 271 free (v_buffer);
275 free (incr_buf); 272
273 delete selection_req;
276 274
277 delete envv; 275 delete envv;
278 delete argv; 276 delete argv;
279 277
280#ifdef KEYSYM_RESOURCE 278#ifdef KEYSYM_RESOURCE
… …
316#endif 314#endif
317 scrollbar_ev.stop (display); 315 scrollbar_ev.stop (display);
318#if ENABLE_TRANSPARENCY || ENABLE_PERL 316#if ENABLE_TRANSPARENCY || ENABLE_PERL
319 rootwin_ev.stop (display); 317 rootwin_ev.stop (display);
320#endif 318#endif
321 incr_ev.stop ();
322 termwin_ev.stop (display); 319 termwin_ev.stop (display);
323 vt_ev.stop (display); 320 vt_ev.stop (display);
324 } 321 }
325 322
326 flush_ev.stop (); 323 flush_ev.stop ();
… …
348rxvt_term::destroy_cb (ev::idle &w, int revents) 345rxvt_term::destroy_cb (ev::idle &w, int revents)
349{ 346{
350 make_current (); 347 make_current ();
351 348
352 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);
353} 362}
354 363
355/*----------------------------------------------------------------------*/ 364/*----------------------------------------------------------------------*/
356/* 365/*
357 * Exit gracefully, clearing the utmp entry and restoring tty attributes 366 * Exit gracefully, clearing the utmp entry and restoring tty attributes
… …
365 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++) 374 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)
366 (*t)->emergency_cleanup (); 375 (*t)->emergency_cleanup ();
367} 376}
368 377
369#if !ENABLE_MINIMAL 378#if !ENABLE_MINIMAL
370static void 379static void ecb_cold
371print_x_error (Display *dpy, XErrorEvent *event) 380print_x_error (Display *dpy, XErrorEvent *event)
372{ 381{
373 char buffer[BUFSIZ]; 382 char buffer[BUFSIZ];
374 char mesg[BUFSIZ]; 383 char mesg[BUFSIZ];
375 char number[32]; 384 char number[32];
376 char *mtype = "XlibMessage"; 385 const char mtype[] = "XlibMessage";
377 XGetErrorText(dpy, event->error_code, buffer, BUFSIZ); 386 XGetErrorText(dpy, event->error_code, buffer, BUFSIZ);
378 XGetErrorDatabaseText(dpy, mtype, "XError", "X Error", mesg, BUFSIZ); 387 XGetErrorDatabaseText(dpy, mtype, "XError", "X Error", mesg, BUFSIZ);
379 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");
380 rxvt_warn ("%s: %s\n", mesg, buffer); 389 rxvt_warn ("%s: %s\n", mesg, buffer);
381 XGetErrorDatabaseText(dpy, mtype, "MajorCode", "Request Major code %d", mesg, BUFSIZ); 390 XGetErrorDatabaseText(dpy, mtype, "MajorCode", "Request Major code %d", mesg, BUFSIZ);
382 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->request_code); 391 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->request_code);
383 sprintf(number, "%d", event->request_code); 392 sprintf(number, "%d", event->request_code);
384 XGetErrorDatabaseText(dpy, "XRequest", number, "", buffer, BUFSIZ); 393 XGetErrorDatabaseText(dpy, "XRequest", number, "", buffer, BUFSIZ);
385 rxvt_warn ("(which is %s)\n", buffer); 394 rxvt_warn ("(which is %s)\n", buffer);
386 if (event->request_code >= 128) { 395 if (event->request_code >= 128) {
387 XGetErrorDatabaseText(dpy, mtype, "MinorCode", "Request Minor code %d", 396 XGetErrorDatabaseText(dpy, mtype, "MinorCode", "Request Minor code %d",
388 mesg, BUFSIZ); 397 mesg, BUFSIZ);
389 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->minor_code); 398 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->minor_code);
390 } 399 }
391 if ((event->error_code == BadWindow) || 400 if ((event->error_code == BadWindow) ||
392 (event->error_code == BadPixmap) || 401 (event->error_code == BadPixmap) ||
393 (event->error_code == BadCursor) || 402 (event->error_code == BadCursor) ||
394 (event->error_code == BadFont) || 403 (event->error_code == BadFont) ||
395 (event->error_code == BadDrawable) || 404 (event->error_code == BadDrawable) ||
396 (event->error_code == BadColor) || 405 (event->error_code == BadColor) ||
397 (event->error_code == BadGC) || 406 (event->error_code == BadGC) ||
398 (event->error_code == BadIDChoice) || 407 (event->error_code == BadIDChoice) ||
399 (event->error_code == BadValue) || 408 (event->error_code == BadValue) ||
400 (event->error_code == BadAtom)) { 409 (event->error_code == BadAtom)) {
401 if (event->error_code == BadValue) 410 if (event->error_code == BadValue)
402 XGetErrorDatabaseText(dpy, mtype, "Value", "Value 0x%x", 411 XGetErrorDatabaseText(dpy, mtype, "Value", "Value 0x%x",
403 mesg, BUFSIZ); 412 mesg, BUFSIZ);
404 else if (event->error_code == BadAtom) 413 else if (event->error_code == BadAtom)
405 XGetErrorDatabaseText(dpy, mtype, "AtomID", "AtomID 0x%x", 414 XGetErrorDatabaseText(dpy, mtype, "AtomID", "AtomID 0x%x",
406 mesg, BUFSIZ); 415 mesg, BUFSIZ);
407 else 416 else
408 XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x", 417 XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x",
409 mesg, BUFSIZ); 418 mesg, BUFSIZ);
410 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid); 419 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid);
411 } 420 }
412 XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d", 421 XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d",
413 mesg, BUFSIZ); 422 mesg, BUFSIZ);
414 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial); 423 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial);
415} 424}
416#endif 425#endif
417 426
418int 427int ecb_cold
419rxvt_xerror_handler (Display *display, XErrorEvent *event) 428rxvt_xerror_handler (Display *display, XErrorEvent *event)
420{ 429{
421 if (GET_R->allowedxerror == -1) 430 if (GET_R->allowedxerror == -1)
422 GET_R->allowedxerror = event->error_code; 431 GET_R->allowedxerror = event->error_code;
423 else 432 else
… …
432 } 441 }
433 442
434 return 0; 443 return 0;
435} 444}
436 445
437int 446int ecb_cold
438rxvt_xioerror_handler (Display *display) 447rxvt_xioerror_handler (Display *display)
439{ 448{
440 rxvt_warn ("X connection to '%s' broken, unable to recover, exiting.\n", 449 rxvt_warn ("X connection to '%s' broken, unable to recover, exiting.\n",
441 DisplayString (display)); 450 DisplayString (display));
442 rxvt_emergency_cleanup (); 451 rxvt_emergency_cleanup ();
… …
465 rxvt_emergency_cleanup (); 474 rxvt_emergency_cleanup ();
466 w.stop (); 475 w.stop ();
467 kill (getpid (), w.signum); 476 kill (getpid (), w.signum);
468} 477}
469 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
470char **rxvt_environ; // startup environment 546char **rxvt_environ; // startup environment
471 547
472void 548void
473rxvt_init () 549rxvt_init ()
474{ 550{
475 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))));
476 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
477 if (!ev_default_loop (0)) 560 if (!ev_default_loop ())
478 rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n"); 561 rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n");
479 562
480 rxvt_environ = environ; 563 rxvt_environ = environ;
481 564
482 signal (SIGHUP, SIG_IGN); 565 signal (SIGHUP, SIG_IGN);
483 signal (SIGPIPE, SIG_IGN); 566 signal (SIGPIPE, SIG_IGN);
484 567
485 sig_handlers.sw_term.start (SIGTERM); ev_unref (); 568 sig_handlers.sw_term.start (SIGTERM); ev_unref ();
486 sig_handlers.sw_int.start (SIGINT); ev_unref (); 569 sig_handlers.sw_int.start (SIGINT); ev_unref ();
487
488 /* need to trap SIGURG for SVR4 (Unixware) rlogin */
489 /* signal (SIGURG, SIG_DFL); */
490 570
491 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); 571 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
492 // TODO: handle this with exceptions and tolerate the memory loss 572 // TODO: handle this with exceptions and tolerate the memory loss
493 XSetIOErrorHandler (rxvt_xioerror_handler); 573 XSetIOErrorHandler (rxvt_xioerror_handler);
494 574
495 XrmInitialize (); 575 XrmInitialize ();
576
577#ifdef HAVE_PIXBUF
578 g_type_init ();
579#endif
496} 580}
497 581
498/*----------------------------------------------------------------------*/ 582/*----------------------------------------------------------------------*/
499/* 583/*
500 * window size/position calculations for XSizeHint and other storage. 584 * window size/position calculations for XSizeHint and other storage.
… …
522 if (rs[Rs_geometry]) 606 if (rs[Rs_geometry])
523 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h); 607 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h);
524 608
525 if (flags & WidthValue) 609 if (flags & WidthValue)
526 { 610 {
611 if (!w)
612 rxvt_fatal ("illegal window geometry (width and height must be non-zero), aborting.\n");
613
527 ncol = clamp (w, 0, std::numeric_limits<int16_t>::max ()); 614 ncol = clamp (w, 1, std::numeric_limits<int16_t>::max ());
528 szHint.flags |= USSize; 615 szHint.flags |= USSize;
529 } 616 }
530 617
531 if (flags & HeightValue) 618 if (flags & HeightValue)
532 { 619 {
620 if (!h)
621 rxvt_fatal ("illegal window geometry (width and height must be non-zero), aborting.\n");
622
533 nrow = clamp (h, 0, std::numeric_limits<int16_t>::max ()); 623 nrow = clamp (h, 1, std::numeric_limits<int16_t>::max ());
534 szHint.flags |= USSize; 624 szHint.flags |= USSize;
535 } 625 }
536 626
537 if (flags & XValue) 627 if (flags & XValue)
538 { 628 {
… …
559 szHint.win_gravity = SouthEastGravity; 649 szHint.win_gravity = SouthEastGravity;
560 else 650 else
561 szHint.win_gravity = SouthWestGravity; 651 szHint.win_gravity = SouthWestGravity;
562 } 652 }
563 } 653 }
564
565 if (!szHint.width || !szHint.height)
566 rxvt_fatal ("window width or height must not be zero, aborting.\n");
567 } 654 }
568 655
569 /* TODO: BOUNDS */ 656 /* TODO: BOUNDS */
570 width = ncol * fwidth; 657 width = ncol * fwidth;
571 height = nrow * fheight; 658 height = nrow * fheight;
… …
616 szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth; 703 szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth;
617 704
618 if (recalc_y) 705 if (recalc_y)
619 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth; 706 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth;
620 707
621 ncol = width / fwidth; 708 ncol = width / fwidth;
622 nrow = height / fheight; 709 nrow = height / fheight;
710
711 // When the size of the vt window is not a multiple of the cell
712 // size, i.e., when the wm does not honour our size hints, there are
713 // extra areas not covered by the terminal screen. Such gaps, when a
714 // bg pixmap is set, would have to be cleared manually to properly
715 // refresh the background. We take the simpler route and shrink the
716 // vt window so as to avoid creating gaps.
717 vt_width = ncol * fwidth;
718 vt_height = nrow * fheight;
623} 719}
624 720
625/*----------------------------------------------------------------------*/ 721/*----------------------------------------------------------------------*/
626/* 722/*
627 * Tell the teletype handler what size the window is. 723 * Tell the teletype handler what size the window is.
… …
635 731
636 struct winsize ws; 732 struct winsize ws;
637 733
638 ws.ws_col = ncol; 734 ws.ws_col = ncol;
639 ws.ws_row = nrow; 735 ws.ws_row = nrow;
640 ws.ws_xpixel = width; 736 ws.ws_xpixel = vt_width;
641 ws.ws_ypixel = height; 737 ws.ws_ypixel = vt_height;
642 (void)ioctl (pty->pty, TIOCSWINSZ, &ws); 738 ioctl (pty->pty, TIOCSWINSZ, &ws);
643 739
644#if 0 740#if 0
645 // TIOCSWINSZ is supposed to do this automatically and correctly 741 // TIOCSWINSZ is supposed to do this automatically and correctly
646 if (cmd_pid) /* force through to the command */ 742 if (cmd_pid) /* force through to the command */
647 kill (-cmd_pid, SIGWINCH); 743 kill (-cmd_pid, SIGWINCH);
648#endif 744#endif
649} 745}
650 746
651/*----------------------------------------------------------------------*/ 747/*----------------------------------------------------------------------*/
652/* set_fonts () - load and set the various fonts 748/* load and set the various fonts */
653 *
654 * init = 1 - initialize
655 *
656 * fontname == FONT_UP - switch to bigger font
657 * fontname == FONT_DN - switch to smaller font
658 */
659bool 749bool
660rxvt_term::set_fonts () 750rxvt_term::set_fonts ()
661{ 751{
662 rxvt_fontset *fs = new rxvt_fontset (this); 752 rxvt_fontset *fs = new rxvt_fontset (this);
663 rxvt_fontprop prop; 753 rxvt_fontprop prop;
… …
677#endif 767#endif
678 768
679 delete fontset[0]; 769 delete fontset[0];
680 fontset[0] = fs; 770 fontset[0] = fs;
681 771
682 prop = (*fs)[1]->properties (); 772 prop = (*fs)[rxvt_fontset::firstFont]->properties ();
683 prop.height += lineSpace; 773 prop.width += letterSpace;
684 774
685 fs->set_prop (prop, false); 775 fs->set_prop (prop, false);
686 776
687 fwidth = prop.width; 777 fwidth = prop.width;
688 fheight = prop.height; 778 fheight = prop.height + lineSpace;
689 fbase = prop.ascent; 779 fbase = prop.ascent;
690 780
691 for (int style = 1; style < 4; style++) 781 for (int style = 1; style < 4; style++)
692 { 782 {
693#if ENABLE_STYLES 783#if ENABLE_STYLES
… …
719#else 809#else
720 fontset[style] = fontset[0]; 810 fontset[style] = fontset[0];
721#endif 811#endif
722 } 812 }
723 813
724 if (parent[0]) 814 if (parent)
725 { 815 {
726 resize_all_windows (0, 0, 0); 816 resize_all_windows (0, 0, 0);
727 scr_remap_chars (); 817 scr_remap_chars ();
728 scr_touch (true); 818 scr_touch (true);
729 } 819 }
… …
732} 822}
733 823
734void 824void
735rxvt_term::set_string_property (Atom prop, const char *str, int len) 825rxvt_term::set_string_property (Atom prop, const char *str, int len)
736{ 826{
737 XChangeProperty (dpy, parent[0], 827 XChangeProperty (dpy, parent,
738 prop, XA_STRING, 8, PropModeReplace, 828 prop, XA_STRING, 8, PropModeReplace,
739 (const unsigned char *)str, len >= 0 ? len : strlen (str)); 829 (const unsigned char *)str, len >= 0 ? len : strlen (str));
740} 830}
741 831
742void 832void
833rxvt_term::set_mbstring_property (Atom prop, const char *str, int len)
834{
835 XTextProperty ct;
836
837 if (XmbTextListToTextProperty (dpy, (char **)&str, 1, XStdICCTextStyle, &ct) >= 0)
838 {
839 XSetTextProperty (dpy, parent, &ct, prop);
840 XFree (ct.value);
841 }
842}
843
844void
743rxvt_term::set_utf8_property (Atom prop, const char *str, int len) 845rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
744{ 846{
745 wchar_t *ws = rxvt_mbstowcs (str, len); 847 wchar_t *ws = rxvt_mbstowcs (str, len);
746 char *s = rxvt_wcstoutf8 (ws); 848 char *s = rxvt_wcstoutf8 (ws);
747 849
748 XChangeProperty (dpy, parent[0], 850 XChangeProperty (dpy, parent,
749 prop, xa[XA_UTF8_STRING], 8, PropModeReplace, 851 prop, xa[XA_UTF8_STRING], 8, PropModeReplace,
750 (const unsigned char *)s, strlen (s)); 852 (const unsigned char *)s, strlen (s));
751 853
752 free (s); 854 free (s);
753 free (ws); 855 free (ws);
… …
757/*----------------------------------------------------------------------*/ 859/*----------------------------------------------------------------------*/
758/* xterm sequences - title, iconName, color (exptl) */ 860/* xterm sequences - title, iconName, color (exptl) */
759void 861void
760rxvt_term::set_title (const char *str) 862rxvt_term::set_title (const char *str)
761{ 863{
762 set_string_property (XA_WM_NAME, str); 864 set_mbstring_property (XA_WM_NAME, str);
763#if ENABLE_EWMH 865#if ENABLE_EWMH
764 set_utf8_property (xa[XA_NET_WM_NAME], str); 866 set_utf8_property (xa[XA_NET_WM_NAME], str);
765#endif 867#endif
766} 868}
767 869
768void 870void
769rxvt_term::set_icon_name (const char *str) 871rxvt_term::set_icon_name (const char *str)
770{ 872{
771 set_string_property (XA_WM_ICON_NAME, str); 873 set_mbstring_property (XA_WM_ICON_NAME, str);
772#if ENABLE_EWMH 874#if ENABLE_EWMH
773 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str); 875 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str);
774#endif 876#endif
775} 877}
776 878
… …
843 945
844/*----------------------------------------------------------------------*/ 946/*----------------------------------------------------------------------*/
845/* 947/*
846 * find if fg/bg matches any of the normal (low-intensity) colors 948 * find if fg/bg matches any of the normal (low-intensity) colors
847 */ 949 */
848void 950char *
849rxvt_term::set_colorfgbg () 951rxvt_term::get_colorfgbg ()
850{ 952{
851 unsigned int i; 953 unsigned int i;
852 const char *xpmb = ""; 954 const char *xpmb = "";
853 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1]; 955 char fstr[] = "default";
956 char bstr[] = "default";
957 char *env_colorfgbg;
854 958
855 strcpy (fstr, "default");
856 strcpy (bstr, "default");
857 for (i = Color_Black; i <= Color_White; i++) 959 for (i = Color_Black; i <= Color_White; i++)
858 if (pix_colors[Color_fg] == pix_colors[i]) 960 if (pix_colors[Color_fg] == pix_colors[i])
859 { 961 {
860 sprintf (fstr, "%d", (i - Color_Black)); 962 sprintf (fstr, "%d", i - Color_Black);
861 break; 963 break;
862 } 964 }
863 965
864 for (i = Color_Black; i <= Color_White; i++) 966 for (i = Color_Black; i <= Color_White; i++)
865 if (pix_colors[Color_bg] == pix_colors[i]) 967 if (pix_colors[Color_bg] == pix_colors[i])
866 { 968 {
867 sprintf (bstr, "%d", (i - Color_Black)); 969 sprintf (bstr, "%d", i - Color_Black);
868#ifdef BG_IMAGE_FROM_FILE 970#ifdef BG_IMAGE_FROM_FILE
869 xpmb = "default;"; 971 xpmb = "default;";
870#endif 972#endif
871 break; 973 break;
872 } 974 }
873 975
976 env_colorfgbg = (char *)rxvt_malloc (sizeof ("COLORFGBG=default;default;bg"));
874 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr); 977 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr);
978 return env_colorfgbg;
875} 979}
876 980
877/*----------------------------------------------------------------------*/ 981/*----------------------------------------------------------------------*/
878 982
879bool 983bool
… …
902 int old_width = szHint.width; 1006 int old_width = szHint.width;
903 int old_height = szHint.height; 1007 int old_height = szHint.height;
904 1008
905 window_calc (newwidth, newheight); 1009 window_calc (newwidth, newheight);
906 1010
907 if (!HOOK_INVOKE ((this, HOOK_RESIZE_ALL_WINDOWS, DT_INT, newwidth, DT_INT, newheight, DT_END))) 1011 bool set_hint = !HOOK_INVOKE ((this, HOOK_RESIZE_ALL_WINDOWS, DT_INT, newwidth, DT_INT, newheight, DT_END));
1012
1013 // to avoid races between us and the wm, we clear the incremental size hints around the xresizewindow
1014 if (set_hint)
1015 {
1016 szHint.flags &= ~(PBaseSize | PResizeInc);
908 XSetWMNormalHints (dpy, parent[0], &szHint); 1017 XSetWMNormalHints (dpy, parent, &szHint);
1018 szHint.flags |= PBaseSize | PResizeInc;
1019 }
909 1020
910 if (!ignoreparent) 1021 if (!ignoreparent)
911 { 1022 {
912#ifdef SMART_RESIZE 1023#ifdef SMART_RESIZE
913 /* 1024 /*
… …
917 int x, y, x1, y1; 1028 int x, y, x1, y1;
918 int dx, dy; 1029 int dx, dy;
919 unsigned int unused_w1, unused_h1, unused_b1, unused_d1; 1030 unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
920 Window unused_cr; 1031 Window unused_cr;
921 1032
922 XTranslateCoordinates (dpy, parent[0], display->root, 1033 XTranslateCoordinates (dpy, parent, display->root,
923 0, 0, &x, &y, &unused_cr); 1034 0, 0, &x, &y, &unused_cr);
924 XGetGeometry (dpy, parent[0], &unused_cr, &x1, &y1, 1035 XGetGeometry (dpy, parent, &unused_cr, &x1, &y1,
925 &unused_w1, &unused_h1, &unused_b1, &unused_d1); 1036 &unused_w1, &unused_h1, &unused_b1, &unused_d1);
926 /* 1037 /*
927 * if display->root isn't the parent window, a WM will probably have offset 1038 * if display->root isn't the parent window, a WM will probably have offset
928 * our position for handles and decorations. Counter it 1039 * our position for handles and decorations. Counter it
929 */ 1040 */
… …
946 if (y < y1) /* top half */ 1057 if (y < y1) /* top half */
947 dy = 0; 1058 dy = 0;
948 else if (y == y1) /* exact center */ 1059 else if (y == y1) /* exact center */
949 dy /= 2; 1060 dy /= 2;
950 1061
951 XMoveResizeWindow (dpy, parent[0], x + dx, y + dy, 1062 XMoveResizeWindow (dpy, parent, x + dx, y + dy,
952 szHint.width, szHint.height); 1063 szHint.width, szHint.height);
953#else 1064#else
954 XResizeWindow (dpy, parent[0], szHint.width, szHint.height); 1065 XResizeWindow (dpy, parent, szHint.width, szHint.height);
955#endif 1066#endif
956 } 1067 }
1068
1069 if (set_hint)
1070 XSetWMNormalHints (dpy, parent, &szHint);
957 1071
958 fix_screen = ncol != prev_ncol || nrow != prev_nrow; 1072 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
959 1073
960 if (fix_screen || newwidth != old_width || newheight != old_height) 1074 if (fix_screen || newwidth != old_width || newheight != old_height)
961 { 1075 {
962 if (scrollBar.state) 1076 if (scrollBar.state)
963 scrollBar.resize (); 1077 scrollBar.resize ();
964 1078
965 XMoveResizeWindow (dpy, vt, 1079 XMoveResizeWindow (dpy, vt,
966 window_vt_x, window_vt_y, 1080 window_vt_x, window_vt_y,
967 width, height); 1081 vt_width, vt_height);
968 1082
969#ifdef HAVE_BG_PIXMAP 1083#ifdef HAVE_BG_PIXMAP
970 if (bgPixmap.window_size_sensitive ()) 1084 if (bg_window_size_sensitive ())
971 update_background (); 1085 update_background ();
972#endif 1086#endif
973
974 scr_clear ();
975 } 1087 }
976 1088
977 if (fix_screen || old_height == 0) 1089 if (fix_screen || old_height == 0)
978 scr_reset (); 1090 scr_reset ();
979 1091
980 // TODO, with nvidia-8178, resizes kill the alpha channel, report if not fixed in newer version
981 //scr_touch (false);
982
983#ifdef HAVE_BG_PIXMAP
984// TODO: this don't seem to have any effect - do we still need it ? If so - in which case exactly ?
985// if (bgPixmap.pixmap)
986// scr_touch (false);
987#endif
988
989#ifdef USE_XIM 1092#ifdef USE_XIM
990 IMSetPosition (); 1093 im_set_position ();
991#endif 1094#endif
992} 1095}
993 1096
994/* 1097/*
995 * Set the width/height of the vt window in characters. Units are pixels. 1098 * Set the width/height of the vt window in characters. Units are pixels.
… …
1008 newwidth = wattr.width - szHint.base_width; 1111 newwidth = wattr.width - szHint.base_width;
1009 if (newheight == 0) 1112 if (newheight == 0)
1010 newheight = wattr.height - szHint.base_height; 1113 newheight = wattr.height - szHint.base_height;
1011 } 1114 }
1012 1115
1013 if (newwidth != width || newheight != height) 1116 if (newwidth != vt_width || newheight != vt_height)
1014 { 1117 {
1015 newwidth += szHint.base_width; 1118 newwidth += szHint.base_width;
1016 newheight += szHint.base_height; 1119 newheight += szHint.base_height;
1017 resize_all_windows (newwidth, newheight, 0); 1120 resize_all_windows (newwidth, newheight, 0);
1018 } 1121 }
… …
1056 status_rect.height = fheight; 1159 status_rect.height = fheight;
1057} 1160}
1058 1161
1059/* Checking whether input method is running. */ 1162/* Checking whether input method is running. */
1060bool 1163bool
1061rxvt_term::IMisRunning () 1164rxvt_term::im_is_running ()
1062{ 1165{
1063 char *p;
1064 Atom atom; 1166 Atom atom;
1065 Window win; 1167 Window win;
1066 char server[IMBUFSIZ]; 1168 char server[IMBUFSIZ];
1067 1169
1068 /* get current locale modifier */ 1170 /* get current locale modifier */
1069 if ((p = XSetLocaleModifiers (NULL)) != NULL) 1171 if (char *p = XSetLocaleModifiers (0))
1070 { 1172 {
1071 strcpy (server, "@server="); 1173 strcpy (server, "@server=");
1072 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */ 1174 strncat (server, p + 4, IMBUFSIZ - 9); /* skip "@im=" */
1073 1175
1074 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */ 1176 if (p = strchr (server + 1, '@')) /* first one only */
1075 *p = '\0'; 1177 *p = '\0';
1076 1178
1077 atom = XInternAtom (dpy, server, False); 1179 atom = XInternAtom (dpy, server, False);
1078 win = XGetSelectionOwner (dpy, atom); 1180 win = XGetSelectionOwner (dpy, atom);
1079 1181
1080 if (win != None) 1182 if (win != None)
1081 return True; 1183 return true;
1082 } 1184 }
1083 1185
1084 return False; 1186 return false;
1085} 1187}
1086 1188
1087void 1189void
1088rxvt_term::IMSendSpot () 1190rxvt_term::im_send_spot ()
1089{ 1191{
1090 XPoint nspot; 1192 XPoint nspot;
1091 XVaNestedList preedit_attr; 1193 XVaNestedList preedit_attr;
1092 1194
1093 if (!Input_Context 1195 if (!Input_Context
… …
1146 1248
1147 term->make_current (); 1249 term->make_current ();
1148 1250
1149 if (text) 1251 if (text)
1150 { 1252 {
1151 void *str; 1253 wchar_t *str;
1152 1254
1153 if (!text->encoding_is_wchar && text->string.multi_byte) 1255 if (!text->encoding_is_wchar && text->string.multi_byte)
1154 { 1256 {
1155 // of course, X makes it ugly again 1257 // of course, X makes it ugly again
1156 if (term->rs[Rs_imLocale]) 1258 if (term->rs[Rs_imLocale])
1157 SET_LOCALE (term->rs[Rs_imLocale]); 1259 SET_LOCALE (term->rs[Rs_imLocale]);
1158 1260
1159 str = rxvt_temp_buf ((text->length + 1) * sizeof (wchar_t)); 1261 str = rxvt_temp_buf<wchar_t> (text->length + 1);
1160 mbstowcs ((wchar_t *)str, text->string.multi_byte, text->length + 1); 1262 mbstowcs (str, text->string.multi_byte, text->length + 1);
1161 1263
1162 if (term->rs[Rs_imLocale]) 1264 if (term->rs[Rs_imLocale])
1163 SET_LOCALE (term->locale); 1265 SET_LOCALE (term->locale);
1164 } 1266 }
1165 else 1267 else
1166 str = (void *)text->string.wide_char; 1268 str = text->string.wide_char;
1167 1269
1168 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW, 1270 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
1169 DT_INT, call_data->caret, 1271 DT_INT, call_data->caret,
1170 DT_INT, call_data->chg_first, 1272 DT_INT, call_data->chg_first,
1171 DT_INT, call_data->chg_length, 1273 DT_INT, call_data->chg_length,
… …
1199/* 1301/*
1200 * Try to open a XIM with the current modifiers, then see if we can 1302 * Try to open a XIM with the current modifiers, then see if we can
1201 * open a suitable preedit type 1303 * open a suitable preedit type
1202 */ 1304 */
1203bool 1305bool
1204rxvt_term::IM_get_IC (const char *modifiers) 1306rxvt_term::im_get_ic (const char *modifiers)
1205{ 1307{
1206 int i, j, found; 1308 int i, j, found;
1207 XIM xim; 1309 XIM xim;
1208 XPoint spot; 1310 XPoint spot;
1209 XRectangle rect, status_rect, needed_rect; 1311 XRectangle rect, status_rect, needed_rect;
1210 unsigned long fg, bg; 1312 unsigned long fg, bg;
1211 const char *p; 1313 const char *p;
1212 char **s; 1314 char **s;
1213 XIMStyles *xim_styles; 1315 XIMStyles *xim_styles;
1214#ifdef ENABLE_XIM_ONTHESPOT
1215 XIMCallback xcb[4];
1216#endif
1217 1316
1218 set_environ (envv); 1317 set_environ (envv);
1219 1318
1220 if (! ((p = XSetLocaleModifiers (modifiers)) && *p)) 1319 if (! ((p = XSetLocaleModifiers (modifiers)) && *p))
1221 return false; 1320 return false;
… …
1242 p = pet[pi]; 1341 p = pet[pi];
1243 1342
1244 if (!p) 1343 if (!p)
1245 continue; 1344 continue;
1246 1345
1247 s = rxvt_splitcommastring (p); 1346 s = rxvt_strsplit (',', p);
1248 1347
1249 for (i = found = 0; !found && s[i]; i++) 1348 for (i = found = 0; !found && s[i]; i++)
1250 { 1349 {
1251 if (!strcmp (s[i], "OverTheSpot")) 1350 if (!strcmp (s[i], "OverTheSpot"))
1252 input_style = XIMPreeditPosition | XIMStatusNothing; 1351 input_style = XIMPreeditPosition | XIMStatusNothing;
… …
1264 input_style = XIMPreeditNothing | XIMStatusNothing; 1363 input_style = XIMPreeditNothing | XIMStatusNothing;
1265 1364
1266 for (j = 0; j < xim_styles->count_styles; j++) 1365 for (j = 0; j < xim_styles->count_styles; j++)
1267 if (input_style == xim_styles->supported_styles[j]) 1366 if (input_style == xim_styles->supported_styles[j])
1268 { 1367 {
1269 rxvt_freecommastring (s); 1368 rxvt_free_strsplit (s);
1270 1369
1271 found = 1; 1370 found = 1;
1272 goto foundpet; 1371 goto foundpet;
1273 } 1372 }
1274 1373
1275 } 1374 }
1276 1375
1277 rxvt_freecommastring (s); 1376 rxvt_free_strsplit (s);
1278 } 1377 }
1279 1378
1280foundpet: 1379foundpet:
1281 1380
1282 XFree (xim_styles); 1381 XFree (xim_styles);
… …
1361 NULL); 1460 NULL);
1362 } 1461 }
1363#if ENABLE_XIM_ONTHESPOT 1462#if ENABLE_XIM_ONTHESPOT
1364 else if (input_style & XIMPreeditCallbacks) 1463 else if (input_style & XIMPreeditCallbacks)
1365 { 1464 {
1465 XIMCallback xcb[4];
1466
1366 im_set_position (spot); 1467 im_set_position (spot);
1367 1468
1368 xcb[0].client_data = (XPointer)this; xcb[0].callback = (XIMProc)xim_preedit_start; 1469 xcb[0].client_data = (XPointer)this; xcb[0].callback = (XIMProc)xim_preedit_start;
1369 xcb[1].client_data = (XPointer)this; xcb[1].callback = (XIMProc)xim_preedit_done; 1470 xcb[1].client_data = (XPointer)this; xcb[1].callback = (XIMProc)xim_preedit_done;
1370 xcb[2].client_data = (XPointer)this; xcb[2].callback = (XIMProc)xim_preedit_draw; 1471 xcb[2].client_data = (XPointer)this; xcb[2].callback = (XIMProc)xim_preedit_draw;
… …
1385#endif 1486#endif
1386 1487
1387 Input_Context = XCreateIC (xim, 1488 Input_Context = XCreateIC (xim,
1388 XNInputStyle, input_style, 1489 XNInputStyle, input_style,
1389 XNClientWindow, vt, 1490 XNClientWindow, vt,
1390 XNFocusWindow, parent[0], 1491 XNFocusWindow, parent,
1391 preedit_attr ? XNPreeditAttributes : NULL, 1492 preedit_attr ? XNPreeditAttributes : NULL,
1392 preedit_attr, 1493 preedit_attr,
1393 status_attr ? XNStatusAttributes : NULL, 1494 status_attr ? XNStatusAttributes : NULL,
1394 status_attr, NULL); 1495 status_attr, NULL);
1395 1496
… …
1408 // unfortunately, only the focus window is used by XIM, hard to fix 1509 // unfortunately, only the focus window is used by XIM, hard to fix
1409 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL)) 1510 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL))
1410 vt_select_input (); 1511 vt_select_input ();
1411#endif 1512#endif
1412 1513
1413 IMSetPosition (); 1514 im_set_position ();
1414 1515
1415 return true; 1516 return true;
1416} 1517}
1417 1518
1418void 1519void
… …
1428 im_destroy (); 1529 im_destroy ();
1429 1530
1430 if (Input_Context) 1531 if (Input_Context)
1431 return; 1532 return;
1432 1533
1433#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1434 if (rs[Rs_imLocale]) 1534 if (rs[Rs_imLocale])
1435 SET_LOCALE (rs[Rs_imLocale]); 1535 SET_LOCALE (rs[Rs_imLocale]);
1436#endif
1437 1536
1438 p = rs[Rs_inputMethod]; 1537 p = rs[Rs_inputMethod];
1439 if (p && *p) 1538 if (p && *p)
1440 { 1539 {
1441 bool found = false; 1540 bool found = false;
1442 1541
1443 s = rxvt_splitcommastring (p); 1542 s = rxvt_strsplit (',', p);
1444 1543
1445 for (i = 0; s[i]; i++) 1544 for (i = 0; s[i]; i++)
1446 { 1545 {
1447 if (*s[i]) 1546 if (*s[i])
1448 { 1547 {
1449 strcpy (buf, "@im="); 1548 strcpy (buf, "@im=");
1450 strncat (buf, s[i], IMBUFSIZ - 5); 1549 strncat (buf, s[i], IMBUFSIZ - 5);
1451 if (IM_get_IC (buf)) 1550 if (im_get_ic (buf))
1452 { 1551 {
1453 found = true; 1552 found = true;
1454 break; 1553 break;
1455 } 1554 }
1456 } 1555 }
1457 } 1556 }
1458 1557
1459 rxvt_freecommastring (s); 1558 rxvt_free_strsplit (s);
1460 1559
1461 if (found) 1560 if (found)
1462 goto done; 1561 goto done;
1463 } 1562 }
1464 1563
1465 /* try with XMODIFIERS env. var. */ 1564 /* try with XMODIFIERS env. var. */
1466 if (IM_get_IC ("")) 1565 if (im_get_ic (""))
1467 goto done; 1566 goto done;
1468 1567
1469 /* try with no modifiers base IF the user didn't specify an IM */ 1568 /* try with no modifiers base IF the user didn't specify an IM */
1470 if (IM_get_IC ("@im=none")) 1569 if (im_get_ic ("@im=none"))
1471 goto done; 1570 goto done;
1472 1571
1473done: 1572done:
1474#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1475 if (rs[Rs_imLocale]) 1573 if (rs[Rs_imLocale])
1476 SET_LOCALE (locale); 1574 SET_LOCALE (locale);
1477#endif
1478} 1575}
1479 1576
1480void 1577void
1481rxvt_term::IMSetPosition () 1578rxvt_term::im_set_position ()
1482{ 1579{
1483 XRectangle preedit_rect, status_rect, *needed_rect; 1580 XRectangle preedit_rect, status_rect, *needed_rect;
1484 XVaNestedList preedit_attr, status_attr; 1581 XVaNestedList preedit_attr, status_attr;
1485 1582
1486 if (!Input_Context 1583 if (!Input_Context
1487 || !focus 1584 || !focus
1488 || !(input_style & (XIMPreeditArea | XIMPreeditPosition)) 1585 || !(input_style & (XIMPreeditArea | XIMPreeditPosition))
1489 || !IMisRunning ()) 1586 || !im_is_running ())
1490 return; 1587 return;
1491 1588
1492 if (input_style & XIMPreeditPosition) 1589 if (input_style & XIMPreeditPosition)
1493 { 1590 {
1494 im_set_size (preedit_rect); 1591 im_set_size (preedit_rect);
… …
1524 1621
1525void 1622void
1526rxvt_term::get_window_origin (int &x, int &y) 1623rxvt_term::get_window_origin (int &x, int &y)
1527{ 1624{
1528 Window cr; 1625 Window cr;
1529 XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr); 1626 XTranslateCoordinates (dpy, parent, display->root, 0, 0, &x, &y, &cr);
1530/* fprintf (stderr, "origin is %+d%+d\n", x, y);*/
1531} 1627}
1532 1628
1533Pixmap 1629Pixmap
1534rxvt_term::get_pixmap_property (int prop_id) 1630rxvt_term::get_pixmap_property (Atom property)
1535{ 1631{
1536 if (prop_id > 0 && prop_id < NUM_XA) 1632 Pixmap pixmap = None;
1537 if (xa[prop_id]) 1633
1538 {
1539 int aformat; 1634 int aformat;
1540 unsigned long nitems, bytes_after; 1635 unsigned long nitems, bytes_after;
1541 Atom atype; 1636 Atom atype;
1542 unsigned char *prop = NULL; 1637 unsigned char *prop;
1543 int result = XGetWindowProperty (dpy, display->root, xa[prop_id], 1638 int result = XGetWindowProperty (dpy, display->root, property,
1544 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 1639 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1545 &nitems, &bytes_after, &prop); 1640 &nitems, &bytes_after, &prop);
1546 if (result == Success && prop && atype == XA_PIXMAP) 1641 if (result == Success)
1642 {
1643 if (atype == XA_PIXMAP)
1547 return *(Pixmap *)prop; 1644 pixmap = *(Pixmap *)prop;
1645 XFree (prop);
1548 } 1646 }
1549 1647
1550 return None; 1648 return pixmap;
1551} 1649}
1552 1650
1553#ifdef HAVE_BG_PIXMAP 1651#ifdef HAVE_BG_PIXMAP
1554# if TRACE_PIXMAPS
1555# undef update_background
1556void
1557rxvt_term::trace_update_background (const char *file, int line)
1558{
1559 fprintf (stderr, "%s:%d:update_background()\n", file, line);
1560 update_background ();
1561}
1562# endif
1563 1652
1564void 1653void
1565rxvt_term::update_background () 1654rxvt_term::update_background ()
1566{ 1655{
1567 if (update_background_ev.is_active ()) 1656 if (update_background_ev.is_active ())
1568 return; 1657 return;
1569 1658
1570 bgPixmap.invalidate (); 1659 bg_invalidate ();
1571 1660
1661 if (!mapped)
1662 return;
1663
1572 ev_tstamp to_wait = 0.5 - (ev::now () - bgPixmap.valid_since); 1664 ev_tstamp to_wait = 0.5 - (ev::now () - bg_valid_since);
1573 1665
1574 if (to_wait <= 0.) 1666 if (to_wait <= 0.)
1575 bgPixmap.render (); 1667 bg_render ();
1576 else 1668 else
1577 update_background_ev.start (to_wait); 1669 update_background_ev.start (to_wait);
1578} 1670}
1579 1671
1580void 1672void
1581rxvt_term::update_background_cb (ev::timer &w, int revents) 1673rxvt_term::update_background_cb (ev::timer &w, int revents)
1582{ 1674{
1583 make_current (); 1675 make_current ();
1584 1676
1585 update_background_ev.stop (); 1677 update_background_ev.stop ();
1586 bgPixmap.render (); 1678 bg_render ();
1587 refresh_check (); 1679 refresh_check ();
1588} 1680}
1589 1681
1590#endif /* HAVE_BG_PIXMAP */ 1682#endif /* HAVE_BG_PIXMAP */
1591 1683

Diff Legend

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