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.281 by root, Fri Dec 14 02:10:33 2007 UTC vs.
Revision 1.355 by sf-exg, Thu Apr 7 12:19:40 2011 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-2006 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.end (); cc-- > v.begin (); )
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));
… …
170#endif 171#endif
171#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 172#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
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::x_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);
185#endif 184#endif
186#ifndef NO_BELL 185#ifndef NO_BELL
187 bell_ev.set <rxvt_term, &rxvt_term::bell_cb> (this); 186 bell_ev.set <rxvt_term, &rxvt_term::bell_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 prepare_ev.set <rxvt_term, &rxvt_term::prepare_cb> (this);
191 flush_ev.set <rxvt_term, &rxvt_term::flush_cb> (this); 189 flush_ev.set <rxvt_term, &rxvt_term::flush_cb> (this);
192 destroy_ev.set <rxvt_term, &rxvt_term::destroy_cb> (this); 190 destroy_ev.set <rxvt_term, &rxvt_term::destroy_cb> (this);
193 pty_ev.set <rxvt_term, &rxvt_term::pty_cb> (this); 191 pty_ev.set <rxvt_term, &rxvt_term::pty_cb> (this);
194 incr_ev.set <rxvt_term, &rxvt_term::incr_cb> (this);
195 termwin_ev.set <rxvt_term, &rxvt_term::x_cb> (this); 192 termwin_ev.set <rxvt_term, &rxvt_term::x_cb> (this);
196 vt_ev.set <rxvt_term, &rxvt_term::x_cb> (this); 193 vt_ev.set <rxvt_term, &rxvt_term::x_cb> (this);
197 194
198 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base; 195 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base;
199 196
… …
227 if (fontset[i] != fontset[0]) 224 if (fontset[i] != fontset[0])
228 delete fontset[i]; 225 delete fontset[i];
229#endif 226#endif
230 delete fontset[0]; 227 delete fontset[0];
231 228
229#ifdef HAVE_BG_PIXMAP
230 bg_destroy ();
231#endif
232
232 if (display) 233 if (display)
233 { 234 {
234 selection_clear (); 235 selection_clear ();
236 selection_clear (true);
235 237
236#ifdef USE_XIM 238#ifdef USE_XIM
237 im_destroy (); 239 im_destroy ();
238#endif 240#endif
239#ifdef XTERM_SCROLLBAR 241 scrollBar.destroy ();
240 if (xscrollbarGC) XFreeGC (dpy, xscrollbarGC);
241 if (ShadowGC) XFreeGC (dpy, ShadowGC);
242#endif
243#ifdef PLAIN_SCROLLBAR
244 if (pscrollbarGC) XFreeGC (dpy, pscrollbarGC);
245#endif
246#ifdef NEXT_SCROLLBAR
247 if (blackGC) XFreeGC (dpy, blackGC);
248 if (whiteGC) XFreeGC (dpy, whiteGC);
249 if (grayGC) XFreeGC (dpy, grayGC);
250 if (darkGC) XFreeGC (dpy, darkGC);
251 if (stippleGC) XFreeGC (dpy, stippleGC);
252 if (dimple) XFreePixmap (dpy, dimple);
253 if (upArrow) XFreePixmap (dpy, upArrow);
254 if (downArrow) XFreePixmap (dpy, downArrow);
255 if (upArrowHi) XFreePixmap (dpy, upArrowHi);
256 if (downArrowHi) XFreePixmap (dpy, downArrowHi);
257#endif
258#ifdef RXVT_SCROLLBAR
259 if (topShadowGC) XFreeGC (dpy, topShadowGC);
260 if (botShadowGC) XFreeGC (dpy, botShadowGC);
261 if (scrollbarGC) XFreeGC (dpy, scrollbarGC);
262#endif
263 if (gc) XFreeGC (dpy, gc); 242 if (gc) XFreeGC (dpy, gc);
264 243
265 delete drawable; 244 delete drawable;
266 // destroy all windows 245 // destroy all windows
267 if (parent[0]) 246 if (parent)
268 XDestroyWindow (dpy, parent[0]); 247 XDestroyWindow (dpy, parent);
269 248
270 for (int i = 0; i < TOTAL_COLORS; i++) 249 for (int i = 0; i < TOTAL_COLORS; i++)
271 if (ISSET_PIXCOLOR (i)) 250 if (ISSET_PIXCOLOR (i))
272 { 251 {
273 pix_colors_focused [i].free (this); 252 pix_colors_focused [i].free (this);
… …
275 pix_colors_unfocused [i].free (this); 254 pix_colors_unfocused [i].free (this);
276#endif 255#endif
277 } 256 }
278 257
279 clear (); 258 clear ();
280 }
281 259
282 delete [] pix_colors_focused; 260 display->flush (); /* ideally .put should do this */
283#if OFF_FOCUS_FADING
284 delete [] pix_colors_unfocused;
285#endif
286
287#ifdef HAVE_BG_PIXMAP
288 bgPixmap.destroy ();
289#endif
290 displays.put (display); 261 displays.put (display);
262 }
291 263
292 scr_release (); 264 scr_release ();
293 265
294 /* clear all resources */ 266 /* clear all resources */
295 for (int i = 0; i < allocated.size (); i++) 267 for (int i = 0; i < allocated.size (); i++)
296 free (allocated [i]); 268 free (allocated [i]);
297 269
298 free (selection.text); 270 free (selection.text);
271 free (selection.clip_text);
299 // TODO: manage env vars in child only(!) 272 // TODO: manage env vars in child only(!)
300 free (env_display); 273 free (env_display);
301 free (env_term); 274 free (env_term);
302 free (locale); 275 free (locale);
303 free (v_buffer); 276 free (v_buffer);
304 free (incr_buf); 277
278 delete selection_req;
305 279
306 delete envv; 280 delete envv;
307 delete argv; 281 delete argv;
308 282
309#ifdef KEYSYM_RESOURCE 283#ifdef KEYSYM_RESOURCE
… …
341 if (display) 315 if (display)
342 { 316 {
343#if USE_XIM 317#if USE_XIM
344 im_ev.stop (display); 318 im_ev.stop (display);
345#endif 319#endif
346#if HAVE_SCROLLBARS
347 scrollbar_ev.stop (display); 320 scrollbar_ev.stop (display);
348#endif
349#if ENABLE_TRANSPARENCY || ENABLE_PERL 321#if ENABLE_TRANSPARENCY || ENABLE_PERL
350 rootwin_ev.stop (display); 322 rootwin_ev.stop (display);
351#endif 323#endif
352 incr_ev.stop ();
353 termwin_ev.stop (display); 324 termwin_ev.stop (display);
354 vt_ev.stop (display); 325 vt_ev.stop (display);
355 } 326 }
356 327
357 prepare_ev.stop (); 328 flush_ev.stop ();
358 pty_ev.stop (); 329 pty_ev.stop ();
359#ifdef CURSOR_BLINK 330#ifdef CURSOR_BLINK
360 cursor_blink_ev.stop (); 331 cursor_blink_ev.stop ();
361#endif 332#endif
362#ifdef TEXT_BLINK 333#ifdef TEXT_BLINK
… …
379rxvt_term::destroy_cb (ev::idle &w, int revents) 350rxvt_term::destroy_cb (ev::idle &w, int revents)
380{ 351{
381 make_current (); 352 make_current ();
382 353
383 delete this; 354 delete this;
355}
356
357void
358rxvt_term::set_option (uint8_t opt, bool set)
359{
360 if (!opt)
361 return;
362
363 uint8_t mask = 1 << (opt & 7);
364 uint8_t &val = options [opt >> 3];
365
366 val = val & ~mask | (set ? mask : 0);
384} 367}
385 368
386/*----------------------------------------------------------------------*/ 369/*----------------------------------------------------------------------*/
387/* 370/*
388 * Exit gracefully, clearing the utmp entry and restoring tty attributes 371 * Exit gracefully, clearing the utmp entry and restoring tty attributes
… …
402print_x_error (Display *dpy, XErrorEvent *event) 385print_x_error (Display *dpy, XErrorEvent *event)
403{ 386{
404 char buffer[BUFSIZ]; 387 char buffer[BUFSIZ];
405 char mesg[BUFSIZ]; 388 char mesg[BUFSIZ];
406 char number[32]; 389 char number[32];
407 char *mtype = "XlibMessage"; 390 const char mtype[] = "XlibMessage";
408 XGetErrorText(dpy, event->error_code, buffer, BUFSIZ); 391 XGetErrorText(dpy, event->error_code, buffer, BUFSIZ);
409 XGetErrorDatabaseText(dpy, mtype, "XError", "X Error", mesg, BUFSIZ); 392 XGetErrorDatabaseText(dpy, mtype, "XError", "X Error", mesg, BUFSIZ);
410 rxvt_warn ("An X Error occured, trying to continue after report.\n"); 393 rxvt_warn ("An X Error occurred, trying to continue after report.\n");
411 rxvt_warn ("%s: %s\n", mesg, buffer); 394 rxvt_warn ("%s: %s\n", mesg, buffer);
412 XGetErrorDatabaseText(dpy, mtype, "MajorCode", "Request Major code %d", mesg, BUFSIZ); 395 XGetErrorDatabaseText(dpy, mtype, "MajorCode", "Request Major code %d", mesg, BUFSIZ);
413 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->request_code); 396 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->request_code);
414 sprintf(number, "%d", event->request_code); 397 sprintf(number, "%d", event->request_code);
415 XGetErrorDatabaseText(dpy, "XRequest", number, "", buffer, BUFSIZ); 398 XGetErrorDatabaseText(dpy, "XRequest", number, "", buffer, BUFSIZ);
416 rxvt_warn ("(which is %s)\n", buffer); 399 rxvt_warn ("(which is %s)\n", buffer);
417 if (event->request_code >= 128) { 400 if (event->request_code >= 128) {
418 XGetErrorDatabaseText(dpy, mtype, "MinorCode", "Request Minor code %d", 401 XGetErrorDatabaseText(dpy, mtype, "MinorCode", "Request Minor code %d",
419 mesg, BUFSIZ); 402 mesg, BUFSIZ);
420 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->minor_code); 403 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->minor_code);
421 } 404 }
422 if ((event->error_code == BadWindow) || 405 if ((event->error_code == BadWindow) ||
423 (event->error_code == BadPixmap) || 406 (event->error_code == BadPixmap) ||
424 (event->error_code == BadCursor) || 407 (event->error_code == BadCursor) ||
425 (event->error_code == BadFont) || 408 (event->error_code == BadFont) ||
426 (event->error_code == BadDrawable) || 409 (event->error_code == BadDrawable) ||
427 (event->error_code == BadColor) || 410 (event->error_code == BadColor) ||
428 (event->error_code == BadGC) || 411 (event->error_code == BadGC) ||
429 (event->error_code == BadIDChoice) || 412 (event->error_code == BadIDChoice) ||
430 (event->error_code == BadValue) || 413 (event->error_code == BadValue) ||
431 (event->error_code == BadAtom)) { 414 (event->error_code == BadAtom)) {
432 if (event->error_code == BadValue) 415 if (event->error_code == BadValue)
433 XGetErrorDatabaseText(dpy, mtype, "Value", "Value 0x%x", 416 XGetErrorDatabaseText(dpy, mtype, "Value", "Value 0x%x",
434 mesg, BUFSIZ); 417 mesg, BUFSIZ);
435 else if (event->error_code == BadAtom) 418 else if (event->error_code == BadAtom)
436 XGetErrorDatabaseText(dpy, mtype, "AtomID", "AtomID 0x%x", 419 XGetErrorDatabaseText(dpy, mtype, "AtomID", "AtomID 0x%x",
437 mesg, BUFSIZ); 420 mesg, BUFSIZ);
438 else 421 else
439 XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x", 422 XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x",
440 mesg, BUFSIZ); 423 mesg, BUFSIZ);
441 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid); 424 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid);
442 } 425 }
443 XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d", 426 XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d",
444 mesg, BUFSIZ); 427 mesg, BUFSIZ);
445 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial); 428 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial);
446} 429}
447#endif 430#endif
448 431
449int 432int
… …
472 DisplayString (display)); 455 DisplayString (display));
473 rxvt_emergency_cleanup (); 456 rxvt_emergency_cleanup ();
474 _exit (EXIT_FAILURE); 457 _exit (EXIT_FAILURE);
475} 458}
476 459
477/*----------------------------------------------------------------------*/
478void
479rxvt_term::init (int argc, const char *const *argv, stringvec *envv)
480{
481 this->envv = envv;
482
483 SET_R (this);
484 set_locale ("");
485 set_environ (envv); // few things in X do not call setlocale :(
486
487 init_vars ();
488
489 init_secondary ();
490
491 const char **cmd_argv = init_resources (argc, argv);
492
493#ifdef KEYSYM_RESOURCE
494 keyboard->register_done ();
495#endif
496
497#ifdef HAVE_SCROLLBARS
498 if (option (Opt_scrollBar))
499 scrollBar.setIdle (); /* set existence for size calculations */
500#endif
501
502 pty = ptytty::create ();
503
504 create_windows (argc, argv);
505
506 init_xlocale ();
507
508 scr_reset (); // initialize screen
509
510#if 0
511 XSynchronize (dpy, True);
512#endif
513
514#ifdef HAVE_SCROLLBARS
515 if (option (Opt_scrollBar))
516 resize_scrollbar (); /* create and map scrollbar */
517#endif
518#ifdef HAVE_BG_PIXMAP
519 {
520 bgPixmap.set_target (this);
521
522#ifdef ENABLE_TRANSPARENCY
523 if (option (Opt_transparent))
524 {
525 bgPixmap.set_transparent ();
526#ifdef HAVE_AFTERIMAGE
527 if (rs [Rs_blurradius])
528 bgPixmap.set_blur_radius (rs [Rs_blurradius]);
529#endif
530 if (ISSET_PIXCOLOR (Color_tint))
531 bgPixmap.set_tint (pix_colors_focused [Color_tint]);
532 if (rs [Rs_shade])
533 bgPixmap.set_shade (rs [Rs_shade]);
534
535 bgPixmap.set_root_pixmap ();
536 XSelectInput (dpy, display->root, PropertyChangeMask);
537 rootwin_ev.start (display, display->root);
538 }
539#endif
540
541#ifdef BG_IMAGE_FROM_FILE
542 if (rs[Rs_backgroundPixmap] != NULL)
543 {
544 const char *p = rs[Rs_backgroundPixmap];
545
546 if ((p = strchr (p, ';')) != NULL)
547 {
548 p++;
549 bgPixmap.set_geometry (p);
550 }
551 else
552 bgPixmap.set_defaultGeometry ();
553
554 if (bgPixmap.set_file (rs[Rs_backgroundPixmap]))
555 if (!bgPixmap.window_position_sensitive ())
556 update_background ();
557 }
558#endif
559 }
560#endif
561
562#if ENABLE_PERL
563 rootwin_ev.start (display, display->root);
564#endif
565
566 set_colorfgbg ();
567
568 init_command (cmd_argv);
569
570 free (cmd_argv);
571
572 if (pty->pty >= 0)
573 pty_ev.start (pty->pty, ev::READ);
574
575 prepare_ev.start ();
576
577 HOOK_INVOKE ((this, HOOK_START, DT_END));
578
579#if ENABLE_XEMBED
580 if (rs[Rs_embed])
581 {
582 long info[2] = { 0, XEMBED_MAPPED };
583
584 XChangeProperty (dpy, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
585 32, PropModeReplace, (unsigned char *)&info, 2);
586 }
587#endif
588
589 XMapWindow (dpy, vt);
590 XMapWindow (dpy, parent[0]);
591}
592
593static struct sig_handlers 460static struct sig_handlers
594{ 461{
595 ev::sig sw_term, sw_int; 462 ev::sig sw_term, sw_int;
596 463
597 /* 464 /*
… …
612 rxvt_emergency_cleanup (); 479 rxvt_emergency_cleanup ();
613 w.stop (); 480 w.stop ();
614 kill (getpid (), w.signum); 481 kill (getpid (), w.signum);
615} 482}
616 483
484static void
485rxvt_get_ttymode (struct termios *tio)
486{
487 if (tcgetattr (STDIN_FILENO, tio) < 0)
488 memset (tio, 0, sizeof (struct termios));
489
490 for (int i = 0; i < NCCS; i++)
491 tio->c_cc[i] = VDISABLE;
492
493 tio->c_cc[VINTR] = CINTR;
494 tio->c_cc[VQUIT] = CQUIT;
495 tio->c_cc[VERASE] = CERASE;
496#ifdef VERASE2
497 tio->c_cc[VERASE2] = CERASE2;
498#endif
499 tio->c_cc[VKILL] = CKILL;
500 tio->c_cc[VEOF] = CEOF;
501 tio->c_cc[VSTART] = CSTART;
502 tio->c_cc[VSTOP] = CSTOP;
503 tio->c_cc[VSUSP] = CSUSP;
504# ifdef VDSUSP
505 tio->c_cc[VDSUSP] = CDSUSP;
506# endif
507# ifdef VREPRINT
508 tio->c_cc[VREPRINT] = CRPRNT;
509# endif
510# ifdef VDISCRD
511 tio->c_cc[VDISCRD] = CFLUSH;
512# endif
513# ifdef VWERSE
514 tio->c_cc[VWERSE] = CWERASE;
515# endif
516# ifdef VLNEXT
517 tio->c_cc[VLNEXT] = CLNEXT;
518# endif
519# ifdef VSTATUS
520 tio->c_cc[VSTATUS] = CSTATUS;
521# endif
522
523# if VMIN != VEOF
524 tio->c_cc[VMIN] = 1;
525# endif
526# if VTIME != VEOL
527 tio->c_cc[VTIME] = 0;
528# endif
529
530 /* input modes */
531 tio->c_iflag = (BRKINT | IGNPAR | ICRNL
532# ifdef IMAXBEL
533 | IMAXBEL
534# endif
535 | IXON);
536
537 /* output modes */
538 tio->c_oflag = (OPOST | ONLCR);
539
540 /* control modes */
541 tio->c_cflag = (CS8 | CREAD);
542
543 /* local modes */
544 tio->c_lflag = (ISIG | ICANON | IEXTEN | ECHO
545# if defined (ECHOCTL) && defined (ECHOKE)
546 | ECHOCTL | ECHOKE
547# endif
548 | ECHOE | ECHOK);
549}
550
617char **rxvt_environ; // startup environment 551char **rxvt_environ; // startup environment
618 552
619void 553void
620rxvt_init () 554rxvt_init ()
621{ 555{
622 ptytty::init (); 556 assert (("fontMask must not overlap other RS masks",
557 0 == (RS_fontMask & (RS_Sel | RS_baseattrMask | RS_customMask | RS_bgMask | RS_fgMask))));
623 558
559 rxvt_get_ttymode (&rxvt_term::def_tio);
560
561 // get rid of stdin/stdout as we don't need them, to free resources
562 dup2 (STDERR_FILENO, STDIN_FILENO);
563 dup2 (STDERR_FILENO, STDOUT_FILENO);
564
624 if (!ev_default_loop (0)) 565 if (!ev_default_loop ())
625 rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n"); 566 rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n");
626 567
627 rxvt_environ = environ; 568 rxvt_environ = environ;
628 569
629 signal (SIGHUP, SIG_IGN); 570 signal (SIGHUP, SIG_IGN);
630 signal (SIGPIPE, SIG_IGN); 571 signal (SIGPIPE, SIG_IGN);
631 572
632 sig_handlers.sw_term.start (SIGTERM); ev_unref (); 573 sig_handlers.sw_term.start (SIGTERM); ev_unref ();
633 sig_handlers.sw_int.start (SIGINT); ev_unref (); 574 sig_handlers.sw_int.start (SIGINT); ev_unref ();
634
635 /* need to trap SIGURG for SVR4 (Unixware) rlogin */
636 /* signal (SIGURG, SIG_DFL); */
637 575
638 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); 576 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
639 // TODO: handle this with exceptions and tolerate the memory loss 577 // TODO: handle this with exceptions and tolerate the memory loss
640 XSetIOErrorHandler (rxvt_xioerror_handler); 578 XSetIOErrorHandler (rxvt_xioerror_handler);
641 579
642 XrmInitialize (); 580 XrmInitialize ();
643}
644
645/* ------------------------------------------------------------------------- *
646 * MEMORY ALLOCATION WRAPPERS *
647 * ------------------------------------------------------------------------- */
648void *
649rxvt_malloc (size_t size)
650{
651 void *p = malloc (size);
652
653 if (!p)
654 rxvt_fatal ("memory allocation failure. aborting.\n");
655
656 return p;
657}
658
659void *
660rxvt_calloc (size_t number, size_t size)
661{
662 void *p = calloc (number, size);
663
664 if (!p)
665 rxvt_fatal ("memory allocation failure. aborting.\n");
666
667 return p;
668}
669
670void *
671rxvt_realloc (void *ptr, size_t size)
672{
673 void *p = realloc (ptr, size);
674
675 if (!p)
676 rxvt_fatal ("memory allocation failure. aborting.\n");
677
678 return p;
679} 581}
680 582
681/*----------------------------------------------------------------------*/ 583/*----------------------------------------------------------------------*/
682/* 584/*
683 * window size/position calculations for XSizeHint and other storage. 585 * window size/position calculations for XSizeHint and other storage.
… …
685 */ 587 */
686void 588void
687rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight) 589rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
688{ 590{
689 short recalc_x, recalc_y; 591 short recalc_x, recalc_y;
690 int x, y, sb_w, flags; 592 int x, y, flags;
691 unsigned int w, h; 593 unsigned int w, h;
692 unsigned int max_width, max_height; 594 unsigned int max_width, max_height;
693 595
694 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity; 596 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity;
695 szHint.win_gravity = NorthWestGravity; 597 szHint.win_gravity = NorthWestGravity;
… …
705 if (rs[Rs_geometry]) 607 if (rs[Rs_geometry])
706 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h); 608 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h);
707 609
708 if (flags & WidthValue) 610 if (flags & WidthValue)
709 { 611 {
612 if (!w)
613 rxvt_fatal ("illegal window geometry (width and height must be non-zero), aborting.\n");
614
710 ncol = clamp (w, 0, std::numeric_limits<int16_t>::max ()); 615 ncol = clamp (w, 1, std::numeric_limits<int16_t>::max ());
711 szHint.flags |= USSize; 616 szHint.flags |= USSize;
712 } 617 }
713 618
714 if (flags & HeightValue) 619 if (flags & HeightValue)
715 { 620 {
621 if (!h)
622 rxvt_fatal ("illegal window geometry (width and height must be non-zero), aborting.\n");
623
716 nrow = clamp (h, 0, std::numeric_limits<int16_t>::max ()); 624 nrow = clamp (h, 1, std::numeric_limits<int16_t>::max ());
717 szHint.flags |= USSize; 625 szHint.flags |= USSize;
718 } 626 }
719 627
720 if (flags & XValue) 628 if (flags & XValue)
721 { 629 {
… …
752 max_width = MAX_COLS * fwidth; 660 max_width = MAX_COLS * fwidth;
753 max_height = MAX_ROWS * fheight; 661 max_height = MAX_ROWS * fheight;
754 662
755 szHint.base_width = szHint.base_height = 2 * int_bwidth; 663 szHint.base_width = szHint.base_height = 2 * int_bwidth;
756 664
757 sb_w = 0;
758 window_vt_x = window_vt_y = int_bwidth; 665 window_vt_x = window_vt_y = int_bwidth;
759 666
760 if (scrollBar.state) 667 if (scrollBar.state)
761 { 668 {
762 sb_w = scrollbar_TotalWidth (); 669 int sb_w = scrollBar.total_width ();
763 szHint.base_width += sb_w; 670 szHint.base_width += sb_w;
764 671
765 if (!option (Opt_scrollBar_right)) 672 if (!option (Opt_scrollBar_right))
766 window_vt_x += sb_w; 673 window_vt_x += sb_w;
767 } 674 }
… …
791 { 698 {
792 min_it (height, max_height); 699 min_it (height, max_height);
793 szHint.height = szHint.base_height + height; 700 szHint.height = szHint.base_height + height;
794 } 701 }
795 702
796 if (scrollBar.state && option (Opt_scrollBar_right))
797 window_sb_x = szHint.width - sb_w;
798
799 if (recalc_x) 703 if (recalc_x)
800 szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth; 704 szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth;
801 705
802 if (recalc_y) 706 if (recalc_y)
803 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth; 707 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth;
804 708
805 ncol = width / fwidth; 709 ncol = width / fwidth;
806 nrow = height / fheight; 710 nrow = height / fheight;
807} 711}
808 712
809/*----------------------------------------------------------------------*/ 713/*----------------------------------------------------------------------*/
810/* 714/*
… …
821 725
822 ws.ws_col = ncol; 726 ws.ws_col = ncol;
823 ws.ws_row = nrow; 727 ws.ws_row = nrow;
824 ws.ws_xpixel = width; 728 ws.ws_xpixel = width;
825 ws.ws_ypixel = height; 729 ws.ws_ypixel = height;
826 (void)ioctl (pty->pty, TIOCSWINSZ, &ws); 730 ioctl (pty->pty, TIOCSWINSZ, &ws);
827 731
828#if 0 732#if 0
829 // TIOCSWINSZ is supposed to do this automatically and correctly 733 // TIOCSWINSZ is supposed to do this automatically and correctly
830 if (cmd_pid) /* force through to the command */ 734 if (cmd_pid) /* force through to the command */
831 kill (-cmd_pid, SIGWINCH); 735 kill (-cmd_pid, SIGWINCH);
… …
861#endif 765#endif
862 766
863 delete fontset[0]; 767 delete fontset[0];
864 fontset[0] = fs; 768 fontset[0] = fs;
865 769
866 prop = (*fs)[1]->properties (); 770 prop = (*fs)[rxvt_fontset::firstFont]->properties ();
867 prop.height += lineSpace; 771 prop.height += lineSpace;
772 prop.width += letterSpace;
868 773
869 fs->set_prop (prop, false); 774 fs->set_prop (prop, false);
870 775
871 fwidth = prop.width; 776 fwidth = prop.width;
872 fheight = prop.height; 777 fheight = prop.height;
… …
903#else 808#else
904 fontset[style] = fontset[0]; 809 fontset[style] = fontset[0];
905#endif 810#endif
906 } 811 }
907 812
908 if (parent[0]) 813 if (parent)
909 { 814 {
910 resize_all_windows (0, 0, 0); 815 resize_all_windows (0, 0, 0);
911 scr_remap_chars (); 816 scr_remap_chars ();
912 scr_touch (true); 817 scr_touch (true);
913 } 818 }
… …
916} 821}
917 822
918void 823void
919rxvt_term::set_string_property (Atom prop, const char *str, int len) 824rxvt_term::set_string_property (Atom prop, const char *str, int len)
920{ 825{
921 XChangeProperty (dpy, parent[0], 826 XChangeProperty (dpy, parent,
922 prop, XA_STRING, 8, PropModeReplace, 827 prop, XA_STRING, 8, PropModeReplace,
923 (const unsigned char *)str, len >= 0 ? len : strlen (str)); 828 (const unsigned char *)str, len >= 0 ? len : strlen (str));
924} 829}
925 830
926void 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
927rxvt_term::set_utf8_property (Atom prop, const char *str, int len) 844rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
928{ 845{
929 wchar_t *ws = rxvt_mbstowcs (str, len); 846 wchar_t *ws = rxvt_mbstowcs (str, len);
930 char *s = rxvt_wcstoutf8 (ws); 847 char *s = rxvt_wcstoutf8 (ws);
931 848
932 XChangeProperty (dpy, parent[0], 849 XChangeProperty (dpy, parent,
933 prop, xa[XA_UTF8_STRING], 8, PropModeReplace, 850 prop, xa[XA_UTF8_STRING], 8, PropModeReplace,
934 (const unsigned char *)s, strlen (s)); 851 (const unsigned char *)s, strlen (s));
935 852
936 free (s); 853 free (s);
937 free (ws); 854 free (ws);
… …
941/*----------------------------------------------------------------------*/ 858/*----------------------------------------------------------------------*/
942/* xterm sequences - title, iconName, color (exptl) */ 859/* xterm sequences - title, iconName, color (exptl) */
943void 860void
944rxvt_term::set_title (const char *str) 861rxvt_term::set_title (const char *str)
945{ 862{
946 set_string_property (XA_WM_NAME, str); 863 set_mbstring_property (XA_WM_NAME, str);
947#if ENABLE_EWMH 864#if ENABLE_EWMH
948 set_utf8_property (xa[XA_NET_WM_NAME], str); 865 set_utf8_property (xa[XA_NET_WM_NAME], str);
949#endif 866#endif
950} 867}
951 868
952void 869void
953rxvt_term::set_icon_name (const char *str) 870rxvt_term::set_icon_name (const char *str)
954{ 871{
955 set_string_property (XA_WM_ICON_NAME, str); 872 set_mbstring_property (XA_WM_ICON_NAME, str);
956#if ENABLE_EWMH 873#if ENABLE_EWMH
957 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str); 874 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str);
958#endif 875#endif
959} 876}
960 877
961void 878void
962rxvt_term::set_window_color (int idx, const char *color) 879rxvt_term::set_window_color (int idx, const char *color)
963{ 880{
964#ifdef XTERM_COLOR_CHANGE 881#ifdef XTERM_COLOR_CHANGE
965 rxvt_color xcol; 882 rxvt_color xcol;
966 int i;
967 883
968 if (color == NULL || *color == '\0') 884 if (color == NULL || *color == '\0')
969 return; 885 return;
970 886
971 color = strdup (color); 887 color = strdup (color);
… …
973 rs[Rs_color + idx] = color; 889 rs[Rs_color + idx] = color;
974 890
975 /* handle color aliases */ 891 /* handle color aliases */
976 if (isdigit (*color)) 892 if (isdigit (*color))
977 { 893 {
978 i = atoi (color); 894 int i = atoi (color);
979 895
980 if (i >= 8 && i <= 15) 896 if (i >= 8 && i <= 15)
981 { 897 {
982 /* bright colors */ 898 /* bright colors */
983 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i - 8]; 899 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i - 8];
… …
1033void 949void
1034rxvt_term::set_colorfgbg () 950rxvt_term::set_colorfgbg ()
1035{ 951{
1036 unsigned int i; 952 unsigned int i;
1037 const char *xpmb = ""; 953 const char *xpmb = "";
1038 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1]; 954 char fstr[] = "default";
955 char bstr[] = "default";
1039 956
1040 strcpy (fstr, "default");
1041 strcpy (bstr, "default");
1042 for (i = Color_Black; i <= Color_White; i++) 957 for (i = Color_Black; i <= Color_White; i++)
1043 if (pix_colors[Color_fg] == pix_colors[i]) 958 if (pix_colors[Color_fg] == pix_colors[i])
1044 { 959 {
1045 sprintf (fstr, "%d", (i - Color_Black)); 960 sprintf (fstr, "%d", i - Color_Black);
1046 break; 961 break;
1047 } 962 }
1048 963
1049 for (i = Color_Black; i <= Color_White; i++) 964 for (i = Color_Black; i <= Color_White; i++)
1050 if (pix_colors[Color_bg] == pix_colors[i]) 965 if (pix_colors[Color_bg] == pix_colors[i])
1051 { 966 {
1052 sprintf (bstr, "%d", (i - Color_Black)); 967 sprintf (bstr, "%d", i - Color_Black);
1053#ifdef BG_IMAGE_FROM_FILE 968#ifdef BG_IMAGE_FROM_FILE
1054 xpmb = "default;"; 969 xpmb = "default;";
1055#endif 970#endif
1056 break; 971 break;
1057 } 972 }
… …
1087 int old_width = szHint.width; 1002 int old_width = szHint.width;
1088 int old_height = szHint.height; 1003 int old_height = szHint.height;
1089 1004
1090 window_calc (newwidth, newheight); 1005 window_calc (newwidth, newheight);
1091 1006
1092 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);
1093 XSetWMNormalHints (dpy, parent[0], &szHint); 1013 XSetWMNormalHints (dpy, parent, &szHint);
1014 szHint.flags |= PBaseSize | PResizeInc;
1015 }
1094 1016
1095 if (!ignoreparent) 1017 if (!ignoreparent)
1096 { 1018 {
1097#ifdef SMART_RESIZE 1019#ifdef SMART_RESIZE
1098 /* 1020 /*
… …
1102 int x, y, x1, y1; 1024 int x, y, x1, y1;
1103 int dx, dy; 1025 int dx, dy;
1104 unsigned int unused_w1, unused_h1, unused_b1, unused_d1; 1026 unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
1105 Window unused_cr; 1027 Window unused_cr;
1106 1028
1107 XTranslateCoordinates (dpy, parent[0], display->root, 1029 XTranslateCoordinates (dpy, parent, display->root,
1108 0, 0, &x, &y, &unused_cr); 1030 0, 0, &x, &y, &unused_cr);
1109 XGetGeometry (dpy, parent[0], &unused_cr, &x1, &y1, 1031 XGetGeometry (dpy, parent, &unused_cr, &x1, &y1,
1110 &unused_w1, &unused_h1, &unused_b1, &unused_d1); 1032 &unused_w1, &unused_h1, &unused_b1, &unused_d1);
1111 /* 1033 /*
1112 * 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
1113 * our position for handles and decorations. Counter it 1035 * our position for handles and decorations. Counter it
1114 */ 1036 */
… …
1131 if (y < y1) /* top half */ 1053 if (y < y1) /* top half */
1132 dy = 0; 1054 dy = 0;
1133 else if (y == y1) /* exact center */ 1055 else if (y == y1) /* exact center */
1134 dy /= 2; 1056 dy /= 2;
1135 1057
1136 XMoveResizeWindow (dpy, parent[0], x + dx, y + dy, 1058 XMoveResizeWindow (dpy, parent, x + dx, y + dy,
1137 szHint.width, szHint.height); 1059 szHint.width, szHint.height);
1138#else 1060#else
1139 XResizeWindow (dpy, parent[0], szHint.width, szHint.height); 1061 XResizeWindow (dpy, parent, szHint.width, szHint.height);
1140#endif 1062#endif
1141 } 1063 }
1064
1065 if (set_hint)
1066 XSetWMNormalHints (dpy, parent, &szHint);
1142 1067
1143 fix_screen = ncol != prev_ncol || nrow != prev_nrow; 1068 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
1144 1069
1145 if (fix_screen || newwidth != old_width || newheight != old_height) 1070 if (fix_screen || newwidth != old_width || newheight != old_height)
1146 { 1071 {
1147 if (scrollBar.state) 1072 if (scrollBar.state)
1148 { 1073 scrollBar.resize ();
1149 XMoveResizeWindow (dpy, scrollBar.win,
1150 window_sb_x, 0,
1151 scrollbar_TotalWidth (), szHint.height);
1152 resize_scrollbar ();
1153 }
1154 1074
1155 XMoveResizeWindow (dpy, vt, 1075 XMoveResizeWindow (dpy, vt,
1156 window_vt_x, window_vt_y, 1076 window_vt_x, window_vt_y,
1157 width, height); 1077 width, height);
1158 1078
1159#ifdef HAVE_BG_PIXMAP 1079#ifdef HAVE_BG_PIXMAP
1160 if (bgPixmap.window_size_sensitive ()) 1080 if (bg_window_size_sensitive ())
1161 update_background (); 1081 update_background ();
1162#endif 1082#endif
1163
1164 scr_clear ();
1165 } 1083 }
1166 1084
1167 if (fix_screen || old_height == 0) 1085 if (fix_screen || old_height == 0)
1168 scr_reset (); 1086 scr_reset ();
1169
1170 // TODO, with nvidia-8178, resizes kill the alpha channel, report if not fixed in newer version
1171 //scr_touch (false);
1172
1173#ifdef HAVE_BG_PIXMAP
1174// TODO: this don't seem to have any effect - do we still need it ? If so - in which case exactly ?
1175// if (bgPixmap.pixmap)
1176// scr_touch (false);
1177#endif
1178 1087
1179#ifdef USE_XIM 1088#ifdef USE_XIM
1180 IMSetPosition (); 1089 IMSetPosition ();
1181#endif 1090#endif
1182} 1091}
… …
1248 1157
1249/* Checking whether input method is running. */ 1158/* Checking whether input method is running. */
1250bool 1159bool
1251rxvt_term::IMisRunning () 1160rxvt_term::IMisRunning ()
1252{ 1161{
1253 char *p;
1254 Atom atom; 1162 Atom atom;
1255 Window win; 1163 Window win;
1256 char server[IMBUFSIZ]; 1164 char server[IMBUFSIZ];
1257 1165
1258 /* get current locale modifier */ 1166 /* get current locale modifier */
1259 if ((p = XSetLocaleModifiers (NULL)) != NULL) 1167 if (char *p = XSetLocaleModifiers (0))
1260 { 1168 {
1261 strcpy (server, "@server="); 1169 strcpy (server, "@server=");
1262 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */ 1170 strncat (server, p + 4, IMBUFSIZ - 9); /* skip "@im=" */
1263 1171
1264 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */ 1172 if (p = strchr (server + 1, '@')) /* first one only */
1265 *p = '\0'; 1173 *p = '\0';
1266 1174
1267 atom = XInternAtom (dpy, server, False); 1175 atom = XInternAtom (dpy, server, False);
1268 win = XGetSelectionOwner (dpy, atom); 1176 win = XGetSelectionOwner (dpy, atom);
1269 1177
1270 if (win != None) 1178 if (win != None)
1271 return True; 1179 return true;
1272 } 1180 }
1273 1181
1274 return False; 1182 return false;
1275} 1183}
1276 1184
1277void 1185void
1278rxvt_term::IMSendSpot () 1186rxvt_term::IMSendSpot ()
1279{ 1187{
… …
1336 1244
1337 term->make_current (); 1245 term->make_current ();
1338 1246
1339 if (text) 1247 if (text)
1340 { 1248 {
1341 void *str; 1249 wchar_t *str;
1342 1250
1343 if (!text->encoding_is_wchar && text->string.multi_byte) 1251 if (!text->encoding_is_wchar && text->string.multi_byte)
1344 { 1252 {
1345 // of course, X makes it ugly again 1253 // of course, X makes it ugly again
1346 if (term->rs[Rs_imLocale]) 1254 if (term->rs[Rs_imLocale])
1347 SET_LOCALE (term->rs[Rs_imLocale]); 1255 SET_LOCALE (term->rs[Rs_imLocale]);
1348 1256
1349 str = rxvt_temp_buf ((text->length + 1) * sizeof (wchar_t)); 1257 str = rxvt_temp_buf<wchar_t> (text->length + 1);
1350 mbstowcs ((wchar_t *)str, text->string.multi_byte, text->length + 1); 1258 mbstowcs (str, text->string.multi_byte, text->length + 1);
1351 1259
1352 if (term->rs[Rs_imLocale]) 1260 if (term->rs[Rs_imLocale])
1353 SET_LOCALE (term->locale); 1261 SET_LOCALE (term->locale);
1354 } 1262 }
1355 else 1263 else
1356 str = (void *)text->string.wide_char; 1264 str = text->string.wide_char;
1357 1265
1358 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW, 1266 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
1359 DT_INT, call_data->caret, 1267 DT_INT, call_data->caret,
1360 DT_INT, call_data->chg_first, 1268 DT_INT, call_data->chg_first,
1361 DT_INT, call_data->chg_length, 1269 DT_INT, call_data->chg_length,
… …
1432 p = pet[pi]; 1340 p = pet[pi];
1433 1341
1434 if (!p) 1342 if (!p)
1435 continue; 1343 continue;
1436 1344
1437 s = rxvt_splitcommastring (p); 1345 s = rxvt_strsplit (',', p);
1438 1346
1439 for (i = found = 0; !found && s[i]; i++) 1347 for (i = found = 0; !found && s[i]; i++)
1440 { 1348 {
1441 if (!strcmp (s[i], "OverTheSpot")) 1349 if (!strcmp (s[i], "OverTheSpot"))
1442 input_style = XIMPreeditPosition | XIMStatusNothing; 1350 input_style = XIMPreeditPosition | XIMStatusNothing;
… …
1454 input_style = XIMPreeditNothing | XIMStatusNothing; 1362 input_style = XIMPreeditNothing | XIMStatusNothing;
1455 1363
1456 for (j = 0; j < xim_styles->count_styles; j++) 1364 for (j = 0; j < xim_styles->count_styles; j++)
1457 if (input_style == xim_styles->supported_styles[j]) 1365 if (input_style == xim_styles->supported_styles[j])
1458 { 1366 {
1459 rxvt_freecommastring (s); 1367 rxvt_free_strsplit (s);
1460 1368
1461 found = 1; 1369 found = 1;
1462 goto foundpet; 1370 goto foundpet;
1463 } 1371 }
1464 1372
1465 } 1373 }
1466 1374
1467 rxvt_freecommastring (s); 1375 rxvt_free_strsplit (s);
1468 } 1376 }
1469 1377
1470foundpet: 1378foundpet:
1471 1379
1472 XFree (xim_styles); 1380 XFree (xim_styles);
… …
1575#endif 1483#endif
1576 1484
1577 Input_Context = XCreateIC (xim, 1485 Input_Context = XCreateIC (xim,
1578 XNInputStyle, input_style, 1486 XNInputStyle, input_style,
1579 XNClientWindow, vt, 1487 XNClientWindow, vt,
1580 XNFocusWindow, parent[0], 1488 XNFocusWindow, parent,
1581 preedit_attr ? XNPreeditAttributes : NULL, 1489 preedit_attr ? XNPreeditAttributes : NULL,
1582 preedit_attr, 1490 preedit_attr,
1583 status_attr ? XNStatusAttributes : NULL, 1491 status_attr ? XNStatusAttributes : NULL,
1584 status_attr, NULL); 1492 status_attr, NULL);
1585 1493
… …
1628 p = rs[Rs_inputMethod]; 1536 p = rs[Rs_inputMethod];
1629 if (p && *p) 1537 if (p && *p)
1630 { 1538 {
1631 bool found = false; 1539 bool found = false;
1632 1540
1633 s = rxvt_splitcommastring (p); 1541 s = rxvt_strsplit (',', p);
1634 1542
1635 for (i = 0; s[i]; i++) 1543 for (i = 0; s[i]; i++)
1636 { 1544 {
1637 if (*s[i]) 1545 if (*s[i])
1638 { 1546 {
… …
1644 break; 1552 break;
1645 } 1553 }
1646 } 1554 }
1647 } 1555 }
1648 1556
1649 rxvt_freecommastring (s); 1557 rxvt_free_strsplit (s);
1650 1558
1651 if (found) 1559 if (found)
1652 goto done; 1560 goto done;
1653 } 1561 }
1654 1562
… …
1714 1622
1715void 1623void
1716rxvt_term::get_window_origin (int &x, int &y) 1624rxvt_term::get_window_origin (int &x, int &y)
1717{ 1625{
1718 Window cr; 1626 Window cr;
1719 XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr); 1627 XTranslateCoordinates (dpy, parent, display->root, 0, 0, &x, &y, &cr);
1720/* fprintf( stderr, "origin is %+d%+d\n", x, y);*/
1721} 1628}
1722 1629
1723Pixmap 1630Pixmap
1724rxvt_term::get_pixmap_property (int prop_id) 1631rxvt_term::get_pixmap_property (Atom property)
1725{ 1632{
1726 if (prop_id > 0 && prop_id < NUM_XA) 1633 Pixmap pixmap = None;
1727 if (xa[prop_id]) 1634
1728 {
1729 int aformat; 1635 int aformat;
1730 unsigned long nitems, bytes_after; 1636 unsigned long nitems, bytes_after;
1731 Atom atype; 1637 Atom atype;
1732 unsigned char *prop = NULL; 1638 unsigned char *prop;
1733 int result = XGetWindowProperty (dpy, display->root, xa[prop_id], 1639 int result = XGetWindowProperty (dpy, display->root, property,
1734 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 1640 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1735 &nitems, &bytes_after, &prop); 1641 &nitems, &bytes_after, &prop);
1736 if (result == Success && prop && atype == XA_PIXMAP) 1642 if (result == Success)
1737 { 1643 {
1738 return *(Pixmap *)prop; 1644 if (atype == XA_PIXMAP)
1739 } 1645 pixmap = *(Pixmap *)prop;
1646 XFree (prop);
1740 } 1647 }
1741 return None; 1648
1649 return pixmap;
1742} 1650}
1743 1651
1744#ifdef HAVE_BG_PIXMAP 1652#ifdef HAVE_BG_PIXMAP
1745# if TRACE_PIXMAPS
1746# undef update_background
1747int rxvt_term::trace_update_background (const char *file, int line)
1748{
1749 fprintf (stderr, "%s:%d:update_background()\n", file, line);
1750 update_background ();
1751}
1752# endif
1753 1653
1754int 1654void
1755rxvt_term::update_background () 1655rxvt_term::update_background ()
1756{ 1656{
1657 if (update_background_ev.is_active ())
1658 return;
1659
1757 bgPixmap.invalidate (); 1660 bg_invalidate ();
1758 1661
1759 /* no chance of real time refresh if we are blurring! */ 1662 ev_tstamp to_wait = 0.5 - (ev::now () - bg_valid_since);
1760 if (bgPixmap.invalid_since + 0.5 < ev::now () && !(bgPixmap.flags & bgPixmap_t::blurNeeded)) 1663
1664 if (to_wait <= 0.)
1761 bgPixmap.render (); 1665 bg_render ();
1762 else 1666 else
1763 {
1764 update_background_ev.stop ();
1765
1766 if (!bgPixmap.need_client_side_rendering())
1767 update_background_ev.start (.05); 1667 update_background_ev.start (to_wait);
1768 else if (bgPixmap.flags & bgPixmap_t::blurNeeded)
1769 update_background_ev.start (.20); /* very slow !!! */
1770 else
1771 update_background_ev.start (.07);
1772 }
1773
1774 return 0;
1775} 1668}
1776 1669
1777void 1670void
1778rxvt_term::update_background_cb (ev::timer &w, int revents) 1671rxvt_term::update_background_cb (ev::timer &w, int revents)
1779{ 1672{
1673 make_current ();
1674
1675 update_background_ev.stop ();
1780 bgPixmap.render (); 1676 bg_render ();
1677 refresh_check ();
1781} 1678}
1782 1679
1783#endif /* HAVE_BG_PIXMAP */ 1680#endif /* HAVE_BG_PIXMAP */
1784 1681
1785/*----------------------- end-of-file (C source) -----------------------*/ 1682/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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