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.294 by root, Fri Jan 4 19:12:23 2008 UTC vs.
Revision 1.362 by sf-exg, Tue Dec 6 11:29:52 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));
… …
172 slip_wheel_ev.set <rxvt_term, &rxvt_term::slip_wheel_cb> (this); 173 slip_wheel_ev.set <rxvt_term, &rxvt_term::slip_wheel_cb> (this);
173#endif 174#endif
174#if ENABLE_TRANSPARENCY || ENABLE_PERL 175#if ENABLE_TRANSPARENCY || ENABLE_PERL
175 rootwin_ev.set <rxvt_term, &rxvt_term::rootwin_cb> (this), 176 rootwin_ev.set <rxvt_term, &rxvt_term::rootwin_cb> (this),
176#endif 177#endif
177#ifdef HAVE_SCROLLBARS
178 scrollbar_ev.set <rxvt_term, &rxvt_term::x_cb> (this), 178 scrollbar_ev.set <rxvt_term, &rxvt_term::x_cb> (this),
179#endif
180#ifdef USE_XIM 179#ifdef USE_XIM
181 im_ev.set <rxvt_term, &rxvt_term::im_cb> (this), 180 im_ev.set <rxvt_term, &rxvt_term::im_cb> (this),
182#endif 181#endif
183#ifdef POINTER_BLANK 182#ifdef POINTER_BLANK
184 pointer_ev.set <rxvt_term, &rxvt_term::pointer_cb> (this); 183 pointer_ev.set <rxvt_term, &rxvt_term::pointer_cb> (this);
… …
188#endif 187#endif
189 child_ev.set <rxvt_term, &rxvt_term::child_cb> (this); 188 child_ev.set <rxvt_term, &rxvt_term::child_cb> (this);
190 flush_ev.set <rxvt_term, &rxvt_term::flush_cb> (this); 189 flush_ev.set <rxvt_term, &rxvt_term::flush_cb> (this);
191 destroy_ev.set <rxvt_term, &rxvt_term::destroy_cb> (this); 190 destroy_ev.set <rxvt_term, &rxvt_term::destroy_cb> (this);
192 pty_ev.set <rxvt_term, &rxvt_term::pty_cb> (this); 191 pty_ev.set <rxvt_term, &rxvt_term::pty_cb> (this);
193 incr_ev.set <rxvt_term, &rxvt_term::incr_cb> (this);
194 termwin_ev.set <rxvt_term, &rxvt_term::x_cb> (this); 192 termwin_ev.set <rxvt_term, &rxvt_term::x_cb> (this);
195 vt_ev.set <rxvt_term, &rxvt_term::x_cb> (this); 193 vt_ev.set <rxvt_term, &rxvt_term::x_cb> (this);
196 194
197 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base; 195 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base;
198 196
199 termlist.push_back (this); 197 termlist.push_back (this);
200 198
201#ifdef KEYSYM_RESOURCE 199#ifdef KEYSYM_RESOURCE
202 keyboard = new keyboard_manager; 200 keyboard = new keyboard_manager;
203#endif 201#endif
202
203 // this->envv = 0;
204} 204}
205 205
206// clean up the most important stuff, do *not* call x or free mem etc. 206// clean up the most important stuff, do *not* call x or free mem etc.
207// for use before an emergency exit 207// for use before an emergency exit
208void 208void
… …
226 if (fontset[i] != fontset[0]) 226 if (fontset[i] != fontset[0])
227 delete fontset[i]; 227 delete fontset[i];
228#endif 228#endif
229 delete fontset[0]; 229 delete fontset[0];
230 230
231#ifdef HAVE_BG_PIXMAP
232 bg_destroy ();
233#endif
234
231 if (display) 235 if (display)
232 { 236 {
233 selection_clear (); 237 selection_clear ();
238 selection_clear (true);
234 239
235#ifdef USE_XIM 240#ifdef USE_XIM
236 im_destroy (); 241 im_destroy ();
237#endif 242#endif
238#ifdef XTERM_SCROLLBAR 243 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); 244 if (gc) XFreeGC (dpy, gc);
263 245
264 delete drawable; 246 delete drawable;
265 // destroy all windows 247 // destroy all windows
266 if (parent[0]) 248 if (parent)
267 XDestroyWindow (dpy, parent[0]); 249 XDestroyWindow (dpy, parent);
268 250
269 for (int i = 0; i < TOTAL_COLORS; i++) 251 for (int i = 0; i < TOTAL_COLORS; i++)
270 if (ISSET_PIXCOLOR (i)) 252 if (ISSET_PIXCOLOR (i))
271 { 253 {
272 pix_colors_focused [i].free (this); 254 pix_colors_focused [i].free (this);
… …
274 pix_colors_unfocused [i].free (this); 256 pix_colors_unfocused [i].free (this);
275#endif 257#endif
276 } 258 }
277 259
278 clear (); 260 clear ();
279 }
280 261
281#ifdef HAVE_BG_PIXMAP
282 bgPixmap.destroy ();
283#endif
284 display->flush (); /* ideally .put should do this */ 262 display->flush (); /* ideally .put should do this */
285 displays.put (display); 263 displays.put (display);
264 }
286 265
287 scr_release (); 266 scr_release ();
288 267
289 /* clear all resources */ 268 /* clear all resources */
290 for (int i = 0; i < allocated.size (); i++) 269 for (int i = 0; i < allocated.size (); i++)
291 free (allocated [i]); 270 free (allocated [i]);
292 271
293 free (selection.text); 272 free (selection.text);
273 free (selection.clip_text);
294 // TODO: manage env vars in child only(!) 274 // TODO: manage env vars in child only(!)
295 free (env_display); 275 free (env_display);
296 free (env_term); 276 free (env_term);
297 free (locale); 277 free (locale);
298 free (v_buffer); 278 free (v_buffer);
299 free (incr_buf); 279
280 delete selection_req;
300 281
301 delete envv; 282 delete envv;
302 delete argv; 283 delete argv;
303 284
304#ifdef KEYSYM_RESOURCE 285#ifdef KEYSYM_RESOURCE
… …
336 if (display) 317 if (display)
337 { 318 {
338#if USE_XIM 319#if USE_XIM
339 im_ev.stop (display); 320 im_ev.stop (display);
340#endif 321#endif
341#if HAVE_SCROLLBARS
342 scrollbar_ev.stop (display); 322 scrollbar_ev.stop (display);
343#endif
344#if ENABLE_TRANSPARENCY || ENABLE_PERL 323#if ENABLE_TRANSPARENCY || ENABLE_PERL
345 rootwin_ev.stop (display); 324 rootwin_ev.stop (display);
346#endif 325#endif
347 incr_ev.stop ();
348 termwin_ev.stop (display); 326 termwin_ev.stop (display);
349 vt_ev.stop (display); 327 vt_ev.stop (display);
350 } 328 }
351 329
352 flush_ev.stop (); 330 flush_ev.stop ();
… …
374rxvt_term::destroy_cb (ev::idle &w, int revents) 352rxvt_term::destroy_cb (ev::idle &w, int revents)
375{ 353{
376 make_current (); 354 make_current ();
377 355
378 delete this; 356 delete this;
357}
358
359void
360rxvt_term::set_option (uint8_t opt, bool set)
361{
362 if (!opt)
363 return;
364
365 uint8_t mask = 1 << (opt & 7);
366 uint8_t &val = options [opt >> 3];
367
368 val = val & ~mask | (set ? mask : 0);
379} 369}
380 370
381/*----------------------------------------------------------------------*/ 371/*----------------------------------------------------------------------*/
382/* 372/*
383 * Exit gracefully, clearing the utmp entry and restoring tty attributes 373 * Exit gracefully, clearing the utmp entry and restoring tty attributes
… …
397print_x_error (Display *dpy, XErrorEvent *event) 387print_x_error (Display *dpy, XErrorEvent *event)
398{ 388{
399 char buffer[BUFSIZ]; 389 char buffer[BUFSIZ];
400 char mesg[BUFSIZ]; 390 char mesg[BUFSIZ];
401 char number[32]; 391 char number[32];
402 char *mtype = "XlibMessage"; 392 const char mtype[] = "XlibMessage";
403 XGetErrorText(dpy, event->error_code, buffer, BUFSIZ); 393 XGetErrorText(dpy, event->error_code, buffer, BUFSIZ);
404 XGetErrorDatabaseText(dpy, mtype, "XError", "X Error", mesg, BUFSIZ); 394 XGetErrorDatabaseText(dpy, mtype, "XError", "X Error", mesg, BUFSIZ);
405 rxvt_warn ("An X Error occured, trying to continue after report.\n"); 395 rxvt_warn ("An X Error occurred, trying to continue after report.\n");
406 rxvt_warn ("%s: %s\n", mesg, buffer); 396 rxvt_warn ("%s: %s\n", mesg, buffer);
407 XGetErrorDatabaseText(dpy, mtype, "MajorCode", "Request Major code %d", mesg, BUFSIZ); 397 XGetErrorDatabaseText(dpy, mtype, "MajorCode", "Request Major code %d", mesg, BUFSIZ);
408 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->request_code); 398 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->request_code);
409 sprintf(number, "%d", event->request_code); 399 sprintf(number, "%d", event->request_code);
410 XGetErrorDatabaseText(dpy, "XRequest", number, "", buffer, BUFSIZ); 400 XGetErrorDatabaseText(dpy, "XRequest", number, "", buffer, BUFSIZ);
411 rxvt_warn ("(which is %s)\n", buffer); 401 rxvt_warn ("(which is %s)\n", buffer);
412 if (event->request_code >= 128) { 402 if (event->request_code >= 128) {
413 XGetErrorDatabaseText(dpy, mtype, "MinorCode", "Request Minor code %d", 403 XGetErrorDatabaseText(dpy, mtype, "MinorCode", "Request Minor code %d",
414 mesg, BUFSIZ); 404 mesg, BUFSIZ);
415 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->minor_code); 405 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->minor_code);
416 } 406 }
417 if ((event->error_code == BadWindow) || 407 if ((event->error_code == BadWindow) ||
418 (event->error_code == BadPixmap) || 408 (event->error_code == BadPixmap) ||
419 (event->error_code == BadCursor) || 409 (event->error_code == BadCursor) ||
420 (event->error_code == BadFont) || 410 (event->error_code == BadFont) ||
421 (event->error_code == BadDrawable) || 411 (event->error_code == BadDrawable) ||
422 (event->error_code == BadColor) || 412 (event->error_code == BadColor) ||
423 (event->error_code == BadGC) || 413 (event->error_code == BadGC) ||
424 (event->error_code == BadIDChoice) || 414 (event->error_code == BadIDChoice) ||
425 (event->error_code == BadValue) || 415 (event->error_code == BadValue) ||
426 (event->error_code == BadAtom)) { 416 (event->error_code == BadAtom)) {
427 if (event->error_code == BadValue) 417 if (event->error_code == BadValue)
428 XGetErrorDatabaseText(dpy, mtype, "Value", "Value 0x%x", 418 XGetErrorDatabaseText(dpy, mtype, "Value", "Value 0x%x",
429 mesg, BUFSIZ); 419 mesg, BUFSIZ);
430 else if (event->error_code == BadAtom) 420 else if (event->error_code == BadAtom)
431 XGetErrorDatabaseText(dpy, mtype, "AtomID", "AtomID 0x%x", 421 XGetErrorDatabaseText(dpy, mtype, "AtomID", "AtomID 0x%x",
432 mesg, BUFSIZ); 422 mesg, BUFSIZ);
433 else 423 else
434 XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x", 424 XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x",
435 mesg, BUFSIZ); 425 mesg, BUFSIZ);
436 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid); 426 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid);
437 } 427 }
438 XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d", 428 XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d",
439 mesg, BUFSIZ); 429 mesg, BUFSIZ);
440 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial); 430 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial);
441} 431}
442#endif 432#endif
443 433
444int 434int
… …
467 DisplayString (display)); 457 DisplayString (display));
468 rxvt_emergency_cleanup (); 458 rxvt_emergency_cleanup ();
469 _exit (EXIT_FAILURE); 459 _exit (EXIT_FAILURE);
470} 460}
471 461
472/*----------------------------------------------------------------------*/
473void
474rxvt_term::init (int argc, const char *const *argv, stringvec *envv)
475{
476 this->envv = envv;
477
478 SET_R (this);
479 set_locale ("");
480 set_environ (envv); // few things in X do not call setlocale :(
481
482 init_vars ();
483
484 init_secondary ();
485
486 const char **cmd_argv = init_resources (argc, argv);
487
488#ifdef KEYSYM_RESOURCE
489 keyboard->register_done ();
490#endif
491
492#ifdef HAVE_SCROLLBARS
493 if (option (Opt_scrollBar))
494 scrollBar.setIdle (); /* set existence for size calculations */
495#endif
496
497 pty = ptytty::create ();
498
499 create_windows (argc, argv);
500
501 init_xlocale ();
502
503 scr_reset (); // initialize screen
504
505#if 0
506 XSynchronize (dpy, True);
507#endif
508
509#ifdef HAVE_SCROLLBARS
510 if (option (Opt_scrollBar))
511 resize_scrollbar (); /* create and map scrollbar */
512#endif
513#ifdef HAVE_BG_PIXMAP
514 {
515 bgPixmap.set_target (this);
516
517#ifdef ENABLE_TRANSPARENCY
518 if (option (Opt_transparent))
519 {
520 bgPixmap.set_transparent ();
521
522#ifdef HAVE_AFTERIMAGE
523 if (rs [Rs_blurradius])
524 bgPixmap.set_blur_radius (rs [Rs_blurradius]);
525#endif
526 if (ISSET_PIXCOLOR (Color_tint))
527 bgPixmap.set_tint (pix_colors_focused [Color_tint]);
528
529 if (rs [Rs_shade])
530 bgPixmap.set_shade (rs [Rs_shade]);
531
532 bgPixmap.set_root_pixmap ();
533 XSelectInput (dpy, display->root, PropertyChangeMask);
534 rootwin_ev.start (display, display->root);
535 }
536#endif
537
538#ifdef BG_IMAGE_FROM_FILE
539 if (rs[Rs_backgroundPixmap])
540 {
541 const char *p = rs[Rs_backgroundPixmap];
542
543 if ((p = strchr (p, ';')) != 0)
544 {
545 p++;
546 bgPixmap.set_geometry (p);
547 }
548 else
549 bgPixmap.set_defaultGeometry ();
550
551 if (bgPixmap.set_file (rs[Rs_backgroundPixmap]))
552 if (!bgPixmap.window_position_sensitive ())
553 update_background ();
554 }
555#endif
556 }
557#endif
558
559#if ENABLE_PERL
560 rootwin_ev.start (display, display->root);
561#endif
562
563 set_colorfgbg ();
564
565 init_command (cmd_argv);
566
567 free (cmd_argv);
568
569 if (pty->pty >= 0)
570 pty_ev.start (pty->pty, ev::READ);
571
572 HOOK_INVOKE ((this, HOOK_START, DT_END));
573
574#if ENABLE_XEMBED
575 if (rs[Rs_embed])
576 {
577 long info[2] = { 0, XEMBED_MAPPED };
578
579 XChangeProperty (dpy, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
580 32, PropModeReplace, (unsigned char *)&info, 2);
581 }
582#endif
583
584 XMapWindow (dpy, vt);
585 XMapWindow (dpy, parent[0]);
586}
587
588static struct sig_handlers 462static struct sig_handlers
589{ 463{
590 ev::sig sw_term, sw_int; 464 ev::sig sw_term, sw_int;
591 465
592 /* 466 /*
… …
607 rxvt_emergency_cleanup (); 481 rxvt_emergency_cleanup ();
608 w.stop (); 482 w.stop ();
609 kill (getpid (), w.signum); 483 kill (getpid (), w.signum);
610} 484}
611 485
486static void
487rxvt_get_ttymode (struct termios *tio)
488{
489 if (tcgetattr (STDIN_FILENO, tio) < 0)
490 memset (tio, 0, sizeof (struct termios));
491
492 for (int i = 0; i < NCCS; i++)
493 tio->c_cc[i] = VDISABLE;
494
495 tio->c_cc[VINTR] = CINTR;
496 tio->c_cc[VQUIT] = CQUIT;
497 tio->c_cc[VERASE] = CERASE;
498#ifdef VERASE2
499 tio->c_cc[VERASE2] = CERASE2;
500#endif
501 tio->c_cc[VKILL] = CKILL;
502 tio->c_cc[VEOF] = CEOF;
503 tio->c_cc[VSTART] = CSTART;
504 tio->c_cc[VSTOP] = CSTOP;
505 tio->c_cc[VSUSP] = CSUSP;
506# ifdef VDSUSP
507 tio->c_cc[VDSUSP] = CDSUSP;
508# endif
509# ifdef VREPRINT
510 tio->c_cc[VREPRINT] = CRPRNT;
511# endif
512# ifdef VDISCRD
513 tio->c_cc[VDISCRD] = CFLUSH;
514# endif
515# ifdef VWERSE
516 tio->c_cc[VWERSE] = CWERASE;
517# endif
518# ifdef VLNEXT
519 tio->c_cc[VLNEXT] = CLNEXT;
520# endif
521# ifdef VSTATUS
522 tio->c_cc[VSTATUS] = CSTATUS;
523# endif
524
525# if VMIN != VEOF
526 tio->c_cc[VMIN] = 1;
527# endif
528# if VTIME != VEOL
529 tio->c_cc[VTIME] = 0;
530# endif
531
532 /* input modes */
533 tio->c_iflag = (BRKINT | IGNPAR | ICRNL
534# ifdef IMAXBEL
535 | IMAXBEL
536# endif
537 | IXON);
538
539 /* output modes */
540 tio->c_oflag = (OPOST | ONLCR);
541
542 /* control modes */
543 tio->c_cflag = (CS8 | CREAD);
544
545 /* local modes */
546 tio->c_lflag = (ISIG | ICANON | IEXTEN | ECHO
547# if defined (ECHOCTL) && defined (ECHOKE)
548 | ECHOCTL | ECHOKE
549# endif
550 | ECHOE | ECHOK);
551}
552
612char **rxvt_environ; // startup environment 553char **rxvt_environ; // startup environment
613 554
614void 555void
615rxvt_init () 556rxvt_init ()
616{ 557{
617 ptytty::init (); 558 assert (("fontMask must not overlap other RS masks",
559 0 == (RS_fontMask & (RS_Sel | RS_baseattrMask | RS_customMask | RS_bgMask | RS_fgMask))));
618 560
561 rxvt_get_ttymode (&rxvt_term::def_tio);
562
563 // get rid of stdin/stdout as we don't need them, to free resources
564 dup2 (STDERR_FILENO, STDIN_FILENO);
565 dup2 (STDERR_FILENO, STDOUT_FILENO);
566
619 if (!ev_default_loop (0)) 567 if (!ev_default_loop ())
620 rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n"); 568 rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n");
621 569
622 rxvt_environ = environ; 570 rxvt_environ = environ;
623 571
624 signal (SIGHUP, SIG_IGN); 572 signal (SIGHUP, SIG_IGN);
625 signal (SIGPIPE, SIG_IGN); 573 signal (SIGPIPE, SIG_IGN);
626 574
627 sig_handlers.sw_term.start (SIGTERM); ev_unref (); 575 sig_handlers.sw_term.start (SIGTERM); ev_unref ();
628 sig_handlers.sw_int.start (SIGINT); ev_unref (); 576 sig_handlers.sw_int.start (SIGINT); ev_unref ();
629
630 /* need to trap SIGURG for SVR4 (Unixware) rlogin */
631 /* signal (SIGURG, SIG_DFL); */
632 577
633 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); 578 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
634 // TODO: handle this with exceptions and tolerate the memory loss 579 // TODO: handle this with exceptions and tolerate the memory loss
635 XSetIOErrorHandler (rxvt_xioerror_handler); 580 XSetIOErrorHandler (rxvt_xioerror_handler);
636 581
… …
644 */ 589 */
645void 590void
646rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight) 591rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
647{ 592{
648 short recalc_x, recalc_y; 593 short recalc_x, recalc_y;
649 int x, y, sb_w, flags; 594 int x, y, flags;
650 unsigned int w, h; 595 unsigned int w, h;
651 unsigned int max_width, max_height; 596 unsigned int max_width, max_height;
652 597
653 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity; 598 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity;
654 szHint.win_gravity = NorthWestGravity; 599 szHint.win_gravity = NorthWestGravity;
… …
664 if (rs[Rs_geometry]) 609 if (rs[Rs_geometry])
665 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h); 610 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h);
666 611
667 if (flags & WidthValue) 612 if (flags & WidthValue)
668 { 613 {
614 if (!w)
615 rxvt_fatal ("illegal window geometry (width and height must be non-zero), aborting.\n");
616
669 ncol = clamp (w, 0, std::numeric_limits<int16_t>::max ()); 617 ncol = clamp (w, 1, std::numeric_limits<int16_t>::max ());
670 szHint.flags |= USSize; 618 szHint.flags |= USSize;
671 } 619 }
672 620
673 if (flags & HeightValue) 621 if (flags & HeightValue)
674 { 622 {
623 if (!h)
624 rxvt_fatal ("illegal window geometry (width and height must be non-zero), aborting.\n");
625
675 nrow = clamp (h, 0, std::numeric_limits<int16_t>::max ()); 626 nrow = clamp (h, 1, std::numeric_limits<int16_t>::max ());
676 szHint.flags |= USSize; 627 szHint.flags |= USSize;
677 } 628 }
678 629
679 if (flags & XValue) 630 if (flags & XValue)
680 { 631 {
… …
711 max_width = MAX_COLS * fwidth; 662 max_width = MAX_COLS * fwidth;
712 max_height = MAX_ROWS * fheight; 663 max_height = MAX_ROWS * fheight;
713 664
714 szHint.base_width = szHint.base_height = 2 * int_bwidth; 665 szHint.base_width = szHint.base_height = 2 * int_bwidth;
715 666
716 sb_w = 0;
717 window_vt_x = window_vt_y = int_bwidth; 667 window_vt_x = window_vt_y = int_bwidth;
718 668
719 if (scrollBar.state) 669 if (scrollBar.state)
720 { 670 {
721 sb_w = scrollbar_TotalWidth (); 671 int sb_w = scrollBar.total_width ();
722 szHint.base_width += sb_w; 672 szHint.base_width += sb_w;
723 673
724 if (!option (Opt_scrollBar_right)) 674 if (!option (Opt_scrollBar_right))
725 window_vt_x += sb_w; 675 window_vt_x += sb_w;
726 } 676 }
… …
750 { 700 {
751 min_it (height, max_height); 701 min_it (height, max_height);
752 szHint.height = szHint.base_height + height; 702 szHint.height = szHint.base_height + height;
753 } 703 }
754 704
755 if (scrollBar.state && option (Opt_scrollBar_right))
756 window_sb_x = szHint.width - sb_w;
757
758 if (recalc_x) 705 if (recalc_x)
759 szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth; 706 szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth;
760 707
761 if (recalc_y) 708 if (recalc_y)
762 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth; 709 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth;
763 710
764 ncol = width / fwidth; 711 ncol = width / fwidth;
765 nrow = height / fheight; 712 nrow = height / fheight;
713
714 // When the size of the vt window is not a multiple of the cell
715 // size, i.e., when the wm does not honour our size hints, there are
716 // extra areas not covered by the terminal screen. Such gaps, when a
717 // bg pixmap is set, would have to be cleared manually to properly
718 // refresh the background. We take the simpler route and shrink the
719 // vt window so as to avoid creating gaps.
720 width = ncol * fwidth;
721 height = nrow * fheight;
766} 722}
767 723
768/*----------------------------------------------------------------------*/ 724/*----------------------------------------------------------------------*/
769/* 725/*
770 * Tell the teletype handler what size the window is. 726 * Tell the teletype handler what size the window is.
… …
780 736
781 ws.ws_col = ncol; 737 ws.ws_col = ncol;
782 ws.ws_row = nrow; 738 ws.ws_row = nrow;
783 ws.ws_xpixel = width; 739 ws.ws_xpixel = width;
784 ws.ws_ypixel = height; 740 ws.ws_ypixel = height;
785 (void)ioctl (pty->pty, TIOCSWINSZ, &ws); 741 ioctl (pty->pty, TIOCSWINSZ, &ws);
786 742
787#if 0 743#if 0
788 // TIOCSWINSZ is supposed to do this automatically and correctly 744 // TIOCSWINSZ is supposed to do this automatically and correctly
789 if (cmd_pid) /* force through to the command */ 745 if (cmd_pid) /* force through to the command */
790 kill (-cmd_pid, SIGWINCH); 746 kill (-cmd_pid, SIGWINCH);
791#endif 747#endif
792} 748}
793 749
794/*----------------------------------------------------------------------*/ 750/*----------------------------------------------------------------------*/
795/* set_fonts () - load and set the various fonts 751/* load and set the various fonts */
796 *
797 * init = 1 - initialize
798 *
799 * fontname == FONT_UP - switch to bigger font
800 * fontname == FONT_DN - switch to smaller font
801 */
802bool 752bool
803rxvt_term::set_fonts () 753rxvt_term::set_fonts ()
804{ 754{
805 rxvt_fontset *fs = new rxvt_fontset (this); 755 rxvt_fontset *fs = new rxvt_fontset (this);
806 rxvt_fontprop prop; 756 rxvt_fontprop prop;
… …
820#endif 770#endif
821 771
822 delete fontset[0]; 772 delete fontset[0];
823 fontset[0] = fs; 773 fontset[0] = fs;
824 774
825 prop = (*fs)[1]->properties (); 775 prop = (*fs)[rxvt_fontset::firstFont]->properties ();
826 prop.height += lineSpace; 776 prop.height += lineSpace;
777 prop.width += letterSpace;
827 778
828 fs->set_prop (prop, false); 779 fs->set_prop (prop, false);
829 780
830 fwidth = prop.width; 781 fwidth = prop.width;
831 fheight = prop.height; 782 fheight = prop.height;
… …
862#else 813#else
863 fontset[style] = fontset[0]; 814 fontset[style] = fontset[0];
864#endif 815#endif
865 } 816 }
866 817
867 if (parent[0]) 818 if (parent)
868 { 819 {
869 resize_all_windows (0, 0, 0); 820 resize_all_windows (0, 0, 0);
870 scr_remap_chars (); 821 scr_remap_chars ();
871 scr_touch (true); 822 scr_touch (true);
872 } 823 }
… …
875} 826}
876 827
877void 828void
878rxvt_term::set_string_property (Atom prop, const char *str, int len) 829rxvt_term::set_string_property (Atom prop, const char *str, int len)
879{ 830{
880 XChangeProperty (dpy, parent[0], 831 XChangeProperty (dpy, parent,
881 prop, XA_STRING, 8, PropModeReplace, 832 prop, XA_STRING, 8, PropModeReplace,
882 (const unsigned char *)str, len >= 0 ? len : strlen (str)); 833 (const unsigned char *)str, len >= 0 ? len : strlen (str));
883} 834}
884 835
885void 836void
837rxvt_term::set_mbstring_property (Atom prop, const char *str, int len)
838{
839 XTextProperty ct;
840
841 if (XmbTextListToTextProperty (dpy, (char **)&str, 1, XStdICCTextStyle, &ct) >= 0)
842 {
843 XSetTextProperty (dpy, parent, &ct, prop);
844 XFree (ct.value);
845 }
846}
847
848void
886rxvt_term::set_utf8_property (Atom prop, const char *str, int len) 849rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
887{ 850{
888 wchar_t *ws = rxvt_mbstowcs (str, len); 851 wchar_t *ws = rxvt_mbstowcs (str, len);
889 char *s = rxvt_wcstoutf8 (ws); 852 char *s = rxvt_wcstoutf8 (ws);
890 853
891 XChangeProperty (dpy, parent[0], 854 XChangeProperty (dpy, parent,
892 prop, xa[XA_UTF8_STRING], 8, PropModeReplace, 855 prop, xa[XA_UTF8_STRING], 8, PropModeReplace,
893 (const unsigned char *)s, strlen (s)); 856 (const unsigned char *)s, strlen (s));
894 857
895 free (s); 858 free (s);
896 free (ws); 859 free (ws);
… …
900/*----------------------------------------------------------------------*/ 863/*----------------------------------------------------------------------*/
901/* xterm sequences - title, iconName, color (exptl) */ 864/* xterm sequences - title, iconName, color (exptl) */
902void 865void
903rxvt_term::set_title (const char *str) 866rxvt_term::set_title (const char *str)
904{ 867{
905 set_string_property (XA_WM_NAME, str); 868 set_mbstring_property (XA_WM_NAME, str);
906#if ENABLE_EWMH 869#if ENABLE_EWMH
907 set_utf8_property (xa[XA_NET_WM_NAME], str); 870 set_utf8_property (xa[XA_NET_WM_NAME], str);
908#endif 871#endif
909} 872}
910 873
911void 874void
912rxvt_term::set_icon_name (const char *str) 875rxvt_term::set_icon_name (const char *str)
913{ 876{
914 set_string_property (XA_WM_ICON_NAME, str); 877 set_mbstring_property (XA_WM_ICON_NAME, str);
915#if ENABLE_EWMH 878#if ENABLE_EWMH
916 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str); 879 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str);
917#endif 880#endif
918} 881}
919 882
920void 883void
921rxvt_term::set_window_color (int idx, const char *color) 884rxvt_term::set_window_color (int idx, const char *color)
922{ 885{
923#ifdef XTERM_COLOR_CHANGE 886#ifdef XTERM_COLOR_CHANGE
924 rxvt_color xcol; 887 rxvt_color xcol;
925 int i;
926 888
927 if (color == NULL || *color == '\0') 889 if (color == NULL || *color == '\0')
928 return; 890 return;
929 891
930 color = strdup (color); 892 color = strdup (color);
… …
932 rs[Rs_color + idx] = color; 894 rs[Rs_color + idx] = color;
933 895
934 /* handle color aliases */ 896 /* handle color aliases */
935 if (isdigit (*color)) 897 if (isdigit (*color))
936 { 898 {
937 i = atoi (color); 899 int i = atoi (color);
938 900
939 if (i >= 8 && i <= 15) 901 if (i >= 8 && i <= 15)
940 { 902 {
941 /* bright colors */ 903 /* bright colors */
942 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i - 8]; 904 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i - 8];
… …
992void 954void
993rxvt_term::set_colorfgbg () 955rxvt_term::set_colorfgbg ()
994{ 956{
995 unsigned int i; 957 unsigned int i;
996 const char *xpmb = ""; 958 const char *xpmb = "";
997 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1]; 959 char fstr[] = "default";
960 char bstr[] = "default";
998 961
999 strcpy (fstr, "default");
1000 strcpy (bstr, "default");
1001 for (i = Color_Black; i <= Color_White; i++) 962 for (i = Color_Black; i <= Color_White; i++)
1002 if (pix_colors[Color_fg] == pix_colors[i]) 963 if (pix_colors[Color_fg] == pix_colors[i])
1003 { 964 {
1004 sprintf (fstr, "%d", (i - Color_Black)); 965 sprintf (fstr, "%d", i - Color_Black);
1005 break; 966 break;
1006 } 967 }
1007 968
1008 for (i = Color_Black; i <= Color_White; i++) 969 for (i = Color_Black; i <= Color_White; i++)
1009 if (pix_colors[Color_bg] == pix_colors[i]) 970 if (pix_colors[Color_bg] == pix_colors[i])
1010 { 971 {
1011 sprintf (bstr, "%d", (i - Color_Black)); 972 sprintf (bstr, "%d", i - Color_Black);
1012#ifdef BG_IMAGE_FROM_FILE 973#ifdef BG_IMAGE_FROM_FILE
1013 xpmb = "default;"; 974 xpmb = "default;";
1014#endif 975#endif
1015 break; 976 break;
1016 } 977 }
… …
1046 int old_width = szHint.width; 1007 int old_width = szHint.width;
1047 int old_height = szHint.height; 1008 int old_height = szHint.height;
1048 1009
1049 window_calc (newwidth, newheight); 1010 window_calc (newwidth, newheight);
1050 1011
1051 if (!HOOK_INVOKE ((this, HOOK_RESIZE_ALL_WINDOWS, DT_INT, newwidth, DT_INT, newheight, DT_END))) 1012 bool set_hint = !HOOK_INVOKE ((this, HOOK_RESIZE_ALL_WINDOWS, DT_INT, newwidth, DT_INT, newheight, DT_END));
1013
1014 // to avoid races between us and the wm, we clear the incremental size hints around the xresizewindow
1015 if (set_hint)
1016 {
1017 szHint.flags &= ~(PBaseSize | PResizeInc);
1052 XSetWMNormalHints (dpy, parent[0], &szHint); 1018 XSetWMNormalHints (dpy, parent, &szHint);
1019 szHint.flags |= PBaseSize | PResizeInc;
1020 }
1053 1021
1054 if (!ignoreparent) 1022 if (!ignoreparent)
1055 { 1023 {
1056#ifdef SMART_RESIZE 1024#ifdef SMART_RESIZE
1057 /* 1025 /*
… …
1061 int x, y, x1, y1; 1029 int x, y, x1, y1;
1062 int dx, dy; 1030 int dx, dy;
1063 unsigned int unused_w1, unused_h1, unused_b1, unused_d1; 1031 unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
1064 Window unused_cr; 1032 Window unused_cr;
1065 1033
1066 XTranslateCoordinates (dpy, parent[0], display->root, 1034 XTranslateCoordinates (dpy, parent, display->root,
1067 0, 0, &x, &y, &unused_cr); 1035 0, 0, &x, &y, &unused_cr);
1068 XGetGeometry (dpy, parent[0], &unused_cr, &x1, &y1, 1036 XGetGeometry (dpy, parent, &unused_cr, &x1, &y1,
1069 &unused_w1, &unused_h1, &unused_b1, &unused_d1); 1037 &unused_w1, &unused_h1, &unused_b1, &unused_d1);
1070 /* 1038 /*
1071 * if display->root isn't the parent window, a WM will probably have offset 1039 * if display->root isn't the parent window, a WM will probably have offset
1072 * our position for handles and decorations. Counter it 1040 * our position for handles and decorations. Counter it
1073 */ 1041 */
… …
1090 if (y < y1) /* top half */ 1058 if (y < y1) /* top half */
1091 dy = 0; 1059 dy = 0;
1092 else if (y == y1) /* exact center */ 1060 else if (y == y1) /* exact center */
1093 dy /= 2; 1061 dy /= 2;
1094 1062
1095 XMoveResizeWindow (dpy, parent[0], x + dx, y + dy, 1063 XMoveResizeWindow (dpy, parent, x + dx, y + dy,
1096 szHint.width, szHint.height); 1064 szHint.width, szHint.height);
1097#else 1065#else
1098 XResizeWindow (dpy, parent[0], szHint.width, szHint.height); 1066 XResizeWindow (dpy, parent, szHint.width, szHint.height);
1099#endif 1067#endif
1100 } 1068 }
1069
1070 if (set_hint)
1071 XSetWMNormalHints (dpy, parent, &szHint);
1101 1072
1102 fix_screen = ncol != prev_ncol || nrow != prev_nrow; 1073 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
1103 1074
1104 if (fix_screen || newwidth != old_width || newheight != old_height) 1075 if (fix_screen || newwidth != old_width || newheight != old_height)
1105 { 1076 {
1106 if (scrollBar.state) 1077 if (scrollBar.state)
1107 { 1078 scrollBar.resize ();
1108 XMoveResizeWindow (dpy, scrollBar.win,
1109 window_sb_x, 0,
1110 scrollbar_TotalWidth (), szHint.height);
1111 resize_scrollbar ();
1112 }
1113 1079
1114 XMoveResizeWindow (dpy, vt, 1080 XMoveResizeWindow (dpy, vt,
1115 window_vt_x, window_vt_y, 1081 window_vt_x, window_vt_y,
1116 width, height); 1082 width, height);
1117 1083
1118#ifdef HAVE_BG_PIXMAP 1084#ifdef HAVE_BG_PIXMAP
1119 if (bgPixmap.window_size_sensitive ()) 1085 if (bg_window_size_sensitive ())
1120 update_background (); 1086 update_background ();
1121#endif 1087#endif
1122
1123 scr_clear ();
1124 } 1088 }
1125 1089
1126 if (fix_screen || old_height == 0) 1090 if (fix_screen || old_height == 0)
1127 scr_reset (); 1091 scr_reset ();
1128 1092
1129 // TODO, with nvidia-8178, resizes kill the alpha channel, report if not fixed in newer version
1130 //scr_touch (false);
1131
1132#ifdef HAVE_BG_PIXMAP
1133// TODO: this don't seem to have any effect - do we still need it ? If so - in which case exactly ?
1134// if (bgPixmap.pixmap)
1135// scr_touch (false);
1136#endif
1137
1138#ifdef USE_XIM 1093#ifdef USE_XIM
1139 IMSetPosition (); 1094 im_set_position ();
1140#endif 1095#endif
1141} 1096}
1142 1097
1143/* 1098/*
1144 * Set the width/height of the vt window in characters. Units are pixels. 1099 * Set the width/height of the vt window in characters. Units are pixels.
… …
1205 status_rect.height = fheight; 1160 status_rect.height = fheight;
1206} 1161}
1207 1162
1208/* Checking whether input method is running. */ 1163/* Checking whether input method is running. */
1209bool 1164bool
1210rxvt_term::IMisRunning () 1165rxvt_term::im_is_running ()
1211{ 1166{
1212 char *p;
1213 Atom atom; 1167 Atom atom;
1214 Window win; 1168 Window win;
1215 char server[IMBUFSIZ]; 1169 char server[IMBUFSIZ];
1216 1170
1217 /* get current locale modifier */ 1171 /* get current locale modifier */
1218 if ((p = XSetLocaleModifiers (NULL)) != NULL) 1172 if (char *p = XSetLocaleModifiers (0))
1219 { 1173 {
1220 strcpy (server, "@server="); 1174 strcpy (server, "@server=");
1221 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */ 1175 strncat (server, p + 4, IMBUFSIZ - 9); /* skip "@im=" */
1222 1176
1223 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */ 1177 if (p = strchr (server + 1, '@')) /* first one only */
1224 *p = '\0'; 1178 *p = '\0';
1225 1179
1226 atom = XInternAtom (dpy, server, False); 1180 atom = XInternAtom (dpy, server, False);
1227 win = XGetSelectionOwner (dpy, atom); 1181 win = XGetSelectionOwner (dpy, atom);
1228 1182
1229 if (win != None) 1183 if (win != None)
1230 return True; 1184 return true;
1231 } 1185 }
1232 1186
1233 return False; 1187 return false;
1234} 1188}
1235 1189
1236void 1190void
1237rxvt_term::IMSendSpot () 1191rxvt_term::im_send_spot ()
1238{ 1192{
1239 XPoint nspot; 1193 XPoint nspot;
1240 XVaNestedList preedit_attr; 1194 XVaNestedList preedit_attr;
1241 1195
1242 if (!Input_Context 1196 if (!Input_Context
… …
1295 1249
1296 term->make_current (); 1250 term->make_current ();
1297 1251
1298 if (text) 1252 if (text)
1299 { 1253 {
1300 void *str; 1254 wchar_t *str;
1301 1255
1302 if (!text->encoding_is_wchar && text->string.multi_byte) 1256 if (!text->encoding_is_wchar && text->string.multi_byte)
1303 { 1257 {
1304 // of course, X makes it ugly again 1258 // of course, X makes it ugly again
1305 if (term->rs[Rs_imLocale]) 1259 if (term->rs[Rs_imLocale])
1306 SET_LOCALE (term->rs[Rs_imLocale]); 1260 SET_LOCALE (term->rs[Rs_imLocale]);
1307 1261
1308 str = rxvt_temp_buf ((text->length + 1) * sizeof (wchar_t)); 1262 str = rxvt_temp_buf<wchar_t> (text->length + 1);
1309 mbstowcs ((wchar_t *)str, text->string.multi_byte, text->length + 1); 1263 mbstowcs (str, text->string.multi_byte, text->length + 1);
1310 1264
1311 if (term->rs[Rs_imLocale]) 1265 if (term->rs[Rs_imLocale])
1312 SET_LOCALE (term->locale); 1266 SET_LOCALE (term->locale);
1313 } 1267 }
1314 else 1268 else
1315 str = (void *)text->string.wide_char; 1269 str = text->string.wide_char;
1316 1270
1317 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW, 1271 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
1318 DT_INT, call_data->caret, 1272 DT_INT, call_data->caret,
1319 DT_INT, call_data->chg_first, 1273 DT_INT, call_data->chg_first,
1320 DT_INT, call_data->chg_length, 1274 DT_INT, call_data->chg_length,
… …
1348/* 1302/*
1349 * Try to open a XIM with the current modifiers, then see if we can 1303 * Try to open a XIM with the current modifiers, then see if we can
1350 * open a suitable preedit type 1304 * open a suitable preedit type
1351 */ 1305 */
1352bool 1306bool
1353rxvt_term::IM_get_IC (const char *modifiers) 1307rxvt_term::im_get_ic (const char *modifiers)
1354{ 1308{
1355 int i, j, found; 1309 int i, j, found;
1356 XIM xim; 1310 XIM xim;
1357 XPoint spot; 1311 XPoint spot;
1358 XRectangle rect, status_rect, needed_rect; 1312 XRectangle rect, status_rect, needed_rect;
1359 unsigned long fg, bg; 1313 unsigned long fg, bg;
1360 const char *p; 1314 const char *p;
1361 char **s; 1315 char **s;
1362 XIMStyles *xim_styles; 1316 XIMStyles *xim_styles;
1363#ifdef ENABLE_XIM_ONTHESPOT
1364 XIMCallback xcb[4];
1365#endif
1366 1317
1367 set_environ (envv); 1318 set_environ (envv);
1368 1319
1369 if (! ((p = XSetLocaleModifiers (modifiers)) && *p)) 1320 if (! ((p = XSetLocaleModifiers (modifiers)) && *p))
1370 return false; 1321 return false;
… …
1391 p = pet[pi]; 1342 p = pet[pi];
1392 1343
1393 if (!p) 1344 if (!p)
1394 continue; 1345 continue;
1395 1346
1396 s = rxvt_splitcommastring (p); 1347 s = rxvt_strsplit (',', p);
1397 1348
1398 for (i = found = 0; !found && s[i]; i++) 1349 for (i = found = 0; !found && s[i]; i++)
1399 { 1350 {
1400 if (!strcmp (s[i], "OverTheSpot")) 1351 if (!strcmp (s[i], "OverTheSpot"))
1401 input_style = XIMPreeditPosition | XIMStatusNothing; 1352 input_style = XIMPreeditPosition | XIMStatusNothing;
… …
1413 input_style = XIMPreeditNothing | XIMStatusNothing; 1364 input_style = XIMPreeditNothing | XIMStatusNothing;
1414 1365
1415 for (j = 0; j < xim_styles->count_styles; j++) 1366 for (j = 0; j < xim_styles->count_styles; j++)
1416 if (input_style == xim_styles->supported_styles[j]) 1367 if (input_style == xim_styles->supported_styles[j])
1417 { 1368 {
1418 rxvt_freecommastring (s); 1369 rxvt_free_strsplit (s);
1419 1370
1420 found = 1; 1371 found = 1;
1421 goto foundpet; 1372 goto foundpet;
1422 } 1373 }
1423 1374
1424 } 1375 }
1425 1376
1426 rxvt_freecommastring (s); 1377 rxvt_free_strsplit (s);
1427 } 1378 }
1428 1379
1429foundpet: 1380foundpet:
1430 1381
1431 XFree (xim_styles); 1382 XFree (xim_styles);
… …
1510 NULL); 1461 NULL);
1511 } 1462 }
1512#if ENABLE_XIM_ONTHESPOT 1463#if ENABLE_XIM_ONTHESPOT
1513 else if (input_style & XIMPreeditCallbacks) 1464 else if (input_style & XIMPreeditCallbacks)
1514 { 1465 {
1466 XIMCallback xcb[4];
1467
1515 im_set_position (spot); 1468 im_set_position (spot);
1516 1469
1517 xcb[0].client_data = (XPointer)this; xcb[0].callback = (XIMProc)xim_preedit_start; 1470 xcb[0].client_data = (XPointer)this; xcb[0].callback = (XIMProc)xim_preedit_start;
1518 xcb[1].client_data = (XPointer)this; xcb[1].callback = (XIMProc)xim_preedit_done; 1471 xcb[1].client_data = (XPointer)this; xcb[1].callback = (XIMProc)xim_preedit_done;
1519 xcb[2].client_data = (XPointer)this; xcb[2].callback = (XIMProc)xim_preedit_draw; 1472 xcb[2].client_data = (XPointer)this; xcb[2].callback = (XIMProc)xim_preedit_draw;
… …
1534#endif 1487#endif
1535 1488
1536 Input_Context = XCreateIC (xim, 1489 Input_Context = XCreateIC (xim,
1537 XNInputStyle, input_style, 1490 XNInputStyle, input_style,
1538 XNClientWindow, vt, 1491 XNClientWindow, vt,
1539 XNFocusWindow, parent[0], 1492 XNFocusWindow, parent,
1540 preedit_attr ? XNPreeditAttributes : NULL, 1493 preedit_attr ? XNPreeditAttributes : NULL,
1541 preedit_attr, 1494 preedit_attr,
1542 status_attr ? XNStatusAttributes : NULL, 1495 status_attr ? XNStatusAttributes : NULL,
1543 status_attr, NULL); 1496 status_attr, NULL);
1544 1497
… …
1557 // unfortunately, only the focus window is used by XIM, hard to fix 1510 // unfortunately, only the focus window is used by XIM, hard to fix
1558 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL)) 1511 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL))
1559 vt_select_input (); 1512 vt_select_input ();
1560#endif 1513#endif
1561 1514
1562 IMSetPosition (); 1515 im_set_position ();
1563 1516
1564 return true; 1517 return true;
1565} 1518}
1566 1519
1567void 1520void
… …
1587 p = rs[Rs_inputMethod]; 1540 p = rs[Rs_inputMethod];
1588 if (p && *p) 1541 if (p && *p)
1589 { 1542 {
1590 bool found = false; 1543 bool found = false;
1591 1544
1592 s = rxvt_splitcommastring (p); 1545 s = rxvt_strsplit (',', p);
1593 1546
1594 for (i = 0; s[i]; i++) 1547 for (i = 0; s[i]; i++)
1595 { 1548 {
1596 if (*s[i]) 1549 if (*s[i])
1597 { 1550 {
1598 strcpy (buf, "@im="); 1551 strcpy (buf, "@im=");
1599 strncat (buf, s[i], IMBUFSIZ - 5); 1552 strncat (buf, s[i], IMBUFSIZ - 5);
1600 if (IM_get_IC (buf)) 1553 if (im_get_ic (buf))
1601 { 1554 {
1602 found = true; 1555 found = true;
1603 break; 1556 break;
1604 } 1557 }
1605 } 1558 }
1606 } 1559 }
1607 1560
1608 rxvt_freecommastring (s); 1561 rxvt_free_strsplit (s);
1609 1562
1610 if (found) 1563 if (found)
1611 goto done; 1564 goto done;
1612 } 1565 }
1613 1566
1614 /* try with XMODIFIERS env. var. */ 1567 /* try with XMODIFIERS env. var. */
1615 if (IM_get_IC ("")) 1568 if (im_get_ic (""))
1616 goto done; 1569 goto done;
1617 1570
1618 /* try with no modifiers base IF the user didn't specify an IM */ 1571 /* try with no modifiers base IF the user didn't specify an IM */
1619 if (IM_get_IC ("@im=none")) 1572 if (im_get_ic ("@im=none"))
1620 goto done; 1573 goto done;
1621 1574
1622done: 1575done:
1623#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE) 1576#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1624 if (rs[Rs_imLocale]) 1577 if (rs[Rs_imLocale])
1625 SET_LOCALE (locale); 1578 SET_LOCALE (locale);
1626#endif 1579#endif
1627} 1580}
1628 1581
1629void 1582void
1630rxvt_term::IMSetPosition () 1583rxvt_term::im_set_position ()
1631{ 1584{
1632 XRectangle preedit_rect, status_rect, *needed_rect; 1585 XRectangle preedit_rect, status_rect, *needed_rect;
1633 XVaNestedList preedit_attr, status_attr; 1586 XVaNestedList preedit_attr, status_attr;
1634 1587
1635 if (!Input_Context 1588 if (!Input_Context
1636 || !focus 1589 || !focus
1637 || !(input_style & (XIMPreeditArea | XIMPreeditPosition)) 1590 || !(input_style & (XIMPreeditArea | XIMPreeditPosition))
1638 || !IMisRunning ()) 1591 || !im_is_running ())
1639 return; 1592 return;
1640 1593
1641 if (input_style & XIMPreeditPosition) 1594 if (input_style & XIMPreeditPosition)
1642 { 1595 {
1643 im_set_size (preedit_rect); 1596 im_set_size (preedit_rect);
… …
1673 1626
1674void 1627void
1675rxvt_term::get_window_origin (int &x, int &y) 1628rxvt_term::get_window_origin (int &x, int &y)
1676{ 1629{
1677 Window cr; 1630 Window cr;
1678 XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr); 1631 XTranslateCoordinates (dpy, parent, display->root, 0, 0, &x, &y, &cr);
1679/* fprintf (stderr, "origin is %+d%+d\n", x, y);*/
1680} 1632}
1681 1633
1682Pixmap 1634Pixmap
1683rxvt_term::get_pixmap_property (int prop_id) 1635rxvt_term::get_pixmap_property (Atom property)
1684{ 1636{
1685 if (prop_id > 0 && prop_id < NUM_XA) 1637 Pixmap pixmap = None;
1686 if (xa[prop_id]) 1638
1687 {
1688 int aformat; 1639 int aformat;
1689 unsigned long nitems, bytes_after; 1640 unsigned long nitems, bytes_after;
1690 Atom atype; 1641 Atom atype;
1691 unsigned char *prop = NULL; 1642 unsigned char *prop;
1692 int result = XGetWindowProperty (dpy, display->root, xa[prop_id], 1643 int result = XGetWindowProperty (dpy, display->root, property,
1693 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 1644 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1694 &nitems, &bytes_after, &prop); 1645 &nitems, &bytes_after, &prop);
1695 if (result == Success && prop && atype == XA_PIXMAP) 1646 if (result == Success)
1647 {
1648 if (atype == XA_PIXMAP)
1696 return *(Pixmap *)prop; 1649 pixmap = *(Pixmap *)prop;
1650 XFree (prop);
1697 } 1651 }
1698 1652
1699 return None; 1653 return pixmap;
1700} 1654}
1701 1655
1702#ifdef HAVE_BG_PIXMAP 1656#ifdef HAVE_BG_PIXMAP
1703# if TRACE_PIXMAPS
1704# undef update_background
1705void
1706rxvt_term::trace_update_background (const char *file, int line)
1707{
1708 fprintf (stderr, "%s:%d:update_background()\n", file, line);
1709 update_background ();
1710}
1711# endif
1712 1657
1713void 1658void
1714rxvt_term::update_background () 1659rxvt_term::update_background ()
1715{ 1660{
1716 if (update_background_ev.is_active ()) 1661 if (update_background_ev.is_active ())
1717 return; 1662 return;
1718 1663
1719 bgPixmap.invalidate (); 1664 bg_invalidate ();
1720 1665
1721 ev_tstamp refresh; 1666 if (!mapped)
1667 return;
1722 1668
1723 if (!bgPixmap.need_client_side_rendering ()) 1669 ev_tstamp to_wait = 0.5 - (ev::now () - bg_valid_since);
1724 refresh = .05; 1670
1725 else if (bgPixmap.flags & bgPixmap_t::blurNeeded) 1671 if (to_wait <= 0.)
1726 /* no chance of real time refresh if we are blurring! */ 1672 bg_render ();
1727 refresh = .50;
1728 else 1673 else
1729 refresh = .07;
1730
1731 update_background_ev.start (refresh); 1674 update_background_ev.start (to_wait);
1732} 1675}
1733 1676
1734void 1677void
1735rxvt_term::update_background_cb (ev::timer &w, int revents) 1678rxvt_term::update_background_cb (ev::timer &w, int revents)
1736{ 1679{
1737 make_current (); 1680 make_current ();
1738 1681
1739 update_background_ev.stop (); 1682 update_background_ev.stop ();
1740 bgPixmap.render (); 1683 bg_render ();
1741 refresh_check (); 1684 refresh_check ();
1742} 1685}
1743 1686
1744#endif /* HAVE_BG_PIXMAP */ 1687#endif /* HAVE_BG_PIXMAP */
1745 1688

Diff Legend

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