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.217 by root, Thu Feb 2 18:00:23 2006 UTC vs.
Revision 1.329 by sf-exg, Wed Jul 21 11:02:14 2010 UTC

1/*--------------------------------*-C-*---------------------------------* 1/*----------------------------------------------------------------------*
2 * File: main.C 2 * File: main.C
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * 4 *
5 * All portions of code are copyright by their respective author/s. 5 * All portions of code are copyright by their respective author/s.
6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk> 6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk>
… …
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-2008 Marc Lehmann <pcg@goof.com>
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.
… …
35#include "keyboard.h" 35#include "keyboard.h"
36#include "rxvtperl.h" 36#include "rxvtperl.h"
37 37
38#include <limits> 38#include <limits>
39 39
40#include <cassert>
40#include <csignal> 41#include <csignal>
41#include <cstring> 42#include <cstring>
42 43
43#ifdef TTY_GID_SUPPORT
44# include <grp.h>
45#endif
46
47#ifdef HAVE_TERMIOS_H
48# include <termios.h> 44#include <termios.h>
45
46#ifdef HAVE_XSETLOCALE
47# define X_LOCALE
48# include <X11/Xlocale.h>
49#else
50# ifdef HAVE_SETLOCALE
51# include <clocale>
52# endif
49#endif 53#endif
50 54
51vector<rxvt_term *> rxvt_term::termlist; 55vector<rxvt_term *> rxvt_term::termlist;
52 56
53// used to tell global functions which terminal instance is "active" 57// used to tell global functions which terminal instance is "active"
… …
56static char curlocale[128], savelocale[128]; 60static char curlocale[128], savelocale[128];
57 61
58bool 62bool
59rxvt_set_locale (const char *locale) NOTHROW 63rxvt_set_locale (const char *locale) NOTHROW
60{ 64{
65 int size = strlen (locale) + 1;
66
67 if (size > sizeof (curlocale))
68 rxvt_fatal ("locale string too long, aborting.\n");
69
61 if (!locale || !strncmp (locale, curlocale, 128)) 70 if (!locale || !memcmp (locale, curlocale, size))
62 return false; 71 return false;
63 72
64 strncpy (curlocale, locale, 128); 73 memcpy (curlocale, locale, size);
65 setlocale (LC_CTYPE, curlocale); 74 setlocale (LC_CTYPE, curlocale);
66 return true; 75 return true;
67} 76}
68 77
69void 78void
… …
83class rxvt_composite_vec rxvt_composite; 92class rxvt_composite_vec rxvt_composite;
84 93
85text_t rxvt_composite_vec::compose (unicode_t c1, unicode_t c2) 94text_t rxvt_composite_vec::compose (unicode_t c1, unicode_t c2)
86{ 95{
87 compose_char *cc; 96 compose_char *cc;
88 97
89 // break compose chains, as stupid readline really likes to duplicate 98 // break compose chains, as stupid readline really likes to duplicate
90 // composing characters for some reason near the end of a line. 99 // composing characters for some reason near the end of a line.
91 cc = (*this)[c1]; 100 cc = (*this)[c1];
92 while (cc) 101 while (cc)
93 { 102 {
94 if (cc->c2 == c2) return c1; 103 if (cc->c2 == c2) return c1;
95 cc = (*this)[cc->c1]; 104 cc = (*this)[cc->c1];
96 } 105 }
97 106
98 // check to see wether this combination already exists otherwise 107 // check to see whether this combination already exists otherwise
99 for (cc = v.end (); cc-- > v.begin (); ) 108 for (cc = v.end (); cc-- > v.begin (); )
100 { 109 {
101 if (cc->c1 == c1 && cc->c2 == c2) 110 if (cc->c1 == c1 && cc->c2 == c2)
102 return COMPOSE_LO + (cc - v.begin ()); 111 return COMPOSE_LO + (cc - v.begin ());
103 } 112 }
… …
142 151
143} 152}
144#endif 153#endif
145 154
146rxvt_term::rxvt_term () 155rxvt_term::rxvt_term ()
147 : 156{
148#if TRANSPARENT 157#if HAVE_BG_PIXMAP
149 rootwin_ev (this, &rxvt_term::rootwin_cb), 158 update_background_ev.set<rxvt_term, &rxvt_term::update_background_cb> (this);
150#endif
151#ifdef HAVE_SCROLLBARS
152 scrollbar_ev (this, &rxvt_term::x_cb),
153#endif 159#endif
154#ifdef CURSOR_BLINK 160#ifdef CURSOR_BLINK
155 cursor_blink_ev (this, &rxvt_term::cursor_blink_cb), 161 cursor_blink_ev.set <rxvt_term, &rxvt_term::cursor_blink_cb> (this); cursor_blink_ev.set (0., CURSOR_BLINK_INTERVAL);
156#endif 162#endif
157#ifdef TEXT_BLINK 163#ifdef TEXT_BLINK
158 text_blink_ev (this, &rxvt_term::text_blink_cb), 164 text_blink_ev.set <rxvt_term, &rxvt_term::text_blink_cb> (this); text_blink_ev.set (0., TEXT_BLINK_INTERVAL);
159#endif 165#endif
160#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 166#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
161 cont_scroll_ev (this, &rxvt_term::cont_scroll_cb), 167 cont_scroll_ev.set <rxvt_term, &rxvt_term::cont_scroll_cb> (this);
162#endif 168#endif
163#ifdef SELECTION_SCROLLING 169#ifdef SELECTION_SCROLLING
164 sel_scroll_ev (this, &rxvt_term::sel_scroll_cb), 170 sel_scroll_ev.set <rxvt_term, &rxvt_term::sel_scroll_cb> (this);
165#endif 171#endif
166#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 172#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
167 slip_wheel_ev (this, &rxvt_term::slip_wheel_cb), 173 slip_wheel_ev.set <rxvt_term, &rxvt_term::slip_wheel_cb> (this);
174#endif
175#if ENABLE_TRANSPARENCY || ENABLE_PERL
176 rootwin_ev.set <rxvt_term, &rxvt_term::rootwin_cb> (this),
177#endif
178 scrollbar_ev.set <rxvt_term, &rxvt_term::x_cb> (this),
179#ifdef USE_XIM
180 im_ev.set <rxvt_term, &rxvt_term::im_cb> (this),
168#endif 181#endif
169#ifdef POINTER_BLANK 182#ifdef POINTER_BLANK
170 pointer_ev (this, &rxvt_term::pointer_cb), 183 pointer_ev.set <rxvt_term, &rxvt_term::pointer_cb> (this);
171#endif 184#endif
172#ifdef USE_XIM
173 im_ev (this, &rxvt_term::im_cb),
174#endif
175#ifndef NO_BELL 185#ifndef NO_BELL
176 bell_ev (this, &rxvt_term::bell_cb), 186 bell_ev.set <rxvt_term, &rxvt_term::bell_cb> (this);
177#endif 187#endif
178 termwin_ev (this, &rxvt_term::x_cb), 188 child_ev.set <rxvt_term, &rxvt_term::child_cb> (this);
179 vt_ev (this, &rxvt_term::x_cb), 189 flush_ev.set <rxvt_term, &rxvt_term::flush_cb> (this);
180 child_ev (this, &rxvt_term::child_cb), 190 destroy_ev.set <rxvt_term, &rxvt_term::destroy_cb> (this);
181 check_ev (this, &rxvt_term::check_cb), 191 pty_ev.set <rxvt_term, &rxvt_term::pty_cb> (this);
182 flush_ev (this, &rxvt_term::flush_cb), 192 incr_ev.set <rxvt_term, &rxvt_term::incr_cb> (this);
183 destroy_ev (this, &rxvt_term::destroy_cb), 193 termwin_ev.set <rxvt_term, &rxvt_term::x_cb> (this);
184 pty_ev (this, &rxvt_term::pty_cb), 194 vt_ev.set <rxvt_term, &rxvt_term::x_cb> (this);
185 incr_ev (this, &rxvt_term::incr_cb) 195
186{
187 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base; 196 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base;
188 197
189 termlist.push_back (this); 198 termlist.push_back (this);
190 199
191#ifdef KEYSYM_RESOURCE 200#ifdef KEYSYM_RESOURCE
… …
193#endif 202#endif
194} 203}
195 204
196// clean up the most important stuff, do *not* call x or free mem etc. 205// clean up the most important stuff, do *not* call x or free mem etc.
197// for use before an emergency exit 206// for use before an emergency exit
207void
198void rxvt_term::emergency_cleanup () 208rxvt_term::emergency_cleanup ()
199{ 209{
200 if (cmd_pid) 210 if (cmd_pid)
201 kill (-cmd_pid, SIGHUP); 211 kill (-cmd_pid, SIGHUP);
202 212
213 pty_ev.stop ();
203 delete pty; pty = 0; 214 delete pty; pty = 0;
204} 215}
205 216
206rxvt_term::~rxvt_term () 217rxvt_term::~rxvt_term ()
207{ 218{
… …
214 if (fontset[i] != fontset[0]) 225 if (fontset[i] != fontset[0])
215 delete fontset[i]; 226 delete fontset[i];
216#endif 227#endif
217 delete fontset[0]; 228 delete fontset[0];
218 229
230#ifdef HAVE_BG_PIXMAP
231 bgPixmap.destroy ();
232#endif
233#ifdef HAVE_AFTERIMAGE
234 if (asv)
235 destroy_asvisual (asv, 0);
236 if (asimman)
237 destroy_image_manager (asimman, 0);
238#endif
239
219 if (display) 240 if (display)
220 { 241 {
221 selection_clear (); 242 selection_clear ();
243 selection_clear (true);
222 244
223#ifdef USE_XIM 245#ifdef USE_XIM
224 im_destroy (); 246 im_destroy ();
225#endif 247#endif
226#ifdef XTERM_SCROLLBAR 248 scrollBar.destroy ();
227 if (xscrollbarGC) XFreeGC (xdisp, xscrollbarGC);
228 if (ShadowGC) XFreeGC (xdisp, ShadowGC);
229#endif
230#ifdef PLAIN_SCROLLBAR
231 if (pscrollbarGC) XFreeGC (xdisp, pscrollbarGC);
232#endif
233#ifdef NEXT_SCROLLBAR
234 if (blackGC) XFreeGC (xdisp, blackGC);
235 if (whiteGC) XFreeGC (xdisp, whiteGC);
236 if (grayGC) XFreeGC (xdisp, grayGC);
237 if (darkGC) XFreeGC (xdisp, darkGC);
238 if (stippleGC) XFreeGC (xdisp, stippleGC);
239 if (dimple) XFreePixmap (xdisp, dimple);
240 if (upArrow) XFreePixmap (xdisp, upArrow);
241 if (downArrow) XFreePixmap (xdisp, downArrow);
242 if (upArrowHi) XFreePixmap (xdisp, upArrowHi);
243 if (downArrowHi) XFreePixmap (xdisp, downArrowHi);
244#endif
245#ifdef RXVT_SCROLLBAR
246 if (topShadowGC) XFreeGC (xdisp, topShadowGC);
247 if (botShadowGC) XFreeGC (xdisp, botShadowGC);
248 if (scrollbarGC) XFreeGC (xdisp, scrollbarGC);
249#endif
250 if (gc) XFreeGC (xdisp, gc); 249 if (gc) XFreeGC (dpy, gc);
251 250
252 delete drawable; 251 delete drawable;
253 // destroy all windows 252 // destroy all windows
254 if (parent[0]) 253 if (parent[0])
255 XDestroyWindow (xdisp, parent[0]); 254 XDestroyWindow (dpy, parent[0]);
256 255
257 for (int i = 0; i < TOTAL_COLORS; i++) 256 for (int i = 0; i < TOTAL_COLORS; i++)
258 if (ISSET_PIXCOLOR (i)) 257 if (ISSET_PIXCOLOR (i))
259 { 258 {
260 pix_colors_focused [i].free (this); 259 pix_colors_focused [i].free (this);
… …
262 pix_colors_unfocused [i].free (this); 261 pix_colors_unfocused [i].free (this);
263#endif 262#endif
264 } 263 }
265 264
266 clear (); 265 clear ();
267 }
268 266
269 delete pix_colors_focused; 267 display->flush (); /* ideally .put should do this */
270#if OFF_FOCUS_FADING
271 delete pix_colors_unfocused;
272#endif
273
274 displays.put (display); 268 displays.put (display);
269 }
275 270
276 scr_release (); 271 scr_release ();
277 272
278 /* clear all resources */ 273 /* clear all resources */
279 for (int i = 0; i < allocated.size (); i++) 274 for (int i = 0; i < allocated.size (); i++)
280 free (allocated [i]); 275 free (allocated [i]);
281 276
282 free (selection.text); 277 free (selection.text);
278 free (selection.clip_text);
283 // TODO: manage env vars in child only(!) 279 // TODO: manage env vars in child only(!)
284 free (env_display); 280 free (env_display);
285 free (env_term); 281 free (env_term);
286 free (locale); 282 free (locale);
287 free (v_buffer); 283 free (v_buffer);
… …
291 delete argv; 287 delete argv;
292 288
293#ifdef KEYSYM_RESOURCE 289#ifdef KEYSYM_RESOURCE
294 delete keyboard; 290 delete keyboard;
295#endif 291#endif
292#ifndef NO_RESOURCES
293 XrmDestroyDatabase (option_db);
294#endif
296} 295}
297 296
298// child has exited, usually destroys 297// child has exited, usually destroys
299void 298void
300rxvt_term::child_cb (child_watcher &w, int status) 299rxvt_term::child_cb (ev::child &w, int status)
301{ 300{
302 HOOK_INVOKE ((this, HOOK_CHILD_EXIT, DT_INT, status, DT_END)); 301 HOOK_INVOKE ((this, HOOK_CHILD_EXIT, DT_INT, status, DT_END));
303 302
304 cmd_pid = 0; 303 cmd_pid = 0;
305 304
306 if (!OPTION (Opt_hold)) 305 if (!option (Opt_hold))
307 destroy (); 306 destroy ();
308} 307}
309 308
310void 309void
311rxvt_term::destroy () 310rxvt_term::destroy ()
312{ 311{
313 if (destroy_ev.active) 312 if (destroy_ev.is_active ())
314 return; 313 return;
315 314
316 HOOK_INVOKE ((this, HOOK_DESTROY, DT_END)); 315 HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));
317 316
318#if ENABLE_OVERLAY 317#if ENABLE_OVERLAY
… …
322 if (display) 321 if (display)
323 { 322 {
324#if USE_XIM 323#if USE_XIM
325 im_ev.stop (display); 324 im_ev.stop (display);
326#endif 325#endif
327#if HAVE_SCROLLBARS
328 scrollbar_ev.stop (display); 326 scrollbar_ev.stop (display);
329#endif 327#if ENABLE_TRANSPARENCY || ENABLE_PERL
330#if TRANSPARENT
331 rootwin_ev.stop (display); 328 rootwin_ev.stop (display);
332#endif 329#endif
333 incr_ev.stop (); 330 incr_ev.stop ();
334 termwin_ev.stop (display); 331 termwin_ev.stop (display);
335 vt_ev.stop (display); 332 vt_ev.stop (display);
336 } 333 }
337 334
338 check_ev.stop (); 335 flush_ev.stop ();
339 pty_ev.stop (); 336 pty_ev.stop ();
340#ifdef CURSOR_BLINK 337#ifdef CURSOR_BLINK
341 cursor_blink_ev.stop (); 338 cursor_blink_ev.stop ();
342#endif 339#endif
343#ifdef TEXT_BLINK 340#ifdef TEXT_BLINK
… …
351#endif 348#endif
352#ifdef POINTER_BLANK 349#ifdef POINTER_BLANK
353 pointer_ev.stop (); 350 pointer_ev.stop ();
354#endif 351#endif
355 352
356 destroy_ev.start (0); 353 destroy_ev.start ();
357} 354}
358 355
359void 356void
360rxvt_term::destroy_cb (time_watcher &w) 357rxvt_term::destroy_cb (ev::idle &w, int revents)
361{ 358{
362 make_current (); 359 make_current ();
363 360
364 delete this; 361 delete this;
365} 362}
… …
394 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->request_code); 391 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->request_code);
395 sprintf(number, "%d", event->request_code); 392 sprintf(number, "%d", event->request_code);
396 XGetErrorDatabaseText(dpy, "XRequest", number, "", buffer, BUFSIZ); 393 XGetErrorDatabaseText(dpy, "XRequest", number, "", buffer, BUFSIZ);
397 rxvt_warn ("(which is %s)\n", buffer); 394 rxvt_warn ("(which is %s)\n", buffer);
398 if (event->request_code >= 128) { 395 if (event->request_code >= 128) {
399 XGetErrorDatabaseText(dpy, mtype, "MinorCode", "Request Minor code %d", 396 XGetErrorDatabaseText(dpy, mtype, "MinorCode", "Request Minor code %d",
400 mesg, BUFSIZ); 397 mesg, BUFSIZ);
401 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->minor_code); 398 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->minor_code);
402 } 399 }
403 if ((event->error_code == BadWindow) || 400 if ((event->error_code == BadWindow) ||
404 (event->error_code == BadPixmap) || 401 (event->error_code == BadPixmap) ||
405 (event->error_code == BadCursor) || 402 (event->error_code == BadCursor) ||
406 (event->error_code == BadFont) || 403 (event->error_code == BadFont) ||
407 (event->error_code == BadDrawable) || 404 (event->error_code == BadDrawable) ||
408 (event->error_code == BadColor) || 405 (event->error_code == BadColor) ||
409 (event->error_code == BadGC) || 406 (event->error_code == BadGC) ||
410 (event->error_code == BadIDChoice) || 407 (event->error_code == BadIDChoice) ||
411 (event->error_code == BadValue) || 408 (event->error_code == BadValue) ||
412 (event->error_code == BadAtom)) { 409 (event->error_code == BadAtom)) {
413 if (event->error_code == BadValue) 410 if (event->error_code == BadValue)
414 XGetErrorDatabaseText(dpy, mtype, "Value", "Value 0x%x", 411 XGetErrorDatabaseText(dpy, mtype, "Value", "Value 0x%x",
415 mesg, BUFSIZ); 412 mesg, BUFSIZ);
416 else if (event->error_code == BadAtom) 413 else if (event->error_code == BadAtom)
417 XGetErrorDatabaseText(dpy, mtype, "AtomID", "AtomID 0x%x", 414 XGetErrorDatabaseText(dpy, mtype, "AtomID", "AtomID 0x%x",
418 mesg, BUFSIZ); 415 mesg, BUFSIZ);
419 else 416 else
420 XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x", 417 XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x",
421 mesg, BUFSIZ); 418 mesg, BUFSIZ);
422 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid); 419 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid);
423 } 420 }
424 XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d", 421 XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d",
425 mesg, BUFSIZ); 422 mesg, BUFSIZ);
426 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial); 423 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial);
427} 424}
428#endif 425#endif
429 426
430int 427int
… …
453 DisplayString (display)); 450 DisplayString (display));
454 rxvt_emergency_cleanup (); 451 rxvt_emergency_cleanup ();
455 _exit (EXIT_FAILURE); 452 _exit (EXIT_FAILURE);
456} 453}
457 454
458/*----------------------------------------------------------------------*/
459bool
460rxvt_term::init (int argc, const char *const *argv, stringvec *envv)
461{
462 this->envv = envv;
463
464 SET_R (this);
465 set_locale ("");
466 set_environ (envv); // few things in X do not call setlocale :(
467
468 if (!init_vars ())
469 return false;
470
471 init_secondary ();
472
473 const char **cmd_argv = init_resources (argc, argv);
474
475#ifdef KEYSYM_RESOURCE
476 keyboard->register_done ();
477#endif
478
479#ifdef HAVE_SCROLLBARS
480 if (OPTION (Opt_scrollBar))
481 scrollBar.setIdle (); /* set existence for size calculations */
482#endif
483
484 pty = ptytty::create ();
485
486 create_windows (argc, argv);
487
488 init_xlocale ();
489
490 scr_reset (); // initialize screen
491
492#if 0
493 XSynchronize (xdisp, True);
494#endif
495
496#ifdef HAVE_SCROLLBARS
497 if (OPTION (Opt_scrollBar))
498 resize_scrollbar (); /* create and map scrollbar */
499#endif
500#ifdef TRANSPARENT
501 if (OPTION (Opt_transparent))
502 {
503 XSelectInput (xdisp, display->root, PropertyChangeMask);
504 check_our_parents ();
505 rootwin_ev.start (display, display->root);
506 }
507#endif
508
509 set_colorfgbg ();
510
511 init_command (cmd_argv);
512
513 free (cmd_argv);
514
515 if (pty->pty >= 0)
516 pty_ev.start (pty->pty, EVENT_READ);
517
518 check_ev.start ();
519
520 HOOK_INVOKE ((this, HOOK_START, DT_END));
521
522#if ENABLE_XEMBED
523 if (rs[Rs_embed])
524 {
525 long info[2] = { 0, XEMBED_MAPPED };
526
527 XChangeProperty (xdisp, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
528 32, PropModeReplace, (unsigned char *)&info, 2);
529 }
530#endif
531
532 XMapWindow (xdisp, vt);
533 XMapWindow (xdisp, parent[0]);
534
535 return true;
536}
537
538static struct sig_handlers 455static struct sig_handlers
539{ 456{
540 sig_watcher sw_term, sw_int; 457 ev::sig sw_term, sw_int;
541 458
542 /* 459 /*
543 * Catch a fatal signal and tidy up before quitting 460 * Catch a fatal signal and tidy up before quitting
544 */ 461 */
545 void 462 void sig_term (ev::sig &w, int revents);
546 sig_term (sig_watcher &w) 463
464 sig_handlers ()
547 { 465 {
548 rxvt_emergency_cleanup (); 466 sw_term.set<sig_handlers, &sig_handlers::sig_term> (this);
549 signal (w.signum, SIG_DFL);
550 kill (getpid (), w.signum);
551 }
552
553 sig_handlers ()
554 : sw_term (this, &sig_handlers::sig_term),
555 sw_int (this, &sig_handlers::sig_term) 467 sw_int .set<sig_handlers, &sig_handlers::sig_term> (this);
556 {
557 } 468 }
558} sig_handlers; 469} sig_handlers;
559 470
471void
472sig_handlers::sig_term (ev::sig &w, int revents)
473{
474 rxvt_emergency_cleanup ();
475 w.stop ();
476 kill (getpid (), w.signum);
477}
478
560char **rxvt_environ; // startup environment 479char **rxvt_environ; // startup environment
561 480
562void 481void
563rxvt_init () 482rxvt_init ()
564{ 483{
484 assert (("fontMask must not overlap other RS masks",
485 0 == (RS_fontMask & (RS_Sel | RS_baseattrMask | RS_customMask | RS_bgMask | RS_fgMask))));
486
565 ptytty::init (); 487 ptytty::init ();
488
489 if (!ev_default_loop (0))
490 rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n");
566 491
567 rxvt_environ = environ; 492 rxvt_environ = environ;
568 493
569 signal (SIGHUP, SIG_IGN); 494 signal (SIGHUP, SIG_IGN);
570 signal (SIGPIPE, SIG_IGN); 495 signal (SIGPIPE, SIG_IGN);
571 496
572 sig_handlers.sw_term.start (SIGTERM); 497 sig_handlers.sw_term.start (SIGTERM); ev_unref ();
573 sig_handlers.sw_int.start (SIGINT); 498 sig_handlers.sw_int.start (SIGINT); ev_unref ();
574
575 /* need to trap SIGURG for SVR4 (Unixware) rlogin */
576 /* signal (SIGURG, SIG_DFL); */
577 499
578 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); 500 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
579 // TODO: handle this with exceptions and tolerate the memory loss 501 // TODO: handle this with exceptions and tolerate the memory loss
580 XSetIOErrorHandler (rxvt_xioerror_handler); 502 XSetIOErrorHandler (rxvt_xioerror_handler);
581 503
582 XrmInitialize (); 504 XrmInitialize ();
583} 505}
584 506
585/* ------------------------------------------------------------------------- *
586 * MEMORY ALLOCATION WRAPPERS *
587 * ------------------------------------------------------------------------- */
588void *
589rxvt_malloc (size_t size)
590{
591 void *p = malloc (size);
592
593 if (!p)
594 rxvt_fatal ("memory allocation failure. aborting.\n");
595
596 return p;
597}
598
599void *
600rxvt_calloc (size_t number, size_t size)
601{
602 void *p = calloc (number, size);
603
604 if (!p)
605 rxvt_fatal ("memory allocation failure. aborting.\n");
606
607 return p;
608}
609
610void *
611rxvt_realloc (void *ptr, size_t size)
612{
613 void *p = realloc (ptr, size);
614
615 if (!p)
616 rxvt_fatal ("memory allocation failure. aborting.\n");
617
618 return p;
619}
620
621/*----------------------------------------------------------------------*/ 507/*----------------------------------------------------------------------*/
622/* 508/*
623 * window size/position calculcations for XSizeHint and other storage. 509 * window size/position calculations for XSizeHint and other storage.
624 * if width/height are non-zero then override calculated width/height 510 * if width/height are non-zero then override calculated width/height
625 */ 511 */
626void 512void
627rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight) 513rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
628{ 514{
629 short recalc_x, recalc_y; 515 short recalc_x, recalc_y;
630 int x, y, sb_w, flags; 516 int x, y, flags;
631 unsigned int w, h; 517 unsigned int w, h;
632 unsigned int max_width, max_height; 518 unsigned int max_width, max_height;
633 519
634 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity; 520 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity;
635 szHint.win_gravity = NorthWestGravity; 521 szHint.win_gravity = NorthWestGravity;
… …
645 if (rs[Rs_geometry]) 531 if (rs[Rs_geometry])
646 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h); 532 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h);
647 533
648 if (flags & WidthValue) 534 if (flags & WidthValue)
649 { 535 {
536 if (!w)
537 rxvt_fatal ("illegal window geometry (width and height must be non-zero), aborting.\n");
538
650 ncol = clamp (w, 0, std::numeric_limits<int16_t>::max ()); 539 ncol = clamp (w, 1, std::numeric_limits<int16_t>::max ());
651 szHint.flags |= USSize; 540 szHint.flags |= USSize;
652 } 541 }
653 542
654 if (flags & HeightValue) 543 if (flags & HeightValue)
655 { 544 {
545 if (!h)
546 rxvt_fatal ("illegal window geometry (width and height must be non-zero), aborting.\n");
547
656 nrow = clamp (h, 0, std::numeric_limits<int16_t>::max ()); 548 nrow = clamp (h, 1, std::numeric_limits<int16_t>::max ());
657 szHint.flags |= USSize; 549 szHint.flags |= USSize;
658 } 550 }
659 551
660 if (flags & XValue) 552 if (flags & XValue)
661 { 553 {
… …
692 max_width = MAX_COLS * fwidth; 584 max_width = MAX_COLS * fwidth;
693 max_height = MAX_ROWS * fheight; 585 max_height = MAX_ROWS * fheight;
694 586
695 szHint.base_width = szHint.base_height = 2 * int_bwidth; 587 szHint.base_width = szHint.base_height = 2 * int_bwidth;
696 588
697 sb_w = 0;
698 window_vt_x = window_vt_y = int_bwidth; 589 window_vt_x = window_vt_y = int_bwidth;
699 590
700 if (scrollBar.state) 591 if (scrollBar.state)
701 { 592 {
702 sb_w = scrollbar_TotalWidth (); 593 int sb_w = scrollBar.total_width ();
703 szHint.base_width += sb_w; 594 szHint.base_width += sb_w;
704 595
705 if (!OPTION (Opt_scrollBar_right)) 596 if (!option (Opt_scrollBar_right))
706 window_vt_x += sb_w; 597 window_vt_x += sb_w;
707 } 598 }
708 599
709 szHint.width_inc = fwidth; 600 szHint.width_inc = fwidth;
710 szHint.height_inc = fheight; 601 szHint.height_inc = fheight;
711 szHint.min_width = szHint.base_width + szHint.width_inc; 602 szHint.min_width = szHint.base_width + szHint.width_inc;
712 szHint.min_height = szHint.base_height + szHint.height_inc; 603 szHint.min_height = szHint.base_height + szHint.height_inc;
713 604
714 if (newwidth && newwidth - szHint.base_width < max_width) 605 if (newwidth && newwidth - szHint.base_width < max_width)
715 { 606 {
716 szHint.width = newwidth; 607 szHint.width = newwidth;
… …
731 { 622 {
732 min_it (height, max_height); 623 min_it (height, max_height);
733 szHint.height = szHint.base_height + height; 624 szHint.height = szHint.base_height + height;
734 } 625 }
735 626
736 if (scrollBar.state && OPTION (Opt_scrollBar_right))
737 window_sb_x = szHint.width - sb_w;
738
739 if (recalc_x) 627 if (recalc_x)
740 szHint.x += DisplayWidth (xdisp, display->screen) - szHint.width - 2 * ext_bwidth; 628 szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth;
741 629
742 if (recalc_y) 630 if (recalc_y)
743 szHint.y += DisplayHeight (xdisp, display->screen) - szHint.height - 2 * ext_bwidth; 631 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth;
744 632
745 ncol = width / fwidth; 633 ncol = width / fwidth;
746 nrow = height / fheight; 634 nrow = height / fheight;
747} 635}
748 636
749/*----------------------------------------------------------------------*/ 637/*----------------------------------------------------------------------*/
750/* 638/*
… …
761 649
762 ws.ws_col = ncol; 650 ws.ws_col = ncol;
763 ws.ws_row = nrow; 651 ws.ws_row = nrow;
764 ws.ws_xpixel = width; 652 ws.ws_xpixel = width;
765 ws.ws_ypixel = height; 653 ws.ws_ypixel = height;
766 (void)ioctl (pty->pty, TIOCSWINSZ, &ws); 654 ioctl (pty->pty, TIOCSWINSZ, &ws);
767 655
768#if 0 656#if 0
769 // TIOCSWINSZ⎈ is supposed to do this automatically and correctly 657 // TIOCSWINSZ is supposed to do this automatically and correctly
770 if (cmd_pid) /* force through to the command */ 658 if (cmd_pid) /* force through to the command */
771 kill (-cmd_pid, SIGWINCH); 659 kill (-cmd_pid, SIGWINCH);
772#endif 660#endif
773} 661}
774 662
… …
801#endif 689#endif
802 690
803 delete fontset[0]; 691 delete fontset[0];
804 fontset[0] = fs; 692 fontset[0] = fs;
805 693
806 prop = (*fs)[1]->properties (); 694 prop = (*fs)[rxvt_fontset::firstFont]->properties ();
807 prop.height += lineSpace; 695 prop.height += lineSpace;
696 prop.width += letterSpace;
697
808 fs->set_prop (prop); 698 fs->set_prop (prop, false);
809 699
810 fwidth = prop.width; 700 fwidth = prop.width;
811 fheight = prop.height; 701 fheight = prop.height;
812 fbase = prop.ascent; 702 fbase = prop.ascent;
813 703
… …
822 { 712 {
823 fontset[style] = fs = new rxvt_fontset (this); 713 fontset[style] = fs = new rxvt_fontset (this);
824 rxvt_fontprop prop2 = prop; 714 rxvt_fontprop prop2 = prop;
825 715
826 if (res) 716 if (res)
827 prop2.weight = prop2.slant = rxvt_fontprop::unset; 717 {
718 fs->populate (res);
719 fs->set_prop (prop2, false);
720 }
828 else 721 else
829 { 722 {
830 res = fontset[0]->fontdesc; 723 fs->populate (fontset[0]->fontdesc);
831 724
832 if (SET_STYLE (0, style) & RS_Bold) prop2.weight = rxvt_fontprop::bold; 725 if (SET_STYLE (0, style) & RS_Bold) prop2.weight = rxvt_fontprop::bold;
833 if (SET_STYLE (0, style) & RS_Italic) prop2.slant = rxvt_fontprop::italic; 726 if (SET_STYLE (0, style) & RS_Italic) prop2.slant = rxvt_fontprop::italic;
727
728 fs->set_prop (prop2, true);
834 } 729 }
835 730
836 fs->populate (res);
837 fs->set_prop (prop2);
838 } 731 }
839#else 732#else
840 fontset[style] = fontset[0]; 733 fontset[style] = fontset[0];
841#endif 734#endif
842 } 735 }
… …
844 if (parent[0]) 737 if (parent[0])
845 { 738 {
846 resize_all_windows (0, 0, 0); 739 resize_all_windows (0, 0, 0);
847 scr_remap_chars (); 740 scr_remap_chars ();
848 scr_touch (true); 741 scr_touch (true);
849 } 742 }
850 743
851 return true; 744 return true;
852} 745}
853 746
747void
854void rxvt_term::set_string_property (Atom prop, const char *str, int len) 748rxvt_term::set_string_property (Atom prop, const char *str, int len)
855{ 749{
856 XChangeProperty (xdisp, parent[0], 750 XChangeProperty (dpy, parent[0],
857 prop, XA_STRING, 8, PropModeReplace, 751 prop, XA_STRING, 8, PropModeReplace,
858 (const unsigned char *)str, len >= 0 ? len : strlen (str)); 752 (const unsigned char *)str, len >= 0 ? len : strlen (str));
859} 753}
860 754
755void
756rxvt_term::set_mbstring_property (Atom prop, const char *str, int len)
757{
758 XTextProperty ct;
759
760 if (XmbTextListToTextProperty (dpy, (char **)&str, 1, XStdICCTextStyle, &ct) >= 0)
761 {
762 XSetTextProperty (dpy, parent[0], &ct, prop);
763 XFree (ct.value);
764 }
765}
766
767void
861void rxvt_term::set_utf8_property (Atom prop, const char *str, int len) 768rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
862{ 769{
863 wchar_t *ws = rxvt_mbstowcs (str, len); 770 wchar_t *ws = rxvt_mbstowcs (str, len);
864 char *s = rxvt_wcstoutf8 (ws); 771 char *s = rxvt_wcstoutf8 (ws);
865 772
866 XChangeProperty (xdisp, parent[0], 773 XChangeProperty (dpy, parent[0],
867 prop, xa[XA_UTF8_STRING], 8, PropModeReplace, 774 prop, xa[XA_UTF8_STRING], 8, PropModeReplace,
868 (const unsigned char *)s, strlen (s)); 775 (const unsigned char *)s, strlen (s));
869 776
870 free (s); 777 free (s);
871 free (ws); 778 free (ws);
… …
875/*----------------------------------------------------------------------*/ 782/*----------------------------------------------------------------------*/
876/* xterm sequences - title, iconName, color (exptl) */ 783/* xterm sequences - title, iconName, color (exptl) */
877void 784void
878rxvt_term::set_title (const char *str) 785rxvt_term::set_title (const char *str)
879{ 786{
880 set_string_property (XA_WM_NAME, str); 787 set_mbstring_property (XA_WM_NAME, str);
881#if ENABLE_EWMH 788#if ENABLE_EWMH
882 set_utf8_property (xa[XA_NET_WM_NAME], str); 789 set_utf8_property (xa[XA_NET_WM_NAME], str);
883#endif 790#endif
884} 791}
885 792
886void 793void
887rxvt_term::set_icon_name (const char *str) 794rxvt_term::set_icon_name (const char *str)
888{ 795{
889 set_string_property (XA_WM_ICON_NAME, str); 796 set_mbstring_property (XA_WM_ICON_NAME, str);
890#if ENABLE_EWMH 797#if ENABLE_EWMH
891 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str); 798 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str);
892#endif 799#endif
893} 800}
894 801
802void
803rxvt_term::set_window_color (int idx, const char *color)
804{
895#ifdef XTERM_COLOR_CHANGE 805#ifdef XTERM_COLOR_CHANGE
896void
897rxvt_term::set_window_color (int idx, const char *color)
898{
899 rxvt_color xcol; 806 rxvt_color xcol;
900 int i; 807
901
902 if (color == NULL || *color == '\0') 808 if (color == NULL || *color == '\0')
903 return; 809 return;
904 810
905 color = strdup (color); 811 color = strdup (color);
906 allocated.push_back ((void *)color); 812 allocated.push_back ((void *)color);
907 rs[Rs_color + idx] = color; 813 rs[Rs_color + idx] = color;
908 814
909 /* handle color aliases */ 815 /* handle color aliases */
910 if (isdigit (*color)) 816 if (isdigit (*color))
911 { 817 {
912 i = atoi (color); 818 int i = atoi (color);
913 819
914 if (i >= 8 && i <= 15) 820 if (i >= 8 && i <= 15)
821 {
915 { /* bright colors */ 822 /* bright colors */
916 i -= 8;
917 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i]; 823 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i - 8];
918 goto done; 824 goto done;
919 } 825 }
920 826
921 if (i >= 0 && i <= 7) 827 if (i >= 0 && i <= 7)
828 {
922 { /* normal colors */ 829 /* normal colors */
923 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i]; 830 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];
924 goto done; 831 goto done;
925 } 832 }
926 } 833 }
927 834
… …
932 * so just keep gobbling up the colormap 839 * so just keep gobbling up the colormap
933 */ 840 */
934 841
935 pix_colors_focused[idx] = xcol; 842 pix_colors_focused[idx] = xcol;
936 843
937 /* XSetWindowAttributes attr; */
938 /* Cursor cursor; */
939done: 844done:
940
941#if OFF_FOCUS_FADING
942 if (rs[Rs_fade])
943 {
944 rgba c;
945 pix_colors [Color_fade].get (c);
946 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
947 }
948#endif
949
950 /*TODO: handle Color_BD, scrollbar background, etc. */ 845 /*TODO: handle Color_BD, scrollbar background, etc. */
951 846
847 update_fade_color (idx);
952 recolour_cursor (); 848 recolour_cursor ();
953 scr_recolour (); 849 scr_recolour ();
850#endif /* XTERM_COLOR_CHANGE */
954} 851}
955
956#else
957# define set_window_color (idx,color) ((void)0)
958#endif /* XTERM_COLOR_CHANGE */
959 852
960void 853void
961rxvt_term::recolour_cursor () 854rxvt_term::recolour_cursor ()
962{ 855{
963 XColor fg, bg; 856 XColor fg, bg;
… …
968 861
969 (ISSET_PIXCOLOR (Color_pointer_bg) 862 (ISSET_PIXCOLOR (Color_pointer_bg)
970 ? pix_colors_focused[Color_pointer_bg] 863 ? pix_colors_focused[Color_pointer_bg]
971 : pix_colors_focused[Color_bg]).get (bg); 864 : pix_colors_focused[Color_bg]).get (bg);
972 865
973 XRecolorCursor (xdisp, TermWin_cursor, &fg, &bg); 866 XRecolorCursor (dpy, TermWin_cursor, &fg, &bg);
974} 867}
975 868
976/*----------------------------------------------------------------------*/ 869/*----------------------------------------------------------------------*/
977/* 870/*
978 * find if fg/bg matches any of the normal (low-intensity) colors 871 * find if fg/bg matches any of the normal (low-intensity) colors
979 */ 872 */
980void 873void
981rxvt_term::set_colorfgbg () 874rxvt_term::set_colorfgbg ()
982{ 875{
983 unsigned int i; 876 unsigned int i;
984 const char *xpmb = "\0"; 877 const char *xpmb = "";
985 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1]; 878 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1];
986 879
987 strcpy (fstr, "default"); 880 strcpy (fstr, "default");
988 strcpy (bstr, "default"); 881 strcpy (bstr, "default");
989 for (i = Color_Black; i <= Color_White; i++) 882 for (i = Color_Black; i <= Color_White; i++)
… …
995 888
996 for (i = Color_Black; i <= Color_White; i++) 889 for (i = Color_Black; i <= Color_White; i++)
997 if (pix_colors[Color_bg] == pix_colors[i]) 890 if (pix_colors[Color_bg] == pix_colors[i])
998 { 891 {
999 sprintf (bstr, "%d", (i - Color_Black)); 892 sprintf (bstr, "%d", (i - Color_Black));
1000#ifdef XPM_BACKGROUND 893#ifdef BG_IMAGE_FROM_FILE
1001 xpmb = "default;"; 894 xpmb = "default;";
1002#endif 895#endif
1003 break; 896 break;
1004 } 897 }
1005 898
… …
1033 int fix_screen; 926 int fix_screen;
1034 int old_width = szHint.width; 927 int old_width = szHint.width;
1035 int old_height = szHint.height; 928 int old_height = szHint.height;
1036 929
1037 window_calc (newwidth, newheight); 930 window_calc (newwidth, newheight);
931
932 bool set_hint = !HOOK_INVOKE ((this, HOOK_RESIZE_ALL_WINDOWS, DT_INT, newwidth, DT_INT, newheight, DT_END));
933
934 // to avoid races between us and the wm, we clear the incremental size hints around the xresizewindow
935 if (set_hint)
936 {
937 szHint.flags &= ~(PBaseSize | PResizeInc);
1038 XSetWMNormalHints (xdisp, parent[0], &szHint); 938 XSetWMNormalHints (dpy, parent[0], &szHint);
939 szHint.flags |= PBaseSize | PResizeInc;
940 }
1039 941
1040 if (!ignoreparent) 942 if (!ignoreparent)
1041 { 943 {
1042#ifdef SMART_RESIZE 944#ifdef SMART_RESIZE
1043 /* 945 /*
… …
1047 int x, y, x1, y1; 949 int x, y, x1, y1;
1048 int dx, dy; 950 int dx, dy;
1049 unsigned int unused_w1, unused_h1, unused_b1, unused_d1; 951 unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
1050 Window unused_cr; 952 Window unused_cr;
1051 953
1052 XTranslateCoordinates (xdisp, parent[0], display->root, 954 XTranslateCoordinates (dpy, parent[0], display->root,
1053 0, 0, &x, &y, &unused_cr); 955 0, 0, &x, &y, &unused_cr);
1054 XGetGeometry (xdisp, parent[0], &unused_cr, &x1, &y1, 956 XGetGeometry (dpy, parent[0], &unused_cr, &x1, &y1,
1055 &unused_w1, &unused_h1, &unused_b1, &unused_d1); 957 &unused_w1, &unused_h1, &unused_b1, &unused_d1);
1056 /* 958 /*
1057 * if display->root isn't the parent window, a WM will probably have offset 959 * if display->root isn't the parent window, a WM will probably have offset
1058 * our position for handles and decorations. Counter it 960 * our position for handles and decorations. Counter it
1059 */ 961 */
… …
1061 { 963 {
1062 x -= x1; 964 x -= x1;
1063 y -= y1; 965 y -= y1;
1064 } 966 }
1065 967
1066 x1 = (DisplayWidth (xdisp, display->screen) - old_width ) / 2; 968 x1 = (DisplayWidth (dpy, display->screen) - old_width ) / 2;
1067 y1 = (DisplayHeight (xdisp, display->screen) - old_height) / 2; 969 y1 = (DisplayHeight (dpy, display->screen) - old_height) / 2;
1068 dx = old_width - szHint.width; 970 dx = old_width - szHint.width;
1069 dy = old_height - szHint.height; 971 dy = old_height - szHint.height;
1070 972
1071 /* Check position of the center of the window */ 973 /* Check position of the center of the window */
1072 if (x < x1) /* left half */ 974 if (x < x1) /* left half */
… …
1076 if (y < y1) /* top half */ 978 if (y < y1) /* top half */
1077 dy = 0; 979 dy = 0;
1078 else if (y == y1) /* exact center */ 980 else if (y == y1) /* exact center */
1079 dy /= 2; 981 dy /= 2;
1080 982
1081 XMoveResizeWindow (xdisp, parent[0], x + dx, y + dy, 983 XMoveResizeWindow (dpy, parent[0], x + dx, y + dy,
1082 szHint.width, szHint.height); 984 szHint.width, szHint.height);
1083#else 985#else
1084 XResizeWindow (xdisp, parent[0], szHint.width, szHint.height); 986 XResizeWindow (dpy, parent[0], szHint.width, szHint.height);
1085#endif 987#endif
1086 } 988 }
989
990 if (set_hint)
991 XSetWMNormalHints (dpy, parent[0], &szHint);
1087 992
1088 fix_screen = ncol != prev_ncol || nrow != prev_nrow; 993 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
1089 994
1090 if (fix_screen || newwidth != old_width || newheight != old_height) 995 if (fix_screen || newwidth != old_width || newheight != old_height)
1091 { 996 {
1092 if (scrollBar.state) 997 if (scrollBar.state)
1093 { 998 scrollBar.resize ();
1094 XMoveResizeWindow (xdisp, scrollBar.win,
1095 window_sb_x, 0,
1096 scrollbar_TotalWidth (), szHint.height);
1097 resize_scrollbar ();
1098 }
1099 999
1100 XMoveResizeWindow (xdisp, vt, 1000 XMoveResizeWindow (dpy, vt,
1101 window_vt_x, window_vt_y, 1001 window_vt_x, window_vt_y,
1102 width, height); 1002 width, height);
1103 1003
1104 scr_clear (); 1004#ifdef HAVE_BG_PIXMAP
1105#ifdef XPM_BACKGROUND 1005 if (bgPixmap.window_size_sensitive ())
1106 resize_pixmap (); 1006 update_background ();
1107#endif 1007#endif
1108 } 1008 }
1109 1009
1110 if (fix_screen || old_height == 0) 1010 if (fix_screen || old_height == 0)
1111 scr_reset (); 1011 scr_reset ();
1112 1012
1113 // TODO, with nvidia-8178, resizes kill the alpha channel, report if not fixed in newer version 1013#ifdef HAVE_BG_PIXMAP
1114 //scr_touch (false); 1014// TODO: this don't seem to have any effect - do we still need it ? If so - in which case exactly ?
1115 1015// if (bgPixmap.pixmap)
1116#ifdef XPM_BACKGROUND
1117 if (pixmap)
1118 scr_touch (false); 1016// scr_touch (false);
1119#endif 1017#endif
1120 1018
1121#ifdef USE_XIM 1019#ifdef USE_XIM
1122 IMSetStatusPosition (); 1020 IMSetPosition ();
1123#endif 1021#endif
1124} 1022}
1125 1023
1126/* 1024/*
1127 * Set the width/height of the vt window in characters. Units are pixels. 1025 * Set the width/height of the vt window in characters. Units are pixels.
… …
1132{ 1030{
1133 XWindowAttributes wattr; 1031 XWindowAttributes wattr;
1134 1032
1135 if (newwidth == 0 || newheight == 0) 1033 if (newwidth == 0 || newheight == 0)
1136 { 1034 {
1137 XGetWindowAttributes (xdisp, display->root, &wattr); 1035 XGetWindowAttributes (dpy, display->root, &wattr);
1138 1036
1139 if (newwidth == 0) 1037 if (newwidth == 0)
1140 newwidth = wattr.width - szHint.base_width; 1038 newwidth = wattr.width - szHint.base_width;
1141 if (newheight == 0) 1039 if (newheight == 0)
1142 newheight = wattr.height - szHint.base_height; 1040 newheight = wattr.height - szHint.base_height;
… …
1190 1088
1191/* Checking whether input method is running. */ 1089/* Checking whether input method is running. */
1192bool 1090bool
1193rxvt_term::IMisRunning () 1091rxvt_term::IMisRunning ()
1194{ 1092{
1195 char *p;
1196 Atom atom; 1093 Atom atom;
1197 Window win; 1094 Window win;
1198 char server[IMBUFSIZ]; 1095 char server[IMBUFSIZ];
1199 1096
1200 /* get current locale modifier */ 1097 /* get current locale modifier */
1201 if ((p = XSetLocaleModifiers (NULL)) != NULL) 1098 if (char *p = XSetLocaleModifiers (0))
1202 { 1099 {
1203 strcpy (server, "@server="); 1100 strcpy (server, "@server=");
1204 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */ 1101 strncat (server, p + 4, IMBUFSIZ - 9); /* skip "@im=" */
1205 1102
1206 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */ 1103 if (p = strchr (server + 1, '@')) /* first one only */
1207 *p = '\0'; 1104 *p = '\0';
1208 1105
1209 atom = XInternAtom (xdisp, server, False); 1106 atom = XInternAtom (dpy, server, False);
1210 win = XGetSelectionOwner (xdisp, atom); 1107 win = XGetSelectionOwner (dpy, atom);
1211 1108
1212 if (win != None) 1109 if (win != None)
1213 return True; 1110 return True;
1214 } 1111 }
1215 1112
… …
1278 1175
1279 term->make_current (); 1176 term->make_current ();
1280 1177
1281 if (text) 1178 if (text)
1282 { 1179 {
1283 void *str; 1180 wchar_t *str;
1284 1181
1285 if (!text->encoding_is_wchar && text->string.multi_byte) 1182 if (!text->encoding_is_wchar && text->string.multi_byte)
1286 { 1183 {
1287 // of course, X makes it ugly again 1184 // of course, X makes it ugly again
1288 if (term->rs[Rs_imLocale]) 1185 if (term->rs[Rs_imLocale])
1289 SET_LOCALE (term->rs[Rs_imLocale]); 1186 SET_LOCALE (term->rs[Rs_imLocale]);
1290 1187
1291 str = rxvt_temp_buf ((text->length + 1) * sizeof (wchar_t)); 1188 str = rxvt_temp_buf<wchar_t> (text->length + 1);
1292 mbstowcs ((wchar_t *)str, text->string.multi_byte, text->length + 1); 1189 mbstowcs (str, text->string.multi_byte, text->length + 1);
1293 1190
1294 if (term->rs[Rs_imLocale]) 1191 if (term->rs[Rs_imLocale])
1295 SET_LOCALE (term->locale); 1192 SET_LOCALE (term->locale);
1296 } 1193 }
1297 else 1194 else
1298 str = (void *)text->string.wide_char; 1195 str = text->string.wide_char;
1299 1196
1300 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW, 1197 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
1301 DT_INT, call_data->caret, 1198 DT_INT, call_data->caret,
1302 DT_INT, call_data->chg_first, 1199 DT_INT, call_data->chg_first,
1303 DT_INT, call_data->chg_length, 1200 DT_INT, call_data->chg_length,
1304 DT_LCS_LEN, (void *)text->feedback, text->feedback ? (int)text->length : 0, 1201 DT_LCS_LEN, (void *)text->feedback, text->feedback ? (int)text->length : 0,
… …
1439 "*", 1336 "*",
1440 fheight, 1337 fheight,
1441 fheight + 1, fheight - 1, 1338 fheight + 1, fheight - 1,
1442 fheight - 2, fheight + 2); 1339 fheight - 2, fheight + 2);
1443 1340
1444 fs = XCreateFontSet (xdisp, rs[Rs_imFont] ? rs[Rs_imFont] : pat, 1341 fs = XCreateFontSet (dpy, rs[Rs_imFont] ? rs[Rs_imFont] : pat,
1445 &missing_charset_list, &missing_charset_count, &def_string); 1342 &missing_charset_list, &missing_charset_count, &def_string);
1446 1343
1447 if (missing_charset_list) 1344 if (missing_charset_list)
1448 XFreeStringList (missing_charset_list); 1345 XFreeStringList (missing_charset_list);
1449 1346
… …
1524 preedit_attr, 1421 preedit_attr,
1525 status_attr ? XNStatusAttributes : NULL, 1422 status_attr ? XNStatusAttributes : NULL,
1526 status_attr, NULL); 1423 status_attr, NULL);
1527 1424
1528 if (preedit_attr) XFree (preedit_attr); 1425 if (preedit_attr) XFree (preedit_attr);
1529 if (status_attr) XFree (status_attr); 1426 if (status_attr) XFree (status_attr);
1530 if (fs) XFreeFontSet (xdisp, fs); 1427 if (fs) XFreeFontSet (dpy, fs);
1531 1428
1532 if (Input_Context == NULL) 1429 if (Input_Context == NULL)
1533 { 1430 {
1534 rxvt_warn ("failed to create input context, continuing without XIM.\n"); 1431 rxvt_warn ("failed to create input context, continuing without XIM.\n");
1535 im_destroy (); 1432 im_destroy ();
… …
1540 // unfortunately, only the focus window is used by XIM, hard to fix 1437 // unfortunately, only the focus window is used by XIM, hard to fix
1541 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL)) 1438 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL))
1542 vt_select_input (); 1439 vt_select_input ();
1543#endif 1440#endif
1544 1441
1545 if (input_style & XIMPreeditArea)
1546 IMSetStatusPosition (); 1442 IMSetPosition ();
1547 1443
1548 return true; 1444 return true;
1549} 1445}
1550 1446
1551void 1447void
… …
1609 SET_LOCALE (locale); 1505 SET_LOCALE (locale);
1610#endif 1506#endif
1611} 1507}
1612 1508
1613void 1509void
1614rxvt_term::IMSetStatusPosition () 1510rxvt_term::IMSetPosition ()
1615{ 1511{
1616 XRectangle preedit_rect, status_rect, *needed_rect; 1512 XRectangle preedit_rect, status_rect, *needed_rect;
1617 XVaNestedList preedit_attr, status_attr; 1513 XVaNestedList preedit_attr, status_attr;
1618 1514
1619 if (!Input_Context 1515 if (!Input_Context
1620 || !focus 1516 || !focus
1621 || !(input_style & XIMPreeditArea) 1517 || !(input_style & (XIMPreeditArea | XIMPreeditPosition))
1622 || !IMisRunning ()) 1518 || !IMisRunning ())
1623 return; 1519 return;
1624 1520
1521 if (input_style & XIMPreeditPosition)
1522 {
1523 im_set_size (preedit_rect);
1524 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);
1525
1526 XSetICValues (Input_Context,
1527 XNPreeditAttributes, preedit_attr, NULL);
1528 }
1529 else
1530 {
1625 /* Getting the necessary width of preedit area */ 1531 /* Getting the necessary width of preedit area */
1626 status_attr = XVaCreateNestedList (0, XNAreaNeeded, &needed_rect, NULL); 1532 status_attr = XVaCreateNestedList (0, XNAreaNeeded, &needed_rect, NULL);
1627 XGetICValues (Input_Context, XNStatusAttributes, status_attr, NULL); 1533 XGetICValues (Input_Context, XNStatusAttributes, status_attr, NULL);
1628 XFree (status_attr); 1534 XFree (status_attr);
1629 1535
1630 im_set_preedit_area (preedit_rect, status_rect, *needed_rect); 1536 im_set_preedit_area (preedit_rect, status_rect, *needed_rect);
1631 XFree (needed_rect); 1537 XFree (needed_rect);
1632 1538
1633 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL); 1539 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);
1634 status_attr = XVaCreateNestedList (0, XNArea, &status_rect, NULL); 1540 status_attr = XVaCreateNestedList (0, XNArea, &status_rect, NULL);
1635 1541
1636 XSetICValues (Input_Context, 1542 XSetICValues (Input_Context,
1637 XNPreeditAttributes, preedit_attr, 1543 XNPreeditAttributes, preedit_attr,
1638 XNStatusAttributes, status_attr, NULL); 1544 XNStatusAttributes, status_attr,
1545 NULL);
1639 1546
1547 XFree (status_attr);
1548 }
1549
1640 XFree (preedit_attr); 1550 XFree (preedit_attr);
1641 XFree (status_attr);
1642} 1551}
1643#endif /* USE_XIM */ 1552#endif /* USE_XIM */
1553
1554void
1555rxvt_term::get_window_origin (int &x, int &y)
1556{
1557 Window cr;
1558 XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr);
1559/* fprintf (stderr, "origin is %+d%+d\n", x, y);*/
1560}
1561
1562Pixmap
1563rxvt_term::get_pixmap_property (int prop_id)
1564{
1565 if (prop_id > 0 && prop_id < NUM_XA)
1566 if (xa[prop_id])
1567 {
1568 int aformat;
1569 unsigned long nitems, bytes_after;
1570 Atom atype;
1571 unsigned char *prop = NULL;
1572 int result = XGetWindowProperty (dpy, display->root, xa[prop_id],
1573 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1574 &nitems, &bytes_after, &prop);
1575 if (result == Success && prop && atype == XA_PIXMAP)
1576 return *(Pixmap *)prop;
1577 }
1578
1579 return None;
1580}
1581
1582#ifdef HAVE_BG_PIXMAP
1583# if TRACE_PIXMAPS
1584# undef update_background
1585void
1586rxvt_term::trace_update_background (const char *file, int line)
1587{
1588 fprintf (stderr, "%s:%d:update_background()\n", file, line);
1589 update_background ();
1590}
1591# endif
1592
1593void
1594rxvt_term::update_background ()
1595{
1596 if (update_background_ev.is_active ())
1597 return;
1598
1599 bgPixmap.invalidate ();
1600
1601 ev_tstamp to_wait = 0.5 - (ev::now () - bgPixmap.valid_since);
1602
1603 if (to_wait <= 0.)
1604 bgPixmap.render ();
1605 else
1606 update_background_ev.start (to_wait);
1607}
1608
1609void
1610rxvt_term::update_background_cb (ev::timer &w, int revents)
1611{
1612 make_current ();
1613
1614 update_background_ev.stop ();
1615 bgPixmap.render ();
1616 refresh_check ();
1617}
1618
1619#endif /* HAVE_BG_PIXMAP */
1644 1620
1645/*----------------------- end-of-file (C source) -----------------------*/ 1621/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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