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.283 by root, Fri Dec 14 05:25:25 2007 UTC vs.
Revision 1.360 by sf-exg, Fri Aug 19 16:01:37 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-2007 Marc Lehmann <pcg@goof.com> 16 * Copyright (c) 2003-2010 Marc Lehmann <schmorp@schmorp.de>
17 * 17 *
18 * This program is free software; you can redistribute it and/or modify 18 * This program is free software; you can redistribute it and/or modify
19 * it under the terms of the GNU General Public License as published by 19 * it under the terms of the GNU General Public License as published by
20 * the Free Software Foundation; either version 2 of the License, or 20 * the Free Software Foundation; either version 2 of the License, or
21 * (at your option) any later version. 21 * (at your option) any later version.
… …
30 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 30 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
31 *---------------------------------------------------------------------*/ 31 *---------------------------------------------------------------------*/
32 32
33#include "../config.h" /* NECESSARY */ 33#include "../config.h" /* NECESSARY */
34#include "rxvt.h" /* NECESSARY */ 34#include "rxvt.h" /* NECESSARY */
35#include "init.h"
35#include "keyboard.h" 36#include "keyboard.h"
36#include "rxvtperl.h" 37#include "rxvtperl.h"
37 38
38#include <limits> 39#include <limits>
39 40
41#include <cassert>
40#include <csignal> 42#include <csignal>
41#include <cstring> 43#include <cstring>
42 44
43#include <termios.h> 45#include <termios.h>
44 46
… …
49# ifdef HAVE_SETLOCALE 51# ifdef HAVE_SETLOCALE
50# include <clocale> 52# include <clocale>
51# endif 53# endif
52#endif 54#endif
53 55
56struct termios rxvt_term::def_tio;
54vector<rxvt_term *> rxvt_term::termlist; 57vector<rxvt_term *> rxvt_term::termlist;
55 58
56// used to tell global functions which terminal instance is "active" 59// used to tell global functions which terminal instance is "active"
57rxvt_t rxvt_current_term; 60rxvt_t rxvt_current_term;
58 61
… …
93text_t rxvt_composite_vec::compose (unicode_t c1, unicode_t c2) 96text_t rxvt_composite_vec::compose (unicode_t c1, unicode_t c2)
94{ 97{
95 compose_char *cc; 98 compose_char *cc;
96 99
97 // break compose chains, as stupid readline really likes to duplicate 100 // break compose chains, as stupid readline really likes to duplicate
98 // composing characters for some reason near the end of a line. 101 // composing characters for some reason, near the end of a line.
99 cc = (*this)[c1]; 102 cc = (*this)[c1];
100 while (cc) 103 while (cc)
101 { 104 {
102 if (cc->c2 == c2) return c1; 105 if (cc->c2 == c2) return c1;
103 cc = (*this)[cc->c1]; 106 cc = (*this)[cc->c1];
104 } 107 }
105 108
106 // check to see wether this combination already exists otherwise 109 // check to see whether this combination already exists otherwise
107 for (cc = v.end (); cc-- > v.begin (); ) 110 for (cc = v.begin (); cc < v.end (); cc++)
108 {
109 if (cc->c1 == c1 && cc->c2 == c2) 111 if (cc->c1 == c1 && cc->c2 == c2)
110 return COMPOSE_LO + (cc - v.begin ()); 112 return COMPOSE_LO + (cc - v.begin ());
111 }
112 113
113 // allocate a new combination 114 // allocate a new combination
114 if (v.size () == COMPOSE_HI - COMPOSE_LO + 1) 115 if (v.size () == COMPOSE_HI - COMPOSE_LO + 1)
115 { 116 {
116 static int seen; 117 static int seen;
117 118
118 if (!seen++) 119 if (!seen++)
119 fprintf (stderr, "too many unrepresentable composite characters, try --enable-unicode3\n"); 120 rxvt_warn ("too many unrepresentable composite characters, try --enable-unicode3\n");
120 121
121 return REPLACEMENT_CHAR; 122 return REPLACEMENT_CHAR;
122 } 123 }
123 124
124 v.push_back (compose_char (c1, c2)); 125 v.push_back (compose_char (c1, c2));
… …
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);
… …
188#endif 187#endif
189 child_ev.set <rxvt_term, &rxvt_term::child_cb> (this); 188 child_ev.set <rxvt_term, &rxvt_term::child_cb> (this);
190 flush_ev.set <rxvt_term, &rxvt_term::flush_cb> (this); 189 flush_ev.set <rxvt_term, &rxvt_term::flush_cb> (this);
191 destroy_ev.set <rxvt_term, &rxvt_term::destroy_cb> (this); 190 destroy_ev.set <rxvt_term, &rxvt_term::destroy_cb> (this);
192 pty_ev.set <rxvt_term, &rxvt_term::pty_cb> (this); 191 pty_ev.set <rxvt_term, &rxvt_term::pty_cb> (this);
193 incr_ev.set <rxvt_term, &rxvt_term::incr_cb> (this);
194 termwin_ev.set <rxvt_term, &rxvt_term::x_cb> (this); 192 termwin_ev.set <rxvt_term, &rxvt_term::x_cb> (this);
195 vt_ev.set <rxvt_term, &rxvt_term::x_cb> (this); 193 vt_ev.set <rxvt_term, &rxvt_term::x_cb> (this);
196 194
197 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base; 195 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base;
198 196
… …
226 if (fontset[i] != fontset[0]) 224 if (fontset[i] != fontset[0])
227 delete fontset[i]; 225 delete fontset[i];
228#endif 226#endif
229 delete fontset[0]; 227 delete fontset[0];
230 228
229#ifdef HAVE_BG_PIXMAP
230 bg_destroy ();
231#endif
232
231 if (display) 233 if (display)
232 { 234 {
233 selection_clear (); 235 selection_clear ();
236 selection_clear (true);
234 237
235#ifdef USE_XIM 238#ifdef USE_XIM
236 im_destroy (); 239 im_destroy ();
237#endif 240#endif
238#ifdef XTERM_SCROLLBAR 241 scrollBar.destroy ();
239 if (xscrollbarGC) XFreeGC (dpy, xscrollbarGC);
240 if (ShadowGC) XFreeGC (dpy, ShadowGC);
241#endif
242#ifdef PLAIN_SCROLLBAR
243 if (pscrollbarGC) XFreeGC (dpy, pscrollbarGC);
244#endif
245#ifdef NEXT_SCROLLBAR
246 if (blackGC) XFreeGC (dpy, blackGC);
247 if (whiteGC) XFreeGC (dpy, whiteGC);
248 if (grayGC) XFreeGC (dpy, grayGC);
249 if (darkGC) XFreeGC (dpy, darkGC);
250 if (stippleGC) XFreeGC (dpy, stippleGC);
251 if (dimple) XFreePixmap (dpy, dimple);
252 if (upArrow) XFreePixmap (dpy, upArrow);
253 if (downArrow) XFreePixmap (dpy, downArrow);
254 if (upArrowHi) XFreePixmap (dpy, upArrowHi);
255 if (downArrowHi) XFreePixmap (dpy, downArrowHi);
256#endif
257#ifdef RXVT_SCROLLBAR
258 if (topShadowGC) XFreeGC (dpy, topShadowGC);
259 if (botShadowGC) XFreeGC (dpy, botShadowGC);
260 if (scrollbarGC) XFreeGC (dpy, scrollbarGC);
261#endif
262 if (gc) XFreeGC (dpy, gc); 242 if (gc) XFreeGC (dpy, gc);
263 243
264 delete drawable; 244 delete drawable;
265 // destroy all windows 245 // destroy all windows
266 if (parent[0]) 246 if (parent)
267 XDestroyWindow (dpy, parent[0]); 247 XDestroyWindow (dpy, parent);
268 248
269 for (int i = 0; i < TOTAL_COLORS; i++) 249 for (int i = 0; i < TOTAL_COLORS; i++)
270 if (ISSET_PIXCOLOR (i)) 250 if (ISSET_PIXCOLOR (i))
271 { 251 {
272 pix_colors_focused [i].free (this); 252 pix_colors_focused [i].free (this);
… …
274 pix_colors_unfocused [i].free (this); 254 pix_colors_unfocused [i].free (this);
275#endif 255#endif
276 } 256 }
277 257
278 clear (); 258 clear ();
279 }
280 259
281 delete [] pix_colors_focused; 260 display->flush (); /* ideally .put should do this */
282#if OFF_FOCUS_FADING
283 delete [] pix_colors_unfocused;
284#endif
285
286#ifdef HAVE_BG_PIXMAP
287 bgPixmap.destroy ();
288#endif
289 displays.put (display); 261 displays.put (display);
262 }
290 263
291 scr_release (); 264 scr_release ();
292 265
293 /* clear all resources */ 266 /* clear all resources */
294 for (int i = 0; i < allocated.size (); i++) 267 for (int i = 0; i < allocated.size (); i++)
295 free (allocated [i]); 268 free (allocated [i]);
296 269
297 free (selection.text); 270 free (selection.text);
271 free (selection.clip_text);
298 // TODO: manage env vars in child only(!) 272 // TODO: manage env vars in child only(!)
299 free (env_display); 273 free (env_display);
300 free (env_term); 274 free (env_term);
301 free (locale); 275 free (locale);
302 free (v_buffer); 276 free (v_buffer);
303 free (incr_buf); 277
278 delete selection_req;
304 279
305 delete envv; 280 delete envv;
306 delete argv; 281 delete argv;
307 282
308#ifdef KEYSYM_RESOURCE 283#ifdef KEYSYM_RESOURCE
… …
340 if (display) 315 if (display)
341 { 316 {
342#if USE_XIM 317#if USE_XIM
343 im_ev.stop (display); 318 im_ev.stop (display);
344#endif 319#endif
345#if HAVE_SCROLLBARS
346 scrollbar_ev.stop (display); 320 scrollbar_ev.stop (display);
347#endif
348#if ENABLE_TRANSPARENCY || ENABLE_PERL 321#if ENABLE_TRANSPARENCY || ENABLE_PERL
349 rootwin_ev.stop (display); 322 rootwin_ev.stop (display);
350#endif 323#endif
351 incr_ev.stop ();
352 termwin_ev.stop (display); 324 termwin_ev.stop (display);
353 vt_ev.stop (display); 325 vt_ev.stop (display);
354 } 326 }
355 327
356 flush_ev.stop (); 328 flush_ev.stop ();
… …
378rxvt_term::destroy_cb (ev::idle &w, int revents) 350rxvt_term::destroy_cb (ev::idle &w, int revents)
379{ 351{
380 make_current (); 352 make_current ();
381 353
382 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);
383} 367}
384 368
385/*----------------------------------------------------------------------*/ 369/*----------------------------------------------------------------------*/
386/* 370/*
387 * Exit gracefully, clearing the utmp entry and restoring tty attributes 371 * Exit gracefully, clearing the utmp entry and restoring tty attributes
… …
401print_x_error (Display *dpy, XErrorEvent *event) 385print_x_error (Display *dpy, XErrorEvent *event)
402{ 386{
403 char buffer[BUFSIZ]; 387 char buffer[BUFSIZ];
404 char mesg[BUFSIZ]; 388 char mesg[BUFSIZ];
405 char number[32]; 389 char number[32];
406 char *mtype = "XlibMessage"; 390 const char mtype[] = "XlibMessage";
407 XGetErrorText(dpy, event->error_code, buffer, BUFSIZ); 391 XGetErrorText(dpy, event->error_code, buffer, BUFSIZ);
408 XGetErrorDatabaseText(dpy, mtype, "XError", "X Error", mesg, BUFSIZ); 392 XGetErrorDatabaseText(dpy, mtype, "XError", "X Error", mesg, BUFSIZ);
409 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");
410 rxvt_warn ("%s: %s\n", mesg, buffer); 394 rxvt_warn ("%s: %s\n", mesg, buffer);
411 XGetErrorDatabaseText(dpy, mtype, "MajorCode", "Request Major code %d", mesg, BUFSIZ); 395 XGetErrorDatabaseText(dpy, mtype, "MajorCode", "Request Major code %d", mesg, BUFSIZ);
412 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->request_code); 396 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->request_code);
413 sprintf(number, "%d", event->request_code); 397 sprintf(number, "%d", event->request_code);
414 XGetErrorDatabaseText(dpy, "XRequest", number, "", buffer, BUFSIZ); 398 XGetErrorDatabaseText(dpy, "XRequest", number, "", buffer, BUFSIZ);
415 rxvt_warn ("(which is %s)\n", buffer); 399 rxvt_warn ("(which is %s)\n", buffer);
416 if (event->request_code >= 128) { 400 if (event->request_code >= 128) {
417 XGetErrorDatabaseText(dpy, mtype, "MinorCode", "Request Minor code %d", 401 XGetErrorDatabaseText(dpy, mtype, "MinorCode", "Request Minor code %d",
418 mesg, BUFSIZ); 402 mesg, BUFSIZ);
419 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->minor_code); 403 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->minor_code);
420 } 404 }
421 if ((event->error_code == BadWindow) || 405 if ((event->error_code == BadWindow) ||
422 (event->error_code == BadPixmap) || 406 (event->error_code == BadPixmap) ||
423 (event->error_code == BadCursor) || 407 (event->error_code == BadCursor) ||
424 (event->error_code == BadFont) || 408 (event->error_code == BadFont) ||
425 (event->error_code == BadDrawable) || 409 (event->error_code == BadDrawable) ||
426 (event->error_code == BadColor) || 410 (event->error_code == BadColor) ||
427 (event->error_code == BadGC) || 411 (event->error_code == BadGC) ||
428 (event->error_code == BadIDChoice) || 412 (event->error_code == BadIDChoice) ||
429 (event->error_code == BadValue) || 413 (event->error_code == BadValue) ||
430 (event->error_code == BadAtom)) { 414 (event->error_code == BadAtom)) {
431 if (event->error_code == BadValue) 415 if (event->error_code == BadValue)
432 XGetErrorDatabaseText(dpy, mtype, "Value", "Value 0x%x", 416 XGetErrorDatabaseText(dpy, mtype, "Value", "Value 0x%x",
433 mesg, BUFSIZ); 417 mesg, BUFSIZ);
434 else if (event->error_code == BadAtom) 418 else if (event->error_code == BadAtom)
435 XGetErrorDatabaseText(dpy, mtype, "AtomID", "AtomID 0x%x", 419 XGetErrorDatabaseText(dpy, mtype, "AtomID", "AtomID 0x%x",
436 mesg, BUFSIZ); 420 mesg, BUFSIZ);
437 else 421 else
438 XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x", 422 XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x",
439 mesg, BUFSIZ); 423 mesg, BUFSIZ);
440 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid); 424 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid);
441 } 425 }
442 XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d", 426 XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d",
443 mesg, BUFSIZ); 427 mesg, BUFSIZ);
444 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial); 428 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial);
445} 429}
446#endif 430#endif
447 431
448int 432int
… …
471 DisplayString (display)); 455 DisplayString (display));
472 rxvt_emergency_cleanup (); 456 rxvt_emergency_cleanup ();
473 _exit (EXIT_FAILURE); 457 _exit (EXIT_FAILURE);
474} 458}
475 459
476/*----------------------------------------------------------------------*/
477void
478rxvt_term::init (int argc, const char *const *argv, stringvec *envv)
479{
480 this->envv = envv;
481
482 SET_R (this);
483 set_locale ("");
484 set_environ (envv); // few things in X do not call setlocale :(
485
486 init_vars ();
487
488 init_secondary ();
489
490 const char **cmd_argv = init_resources (argc, argv);
491
492#ifdef KEYSYM_RESOURCE
493 keyboard->register_done ();
494#endif
495
496#ifdef HAVE_SCROLLBARS
497 if (option (Opt_scrollBar))
498 scrollBar.setIdle (); /* set existence for size calculations */
499#endif
500
501 pty = ptytty::create ();
502
503 create_windows (argc, argv);
504
505 init_xlocale ();
506
507 scr_reset (); // initialize screen
508
509#if 0
510 XSynchronize (dpy, True);
511#endif
512
513#ifdef HAVE_SCROLLBARS
514 if (option (Opt_scrollBar))
515 resize_scrollbar (); /* create and map scrollbar */
516#endif
517#ifdef HAVE_BG_PIXMAP
518 {
519 bgPixmap.set_target (this);
520
521#ifdef ENABLE_TRANSPARENCY
522 if (option (Opt_transparent))
523 {
524 bgPixmap.set_transparent ();
525#ifdef HAVE_AFTERIMAGE
526 if (rs [Rs_blurradius])
527 bgPixmap.set_blur_radius (rs [Rs_blurradius]);
528#endif
529 if (ISSET_PIXCOLOR (Color_tint))
530 bgPixmap.set_tint (pix_colors_focused [Color_tint]);
531 if (rs [Rs_shade])
532 bgPixmap.set_shade (rs [Rs_shade]);
533
534 bgPixmap.set_root_pixmap ();
535 XSelectInput (dpy, display->root, PropertyChangeMask);
536 rootwin_ev.start (display, display->root);
537 }
538#endif
539
540#ifdef BG_IMAGE_FROM_FILE
541 if (rs[Rs_backgroundPixmap] != NULL)
542 {
543 const char *p = rs[Rs_backgroundPixmap];
544
545 if ((p = strchr (p, ';')) != NULL)
546 {
547 p++;
548 bgPixmap.set_geometry (p);
549 }
550 else
551 bgPixmap.set_defaultGeometry ();
552
553 if (bgPixmap.set_file (rs[Rs_backgroundPixmap]))
554 if (!bgPixmap.window_position_sensitive ())
555 update_background ();
556 }
557#endif
558 }
559#endif
560
561#if ENABLE_PERL
562 rootwin_ev.start (display, display->root);
563#endif
564
565 set_colorfgbg ();
566
567 init_command (cmd_argv);
568
569 free (cmd_argv);
570
571 if (pty->pty >= 0)
572 pty_ev.start (pty->pty, ev::READ);
573
574 HOOK_INVOKE ((this, HOOK_START, DT_END));
575
576#if ENABLE_XEMBED
577 if (rs[Rs_embed])
578 {
579 long info[2] = { 0, XEMBED_MAPPED };
580
581 XChangeProperty (dpy, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
582 32, PropModeReplace, (unsigned char *)&info, 2);
583 }
584#endif
585
586 XMapWindow (dpy, vt);
587 XMapWindow (dpy, parent[0]);
588}
589
590static struct sig_handlers 460static struct sig_handlers
591{ 461{
592 ev::sig sw_term, sw_int; 462 ev::sig sw_term, sw_int;
593 463
594 /* 464 /*
… …
609 rxvt_emergency_cleanup (); 479 rxvt_emergency_cleanup ();
610 w.stop (); 480 w.stop ();
611 kill (getpid (), w.signum); 481 kill (getpid (), w.signum);
612} 482}
613 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
614char **rxvt_environ; // startup environment 551char **rxvt_environ; // startup environment
615 552
616void 553void
617rxvt_init () 554rxvt_init ()
618{ 555{
619 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))));
620 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
621 if (!ev_default_loop (0)) 565 if (!ev_default_loop ())
622 rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n"); 566 rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n");
623 567
624 rxvt_environ = environ; 568 rxvt_environ = environ;
625 569
626 signal (SIGHUP, SIG_IGN); 570 signal (SIGHUP, SIG_IGN);
627 signal (SIGPIPE, SIG_IGN); 571 signal (SIGPIPE, SIG_IGN);
628 572
629 sig_handlers.sw_term.start (SIGTERM); ev_unref (); 573 sig_handlers.sw_term.start (SIGTERM); ev_unref ();
630 sig_handlers.sw_int.start (SIGINT); ev_unref (); 574 sig_handlers.sw_int.start (SIGINT); ev_unref ();
631
632 /* need to trap SIGURG for SVR4 (Unixware) rlogin */
633 /* signal (SIGURG, SIG_DFL); */
634 575
635 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); 576 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
636 // TODO: handle this with exceptions and tolerate the memory loss 577 // TODO: handle this with exceptions and tolerate the memory loss
637 XSetIOErrorHandler (rxvt_xioerror_handler); 578 XSetIOErrorHandler (rxvt_xioerror_handler);
638 579
639 XrmInitialize (); 580 XrmInitialize ();
640}
641
642/* ------------------------------------------------------------------------- *
643 * MEMORY ALLOCATION WRAPPERS *
644 * ------------------------------------------------------------------------- */
645void *
646rxvt_malloc (size_t size)
647{
648 void *p = malloc (size);
649
650 if (!p)
651 rxvt_fatal ("memory allocation failure. aborting.\n");
652
653 return p;
654}
655
656void *
657rxvt_calloc (size_t number, size_t size)
658{
659 void *p = calloc (number, size);
660
661 if (!p)
662 rxvt_fatal ("memory allocation failure. aborting.\n");
663
664 return p;
665}
666
667void *
668rxvt_realloc (void *ptr, size_t size)
669{
670 void *p = realloc (ptr, size);
671
672 if (!p)
673 rxvt_fatal ("memory allocation failure. aborting.\n");
674
675 return p;
676} 581}
677 582
678/*----------------------------------------------------------------------*/ 583/*----------------------------------------------------------------------*/
679/* 584/*
680 * window size/position calculations for XSizeHint and other storage. 585 * window size/position calculations for XSizeHint and other storage.
… …
682 */ 587 */
683void 588void
684rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight) 589rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
685{ 590{
686 short recalc_x, recalc_y; 591 short recalc_x, recalc_y;
687 int x, y, sb_w, flags; 592 int x, y, flags;
688 unsigned int w, h; 593 unsigned int w, h;
689 unsigned int max_width, max_height; 594 unsigned int max_width, max_height;
690 595
691 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity; 596 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity;
692 szHint.win_gravity = NorthWestGravity; 597 szHint.win_gravity = NorthWestGravity;
… …
702 if (rs[Rs_geometry]) 607 if (rs[Rs_geometry])
703 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h); 608 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h);
704 609
705 if (flags & WidthValue) 610 if (flags & WidthValue)
706 { 611 {
612 if (!w)
613 rxvt_fatal ("illegal window geometry (width and height must be non-zero), aborting.\n");
614
707 ncol = clamp (w, 0, std::numeric_limits<int16_t>::max ()); 615 ncol = clamp (w, 1, std::numeric_limits<int16_t>::max ());
708 szHint.flags |= USSize; 616 szHint.flags |= USSize;
709 } 617 }
710 618
711 if (flags & HeightValue) 619 if (flags & HeightValue)
712 { 620 {
621 if (!h)
622 rxvt_fatal ("illegal window geometry (width and height must be non-zero), aborting.\n");
623
713 nrow = clamp (h, 0, std::numeric_limits<int16_t>::max ()); 624 nrow = clamp (h, 1, std::numeric_limits<int16_t>::max ());
714 szHint.flags |= USSize; 625 szHint.flags |= USSize;
715 } 626 }
716 627
717 if (flags & XValue) 628 if (flags & XValue)
718 { 629 {
… …
749 max_width = MAX_COLS * fwidth; 660 max_width = MAX_COLS * fwidth;
750 max_height = MAX_ROWS * fheight; 661 max_height = MAX_ROWS * fheight;
751 662
752 szHint.base_width = szHint.base_height = 2 * int_bwidth; 663 szHint.base_width = szHint.base_height = 2 * int_bwidth;
753 664
754 sb_w = 0;
755 window_vt_x = window_vt_y = int_bwidth; 665 window_vt_x = window_vt_y = int_bwidth;
756 666
757 if (scrollBar.state) 667 if (scrollBar.state)
758 { 668 {
759 sb_w = scrollbar_TotalWidth (); 669 int sb_w = scrollBar.total_width ();
760 szHint.base_width += sb_w; 670 szHint.base_width += sb_w;
761 671
762 if (!option (Opt_scrollBar_right)) 672 if (!option (Opt_scrollBar_right))
763 window_vt_x += sb_w; 673 window_vt_x += sb_w;
764 } 674 }
… …
788 { 698 {
789 min_it (height, max_height); 699 min_it (height, max_height);
790 szHint.height = szHint.base_height + height; 700 szHint.height = szHint.base_height + height;
791 } 701 }
792 702
793 if (scrollBar.state && option (Opt_scrollBar_right))
794 window_sb_x = szHint.width - sb_w;
795
796 if (recalc_x) 703 if (recalc_x)
797 szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth; 704 szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth;
798 705
799 if (recalc_y) 706 if (recalc_y)
800 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth; 707 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth;
801 708
802 ncol = width / fwidth; 709 ncol = width / fwidth;
803 nrow = height / fheight; 710 nrow = height / fheight;
711
712 // When the size of the vt window is not a multiple of the cell
713 // size, i.e., when the wm does not honour our size hints, there are
714 // extra areas not covered by the terminal screen. Such gaps, when a
715 // bg pixmap is set, would have to be cleared manually to properly
716 // refresh the background. We take the simpler route and shrink the
717 // vt window so as to avoid creating gaps.
718 width = ncol * fwidth;
719 height = nrow * fheight;
804} 720}
805 721
806/*----------------------------------------------------------------------*/ 722/*----------------------------------------------------------------------*/
807/* 723/*
808 * Tell the teletype handler what size the window is. 724 * Tell the teletype handler what size the window is.
… …
818 734
819 ws.ws_col = ncol; 735 ws.ws_col = ncol;
820 ws.ws_row = nrow; 736 ws.ws_row = nrow;
821 ws.ws_xpixel = width; 737 ws.ws_xpixel = width;
822 ws.ws_ypixel = height; 738 ws.ws_ypixel = height;
823 (void)ioctl (pty->pty, TIOCSWINSZ, &ws); 739 ioctl (pty->pty, TIOCSWINSZ, &ws);
824 740
825#if 0 741#if 0
826 // TIOCSWINSZ is supposed to do this automatically and correctly 742 // TIOCSWINSZ is supposed to do this automatically and correctly
827 if (cmd_pid) /* force through to the command */ 743 if (cmd_pid) /* force through to the command */
828 kill (-cmd_pid, SIGWINCH); 744 kill (-cmd_pid, SIGWINCH);
829#endif 745#endif
830} 746}
831 747
832/*----------------------------------------------------------------------*/ 748/*----------------------------------------------------------------------*/
833/* set_fonts () - load and set the various fonts 749/* load and set the various fonts */
834 *
835 * init = 1 - initialize
836 *
837 * fontname == FONT_UP - switch to bigger font
838 * fontname == FONT_DN - switch to smaller font
839 */
840bool 750bool
841rxvt_term::set_fonts () 751rxvt_term::set_fonts ()
842{ 752{
843 rxvt_fontset *fs = new rxvt_fontset (this); 753 rxvt_fontset *fs = new rxvt_fontset (this);
844 rxvt_fontprop prop; 754 rxvt_fontprop prop;
… …
858#endif 768#endif
859 769
860 delete fontset[0]; 770 delete fontset[0];
861 fontset[0] = fs; 771 fontset[0] = fs;
862 772
863 prop = (*fs)[1]->properties (); 773 prop = (*fs)[rxvt_fontset::firstFont]->properties ();
864 prop.height += lineSpace; 774 prop.height += lineSpace;
775 prop.width += letterSpace;
865 776
866 fs->set_prop (prop, false); 777 fs->set_prop (prop, false);
867 778
868 fwidth = prop.width; 779 fwidth = prop.width;
869 fheight = prop.height; 780 fheight = prop.height;
… …
900#else 811#else
901 fontset[style] = fontset[0]; 812 fontset[style] = fontset[0];
902#endif 813#endif
903 } 814 }
904 815
905 if (parent[0]) 816 if (parent)
906 { 817 {
907 resize_all_windows (0, 0, 0); 818 resize_all_windows (0, 0, 0);
908 scr_remap_chars (); 819 scr_remap_chars ();
909 scr_touch (true); 820 scr_touch (true);
910 } 821 }
… …
913} 824}
914 825
915void 826void
916rxvt_term::set_string_property (Atom prop, const char *str, int len) 827rxvt_term::set_string_property (Atom prop, const char *str, int len)
917{ 828{
918 XChangeProperty (dpy, parent[0], 829 XChangeProperty (dpy, parent,
919 prop, XA_STRING, 8, PropModeReplace, 830 prop, XA_STRING, 8, PropModeReplace,
920 (const unsigned char *)str, len >= 0 ? len : strlen (str)); 831 (const unsigned char *)str, len >= 0 ? len : strlen (str));
921} 832}
922 833
923void 834void
835rxvt_term::set_mbstring_property (Atom prop, const char *str, int len)
836{
837 XTextProperty ct;
838
839 if (XmbTextListToTextProperty (dpy, (char **)&str, 1, XStdICCTextStyle, &ct) >= 0)
840 {
841 XSetTextProperty (dpy, parent, &ct, prop);
842 XFree (ct.value);
843 }
844}
845
846void
924rxvt_term::set_utf8_property (Atom prop, const char *str, int len) 847rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
925{ 848{
926 wchar_t *ws = rxvt_mbstowcs (str, len); 849 wchar_t *ws = rxvt_mbstowcs (str, len);
927 char *s = rxvt_wcstoutf8 (ws); 850 char *s = rxvt_wcstoutf8 (ws);
928 851
929 XChangeProperty (dpy, parent[0], 852 XChangeProperty (dpy, parent,
930 prop, xa[XA_UTF8_STRING], 8, PropModeReplace, 853 prop, xa[XA_UTF8_STRING], 8, PropModeReplace,
931 (const unsigned char *)s, strlen (s)); 854 (const unsigned char *)s, strlen (s));
932 855
933 free (s); 856 free (s);
934 free (ws); 857 free (ws);
… …
938/*----------------------------------------------------------------------*/ 861/*----------------------------------------------------------------------*/
939/* xterm sequences - title, iconName, color (exptl) */ 862/* xterm sequences - title, iconName, color (exptl) */
940void 863void
941rxvt_term::set_title (const char *str) 864rxvt_term::set_title (const char *str)
942{ 865{
943 set_string_property (XA_WM_NAME, str); 866 set_mbstring_property (XA_WM_NAME, str);
944#if ENABLE_EWMH 867#if ENABLE_EWMH
945 set_utf8_property (xa[XA_NET_WM_NAME], str); 868 set_utf8_property (xa[XA_NET_WM_NAME], str);
946#endif 869#endif
947} 870}
948 871
949void 872void
950rxvt_term::set_icon_name (const char *str) 873rxvt_term::set_icon_name (const char *str)
951{ 874{
952 set_string_property (XA_WM_ICON_NAME, str); 875 set_mbstring_property (XA_WM_ICON_NAME, str);
953#if ENABLE_EWMH 876#if ENABLE_EWMH
954 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str); 877 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str);
955#endif 878#endif
956} 879}
957 880
958void 881void
959rxvt_term::set_window_color (int idx, const char *color) 882rxvt_term::set_window_color (int idx, const char *color)
960{ 883{
961#ifdef XTERM_COLOR_CHANGE 884#ifdef XTERM_COLOR_CHANGE
962 rxvt_color xcol; 885 rxvt_color xcol;
963 int i;
964 886
965 if (color == NULL || *color == '\0') 887 if (color == NULL || *color == '\0')
966 return; 888 return;
967 889
968 color = strdup (color); 890 color = strdup (color);
… …
970 rs[Rs_color + idx] = color; 892 rs[Rs_color + idx] = color;
971 893
972 /* handle color aliases */ 894 /* handle color aliases */
973 if (isdigit (*color)) 895 if (isdigit (*color))
974 { 896 {
975 i = atoi (color); 897 int i = atoi (color);
976 898
977 if (i >= 8 && i <= 15) 899 if (i >= 8 && i <= 15)
978 { 900 {
979 /* bright colors */ 901 /* bright colors */
980 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i - 8]; 902 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i - 8];
… …
1030void 952void
1031rxvt_term::set_colorfgbg () 953rxvt_term::set_colorfgbg ()
1032{ 954{
1033 unsigned int i; 955 unsigned int i;
1034 const char *xpmb = ""; 956 const char *xpmb = "";
1035 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1]; 957 char fstr[] = "default";
958 char bstr[] = "default";
1036 959
1037 strcpy (fstr, "default");
1038 strcpy (bstr, "default");
1039 for (i = Color_Black; i <= Color_White; i++) 960 for (i = Color_Black; i <= Color_White; i++)
1040 if (pix_colors[Color_fg] == pix_colors[i]) 961 if (pix_colors[Color_fg] == pix_colors[i])
1041 { 962 {
1042 sprintf (fstr, "%d", (i - Color_Black)); 963 sprintf (fstr, "%d", i - Color_Black);
1043 break; 964 break;
1044 } 965 }
1045 966
1046 for (i = Color_Black; i <= Color_White; i++) 967 for (i = Color_Black; i <= Color_White; i++)
1047 if (pix_colors[Color_bg] == pix_colors[i]) 968 if (pix_colors[Color_bg] == pix_colors[i])
1048 { 969 {
1049 sprintf (bstr, "%d", (i - Color_Black)); 970 sprintf (bstr, "%d", i - Color_Black);
1050#ifdef BG_IMAGE_FROM_FILE 971#ifdef BG_IMAGE_FROM_FILE
1051 xpmb = "default;"; 972 xpmb = "default;";
1052#endif 973#endif
1053 break; 974 break;
1054 } 975 }
… …
1084 int old_width = szHint.width; 1005 int old_width = szHint.width;
1085 int old_height = szHint.height; 1006 int old_height = szHint.height;
1086 1007
1087 window_calc (newwidth, newheight); 1008 window_calc (newwidth, newheight);
1088 1009
1089 if (!HOOK_INVOKE ((this, HOOK_RESIZE_ALL_WINDOWS, DT_INT, newwidth, DT_INT, newheight, DT_END))) 1010 bool set_hint = !HOOK_INVOKE ((this, HOOK_RESIZE_ALL_WINDOWS, DT_INT, newwidth, DT_INT, newheight, DT_END));
1011
1012 // to avoid races between us and the wm, we clear the incremental size hints around the xresizewindow
1013 if (set_hint)
1014 {
1015 szHint.flags &= ~(PBaseSize | PResizeInc);
1090 XSetWMNormalHints (dpy, parent[0], &szHint); 1016 XSetWMNormalHints (dpy, parent, &szHint);
1017 szHint.flags |= PBaseSize | PResizeInc;
1018 }
1091 1019
1092 if (!ignoreparent) 1020 if (!ignoreparent)
1093 { 1021 {
1094#ifdef SMART_RESIZE 1022#ifdef SMART_RESIZE
1095 /* 1023 /*
… …
1099 int x, y, x1, y1; 1027 int x, y, x1, y1;
1100 int dx, dy; 1028 int dx, dy;
1101 unsigned int unused_w1, unused_h1, unused_b1, unused_d1; 1029 unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
1102 Window unused_cr; 1030 Window unused_cr;
1103 1031
1104 XTranslateCoordinates (dpy, parent[0], display->root, 1032 XTranslateCoordinates (dpy, parent, display->root,
1105 0, 0, &x, &y, &unused_cr); 1033 0, 0, &x, &y, &unused_cr);
1106 XGetGeometry (dpy, parent[0], &unused_cr, &x1, &y1, 1034 XGetGeometry (dpy, parent, &unused_cr, &x1, &y1,
1107 &unused_w1, &unused_h1, &unused_b1, &unused_d1); 1035 &unused_w1, &unused_h1, &unused_b1, &unused_d1);
1108 /* 1036 /*
1109 * if display->root isn't the parent window, a WM will probably have offset 1037 * if display->root isn't the parent window, a WM will probably have offset
1110 * our position for handles and decorations. Counter it 1038 * our position for handles and decorations. Counter it
1111 */ 1039 */
… …
1128 if (y < y1) /* top half */ 1056 if (y < y1) /* top half */
1129 dy = 0; 1057 dy = 0;
1130 else if (y == y1) /* exact center */ 1058 else if (y == y1) /* exact center */
1131 dy /= 2; 1059 dy /= 2;
1132 1060
1133 XMoveResizeWindow (dpy, parent[0], x + dx, y + dy, 1061 XMoveResizeWindow (dpy, parent, x + dx, y + dy,
1134 szHint.width, szHint.height); 1062 szHint.width, szHint.height);
1135#else 1063#else
1136 XResizeWindow (dpy, parent[0], szHint.width, szHint.height); 1064 XResizeWindow (dpy, parent, szHint.width, szHint.height);
1137#endif 1065#endif
1138 } 1066 }
1067
1068 if (set_hint)
1069 XSetWMNormalHints (dpy, parent, &szHint);
1139 1070
1140 fix_screen = ncol != prev_ncol || nrow != prev_nrow; 1071 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
1141 1072
1142 if (fix_screen || newwidth != old_width || newheight != old_height) 1073 if (fix_screen || newwidth != old_width || newheight != old_height)
1143 { 1074 {
1144 if (scrollBar.state) 1075 if (scrollBar.state)
1145 { 1076 scrollBar.resize ();
1146 XMoveResizeWindow (dpy, scrollBar.win,
1147 window_sb_x, 0,
1148 scrollbar_TotalWidth (), szHint.height);
1149 resize_scrollbar ();
1150 }
1151 1077
1152 XMoveResizeWindow (dpy, vt, 1078 XMoveResizeWindow (dpy, vt,
1153 window_vt_x, window_vt_y, 1079 window_vt_x, window_vt_y,
1154 width, height); 1080 width, height);
1155 1081
1156#ifdef HAVE_BG_PIXMAP 1082#ifdef HAVE_BG_PIXMAP
1157 if (bgPixmap.window_size_sensitive ()) 1083 if (bg_window_size_sensitive ())
1158 update_background (); 1084 update_background ();
1159#endif 1085#endif
1160
1161 scr_clear ();
1162 } 1086 }
1163 1087
1164 if (fix_screen || old_height == 0) 1088 if (fix_screen || old_height == 0)
1165 scr_reset (); 1089 scr_reset ();
1166 1090
1167 // TODO, with nvidia-8178, resizes kill the alpha channel, report if not fixed in newer version
1168 //scr_touch (false);
1169
1170#ifdef HAVE_BG_PIXMAP
1171// TODO: this don't seem to have any effect - do we still need it ? If so - in which case exactly ?
1172// if (bgPixmap.pixmap)
1173// scr_touch (false);
1174#endif
1175
1176#ifdef USE_XIM 1091#ifdef USE_XIM
1177 IMSetPosition (); 1092 im_set_position ();
1178#endif 1093#endif
1179} 1094}
1180 1095
1181/* 1096/*
1182 * Set the width/height of the vt window in characters. Units are pixels. 1097 * Set the width/height of the vt window in characters. Units are pixels.
… …
1243 status_rect.height = fheight; 1158 status_rect.height = fheight;
1244} 1159}
1245 1160
1246/* Checking whether input method is running. */ 1161/* Checking whether input method is running. */
1247bool 1162bool
1248rxvt_term::IMisRunning () 1163rxvt_term::im_is_running ()
1249{ 1164{
1250 char *p;
1251 Atom atom; 1165 Atom atom;
1252 Window win; 1166 Window win;
1253 char server[IMBUFSIZ]; 1167 char server[IMBUFSIZ];
1254 1168
1255 /* get current locale modifier */ 1169 /* get current locale modifier */
1256 if ((p = XSetLocaleModifiers (NULL)) != NULL) 1170 if (char *p = XSetLocaleModifiers (0))
1257 { 1171 {
1258 strcpy (server, "@server="); 1172 strcpy (server, "@server=");
1259 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */ 1173 strncat (server, p + 4, IMBUFSIZ - 9); /* skip "@im=" */
1260 1174
1261 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */ 1175 if (p = strchr (server + 1, '@')) /* first one only */
1262 *p = '\0'; 1176 *p = '\0';
1263 1177
1264 atom = XInternAtom (dpy, server, False); 1178 atom = XInternAtom (dpy, server, False);
1265 win = XGetSelectionOwner (dpy, atom); 1179 win = XGetSelectionOwner (dpy, atom);
1266 1180
1267 if (win != None) 1181 if (win != None)
1268 return True; 1182 return true;
1269 } 1183 }
1270 1184
1271 return False; 1185 return false;
1272} 1186}
1273 1187
1274void 1188void
1275rxvt_term::IMSendSpot () 1189rxvt_term::im_send_spot ()
1276{ 1190{
1277 XPoint nspot; 1191 XPoint nspot;
1278 XVaNestedList preedit_attr; 1192 XVaNestedList preedit_attr;
1279 1193
1280 if (!Input_Context 1194 if (!Input_Context
… …
1333 1247
1334 term->make_current (); 1248 term->make_current ();
1335 1249
1336 if (text) 1250 if (text)
1337 { 1251 {
1338 void *str; 1252 wchar_t *str;
1339 1253
1340 if (!text->encoding_is_wchar && text->string.multi_byte) 1254 if (!text->encoding_is_wchar && text->string.multi_byte)
1341 { 1255 {
1342 // of course, X makes it ugly again 1256 // of course, X makes it ugly again
1343 if (term->rs[Rs_imLocale]) 1257 if (term->rs[Rs_imLocale])
1344 SET_LOCALE (term->rs[Rs_imLocale]); 1258 SET_LOCALE (term->rs[Rs_imLocale]);
1345 1259
1346 str = rxvt_temp_buf ((text->length + 1) * sizeof (wchar_t)); 1260 str = rxvt_temp_buf<wchar_t> (text->length + 1);
1347 mbstowcs ((wchar_t *)str, text->string.multi_byte, text->length + 1); 1261 mbstowcs (str, text->string.multi_byte, text->length + 1);
1348 1262
1349 if (term->rs[Rs_imLocale]) 1263 if (term->rs[Rs_imLocale])
1350 SET_LOCALE (term->locale); 1264 SET_LOCALE (term->locale);
1351 } 1265 }
1352 else 1266 else
1353 str = (void *)text->string.wide_char; 1267 str = text->string.wide_char;
1354 1268
1355 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW, 1269 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
1356 DT_INT, call_data->caret, 1270 DT_INT, call_data->caret,
1357 DT_INT, call_data->chg_first, 1271 DT_INT, call_data->chg_first,
1358 DT_INT, call_data->chg_length, 1272 DT_INT, call_data->chg_length,
… …
1386/* 1300/*
1387 * Try to open a XIM with the current modifiers, then see if we can 1301 * Try to open a XIM with the current modifiers, then see if we can
1388 * open a suitable preedit type 1302 * open a suitable preedit type
1389 */ 1303 */
1390bool 1304bool
1391rxvt_term::IM_get_IC (const char *modifiers) 1305rxvt_term::im_get_ic (const char *modifiers)
1392{ 1306{
1393 int i, j, found; 1307 int i, j, found;
1394 XIM xim; 1308 XIM xim;
1395 XPoint spot; 1309 XPoint spot;
1396 XRectangle rect, status_rect, needed_rect; 1310 XRectangle rect, status_rect, needed_rect;
1397 unsigned long fg, bg; 1311 unsigned long fg, bg;
1398 const char *p; 1312 const char *p;
1399 char **s; 1313 char **s;
1400 XIMStyles *xim_styles; 1314 XIMStyles *xim_styles;
1401#ifdef ENABLE_XIM_ONTHESPOT
1402 XIMCallback xcb[4];
1403#endif
1404 1315
1405 set_environ (envv); 1316 set_environ (envv);
1406 1317
1407 if (! ((p = XSetLocaleModifiers (modifiers)) && *p)) 1318 if (! ((p = XSetLocaleModifiers (modifiers)) && *p))
1408 return false; 1319 return false;
… …
1429 p = pet[pi]; 1340 p = pet[pi];
1430 1341
1431 if (!p) 1342 if (!p)
1432 continue; 1343 continue;
1433 1344
1434 s = rxvt_splitcommastring (p); 1345 s = rxvt_strsplit (',', p);
1435 1346
1436 for (i = found = 0; !found && s[i]; i++) 1347 for (i = found = 0; !found && s[i]; i++)
1437 { 1348 {
1438 if (!strcmp (s[i], "OverTheSpot")) 1349 if (!strcmp (s[i], "OverTheSpot"))
1439 input_style = XIMPreeditPosition | XIMStatusNothing; 1350 input_style = XIMPreeditPosition | XIMStatusNothing;
… …
1451 input_style = XIMPreeditNothing | XIMStatusNothing; 1362 input_style = XIMPreeditNothing | XIMStatusNothing;
1452 1363
1453 for (j = 0; j < xim_styles->count_styles; j++) 1364 for (j = 0; j < xim_styles->count_styles; j++)
1454 if (input_style == xim_styles->supported_styles[j]) 1365 if (input_style == xim_styles->supported_styles[j])
1455 { 1366 {
1456 rxvt_freecommastring (s); 1367 rxvt_free_strsplit (s);
1457 1368
1458 found = 1; 1369 found = 1;
1459 goto foundpet; 1370 goto foundpet;
1460 } 1371 }
1461 1372
1462 } 1373 }
1463 1374
1464 rxvt_freecommastring (s); 1375 rxvt_free_strsplit (s);
1465 } 1376 }
1466 1377
1467foundpet: 1378foundpet:
1468 1379
1469 XFree (xim_styles); 1380 XFree (xim_styles);
… …
1548 NULL); 1459 NULL);
1549 } 1460 }
1550#if ENABLE_XIM_ONTHESPOT 1461#if ENABLE_XIM_ONTHESPOT
1551 else if (input_style & XIMPreeditCallbacks) 1462 else if (input_style & XIMPreeditCallbacks)
1552 { 1463 {
1464 XIMCallback xcb[4];
1465
1553 im_set_position (spot); 1466 im_set_position (spot);
1554 1467
1555 xcb[0].client_data = (XPointer)this; xcb[0].callback = (XIMProc)xim_preedit_start; 1468 xcb[0].client_data = (XPointer)this; xcb[0].callback = (XIMProc)xim_preedit_start;
1556 xcb[1].client_data = (XPointer)this; xcb[1].callback = (XIMProc)xim_preedit_done; 1469 xcb[1].client_data = (XPointer)this; xcb[1].callback = (XIMProc)xim_preedit_done;
1557 xcb[2].client_data = (XPointer)this; xcb[2].callback = (XIMProc)xim_preedit_draw; 1470 xcb[2].client_data = (XPointer)this; xcb[2].callback = (XIMProc)xim_preedit_draw;
… …
1572#endif 1485#endif
1573 1486
1574 Input_Context = XCreateIC (xim, 1487 Input_Context = XCreateIC (xim,
1575 XNInputStyle, input_style, 1488 XNInputStyle, input_style,
1576 XNClientWindow, vt, 1489 XNClientWindow, vt,
1577 XNFocusWindow, parent[0], 1490 XNFocusWindow, parent,
1578 preedit_attr ? XNPreeditAttributes : NULL, 1491 preedit_attr ? XNPreeditAttributes : NULL,
1579 preedit_attr, 1492 preedit_attr,
1580 status_attr ? XNStatusAttributes : NULL, 1493 status_attr ? XNStatusAttributes : NULL,
1581 status_attr, NULL); 1494 status_attr, NULL);
1582 1495
… …
1595 // unfortunately, only the focus window is used by XIM, hard to fix 1508 // unfortunately, only the focus window is used by XIM, hard to fix
1596 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL)) 1509 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL))
1597 vt_select_input (); 1510 vt_select_input ();
1598#endif 1511#endif
1599 1512
1600 IMSetPosition (); 1513 im_set_position ();
1601 1514
1602 return true; 1515 return true;
1603} 1516}
1604 1517
1605void 1518void
… …
1625 p = rs[Rs_inputMethod]; 1538 p = rs[Rs_inputMethod];
1626 if (p && *p) 1539 if (p && *p)
1627 { 1540 {
1628 bool found = false; 1541 bool found = false;
1629 1542
1630 s = rxvt_splitcommastring (p); 1543 s = rxvt_strsplit (',', p);
1631 1544
1632 for (i = 0; s[i]; i++) 1545 for (i = 0; s[i]; i++)
1633 { 1546 {
1634 if (*s[i]) 1547 if (*s[i])
1635 { 1548 {
1636 strcpy (buf, "@im="); 1549 strcpy (buf, "@im=");
1637 strncat (buf, s[i], IMBUFSIZ - 5); 1550 strncat (buf, s[i], IMBUFSIZ - 5);
1638 if (IM_get_IC (buf)) 1551 if (im_get_ic (buf))
1639 { 1552 {
1640 found = true; 1553 found = true;
1641 break; 1554 break;
1642 } 1555 }
1643 } 1556 }
1644 } 1557 }
1645 1558
1646 rxvt_freecommastring (s); 1559 rxvt_free_strsplit (s);
1647 1560
1648 if (found) 1561 if (found)
1649 goto done; 1562 goto done;
1650 } 1563 }
1651 1564
1652 /* try with XMODIFIERS env. var. */ 1565 /* try with XMODIFIERS env. var. */
1653 if (IM_get_IC ("")) 1566 if (im_get_ic (""))
1654 goto done; 1567 goto done;
1655 1568
1656 /* try with no modifiers base IF the user didn't specify an IM */ 1569 /* try with no modifiers base IF the user didn't specify an IM */
1657 if (IM_get_IC ("@im=none")) 1570 if (im_get_ic ("@im=none"))
1658 goto done; 1571 goto done;
1659 1572
1660done: 1573done:
1661#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE) 1574#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1662 if (rs[Rs_imLocale]) 1575 if (rs[Rs_imLocale])
1663 SET_LOCALE (locale); 1576 SET_LOCALE (locale);
1664#endif 1577#endif
1665} 1578}
1666 1579
1667void 1580void
1668rxvt_term::IMSetPosition () 1581rxvt_term::im_set_position ()
1669{ 1582{
1670 XRectangle preedit_rect, status_rect, *needed_rect; 1583 XRectangle preedit_rect, status_rect, *needed_rect;
1671 XVaNestedList preedit_attr, status_attr; 1584 XVaNestedList preedit_attr, status_attr;
1672 1585
1673 if (!Input_Context 1586 if (!Input_Context
1674 || !focus 1587 || !focus
1675 || !(input_style & (XIMPreeditArea | XIMPreeditPosition)) 1588 || !(input_style & (XIMPreeditArea | XIMPreeditPosition))
1676 || !IMisRunning ()) 1589 || !im_is_running ())
1677 return; 1590 return;
1678 1591
1679 if (input_style & XIMPreeditPosition) 1592 if (input_style & XIMPreeditPosition)
1680 { 1593 {
1681 im_set_size (preedit_rect); 1594 im_set_size (preedit_rect);
… …
1711 1624
1712void 1625void
1713rxvt_term::get_window_origin (int &x, int &y) 1626rxvt_term::get_window_origin (int &x, int &y)
1714{ 1627{
1715 Window cr; 1628 Window cr;
1716 XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr); 1629 XTranslateCoordinates (dpy, parent, display->root, 0, 0, &x, &y, &cr);
1717/* fprintf( stderr, "origin is %+d%+d\n", x, y);*/
1718} 1630}
1719 1631
1720Pixmap 1632Pixmap
1721rxvt_term::get_pixmap_property (int prop_id) 1633rxvt_term::get_pixmap_property (Atom property)
1722{ 1634{
1723 if (prop_id > 0 && prop_id < NUM_XA) 1635 Pixmap pixmap = None;
1724 if (xa[prop_id]) 1636
1725 {
1726 int aformat; 1637 int aformat;
1727 unsigned long nitems, bytes_after; 1638 unsigned long nitems, bytes_after;
1728 Atom atype; 1639 Atom atype;
1729 unsigned char *prop = NULL; 1640 unsigned char *prop;
1730 int result = XGetWindowProperty (dpy, display->root, xa[prop_id], 1641 int result = XGetWindowProperty (dpy, display->root, property,
1731 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 1642 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1732 &nitems, &bytes_after, &prop); 1643 &nitems, &bytes_after, &prop);
1733 if (result == Success && prop && atype == XA_PIXMAP) 1644 if (result == Success)
1734 { 1645 {
1735 return *(Pixmap *)prop; 1646 if (atype == XA_PIXMAP)
1736 } 1647 pixmap = *(Pixmap *)prop;
1648 XFree (prop);
1737 } 1649 }
1738 return None; 1650
1651 return pixmap;
1739} 1652}
1740 1653
1741#ifdef HAVE_BG_PIXMAP 1654#ifdef HAVE_BG_PIXMAP
1742# if TRACE_PIXMAPS
1743# undef update_background
1744int rxvt_term::trace_update_background (const char *file, int line)
1745{
1746 fprintf (stderr, "%s:%d:update_background()\n", file, line);
1747 update_background ();
1748}
1749# endif
1750 1655
1751int 1656void
1752rxvt_term::update_background () 1657rxvt_term::update_background ()
1753{ 1658{
1659 if (update_background_ev.is_active ())
1660 return;
1661
1754 bgPixmap.invalidate (); 1662 bg_invalidate ();
1755 1663
1756 /* no chance of real time refresh if we are blurring! */ 1664 ev_tstamp to_wait = 0.5 - (ev::now () - bg_valid_since);
1757 if (bgPixmap.invalid_since + 0.5 < ev::now () && !(bgPixmap.flags & bgPixmap_t::blurNeeded)) 1665
1666 if (to_wait <= 0.)
1758 bgPixmap.render (); 1667 bg_render ();
1759 else 1668 else
1760 {
1761 update_background_ev.stop ();
1762
1763 if (!bgPixmap.need_client_side_rendering())
1764 update_background_ev.start (.05); 1669 update_background_ev.start (to_wait);
1765 else if (bgPixmap.flags & bgPixmap_t::blurNeeded)
1766 update_background_ev.start (.20); /* very slow !!! */
1767 else
1768 update_background_ev.start (.07);
1769 }
1770
1771 return 0;
1772} 1670}
1773 1671
1774void 1672void
1775rxvt_term::update_background_cb (ev::timer &w, int revents) 1673rxvt_term::update_background_cb (ev::timer &w, int revents)
1776{ 1674{
1675 make_current ();
1676
1677 update_background_ev.stop ();
1777 bgPixmap.render (); 1678 bg_render ();
1679 refresh_check ();
1778} 1680}
1779 1681
1780#endif /* HAVE_BG_PIXMAP */ 1682#endif /* HAVE_BG_PIXMAP */
1781 1683
1782/*----------------------- end-of-file (C source) -----------------------*/ 1684/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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