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.271 by root, Tue Dec 4 16:33:42 2007 UTC vs.
Revision 1.363 by root, Sat Dec 17 23:17:33 2011 UTC

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

Diff Legend

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