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.209 by root, Mon Jan 30 20:12:37 2006 UTC vs.
Revision 1.331 by sf-exg, Mon Jul 26 22:07:38 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]);
255
256 for (int i = 0; i < TOTAL_COLORS; i++)
257 if (ISSET_PIXCOLOR (i))
258 {
259 pix_colors_focused [i].free (this);
260#if OFF_FOCUS_FADING
261 pix_colors_unfocused [i].free (this);
262#endif
263 }
256 264
257 clear (); 265 clear ();
258 }
259 266
260 // TODO: free pixcolours, colours should become part of rxvt_display 267 display->flush (); /* ideally .put should do this */
261 delete pix_colors_focused;
262#if OFF_FOCUS_FADING
263 delete pix_colors_unfocused;
264#endif
265
266 displays.put (display); 268 displays.put (display);
269 }
267 270
268 scr_release (); 271 scr_release ();
269 272
270 /* clear all resources */ 273 /* clear all resources */
271 for (int i = 0; i < allocated.size (); i++) 274 for (int i = 0; i < allocated.size (); i++)
272 free (allocated [i]); 275 free (allocated [i]);
273 276
274 free (selection.text); 277 free (selection.text);
278 free (selection.clip_text);
275 // TODO: manage env vars in child only(!) 279 // TODO: manage env vars in child only(!)
276 free (env_display); 280 free (env_display);
277 free (env_term); 281 free (env_term);
278 free (locale); 282 free (locale);
279 free (v_buffer); 283 free (v_buffer);
… …
283 delete argv; 287 delete argv;
284 288
285#ifdef KEYSYM_RESOURCE 289#ifdef KEYSYM_RESOURCE
286 delete keyboard; 290 delete keyboard;
287#endif 291#endif
292#ifndef NO_RESOURCES
293 XrmDestroyDatabase (option_db);
294#endif
288} 295}
289 296
290// child has exited, usually destroys 297// child has exited, usually destroys
291void 298void
292rxvt_term::child_cb (child_watcher &w, int status) 299rxvt_term::child_cb (ev::child &w, int status)
293{ 300{
294 HOOK_INVOKE ((this, HOOK_CHILD_EXIT, DT_INT, status, DT_END)); 301 HOOK_INVOKE ((this, HOOK_CHILD_EXIT, DT_INT, status, DT_END));
295 302
296 cmd_pid = 0; 303 cmd_pid = 0;
297 304
298 if (!OPTION (Opt_hold)) 305 if (!option (Opt_hold))
299 destroy (); 306 destroy ();
300} 307}
301 308
302void 309void
303rxvt_term::destroy () 310rxvt_term::destroy ()
304{ 311{
305 if (destroy_ev.active) 312 if (destroy_ev.is_active ())
306 return; 313 return;
307 314
308 HOOK_INVOKE ((this, HOOK_DESTROY, DT_END)); 315 HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));
309 316
310#if ENABLE_OVERLAY 317#if ENABLE_OVERLAY
… …
314 if (display) 321 if (display)
315 { 322 {
316#if USE_XIM 323#if USE_XIM
317 im_ev.stop (display); 324 im_ev.stop (display);
318#endif 325#endif
319#if HAVE_SCROLLBARS
320 scrollbar_ev.stop (display); 326 scrollbar_ev.stop (display);
321#endif 327#if ENABLE_TRANSPARENCY || ENABLE_PERL
322#if TRANSPARENT
323 rootwin_ev.stop (display); 328 rootwin_ev.stop (display);
324#endif 329#endif
325 incr_ev.stop (); 330 incr_ev.stop ();
326 termwin_ev.stop (display); 331 termwin_ev.stop (display);
327 vt_ev.stop (display); 332 vt_ev.stop (display);
328 } 333 }
329 334
330 check_ev.stop (); 335 flush_ev.stop ();
331 pty_ev.stop (); 336 pty_ev.stop ();
332#ifdef CURSOR_BLINK 337#ifdef CURSOR_BLINK
333 cursor_blink_ev.stop (); 338 cursor_blink_ev.stop ();
334#endif 339#endif
335#ifdef TEXT_BLINK 340#ifdef TEXT_BLINK
… …
343#endif 348#endif
344#ifdef POINTER_BLANK 349#ifdef POINTER_BLANK
345 pointer_ev.stop (); 350 pointer_ev.stop ();
346#endif 351#endif
347 352
348 destroy_ev.start (0); 353 destroy_ev.start ();
349} 354}
350 355
351void 356void
352rxvt_term::destroy_cb (time_watcher &w) 357rxvt_term::destroy_cb (ev::idle &w, int revents)
353{ 358{
354 make_current (); 359 make_current ();
355 360
356 delete this; 361 delete this;
357} 362}
… …
378 char mesg[BUFSIZ]; 383 char mesg[BUFSIZ];
379 char number[32]; 384 char number[32];
380 char *mtype = "XlibMessage"; 385 char *mtype = "XlibMessage";
381 XGetErrorText(dpy, event->error_code, buffer, BUFSIZ); 386 XGetErrorText(dpy, event->error_code, buffer, BUFSIZ);
382 XGetErrorDatabaseText(dpy, mtype, "XError", "X Error", mesg, BUFSIZ); 387 XGetErrorDatabaseText(dpy, mtype, "XError", "X Error", mesg, BUFSIZ);
383 rxvt_warn ("An X Error occured, trying to continue after report.\n"); 388 rxvt_warn ("An X Error occurred, trying to continue after report.\n");
384 rxvt_warn ("%s: %s\n", mesg, buffer); 389 rxvt_warn ("%s: %s\n", mesg, buffer);
385 XGetErrorDatabaseText(dpy, mtype, "MajorCode", "Request Major code %d", mesg, BUFSIZ); 390 XGetErrorDatabaseText(dpy, mtype, "MajorCode", "Request Major code %d", mesg, BUFSIZ);
386 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->request_code); 391 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->request_code);
387 sprintf(number, "%d", event->request_code); 392 sprintf(number, "%d", event->request_code);
388 XGetErrorDatabaseText(dpy, "XRequest", number, "", buffer, BUFSIZ); 393 XGetErrorDatabaseText(dpy, "XRequest", number, "", buffer, BUFSIZ);
389 rxvt_warn ("(which is %s)\n", buffer); 394 rxvt_warn ("(which is %s)\n", buffer);
390 if (event->request_code >= 128) { 395 if (event->request_code >= 128) {
391 XGetErrorDatabaseText(dpy, mtype, "MinorCode", "Request Minor code %d", 396 XGetErrorDatabaseText(dpy, mtype, "MinorCode", "Request Minor code %d",
392 mesg, BUFSIZ); 397 mesg, BUFSIZ);
393 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->minor_code); 398 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->minor_code);
394 } 399 }
395 if ((event->error_code == BadWindow) || 400 if ((event->error_code == BadWindow) ||
396 (event->error_code == BadPixmap) || 401 (event->error_code == BadPixmap) ||
397 (event->error_code == BadCursor) || 402 (event->error_code == BadCursor) ||
398 (event->error_code == BadFont) || 403 (event->error_code == BadFont) ||
399 (event->error_code == BadDrawable) || 404 (event->error_code == BadDrawable) ||
400 (event->error_code == BadColor) || 405 (event->error_code == BadColor) ||
401 (event->error_code == BadGC) || 406 (event->error_code == BadGC) ||
402 (event->error_code == BadIDChoice) || 407 (event->error_code == BadIDChoice) ||
403 (event->error_code == BadValue) || 408 (event->error_code == BadValue) ||
404 (event->error_code == BadAtom)) { 409 (event->error_code == BadAtom)) {
405 if (event->error_code == BadValue) 410 if (event->error_code == BadValue)
406 XGetErrorDatabaseText(dpy, mtype, "Value", "Value 0x%x", 411 XGetErrorDatabaseText(dpy, mtype, "Value", "Value 0x%x",
407 mesg, BUFSIZ); 412 mesg, BUFSIZ);
408 else if (event->error_code == BadAtom) 413 else if (event->error_code == BadAtom)
409 XGetErrorDatabaseText(dpy, mtype, "AtomID", "AtomID 0x%x", 414 XGetErrorDatabaseText(dpy, mtype, "AtomID", "AtomID 0x%x",
410 mesg, BUFSIZ); 415 mesg, BUFSIZ);
411 else 416 else
412 XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x", 417 XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x",
413 mesg, BUFSIZ); 418 mesg, BUFSIZ);
414 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid); 419 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid);
415 } 420 }
416 XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d", 421 XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d",
417 mesg, BUFSIZ); 422 mesg, BUFSIZ);
418 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial); 423 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial);
419} 424}
420#endif 425#endif
421 426
422int 427int
… …
445 DisplayString (display)); 450 DisplayString (display));
446 rxvt_emergency_cleanup (); 451 rxvt_emergency_cleanup ();
447 _exit (EXIT_FAILURE); 452 _exit (EXIT_FAILURE);
448} 453}
449 454
450/*----------------------------------------------------------------------*/
451bool
452rxvt_term::init (int argc, const char *const *argv, stringvec *envv)
453{
454 this->envv = envv;
455
456 SET_R (this);
457 set_locale ("");
458 set_environ (envv); // few things in X do not call setlocale :(
459
460 if (!init_vars ())
461 return false;
462
463 init_secondary ();
464
465 const char **cmd_argv = init_resources (argc, argv);
466
467#ifdef KEYSYM_RESOURCE
468 keyboard->register_done ();
469#endif
470
471#ifdef HAVE_SCROLLBARS
472 if (OPTION (Opt_scrollBar))
473 scrollBar.setIdle (); /* set existence for size calculations */
474#endif
475
476 pty = ptytty::create ();
477
478 create_windows (argc, argv);
479
480 init_xlocale ();
481
482 scr_reset (); // initialize screen
483
484#if 0
485 XSynchronize (xdisp, True);
486#endif
487
488#ifdef HAVE_SCROLLBARS
489 if (OPTION (Opt_scrollBar))
490 resize_scrollbar (); /* create and map scrollbar */
491#endif
492#ifdef TRANSPARENT
493 if (OPTION (Opt_transparent))
494 {
495 XSelectInput (xdisp, display->root, PropertyChangeMask);
496 check_our_parents ();
497 rootwin_ev.start (display, display->root);
498 }
499#endif
500
501 set_colorfgbg ();
502
503 init_command (cmd_argv);
504
505 free (cmd_argv);
506
507 if (pty->pty >= 0)
508 pty_ev.start (pty->pty, EVENT_READ);
509
510 check_ev.start ();
511
512 HOOK_INVOKE ((this, HOOK_START, DT_END));
513
514#if ENABLE_XEMBED
515 if (rs[Rs_embed])
516 {
517 long info[2] = { 0, XEMBED_MAPPED };
518
519 XChangeProperty (xdisp, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
520 32, PropModeReplace, (unsigned char *)&info, 2);
521 }
522#endif
523
524 XMapWindow (xdisp, vt);
525 XMapWindow (xdisp, parent[0]);
526
527 return true;
528}
529
530static struct sig_handlers 455static struct sig_handlers
531{ 456{
532 sig_watcher sw_term, sw_int; 457 ev::sig sw_term, sw_int;
533 458
534 /* 459 /*
535 * Catch a fatal signal and tidy up before quitting 460 * Catch a fatal signal and tidy up before quitting
536 */ 461 */
537 void 462 void sig_term (ev::sig &w, int revents);
538 sig_term (sig_watcher &w) 463
464 sig_handlers ()
539 { 465 {
540 rxvt_emergency_cleanup (); 466 sw_term.set<sig_handlers, &sig_handlers::sig_term> (this);
541 signal (w.signum, SIG_DFL);
542 kill (getpid (), w.signum);
543 }
544
545 sig_handlers ()
546 : sw_term (this, &sig_handlers::sig_term),
547 sw_int (this, &sig_handlers::sig_term) 467 sw_int .set<sig_handlers, &sig_handlers::sig_term> (this);
548 {
549 } 468 }
550} sig_handlers; 469} sig_handlers;
551 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
552char **rxvt_environ; // startup environment 479char **rxvt_environ; // startup environment
553 480
554void 481void
555rxvt_init () 482rxvt_init ()
556{ 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
487 // get rid of stdin/stdout as we don't need them, to free resources
488 dup2 (STDERR_FILENO, STDIN_FILENO);
489 dup2 (STDERR_FILENO, STDOUT_FILENO);
490
557 ptytty::init (); 491 ptytty::init ();
492
493 if (!ev_default_loop (0))
494 rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n");
558 495
559 rxvt_environ = environ; 496 rxvt_environ = environ;
560 497
561 signal (SIGHUP, SIG_IGN); 498 signal (SIGHUP, SIG_IGN);
562 signal (SIGPIPE, SIG_IGN); 499 signal (SIGPIPE, SIG_IGN);
563 500
564 sig_handlers.sw_term.start (SIGTERM); 501 sig_handlers.sw_term.start (SIGTERM); ev_unref ();
565 sig_handlers.sw_int.start (SIGINT); 502 sig_handlers.sw_int.start (SIGINT); ev_unref ();
566
567 /* need to trap SIGURG for SVR4 (Unixware) rlogin */
568 /* signal (SIGURG, SIG_DFL); */
569 503
570 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); 504 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
571 // TODO: handle this with exceptions and tolerate the memory loss 505 // TODO: handle this with exceptions and tolerate the memory loss
572 XSetIOErrorHandler (rxvt_xioerror_handler); 506 XSetIOErrorHandler (rxvt_xioerror_handler);
573 507
574 XrmInitialize (); 508 XrmInitialize ();
575} 509}
576 510
577/* ------------------------------------------------------------------------- *
578 * MEMORY ALLOCATION WRAPPERS *
579 * ------------------------------------------------------------------------- */
580void *
581rxvt_malloc (size_t size)
582{
583 void *p = malloc (size);
584
585 if (!p)
586 rxvt_fatal ("memory allocation failure. aborting.\n");
587
588 return p;
589}
590
591void *
592rxvt_calloc (size_t number, size_t size)
593{
594 void *p = calloc (number, size);
595
596 if (!p)
597 rxvt_fatal ("memory allocation failure. aborting.\n");
598
599 return p;
600}
601
602void *
603rxvt_realloc (void *ptr, size_t size)
604{
605 void *p = realloc (ptr, size);
606
607 if (!p)
608 rxvt_fatal ("memory allocation failure. aborting.\n");
609
610 return p;
611}
612
613/*----------------------------------------------------------------------*/ 511/*----------------------------------------------------------------------*/
614/* 512/*
615 * window size/position calculcations for XSizeHint and other storage. 513 * window size/position calculations for XSizeHint and other storage.
616 * if width/height are non-zero then override calculated width/height 514 * if width/height are non-zero then override calculated width/height
617 */ 515 */
618void 516void
619rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight) 517rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
620{ 518{
621 short recalc_x, recalc_y; 519 short recalc_x, recalc_y;
622 int x, y, sb_w, flags; 520 int x, y, flags;
623 unsigned int w, h; 521 unsigned int w, h;
624 unsigned int max_width, max_height; 522 unsigned int max_width, max_height;
625 523
626 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity; 524 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity;
627 szHint.win_gravity = NorthWestGravity; 525 szHint.win_gravity = NorthWestGravity;
… …
637 if (rs[Rs_geometry]) 535 if (rs[Rs_geometry])
638 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h); 536 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h);
639 537
640 if (flags & WidthValue) 538 if (flags & WidthValue)
641 { 539 {
540 if (!w)
541 rxvt_fatal ("illegal window geometry (width and height must be non-zero), aborting.\n");
542
642 ncol = clamp (w, 0, std::numeric_limits<int16_t>::max ()); 543 ncol = clamp (w, 1, std::numeric_limits<int16_t>::max ());
643 szHint.flags |= USSize; 544 szHint.flags |= USSize;
644 } 545 }
645 546
646 if (flags & HeightValue) 547 if (flags & HeightValue)
647 { 548 {
549 if (!h)
550 rxvt_fatal ("illegal window geometry (width and height must be non-zero), aborting.\n");
551
648 nrow = clamp (h, 0, std::numeric_limits<int16_t>::max ()); 552 nrow = clamp (h, 1, std::numeric_limits<int16_t>::max ());
649 szHint.flags |= USSize; 553 szHint.flags |= USSize;
650 } 554 }
651 555
652 if (flags & XValue) 556 if (flags & XValue)
653 { 557 {
… …
684 max_width = MAX_COLS * fwidth; 588 max_width = MAX_COLS * fwidth;
685 max_height = MAX_ROWS * fheight; 589 max_height = MAX_ROWS * fheight;
686 590
687 szHint.base_width = szHint.base_height = 2 * int_bwidth; 591 szHint.base_width = szHint.base_height = 2 * int_bwidth;
688 592
689 sb_w = 0;
690 window_vt_x = window_vt_y = int_bwidth; 593 window_vt_x = window_vt_y = int_bwidth;
691 594
692 if (scrollBar.state) 595 if (scrollBar.state)
693 { 596 {
694 sb_w = scrollbar_TotalWidth (); 597 int sb_w = scrollBar.total_width ();
695 szHint.base_width += sb_w; 598 szHint.base_width += sb_w;
599
696 if (!OPTION (Opt_scrollBar_right)) 600 if (!option (Opt_scrollBar_right))
697 window_vt_x += sb_w; 601 window_vt_x += sb_w;
698 } 602 }
699 603
700 szHint.width_inc = fwidth; 604 szHint.width_inc = fwidth;
701 szHint.height_inc = fheight; 605 szHint.height_inc = fheight;
702 szHint.min_width = szHint.base_width + szHint.width_inc; 606 szHint.min_width = szHint.base_width + szHint.width_inc;
703 szHint.min_height = szHint.base_height + szHint.height_inc; 607 szHint.min_height = szHint.base_height + szHint.height_inc;
704 608
705 if (newwidth && newwidth - szHint.base_width < max_width) 609 if (newwidth && newwidth - szHint.base_width < max_width)
706 { 610 {
707 szHint.width = newwidth; 611 szHint.width = newwidth;
… …
722 { 626 {
723 min_it (height, max_height); 627 min_it (height, max_height);
724 szHint.height = szHint.base_height + height; 628 szHint.height = szHint.base_height + height;
725 } 629 }
726 630
727 if (scrollBar.state && OPTION (Opt_scrollBar_right))
728 window_sb_x = szHint.width - sb_w;
729
730 if (recalc_x) 631 if (recalc_x)
731 szHint.x += DisplayWidth (xdisp, display->screen) - szHint.width - 2 * ext_bwidth; 632 szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth;
732 633
733 if (recalc_y) 634 if (recalc_y)
734 szHint.y += DisplayHeight (xdisp, display->screen) - szHint.height - 2 * ext_bwidth; 635 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth;
735 636
736 ncol = width / fwidth; 637 ncol = width / fwidth;
737 nrow = height / fheight; 638 nrow = height / fheight;
738} 639}
739 640
740/*----------------------------------------------------------------------*/ 641/*----------------------------------------------------------------------*/
741/* 642/*
… …
752 653
753 ws.ws_col = ncol; 654 ws.ws_col = ncol;
754 ws.ws_row = nrow; 655 ws.ws_row = nrow;
755 ws.ws_xpixel = width; 656 ws.ws_xpixel = width;
756 ws.ws_ypixel = height; 657 ws.ws_ypixel = height;
757 (void)ioctl (pty->pty, TIOCSWINSZ, &ws); 658 ioctl (pty->pty, TIOCSWINSZ, &ws);
758 659
759#if 0 660#if 0
760 // TIOCSWINSZ⎈ is supposed to do this automatically and correctly 661 // TIOCSWINSZ is supposed to do this automatically and correctly
761 if (cmd_pid) /* force through to the command */ 662 if (cmd_pid) /* force through to the command */
762 kill (-cmd_pid, SIGWINCH); 663 kill (-cmd_pid, SIGWINCH);
763#endif 664#endif
764} 665}
765 666
… …
792#endif 693#endif
793 694
794 delete fontset[0]; 695 delete fontset[0];
795 fontset[0] = fs; 696 fontset[0] = fs;
796 697
797 prop = (*fs)[1]->properties (); 698 prop = (*fs)[rxvt_fontset::firstFont]->properties ();
798 prop.height += lineSpace; 699 prop.height += lineSpace;
700 prop.width += letterSpace;
701
799 fs->set_prop (prop); 702 fs->set_prop (prop, false);
800 703
801 fwidth = prop.width; 704 fwidth = prop.width;
802 fheight = prop.height; 705 fheight = prop.height;
803 fbase = prop.ascent; 706 fbase = prop.ascent;
804 707
… …
813 { 716 {
814 fontset[style] = fs = new rxvt_fontset (this); 717 fontset[style] = fs = new rxvt_fontset (this);
815 rxvt_fontprop prop2 = prop; 718 rxvt_fontprop prop2 = prop;
816 719
817 if (res) 720 if (res)
818 prop2.weight = prop2.slant = rxvt_fontprop::unset; 721 {
722 fs->populate (res);
723 fs->set_prop (prop2, false);
724 }
819 else 725 else
820 { 726 {
821 res = fontset[0]->fontdesc; 727 fs->populate (fontset[0]->fontdesc);
822 728
823 if (SET_STYLE (0, style) & RS_Bold) prop2.weight = rxvt_fontprop::bold; 729 if (SET_STYLE (0, style) & RS_Bold) prop2.weight = rxvt_fontprop::bold;
824 if (SET_STYLE (0, style) & RS_Italic) prop2.slant = rxvt_fontprop::italic; 730 if (SET_STYLE (0, style) & RS_Italic) prop2.slant = rxvt_fontprop::italic;
731
732 fs->set_prop (prop2, true);
825 } 733 }
826 734
827 fs->populate (res);
828 fs->set_prop (prop2);
829 } 735 }
830#else 736#else
831 fontset[style] = fontset[0]; 737 fontset[style] = fontset[0];
832#endif 738#endif
833 } 739 }
… …
835 if (parent[0]) 741 if (parent[0])
836 { 742 {
837 resize_all_windows (0, 0, 0); 743 resize_all_windows (0, 0, 0);
838 scr_remap_chars (); 744 scr_remap_chars ();
839 scr_touch (true); 745 scr_touch (true);
840 } 746 }
841 747
842 return true; 748 return true;
843} 749}
844 750
751void
845void rxvt_term::set_string_property (Atom prop, const char *str, int len) 752rxvt_term::set_string_property (Atom prop, const char *str, int len)
846{ 753{
847 XChangeProperty (xdisp, parent[0], 754 XChangeProperty (dpy, parent[0],
848 prop, XA_STRING, 8, PropModeReplace, 755 prop, XA_STRING, 8, PropModeReplace,
849 (const unsigned char *)str, len >= 0 ? len : strlen (str)); 756 (const unsigned char *)str, len >= 0 ? len : strlen (str));
850} 757}
851 758
759void
760rxvt_term::set_mbstring_property (Atom prop, const char *str, int len)
761{
762 XTextProperty ct;
763
764 if (XmbTextListToTextProperty (dpy, (char **)&str, 1, XStdICCTextStyle, &ct) >= 0)
765 {
766 XSetTextProperty (dpy, parent[0], &ct, prop);
767 XFree (ct.value);
768 }
769}
770
771void
852void rxvt_term::set_utf8_property (Atom prop, const char *str, int len) 772rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
853{ 773{
854 wchar_t *ws = rxvt_mbstowcs (str, len); 774 wchar_t *ws = rxvt_mbstowcs (str, len);
855 char *s = rxvt_wcstoutf8 (ws); 775 char *s = rxvt_wcstoutf8 (ws);
856 776
857 XChangeProperty (xdisp, parent[0], 777 XChangeProperty (dpy, parent[0],
858 prop, xa[XA_UTF8_STRING], 8, PropModeReplace, 778 prop, xa[XA_UTF8_STRING], 8, PropModeReplace,
859 (const unsigned char *)s, strlen (s)); 779 (const unsigned char *)s, strlen (s));
860 780
861 free (s); 781 free (s);
862 free (ws); 782 free (ws);
… …
866/*----------------------------------------------------------------------*/ 786/*----------------------------------------------------------------------*/
867/* xterm sequences - title, iconName, color (exptl) */ 787/* xterm sequences - title, iconName, color (exptl) */
868void 788void
869rxvt_term::set_title (const char *str) 789rxvt_term::set_title (const char *str)
870{ 790{
871 set_string_property (XA_WM_NAME, str); 791 set_mbstring_property (XA_WM_NAME, str);
872#if ENABLE_EWMH 792#if ENABLE_EWMH
873 set_utf8_property (xa[XA_NET_WM_NAME], str); 793 set_utf8_property (xa[XA_NET_WM_NAME], str);
874#endif 794#endif
875} 795}
876 796
877void 797void
878rxvt_term::set_icon_name (const char *str) 798rxvt_term::set_icon_name (const char *str)
879{ 799{
880 set_string_property (XA_WM_ICON_NAME, str); 800 set_mbstring_property (XA_WM_ICON_NAME, str);
881#if ENABLE_EWMH 801#if ENABLE_EWMH
882 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str); 802 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str);
883#endif 803#endif
884} 804}
885 805
806void
807rxvt_term::set_window_color (int idx, const char *color)
808{
886#ifdef XTERM_COLOR_CHANGE 809#ifdef XTERM_COLOR_CHANGE
887void
888rxvt_term::set_window_color (int idx, const char *color)
889{
890 rxvt_color xcol; 810 rxvt_color xcol;
891 int i;
892 811
893 if (color == NULL || *color == '\0') 812 if (color == NULL || *color == '\0')
894 return; 813 return;
895 814
815 color = strdup (color);
816 allocated.push_back ((void *)color);
817 rs[Rs_color + idx] = color;
818
896 /* handle color aliases */ 819 /* handle color aliases */
897 if (isdigit (*color)) 820 if (isdigit (*color))
898 { 821 {
899 i = atoi (color); 822 int i = atoi (color);
900 823
901 if (i >= 8 && i <= 15) 824 if (i >= 8 && i <= 15)
825 {
902 { /* bright colors */ 826 /* bright colors */
903 i -= 8;
904 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i]; 827 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i - 8];
905 SET_PIXCOLOR (idx);
906 goto done; 828 goto done;
907 } 829 }
908 830
909 if (i >= 0 && i <= 7) 831 if (i >= 0 && i <= 7)
832 {
910 { /* normal colors */ 833 /* normal colors */
911 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i]; 834 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];
912 SET_PIXCOLOR (idx);
913 goto done; 835 goto done;
914 } 836 }
915 } 837 }
916 838
917 if (!set_color (xcol, color)) 839 set_color (xcol, color);
918 return;
919
920 /* XStoreColor (xdisp, display->cmap, XColor*); */
921 840
922 /* 841 /*
923 * FIXME: should free colors here, but no idea how to do it so instead, 842 * FIXME: should free colors here, but no idea how to do it so instead,
924 * so just keep gobbling up the colormap 843 * so just keep gobbling up the colormap
925 */ 844 */
926# if 0
927 for (i = Color_Black; i <= Color_White; i++)
928 if (pix_colors[idx] == pix_colors[i])
929 break;
930 if (i > Color_White)
931 {
932 /* fprintf (stderr, "XFreeColors: pix_colors [%d] = %lu\n", idx, pix_colors [idx]); */
933 XFreeColors (xdisp, display->cmap, (pix_colors + idx), 1,
934 DisplayPlanes (xdisp, display->screen));
935 }
936# endif
937 845
938 pix_colors_focused[idx] = xcol; 846 pix_colors_focused[idx] = xcol;
939 SET_PIXCOLOR (idx);
940 847
941 /* XSetWindowAttributes attr; */
942 /* Cursor cursor; */
943done: 848done:
944
945#if OFF_FOCUS_FADING
946 if (rs[Rs_fade])
947 pix_colors_unfocused[idx] = pix_colors_focused[idx].fade (this, atoi (rs[Rs_fade]), pix_colors[Color_fade]);
948#endif
949
950 /*TODO: handle Color_BD, scrollbar background, etc. */ 849 /*TODO: handle Color_BD, scrollbar background, etc. */
951 850
851 update_fade_color (idx);
952 recolour_cursor (); 852 recolour_cursor ();
953 scr_recolour (); 853 scr_recolour ();
854#endif /* XTERM_COLOR_CHANGE */
954} 855}
955
956#else
957# define set_window_color (idx,color) ((void)0)
958#endif /* XTERM_COLOR_CHANGE */
959 856
960void 857void
961rxvt_term::recolour_cursor () 858rxvt_term::recolour_cursor ()
962{ 859{
963 XColor xcol[2]; 860 XColor fg, bg;
964 861
965 xcol[0].pixel = ISSET_PIXCOLOR (Color_pointer_fg) 862 (ISSET_PIXCOLOR (Color_pointer_fg)
966 ? pix_colors_focused[Color_pointer_fg] 863 ? pix_colors_focused[Color_pointer_fg]
967 : pix_colors_focused[Color_fg]; 864 : pix_colors_focused[Color_fg]).get (fg);
865
968 xcol[1].pixel = ISSET_PIXCOLOR (Color_pointer_bg) 866 (ISSET_PIXCOLOR (Color_pointer_bg)
969 ? pix_colors_focused[Color_pointer_bg] 867 ? pix_colors_focused[Color_pointer_bg]
970 : pix_colors_focused[Color_bg]; 868 : pix_colors_focused[Color_bg]).get (bg);
971 869
972 XQueryColors (xdisp, cmap, xcol, 2);
973 XRecolorCursor (xdisp, TermWin_cursor, xcol + 0, xcol + 1); 870 XRecolorCursor (dpy, TermWin_cursor, &fg, &bg);
974} 871}
975 872
976/*----------------------------------------------------------------------*/ 873/*----------------------------------------------------------------------*/
977/* 874/*
978 * find if fg/bg matches any of the normal (low-intensity) colors 875 * find if fg/bg matches any of the normal (low-intensity) colors
979 */ 876 */
980void 877void
981rxvt_term::set_colorfgbg () 878rxvt_term::set_colorfgbg ()
982{ 879{
983 unsigned int i; 880 unsigned int i;
984 const char *xpmb = "\0"; 881 const char *xpmb = "";
985 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1]; 882 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1];
986 883
987 strcpy (fstr, "default"); 884 strcpy (fstr, "default");
988 strcpy (bstr, "default"); 885 strcpy (bstr, "default");
989 for (i = Color_Black; i <= Color_White; i++) 886 for (i = Color_Black; i <= Color_White; i++)
… …
995 892
996 for (i = Color_Black; i <= Color_White; i++) 893 for (i = Color_Black; i <= Color_White; i++)
997 if (pix_colors[Color_bg] == pix_colors[i]) 894 if (pix_colors[Color_bg] == pix_colors[i])
998 { 895 {
999 sprintf (bstr, "%d", (i - Color_Black)); 896 sprintf (bstr, "%d", (i - Color_Black));
1000#ifdef XPM_BACKGROUND 897#ifdef BG_IMAGE_FROM_FILE
1001 xpmb = "default;"; 898 xpmb = "default;";
1002#endif 899#endif
1003 break; 900 break;
1004 } 901 }
1005 902
… …
1014 if (color.set (this, name)) 911 if (color.set (this, name))
1015 return true; 912 return true;
1016 913
1017 rxvt_warn ("can't get colour '%s', continuing without.\n", name); 914 rxvt_warn ("can't get colour '%s', continuing without.\n", name);
1018 return false; 915 return false;
916}
917
918void
919rxvt_term::alias_color (int dst, int src)
920{
921 pix_colors[dst].set (this, rs[Rs_color + dst] = rs[Rs_color + src]);
1019} 922}
1020 923
1021/* -------------------------------------------------------------------- * 924/* -------------------------------------------------------------------- *
1022 * - WINDOW RESIZING - * 925 * - WINDOW RESIZING - *
1023 * -------------------------------------------------------------------- */ 926 * -------------------------------------------------------------------- */
… …
1027 int fix_screen; 930 int fix_screen;
1028 int old_width = szHint.width; 931 int old_width = szHint.width;
1029 int old_height = szHint.height; 932 int old_height = szHint.height;
1030 933
1031 window_calc (newwidth, newheight); 934 window_calc (newwidth, newheight);
935
936 bool set_hint = !HOOK_INVOKE ((this, HOOK_RESIZE_ALL_WINDOWS, DT_INT, newwidth, DT_INT, newheight, DT_END));
937
938 // to avoid races between us and the wm, we clear the incremental size hints around the xresizewindow
939 if (set_hint)
940 {
941 szHint.flags &= ~(PBaseSize | PResizeInc);
1032 XSetWMNormalHints (xdisp, parent[0], &szHint); 942 XSetWMNormalHints (dpy, parent[0], &szHint);
943 szHint.flags |= PBaseSize | PResizeInc;
944 }
1033 945
1034 if (!ignoreparent) 946 if (!ignoreparent)
1035 { 947 {
1036#ifdef SMART_RESIZE 948#ifdef SMART_RESIZE
1037 /* 949 /*
… …
1041 int x, y, x1, y1; 953 int x, y, x1, y1;
1042 int dx, dy; 954 int dx, dy;
1043 unsigned int unused_w1, unused_h1, unused_b1, unused_d1; 955 unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
1044 Window unused_cr; 956 Window unused_cr;
1045 957
1046 XTranslateCoordinates (xdisp, parent[0], display->root, 958 XTranslateCoordinates (dpy, parent[0], display->root,
1047 0, 0, &x, &y, &unused_cr); 959 0, 0, &x, &y, &unused_cr);
1048 XGetGeometry (xdisp, parent[0], &unused_cr, &x1, &y1, 960 XGetGeometry (dpy, parent[0], &unused_cr, &x1, &y1,
1049 &unused_w1, &unused_h1, &unused_b1, &unused_d1); 961 &unused_w1, &unused_h1, &unused_b1, &unused_d1);
1050 /* 962 /*
1051 * if display->root isn't the parent window, a WM will probably have offset 963 * if display->root isn't the parent window, a WM will probably have offset
1052 * our position for handles and decorations. Counter it 964 * our position for handles and decorations. Counter it
1053 */ 965 */
… …
1055 { 967 {
1056 x -= x1; 968 x -= x1;
1057 y -= y1; 969 y -= y1;
1058 } 970 }
1059 971
1060 x1 = (DisplayWidth (xdisp, display->screen) - old_width ) / 2; 972 x1 = (DisplayWidth (dpy, display->screen) - old_width ) / 2;
1061 y1 = (DisplayHeight (xdisp, display->screen) - old_height) / 2; 973 y1 = (DisplayHeight (dpy, display->screen) - old_height) / 2;
1062 dx = old_width - szHint.width; 974 dx = old_width - szHint.width;
1063 dy = old_height - szHint.height; 975 dy = old_height - szHint.height;
1064 976
1065 /* Check position of the center of the window */ 977 /* Check position of the center of the window */
1066 if (x < x1) /* left half */ 978 if (x < x1) /* left half */
… …
1070 if (y < y1) /* top half */ 982 if (y < y1) /* top half */
1071 dy = 0; 983 dy = 0;
1072 else if (y == y1) /* exact center */ 984 else if (y == y1) /* exact center */
1073 dy /= 2; 985 dy /= 2;
1074 986
1075 XMoveResizeWindow (xdisp, parent[0], x + dx, y + dy, 987 XMoveResizeWindow (dpy, parent[0], x + dx, y + dy,
1076 szHint.width, szHint.height); 988 szHint.width, szHint.height);
1077#else 989#else
1078 XResizeWindow (xdisp, parent[0], szHint.width, szHint.height); 990 XResizeWindow (dpy, parent[0], szHint.width, szHint.height);
1079#endif 991#endif
1080 } 992 }
993
994 if (set_hint)
995 XSetWMNormalHints (dpy, parent[0], &szHint);
1081 996
1082 fix_screen = ncol != prev_ncol || nrow != prev_nrow; 997 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
1083 998
1084 if (fix_screen || newwidth != old_width || newheight != old_height) 999 if (fix_screen || newwidth != old_width || newheight != old_height)
1085 { 1000 {
1086 if (scrollBar.state) 1001 if (scrollBar.state)
1087 { 1002 scrollBar.resize ();
1088 XMoveResizeWindow (xdisp, scrollBar.win,
1089 window_sb_x, 0,
1090 scrollbar_TotalWidth (), szHint.height);
1091 resize_scrollbar ();
1092 }
1093 1003
1094 XMoveResizeWindow (xdisp, vt, 1004 XMoveResizeWindow (dpy, vt,
1095 window_vt_x, window_vt_y, 1005 window_vt_x, window_vt_y,
1096 width, height); 1006 width, height);
1097 1007
1098 scr_clear (); 1008#ifdef HAVE_BG_PIXMAP
1099#ifdef XPM_BACKGROUND 1009 if (bgPixmap.window_size_sensitive ())
1100 resize_pixmap (); 1010 update_background ();
1101#endif 1011#endif
1102 } 1012 }
1103 1013
1104 if (fix_screen || old_height == 0) 1014 if (fix_screen || old_height == 0)
1105 scr_reset (); 1015 scr_reset ();
1106 1016
1107#ifdef XPM_BACKGROUND 1017#ifdef HAVE_BG_PIXMAP
1108 if (pixmap) 1018// TODO: this don't seem to have any effect - do we still need it ? If so - in which case exactly ?
1019// if (bgPixmap.pixmap)
1109 scr_touch (false); 1020// scr_touch (false);
1110#endif 1021#endif
1111 1022
1112#ifdef USE_XIM 1023#ifdef USE_XIM
1113 IMSetStatusPosition (); 1024 IMSetPosition ();
1114#endif 1025#endif
1115} 1026}
1116 1027
1117/* 1028/*
1118 * Set the width/height of the vt window in characters. Units are pixels. 1029 * Set the width/height of the vt window in characters. Units are pixels.
… …
1123{ 1034{
1124 XWindowAttributes wattr; 1035 XWindowAttributes wattr;
1125 1036
1126 if (newwidth == 0 || newheight == 0) 1037 if (newwidth == 0 || newheight == 0)
1127 { 1038 {
1128 XGetWindowAttributes (xdisp, display->root, &wattr); 1039 XGetWindowAttributes (dpy, display->root, &wattr);
1129 1040
1130 if (newwidth == 0) 1041 if (newwidth == 0)
1131 newwidth = wattr.width - szHint.base_width; 1042 newwidth = wattr.width - szHint.base_width;
1132 if (newheight == 0) 1043 if (newheight == 0)
1133 newheight = wattr.height - szHint.base_height; 1044 newheight = wattr.height - szHint.base_height;
… …
1147#ifdef USE_XIM 1058#ifdef USE_XIM
1148 1059
1149void 1060void
1150rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg) 1061rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg)
1151{ 1062{
1152 fg = pix_colors[Color_fg]; 1063 fg = pix_colors [Color_fg];
1153 bg = pix_colors[Color_bg]; 1064 bg = pix_colors [Color_bg];
1154} 1065}
1155 1066
1156void 1067void
1157rxvt_term::im_set_size (XRectangle &size) 1068rxvt_term::im_set_size (XRectangle &size)
1158{ 1069{
… …
1181 1092
1182/* Checking whether input method is running. */ 1093/* Checking whether input method is running. */
1183bool 1094bool
1184rxvt_term::IMisRunning () 1095rxvt_term::IMisRunning ()
1185{ 1096{
1186 char *p;
1187 Atom atom; 1097 Atom atom;
1188 Window win; 1098 Window win;
1189 char server[IMBUFSIZ]; 1099 char server[IMBUFSIZ];
1190 1100
1191 /* get current locale modifier */ 1101 /* get current locale modifier */
1192 if ((p = XSetLocaleModifiers (NULL)) != NULL) 1102 if (char *p = XSetLocaleModifiers (0))
1193 { 1103 {
1194 strcpy (server, "@server="); 1104 strcpy (server, "@server=");
1195 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */ 1105 strncat (server, p + 4, IMBUFSIZ - 9); /* skip "@im=" */
1196 1106
1197 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */ 1107 if (p = strchr (server + 1, '@')) /* first one only */
1198 *p = '\0'; 1108 *p = '\0';
1199 1109
1200 atom = XInternAtom (xdisp, server, False); 1110 atom = XInternAtom (dpy, server, False);
1201 win = XGetSelectionOwner (xdisp, atom); 1111 win = XGetSelectionOwner (dpy, atom);
1202 1112
1203 if (win != None) 1113 if (win != None)
1204 return True; 1114 return True;
1205 } 1115 }
1206 1116
… …
1269 1179
1270 term->make_current (); 1180 term->make_current ();
1271 1181
1272 if (text) 1182 if (text)
1273 { 1183 {
1274 void *str; 1184 wchar_t *str;
1275 1185
1276 if (!text->encoding_is_wchar && text->string.multi_byte) 1186 if (!text->encoding_is_wchar && text->string.multi_byte)
1277 { 1187 {
1278 // of course, X makes it ugly again 1188 // of course, X makes it ugly again
1279 if (term->rs[Rs_imLocale]) 1189 if (term->rs[Rs_imLocale])
1280 SET_LOCALE (term->rs[Rs_imLocale]); 1190 SET_LOCALE (term->rs[Rs_imLocale]);
1281 1191
1282 str = rxvt_temp_buf ((text->length + 1) * sizeof (wchar_t)); 1192 str = rxvt_temp_buf<wchar_t> (text->length + 1);
1283 mbstowcs ((wchar_t *)str, text->string.multi_byte, text->length + 1); 1193 mbstowcs (str, text->string.multi_byte, text->length + 1);
1284 1194
1285 if (term->rs[Rs_imLocale]) 1195 if (term->rs[Rs_imLocale])
1286 SET_LOCALE (term->locale); 1196 SET_LOCALE (term->locale);
1287 } 1197 }
1288 else 1198 else
1289 str = (void *)text->string.wide_char; 1199 str = text->string.wide_char;
1290 1200
1291 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW, 1201 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
1292 DT_INT, call_data->caret, 1202 DT_INT, call_data->caret,
1293 DT_INT, call_data->chg_first, 1203 DT_INT, call_data->chg_first,
1294 DT_INT, call_data->chg_length, 1204 DT_INT, call_data->chg_length,
1295 DT_LCS_LEN, (void *)text->feedback, text->feedback ? (int)text->length : 0, 1205 DT_LCS_LEN, (void *)text->feedback, text->feedback ? (int)text->length : 0,
… …
1430 "*", 1340 "*",
1431 fheight, 1341 fheight,
1432 fheight + 1, fheight - 1, 1342 fheight + 1, fheight - 1,
1433 fheight - 2, fheight + 2); 1343 fheight - 2, fheight + 2);
1434 1344
1435 fs = XCreateFontSet (xdisp, rs[Rs_imFont] ? rs[Rs_imFont] : pat, 1345 fs = XCreateFontSet (dpy, rs[Rs_imFont] ? rs[Rs_imFont] : pat,
1436 &missing_charset_list, &missing_charset_count, &def_string); 1346 &missing_charset_list, &missing_charset_count, &def_string);
1437 1347
1438 if (missing_charset_list) 1348 if (missing_charset_list)
1439 XFreeStringList (missing_charset_list); 1349 XFreeStringList (missing_charset_list);
1440 1350
… …
1515 preedit_attr, 1425 preedit_attr,
1516 status_attr ? XNStatusAttributes : NULL, 1426 status_attr ? XNStatusAttributes : NULL,
1517 status_attr, NULL); 1427 status_attr, NULL);
1518 1428
1519 if (preedit_attr) XFree (preedit_attr); 1429 if (preedit_attr) XFree (preedit_attr);
1520 if (status_attr) XFree (status_attr); 1430 if (status_attr) XFree (status_attr);
1521 if (fs) XFreeFontSet (xdisp, fs); 1431 if (fs) XFreeFontSet (dpy, fs);
1522 1432
1523 if (Input_Context == NULL) 1433 if (Input_Context == NULL)
1524 { 1434 {
1525 rxvt_warn ("failed to create input context, continuing without XIM.\n"); 1435 rxvt_warn ("failed to create input context, continuing without XIM.\n");
1526 im_destroy (); 1436 im_destroy ();
… …
1531 // unfortunately, only the focus window is used by XIM, hard to fix 1441 // unfortunately, only the focus window is used by XIM, hard to fix
1532 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL)) 1442 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL))
1533 vt_select_input (); 1443 vt_select_input ();
1534#endif 1444#endif
1535 1445
1536 if (input_style & XIMPreeditArea)
1537 IMSetStatusPosition (); 1446 IMSetPosition ();
1538 1447
1539 return true; 1448 return true;
1540} 1449}
1541 1450
1542void 1451void
… …
1600 SET_LOCALE (locale); 1509 SET_LOCALE (locale);
1601#endif 1510#endif
1602} 1511}
1603 1512
1604void 1513void
1605rxvt_term::IMSetStatusPosition () 1514rxvt_term::IMSetPosition ()
1606{ 1515{
1607 XRectangle preedit_rect, status_rect, *needed_rect; 1516 XRectangle preedit_rect, status_rect, *needed_rect;
1608 XVaNestedList preedit_attr, status_attr; 1517 XVaNestedList preedit_attr, status_attr;
1609 1518
1610 if (!Input_Context 1519 if (!Input_Context
1611 || !focus 1520 || !focus
1612 || !(input_style & XIMPreeditArea) 1521 || !(input_style & (XIMPreeditArea | XIMPreeditPosition))
1613 || !IMisRunning ()) 1522 || !IMisRunning ())
1614 return; 1523 return;
1615 1524
1525 if (input_style & XIMPreeditPosition)
1526 {
1527 im_set_size (preedit_rect);
1528 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);
1529
1530 XSetICValues (Input_Context,
1531 XNPreeditAttributes, preedit_attr, NULL);
1532 }
1533 else
1534 {
1616 /* Getting the necessary width of preedit area */ 1535 /* Getting the necessary width of preedit area */
1617 status_attr = XVaCreateNestedList (0, XNAreaNeeded, &needed_rect, NULL); 1536 status_attr = XVaCreateNestedList (0, XNAreaNeeded, &needed_rect, NULL);
1618 XGetICValues (Input_Context, XNStatusAttributes, status_attr, NULL); 1537 XGetICValues (Input_Context, XNStatusAttributes, status_attr, NULL);
1619 XFree (status_attr); 1538 XFree (status_attr);
1620 1539
1621 im_set_preedit_area (preedit_rect, status_rect, *needed_rect); 1540 im_set_preedit_area (preedit_rect, status_rect, *needed_rect);
1622 XFree (needed_rect); 1541 XFree (needed_rect);
1623 1542
1624 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL); 1543 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);
1625 status_attr = XVaCreateNestedList (0, XNArea, &status_rect, NULL); 1544 status_attr = XVaCreateNestedList (0, XNArea, &status_rect, NULL);
1626 1545
1627 XSetICValues (Input_Context, 1546 XSetICValues (Input_Context,
1628 XNPreeditAttributes, preedit_attr, 1547 XNPreeditAttributes, preedit_attr,
1629 XNStatusAttributes, status_attr, NULL); 1548 XNStatusAttributes, status_attr,
1549 NULL);
1630 1550
1551 XFree (status_attr);
1552 }
1553
1631 XFree (preedit_attr); 1554 XFree (preedit_attr);
1632 XFree (status_attr);
1633} 1555}
1634#endif /* USE_XIM */ 1556#endif /* USE_XIM */
1557
1558void
1559rxvt_term::get_window_origin (int &x, int &y)
1560{
1561 Window cr;
1562 XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr);
1563/* fprintf (stderr, "origin is %+d%+d\n", x, y);*/
1564}
1565
1566Pixmap
1567rxvt_term::get_pixmap_property (int prop_id)
1568{
1569 if (prop_id > 0 && prop_id < NUM_XA)
1570 if (xa[prop_id])
1571 {
1572 int aformat;
1573 unsigned long nitems, bytes_after;
1574 Atom atype;
1575 unsigned char *prop = NULL;
1576 int result = XGetWindowProperty (dpy, display->root, xa[prop_id],
1577 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1578 &nitems, &bytes_after, &prop);
1579 if (result == Success && prop && atype == XA_PIXMAP)
1580 return *(Pixmap *)prop;
1581 }
1582
1583 return None;
1584}
1585
1586#ifdef HAVE_BG_PIXMAP
1587# if TRACE_PIXMAPS
1588# undef update_background
1589void
1590rxvt_term::trace_update_background (const char *file, int line)
1591{
1592 fprintf (stderr, "%s:%d:update_background()\n", file, line);
1593 update_background ();
1594}
1595# endif
1596
1597void
1598rxvt_term::update_background ()
1599{
1600 if (update_background_ev.is_active ())
1601 return;
1602
1603 bgPixmap.invalidate ();
1604
1605 ev_tstamp to_wait = 0.5 - (ev::now () - bgPixmap.valid_since);
1606
1607 if (to_wait <= 0.)
1608 bgPixmap.render ();
1609 else
1610 update_background_ev.start (to_wait);
1611}
1612
1613void
1614rxvt_term::update_background_cb (ev::timer &w, int revents)
1615{
1616 make_current ();
1617
1618 update_background_ev.stop ();
1619 bgPixmap.render ();
1620 refresh_check ();
1621}
1622
1623#endif /* HAVE_BG_PIXMAP */
1635 1624
1636/*----------------------- end-of-file (C source) -----------------------*/ 1625/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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