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.199 by root, Tue Jan 24 19:40:12 2006 UTC vs.
Revision 1.327 by root, Sun May 23 00:25:48 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 dDisp;
222
223 selection_clear (); 242 selection_clear ();
243 selection_clear (true);
224 244
225#ifdef USE_XIM 245#ifdef USE_XIM
226 im_destroy (); 246 im_destroy ();
227#endif 247#endif
228#ifdef XTERM_SCROLLBAR 248 scrollBar.destroy ();
229 if (xscrollbarGC) XFreeGC (disp, xscrollbarGC);
230 if (ShadowGC) XFreeGC (disp, ShadowGC);
231#endif
232#ifdef PLAIN_SCROLLBAR
233 if (pscrollbarGC) XFreeGC (disp, pscrollbarGC);
234#endif
235#ifdef NEXT_SCROLLBAR
236 if (blackGC) XFreeGC (disp, blackGC);
237 if (whiteGC) XFreeGC (disp, whiteGC);
238 if (grayGC) XFreeGC (disp, grayGC);
239 if (darkGC) XFreeGC (disp, darkGC);
240 if (stippleGC) XFreeGC (disp, stippleGC);
241 if (dimple) XFreePixmap (disp, dimple);
242 if (upArrow) XFreePixmap (disp, upArrow);
243 if (downArrow) XFreePixmap (disp, downArrow);
244 if (upArrowHi) XFreePixmap (disp, upArrowHi);
245 if (downArrowHi) XFreePixmap (disp, downArrowHi);
246#endif
247#ifdef RXVT_SCROLLBAR
248 if (topShadowGC) XFreeGC (disp, topShadowGC);
249 if (botShadowGC) XFreeGC (disp, botShadowGC);
250 if (scrollbarGC) XFreeGC (disp, scrollbarGC);
251#endif
252 if (gc) XFreeGC (disp, gc); 249 if (gc) XFreeGC (dpy, gc);
253 250
254 delete drawable; 251 delete drawable;
255 // destroy all windows 252 // destroy all windows
256 if (parent[0]) 253 if (parent[0])
257 XDestroyWindow (disp, parent[0]); 254 XDestroyWindow (dpy, parent[0]);
258 }
259 255
260 // TODO: free pixcolours, colours should become part of rxvt_display 256 for (int i = 0; i < TOTAL_COLORS; i++)
261 delete pix_colors_focused; 257 if (ISSET_PIXCOLOR (i))
258 {
259 pix_colors_focused [i].free (this);
262#if OFF_FOCUS_FADING 260#if OFF_FOCUS_FADING
263 delete pix_colors_unfocused; 261 pix_colors_unfocused [i].free (this);
264#endif 262#endif
263 }
265 264
265 clear ();
266
267 display->flush (); /* ideally .put should do this */
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_windowid);
277 free (env_display); 280 free (env_display);
278 free (env_term); 281 free (env_term);
279 free (env_colorfgbg);
280 free (locale); 282 free (locale);
281 free (v_buffer); 283 free (v_buffer);
282 free (incr_buf); 284 free (incr_buf);
283 285
284 delete envv; 286 delete envv;
285 delete argv; 287 delete argv;
286 288
287#ifdef KEYSYM_RESOURCE 289#ifdef KEYSYM_RESOURCE
288 delete keyboard; 290 delete keyboard;
289#endif 291#endif
292#ifndef NO_RESOURCES
293 XrmDestroyDatabase (option_db);
294#endif
290} 295}
291 296
292// child has exited, usually destroys 297// child has exited, usually destroys
293void 298void
294rxvt_term::child_cb (child_watcher &w, int status) 299rxvt_term::child_cb (ev::child &w, int status)
295{ 300{
296 HOOK_INVOKE ((this, HOOK_CHILD_EXIT, DT_INT, status, DT_END)); 301 HOOK_INVOKE ((this, HOOK_CHILD_EXIT, DT_INT, status, DT_END));
297 302
298 cmd_pid = 0; 303 cmd_pid = 0;
299 304
300 if (!OPTION (Opt_hold)) 305 if (!option (Opt_hold))
301 destroy (); 306 destroy ();
302} 307}
303 308
304void 309void
305rxvt_term::destroy () 310rxvt_term::destroy ()
306{ 311{
307 if (destroy_ev.active) 312 if (destroy_ev.is_active ())
308 return; 313 return;
309 314
310 if (HOOK_INVOKE ((this, HOOK_DESTROY, DT_END))) 315 HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));
311 return;
312 316
313#if ENABLE_OVERLAY 317#if ENABLE_OVERLAY
314 scr_overlay_off (); 318 scr_overlay_off ();
315#endif 319#endif
316 320
317 if (display) 321 if (display)
318 { 322 {
319#if USE_XIM 323#if USE_XIM
320 im_ev.stop (display); 324 im_ev.stop (display);
321#endif 325#endif
322#if HAVE_SCROLLBARS
323 scrollbar_ev.stop (display); 326 scrollbar_ev.stop (display);
324#endif 327#if ENABLE_TRANSPARENCY || ENABLE_PERL
325#if TRANSPARENT
326 rootwin_ev.stop (display); 328 rootwin_ev.stop (display);
327#endif 329#endif
328 incr_ev.stop (); 330 incr_ev.stop ();
329 termwin_ev.stop (display); 331 termwin_ev.stop (display);
330 vt_ev.stop (display); 332 vt_ev.stop (display);
331 } 333 }
332 334
333 check_ev.stop (); 335 flush_ev.stop ();
334 pty_ev.stop (); 336 pty_ev.stop ();
335#ifdef CURSOR_BLINK 337#ifdef CURSOR_BLINK
336 cursor_blink_ev.stop (); 338 cursor_blink_ev.stop ();
337#endif 339#endif
338#ifdef TEXT_BLINK 340#ifdef TEXT_BLINK
… …
346#endif 348#endif
347#ifdef POINTER_BLANK 349#ifdef POINTER_BLANK
348 pointer_ev.stop (); 350 pointer_ev.stop ();
349#endif 351#endif
350 352
351 destroy_ev.start (0); 353 destroy_ev.start ();
352} 354}
353 355
354void 356void
355rxvt_term::destroy_cb (time_watcher &w) 357rxvt_term::destroy_cb (ev::idle &w, int revents)
356{ 358{
357 make_current (); 359 make_current ();
358 360
359 delete this; 361 delete this;
360} 362}
… …
371{ 373{
372 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++) 374 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)
373 (*t)->emergency_cleanup (); 375 (*t)->emergency_cleanup ();
374} 376}
375 377
376#if ENABLE_FRILLS 378#if !ENABLE_MINIMAL
377static void 379static void
378print_x_error (Display *dpy, XErrorEvent *event) 380print_x_error (Display *dpy, XErrorEvent *event)
379{ 381{
380 char buffer[BUFSIZ]; 382 char buffer[BUFSIZ];
381 char mesg[BUFSIZ]; 383 char mesg[BUFSIZ];
… …
389 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->request_code); 391 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->request_code);
390 sprintf(number, "%d", event->request_code); 392 sprintf(number, "%d", event->request_code);
391 XGetErrorDatabaseText(dpy, "XRequest", number, "", buffer, BUFSIZ); 393 XGetErrorDatabaseText(dpy, "XRequest", number, "", buffer, BUFSIZ);
392 rxvt_warn ("(which is %s)\n", buffer); 394 rxvt_warn ("(which is %s)\n", buffer);
393 if (event->request_code >= 128) { 395 if (event->request_code >= 128) {
394 XGetErrorDatabaseText(dpy, mtype, "MinorCode", "Request Minor code %d", 396 XGetErrorDatabaseText(dpy, mtype, "MinorCode", "Request Minor code %d",
395 mesg, BUFSIZ); 397 mesg, BUFSIZ);
396 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->minor_code); 398 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->minor_code);
397 } 399 }
398 if ((event->error_code == BadWindow) || 400 if ((event->error_code == BadWindow) ||
399 (event->error_code == BadPixmap) || 401 (event->error_code == BadPixmap) ||
400 (event->error_code == BadCursor) || 402 (event->error_code == BadCursor) ||
401 (event->error_code == BadFont) || 403 (event->error_code == BadFont) ||
402 (event->error_code == BadDrawable) || 404 (event->error_code == BadDrawable) ||
403 (event->error_code == BadColor) || 405 (event->error_code == BadColor) ||
404 (event->error_code == BadGC) || 406 (event->error_code == BadGC) ||
405 (event->error_code == BadIDChoice) || 407 (event->error_code == BadIDChoice) ||
406 (event->error_code == BadValue) || 408 (event->error_code == BadValue) ||
407 (event->error_code == BadAtom)) { 409 (event->error_code == BadAtom)) {
408 if (event->error_code == BadValue) 410 if (event->error_code == BadValue)
409 XGetErrorDatabaseText(dpy, mtype, "Value", "Value 0x%x", 411 XGetErrorDatabaseText(dpy, mtype, "Value", "Value 0x%x",
410 mesg, BUFSIZ); 412 mesg, BUFSIZ);
411 else if (event->error_code == BadAtom) 413 else if (event->error_code == BadAtom)
412 XGetErrorDatabaseText(dpy, mtype, "AtomID", "AtomID 0x%x", 414 XGetErrorDatabaseText(dpy, mtype, "AtomID", "AtomID 0x%x",
413 mesg, BUFSIZ); 415 mesg, BUFSIZ);
414 else 416 else
415 XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x", 417 XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x",
416 mesg, BUFSIZ); 418 mesg, BUFSIZ);
417 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid); 419 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid);
418 } 420 }
419 XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d", 421 XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d",
420 mesg, BUFSIZ); 422 mesg, BUFSIZ);
421 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial); 423 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial);
422} 424}
423#endif 425#endif
424 426
425int 427int
… …
429 GET_R->allowedxerror = event->error_code; 431 GET_R->allowedxerror = event->error_code;
430 else 432 else
431 { 433 {
432 // GET_R is most likely not the terminal which caused the error, 434 // GET_R is most likely not the terminal which caused the error,
433 // so just output the error and continue 435 // so just output the error and continue
434#if ENABLE_FRILLS 436#if ENABLE_MINIMAL
437 old_xerror_handler (display, event);
438#else
435 print_x_error (display, event); 439 print_x_error (display, event);
436#else
437 old_xerror_handler (display, event);
438#endif 440#endif
439 } 441 }
440 442
441 return 0; 443 return 0;
442} 444}
… …
448 DisplayString (display)); 450 DisplayString (display));
449 rxvt_emergency_cleanup (); 451 rxvt_emergency_cleanup ();
450 _exit (EXIT_FAILURE); 452 _exit (EXIT_FAILURE);
451} 453}
452 454
453/*----------------------------------------------------------------------*/
454bool
455rxvt_term::init (int argc, const char *const *argv, stringvec *envv)
456{
457 this->envv = envv;
458
459 SET_R (this);
460 set_locale ("");
461 set_environ (envv); // few things in X do not call setlocale :(
462
463 if (!init_vars ())
464 return false;
465
466 init_secondary ();
467
468 const char **cmd_argv = init_resources (argc, argv);
469
470#ifdef KEYSYM_RESOURCE
471 keyboard->register_done ();
472#endif
473
474#ifdef HAVE_SCROLLBARS
475 if (OPTION (Opt_scrollBar))
476 scrollBar.setIdle (); /* set existence for size calculations */
477#endif
478
479 pty = ptytty::create ();
480
481 create_windows (argc, argv);
482
483 dDisp;
484
485 init_xlocale ();
486
487 scr_reset (); // initialize screen
488
489#if 0
490 XSynchronize (disp, True);
491#endif
492
493#ifdef HAVE_SCROLLBARS
494 if (OPTION (Opt_scrollBar))
495 resize_scrollbar (); /* create and map scrollbar */
496#endif
497#ifdef TRANSPARENT
498 if (OPTION (Opt_transparent))
499 {
500 XSelectInput (disp, display->root, PropertyChangeMask);
501 check_our_parents ();
502 rootwin_ev.start (display, display->root);
503 }
504#endif
505
506 set_colorfgbg ();
507
508 init_command (cmd_argv);
509
510 free (cmd_argv);
511
512 if (pty->pty >= 0)
513 pty_ev.start (pty->pty, EVENT_READ);
514
515 check_ev.start ();
516
517 HOOK_INVOKE ((this, HOOK_START, DT_END));
518
519 XMapWindow (disp, vt);
520 XMapWindow (disp, parent[0]);
521
522 return true;
523}
524
525static struct sig_handlers 455static struct sig_handlers
526{ 456{
527 sig_watcher sw_term, sw_int; 457 ev::sig sw_term, sw_int;
528 458
529 /* 459 /*
530 * Catch a fatal signal and tidy up before quitting 460 * Catch a fatal signal and tidy up before quitting
531 */ 461 */
532 void 462 void sig_term (ev::sig &w, int revents);
533 sig_term (sig_watcher &w) 463
464 sig_handlers ()
534 { 465 {
535 rxvt_emergency_cleanup (); 466 sw_term.set<sig_handlers, &sig_handlers::sig_term> (this);
536 signal (w.signum, SIG_DFL);
537 kill (getpid (), w.signum);
538 }
539
540 sig_handlers ()
541 : sw_term (this, &sig_handlers::sig_term),
542 sw_int (this, &sig_handlers::sig_term) 467 sw_int .set<sig_handlers, &sig_handlers::sig_term> (this);
543 {
544 } 468 }
545} sig_handlers; 469} sig_handlers;
546 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
547char **rxvt_environ; // startup environment 479char **rxvt_environ; // startup environment
548 480
549void 481void
550rxvt_init () 482rxvt_init ()
551{ 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
552 ptytty::init (); 487 ptytty::init ();
488
489 if (!ev_default_loop (0))
490 rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n");
553 491
554 rxvt_environ = environ; 492 rxvt_environ = environ;
555 493
556 signal (SIGHUP, SIG_IGN); 494 signal (SIGHUP, SIG_IGN);
557 signal (SIGPIPE, SIG_IGN); 495 signal (SIGPIPE, SIG_IGN);
558 496
559 sig_handlers.sw_term.start (SIGTERM); 497 sig_handlers.sw_term.start (SIGTERM); ev_unref ();
560 sig_handlers.sw_int.start (SIGINT); 498 sig_handlers.sw_int.start (SIGINT); ev_unref ();
561 499
562 /* need to trap SIGURG for SVR4 (Unixware) rlogin */ 500 /* need to trap SIGURG for SVR4 (Unixware) rlogin */
563 /* signal (SIGURG, SIG_DFL); */ 501 /* signal (SIGURG, SIG_DFL); */
564 502
565 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); 503 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
… …
567 XSetIOErrorHandler (rxvt_xioerror_handler); 505 XSetIOErrorHandler (rxvt_xioerror_handler);
568 506
569 XrmInitialize (); 507 XrmInitialize ();
570} 508}
571 509
572/* ------------------------------------------------------------------------- *
573 * MEMORY ALLOCATION WRAPPERS *
574 * ------------------------------------------------------------------------- */
575void *
576rxvt_malloc (size_t size)
577{
578 void *p = malloc (size);
579
580 if (!p)
581 rxvt_fatal ("memory allocation failure. aborting.\n");
582
583 return p;
584}
585
586void *
587rxvt_calloc (size_t number, size_t size)
588{
589 void *p = calloc (number, size);
590
591 if (!p)
592 rxvt_fatal ("memory allocation failure. aborting.\n");
593
594 return p;
595}
596
597void *
598rxvt_realloc (void *ptr, size_t size)
599{
600 void *p = realloc (ptr, size);
601
602 if (!p)
603 rxvt_fatal ("memory allocation failure. aborting.\n");
604
605 return p;
606}
607
608/*----------------------------------------------------------------------*/ 510/*----------------------------------------------------------------------*/
609/* 511/*
610 * window size/position calculcations for XSizeHint and other storage. 512 * window size/position calculations for XSizeHint and other storage.
611 * if width/height are non-zero then override calculated width/height 513 * if width/height are non-zero then override calculated width/height
612 */ 514 */
613void 515void
614rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight) 516rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
615{ 517{
616 short recalc_x, recalc_y; 518 short recalc_x, recalc_y;
617 int x, y, sb_w, flags; 519 int x, y, flags;
618 unsigned int w, h; 520 unsigned int w, h;
619 unsigned int max_width, max_height; 521 unsigned int max_width, max_height;
620 dDisp;
621 522
622 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity; 523 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity;
623 szHint.win_gravity = NorthWestGravity; 524 szHint.win_gravity = NorthWestGravity;
624 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */ 525 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */
625 526
… …
633 if (rs[Rs_geometry]) 534 if (rs[Rs_geometry])
634 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h); 535 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h);
635 536
636 if (flags & WidthValue) 537 if (flags & WidthValue)
637 { 538 {
539 if (!w)
540 rxvt_fatal ("illegal window geometry (width and height must be non-zero), aborting.\n");
541
638 ncol = clamp (w, 0, std::numeric_limits<int16_t>::max ()); 542 ncol = clamp (w, 1, std::numeric_limits<int16_t>::max ());
639 szHint.flags |= USSize; 543 szHint.flags |= USSize;
640 } 544 }
641 545
642 if (flags & HeightValue) 546 if (flags & HeightValue)
643 { 547 {
548 if (!h)
549 rxvt_fatal ("illegal window geometry (width and height must be non-zero), aborting.\n");
550
644 nrow = clamp (h, 0, std::numeric_limits<int16_t>::max ()); 551 nrow = clamp (h, 1, std::numeric_limits<int16_t>::max ());
645 szHint.flags |= USSize; 552 szHint.flags |= USSize;
646 } 553 }
647 554
648 if (flags & XValue) 555 if (flags & XValue)
649 { 556 {
… …
680 max_width = MAX_COLS * fwidth; 587 max_width = MAX_COLS * fwidth;
681 max_height = MAX_ROWS * fheight; 588 max_height = MAX_ROWS * fheight;
682 589
683 szHint.base_width = szHint.base_height = 2 * int_bwidth; 590 szHint.base_width = szHint.base_height = 2 * int_bwidth;
684 591
685 sb_w = 0;
686 window_vt_x = window_vt_y = int_bwidth; 592 window_vt_x = window_vt_y = int_bwidth;
687 593
688 if (scrollBar.state) 594 if (scrollBar.state)
689 { 595 {
690 sb_w = scrollbar_TotalWidth (); 596 int sb_w = scrollBar.total_width ();
691 szHint.base_width += sb_w; 597 szHint.base_width += sb_w;
598
692 if (!OPTION (Opt_scrollBar_right)) 599 if (!option (Opt_scrollBar_right))
693 window_vt_x += sb_w; 600 window_vt_x += sb_w;
694 } 601 }
695 602
696 szHint.width_inc = fwidth; 603 szHint.width_inc = fwidth;
697 szHint.height_inc = fheight; 604 szHint.height_inc = fheight;
698 szHint.min_width = szHint.base_width + szHint.width_inc; 605 szHint.min_width = szHint.base_width + szHint.width_inc;
699 szHint.min_height = szHint.base_height + szHint.height_inc; 606 szHint.min_height = szHint.base_height + szHint.height_inc;
700 607
701 if (newwidth && newwidth - szHint.base_width < max_width) 608 if (newwidth && newwidth - szHint.base_width < max_width)
702 { 609 {
703 szHint.width = newwidth; 610 szHint.width = newwidth;
… …
718 { 625 {
719 min_it (height, max_height); 626 min_it (height, max_height);
720 szHint.height = szHint.base_height + height; 627 szHint.height = szHint.base_height + height;
721 } 628 }
722 629
723 if (scrollBar.state && OPTION (Opt_scrollBar_right))
724 window_sb_x = szHint.width - sb_w;
725
726 if (recalc_x) 630 if (recalc_x)
727 szHint.x += DisplayWidth (disp, display->screen) - szHint.width - 2 * ext_bwidth; 631 szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth;
632
728 if (recalc_y) 633 if (recalc_y)
729 szHint.y += DisplayHeight (disp, display->screen) - szHint.height - 2 * ext_bwidth; 634 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth;
730 635
731 ncol = width / fwidth; 636 ncol = width / fwidth;
732 nrow = height / fheight; 637 nrow = height / fheight;
733} 638}
734 639
735/*----------------------------------------------------------------------*/ 640/*----------------------------------------------------------------------*/
736/* 641/*
… …
747 652
748 ws.ws_col = ncol; 653 ws.ws_col = ncol;
749 ws.ws_row = nrow; 654 ws.ws_row = nrow;
750 ws.ws_xpixel = width; 655 ws.ws_xpixel = width;
751 ws.ws_ypixel = height; 656 ws.ws_ypixel = height;
752 (void)ioctl (pty->pty, TIOCSWINSZ, &ws); 657 ioctl (pty->pty, TIOCSWINSZ, &ws);
753 658
754#if 0 659#if 0
755 // TIOCSWINSZ⎈ is supposed to do this automatically and correctly 660 // TIOCSWINSZ is supposed to do this automatically and correctly
756 if (cmd_pid) /* force through to the command */ 661 if (cmd_pid) /* force through to the command */
757 kill (-cmd_pid, SIGWINCH); 662 kill (-cmd_pid, SIGWINCH);
758#endif 663#endif
759} 664}
760 665
… …
787#endif 692#endif
788 693
789 delete fontset[0]; 694 delete fontset[0];
790 fontset[0] = fs; 695 fontset[0] = fs;
791 696
792 prop = (*fs)[1]->properties (); 697 prop = (*fs)[rxvt_fontset::firstFont]->properties ();
793 prop.height += lineSpace; 698 prop.height += lineSpace;
699 prop.width += letterSpace;
700
794 fs->set_prop (prop); 701 fs->set_prop (prop, false);
795 702
796 fwidth = prop.width; 703 fwidth = prop.width;
797 fheight = prop.height; 704 fheight = prop.height;
798 fbase = prop.ascent; 705 fbase = prop.ascent;
799 706
… …
808 { 715 {
809 fontset[style] = fs = new rxvt_fontset (this); 716 fontset[style] = fs = new rxvt_fontset (this);
810 rxvt_fontprop prop2 = prop; 717 rxvt_fontprop prop2 = prop;
811 718
812 if (res) 719 if (res)
813 prop2.weight = prop2.slant = rxvt_fontprop::unset; 720 {
721 fs->populate (res);
722 fs->set_prop (prop2, false);
723 }
814 else 724 else
815 { 725 {
816 res = fontset[0]->fontdesc; 726 fs->populate (fontset[0]->fontdesc);
817 727
818 if (SET_STYLE (0, style) & RS_Bold) prop2.weight = rxvt_fontprop::bold; 728 if (SET_STYLE (0, style) & RS_Bold) prop2.weight = rxvt_fontprop::bold;
819 if (SET_STYLE (0, style) & RS_Italic) prop2.slant = rxvt_fontprop::italic; 729 if (SET_STYLE (0, style) & RS_Italic) prop2.slant = rxvt_fontprop::italic;
730
731 fs->set_prop (prop2, true);
820 } 732 }
821 733
822 fs->populate (res);
823 fs->set_prop (prop2);
824 } 734 }
825#else 735#else
826 fontset[style] = fontset[0]; 736 fontset[style] = fontset[0];
827#endif 737#endif
828 } 738 }
… …
830 if (parent[0]) 740 if (parent[0])
831 { 741 {
832 resize_all_windows (0, 0, 0); 742 resize_all_windows (0, 0, 0);
833 scr_remap_chars (); 743 scr_remap_chars ();
834 scr_touch (true); 744 scr_touch (true);
835 } 745 }
836 746
837 return true; 747 return true;
838} 748}
839 749
750void
840void rxvt_term::set_string_property (Atom prop, const char *str, int len) 751rxvt_term::set_string_property (Atom prop, const char *str, int len)
841{ 752{
842 XChangeProperty (display->display, parent[0], 753 XChangeProperty (dpy, parent[0],
843 prop, XA_STRING, 8, PropModeReplace, 754 prop, XA_STRING, 8, PropModeReplace,
844 (const unsigned char *)str, len >= 0 ? len : strlen (str)); 755 (const unsigned char *)str, len >= 0 ? len : strlen (str));
845} 756}
846 757
758void
847void rxvt_term::set_utf8_property (Atom prop, const char *str, int len) 759rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
848{ 760{
849 wchar_t *ws = rxvt_mbstowcs (str, len); 761 wchar_t *ws = rxvt_mbstowcs (str, len);
850 char *s = rxvt_wcstoutf8 (ws); 762 char *s = rxvt_wcstoutf8 (ws);
851 763
852 XChangeProperty (display->display, parent[0], 764 XChangeProperty (dpy, parent[0],
853 prop, xa[XA_UTF8_STRING], 8, PropModeReplace, 765 prop, xa[XA_UTF8_STRING], 8, PropModeReplace,
854 (const unsigned char *)s, strlen (s)); 766 (const unsigned char *)s, strlen (s));
855 767
856 free (s); 768 free (s);
857 free (ws); 769 free (ws);
… …
876#if ENABLE_EWMH 788#if ENABLE_EWMH
877 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str); 789 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str);
878#endif 790#endif
879} 791}
880 792
793void
794rxvt_term::set_window_color (int idx, const char *color)
795{
881#ifdef XTERM_COLOR_CHANGE 796#ifdef XTERM_COLOR_CHANGE
882void
883rxvt_term::set_window_color (int idx, const char *color)
884{
885 rxvt_color xcol; 797 rxvt_color xcol;
886 int i;
887 798
888 if (color == NULL || *color == '\0') 799 if (color == NULL || *color == '\0')
889 return; 800 return;
890 801
802 color = strdup (color);
803 allocated.push_back ((void *)color);
804 rs[Rs_color + idx] = color;
805
891 /* handle color aliases */ 806 /* handle color aliases */
892 if (isdigit (*color)) 807 if (isdigit (*color))
893 { 808 {
894 i = atoi (color); 809 int i = atoi (color);
895 810
896 if (i >= 8 && i <= 15) 811 if (i >= 8 && i <= 15)
812 {
897 { /* bright colors */ 813 /* bright colors */
898 i -= 8;
899 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i]; 814 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i - 8];
900 SET_PIXCOLOR (idx);
901 goto done; 815 goto done;
902 } 816 }
903 817
904 if (i >= 0 && i <= 7) 818 if (i >= 0 && i <= 7)
819 {
905 { /* normal colors */ 820 /* normal colors */
906 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i]; 821 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];
907 SET_PIXCOLOR (idx);
908 goto done; 822 goto done;
909 } 823 }
910 } 824 }
911 825
912 if (!rXParseAllocColor (&xcol, color)) 826 set_color (xcol, color);
913 return;
914
915 /* XStoreColor (display->display, display->cmap, XColor*); */
916 827
917 /* 828 /*
918 * FIXME: should free colors here, but no idea how to do it so instead, 829 * FIXME: should free colors here, but no idea how to do it so instead,
919 * so just keep gobbling up the colormap 830 * so just keep gobbling up the colormap
920 */ 831 */
921# if 0
922 for (i = Color_Black; i <= Color_White; i++)
923 if (pix_colors[idx] == pix_colors[i])
924 break;
925 if (i > Color_White)
926 {
927 /* fprintf (stderr, "XFreeColors: pix_colors [%d] = %lu\n", idx, pix_colors [idx]); */
928 XFreeColors (display->display, display->cmap, (pix_colors + idx), 1,
929 DisplayPlanes (display->display, display->screen));
930 }
931# endif
932 832
933 pix_colors_focused[idx] = xcol; 833 pix_colors_focused[idx] = xcol;
934 SET_PIXCOLOR (idx);
935 834
936 /* XSetWindowAttributes attr; */
937 /* Cursor cursor; */
938done: 835done:
939
940#if OFF_FOCUS_FADING
941 if (rs[Rs_fade])
942 pix_colors_unfocused[idx] = pix_colors_focused[idx].fade (display, atoi (rs[Rs_fade]), pix_colors[Color_fade]);
943#endif
944
945 /*TODO: handle Color_BD, scrollbar background, etc. */ 836 /*TODO: handle Color_BD, scrollbar background, etc. */
946 837
838 update_fade_color (idx);
947 recolour_cursor (); 839 recolour_cursor ();
948 scr_recolour (); 840 scr_recolour ();
841#endif /* XTERM_COLOR_CHANGE */
949} 842}
950
951#else
952# define set_window_color (idx,color) ((void)0)
953#endif /* XTERM_COLOR_CHANGE */
954 843
955void 844void
956rxvt_term::recolour_cursor () 845rxvt_term::recolour_cursor ()
957{ 846{
958 XColor xcol[2]; 847 XColor fg, bg;
959 848
960 xcol[0].pixel = ISSET_PIXCOLOR (Color_pointer_fg) 849 (ISSET_PIXCOLOR (Color_pointer_fg)
961 ? pix_colors_focused[Color_pointer_fg] 850 ? pix_colors_focused[Color_pointer_fg]
962 : pix_colors_focused[Color_fg]; 851 : pix_colors_focused[Color_fg]).get (fg);
852
963 xcol[1].pixel = ISSET_PIXCOLOR (Color_pointer_bg) 853 (ISSET_PIXCOLOR (Color_pointer_bg)
964 ? pix_colors_focused[Color_pointer_bg] 854 ? pix_colors_focused[Color_pointer_bg]
965 : pix_colors_focused[Color_bg]; 855 : pix_colors_focused[Color_bg]).get (bg);
966 856
967 XQueryColors (display->display, display->cmap, xcol, 2); 857 XRecolorCursor (dpy, TermWin_cursor, &fg, &bg);
968 XRecolorCursor (display->display, TermWin_cursor, xcol + 0, xcol + 1);
969} 858}
970 859
971/*----------------------------------------------------------------------*/ 860/*----------------------------------------------------------------------*/
972/* 861/*
973 * find if fg/bg matches any of the normal (low-intensity) colors 862 * find if fg/bg matches any of the normal (low-intensity) colors
974 */ 863 */
975void 864void
976rxvt_term::set_colorfgbg () 865rxvt_term::set_colorfgbg ()
977{ 866{
978 unsigned int i; 867 unsigned int i;
979 const char *xpmb = "\0"; 868 const char *xpmb = "";
980 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1]; 869 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1];
981 870
982 env_colorfgbg = (char *)rxvt_malloc (sizeof ("COLORFGBG=default;default;bg") + 1);
983 strcpy (fstr, "default"); 871 strcpy (fstr, "default");
984 strcpy (bstr, "default"); 872 strcpy (bstr, "default");
985 for (i = Color_Black; i <= Color_White; i++) 873 for (i = Color_Black; i <= Color_White; i++)
986 if (pix_colors[Color_fg] == pix_colors[i]) 874 if (pix_colors[Color_fg] == pix_colors[i])
987 { 875 {
… …
991 879
992 for (i = Color_Black; i <= Color_White; i++) 880 for (i = Color_Black; i <= Color_White; i++)
993 if (pix_colors[Color_bg] == pix_colors[i]) 881 if (pix_colors[Color_bg] == pix_colors[i])
994 { 882 {
995 sprintf (bstr, "%d", (i - Color_Black)); 883 sprintf (bstr, "%d", (i - Color_Black));
996#ifdef XPM_BACKGROUND 884#ifdef BG_IMAGE_FROM_FILE
997 xpmb = "default;"; 885 xpmb = "default;";
998#endif 886#endif
999 break; 887 break;
1000 } 888 }
1001 889
1002 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr); 890 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr);
1003} 891}
1004 892
1005/*----------------------------------------------------------------------*/ 893/*----------------------------------------------------------------------*/
1006 894
1007int 895bool
1008rxvt_term::rXParseAllocColor (rxvt_color *screen_in_out, const char *colour) 896rxvt_term::set_color (rxvt_color &color, const char *name)
1009{ 897{
1010 if (!screen_in_out->set (display, colour)) 898 if (color.set (this, name))
1011 {
1012 rxvt_warn ("can't get colour '%s', continuing without.\n", colour);
1013 return false;
1014 }
1015
1016 return true; 899 return true;
900
901 rxvt_warn ("can't get colour '%s', continuing without.\n", name);
902 return false;
903}
904
905void
906rxvt_term::alias_color (int dst, int src)
907{
908 pix_colors[dst].set (this, rs[Rs_color + dst] = rs[Rs_color + src]);
1017} 909}
1018 910
1019/* -------------------------------------------------------------------- * 911/* -------------------------------------------------------------------- *
1020 * - WINDOW RESIZING - * 912 * - WINDOW RESIZING - *
1021 * -------------------------------------------------------------------- */ 913 * -------------------------------------------------------------------- */
… …
1023rxvt_term::resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent) 915rxvt_term::resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent)
1024{ 916{
1025 int fix_screen; 917 int fix_screen;
1026 int old_width = szHint.width; 918 int old_width = szHint.width;
1027 int old_height = szHint.height; 919 int old_height = szHint.height;
1028 dDisp;
1029 920
1030 window_calc (newwidth, newheight); 921 window_calc (newwidth, newheight);
922
923 bool set_hint = !HOOK_INVOKE ((this, HOOK_RESIZE_ALL_WINDOWS, DT_INT, newwidth, DT_INT, newheight, DT_END));
924
925 // to avoid races between us and the wm, we clear the incremental size hints around the xresizewindow
926 if (set_hint)
927 {
928 szHint.flags &= ~(PBaseSize | PResizeInc);
1031 XSetWMNormalHints (disp, parent[0], &szHint); 929 XSetWMNormalHints (dpy, parent[0], &szHint);
930 szHint.flags |= PBaseSize | PResizeInc;
931 }
1032 932
1033 if (!ignoreparent) 933 if (!ignoreparent)
1034 { 934 {
1035#ifdef SMART_RESIZE 935#ifdef SMART_RESIZE
1036 /* 936 /*
… …
1040 int x, y, x1, y1; 940 int x, y, x1, y1;
1041 int dx, dy; 941 int dx, dy;
1042 unsigned int unused_w1, unused_h1, unused_b1, unused_d1; 942 unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
1043 Window unused_cr; 943 Window unused_cr;
1044 944
1045 XTranslateCoordinates (disp, parent[0], display->root, 945 XTranslateCoordinates (dpy, parent[0], display->root,
1046 0, 0, &x, &y, &unused_cr); 946 0, 0, &x, &y, &unused_cr);
1047 XGetGeometry (disp, parent[0], &unused_cr, &x1, &y1, 947 XGetGeometry (dpy, parent[0], &unused_cr, &x1, &y1,
1048 &unused_w1, &unused_h1, &unused_b1, &unused_d1); 948 &unused_w1, &unused_h1, &unused_b1, &unused_d1);
1049 /* 949 /*
1050 * if display->root isn't the parent window, a WM will probably have offset 950 * if display->root isn't the parent window, a WM will probably have offset
1051 * our position for handles and decorations. Counter it 951 * our position for handles and decorations. Counter it
1052 */ 952 */
… …
1054 { 954 {
1055 x -= x1; 955 x -= x1;
1056 y -= y1; 956 y -= y1;
1057 } 957 }
1058 958
1059 x1 = (DisplayWidth (disp, display->screen) - old_width ) / 2; 959 x1 = (DisplayWidth (dpy, display->screen) - old_width ) / 2;
1060 y1 = (DisplayHeight (disp, display->screen) - old_height) / 2; 960 y1 = (DisplayHeight (dpy, display->screen) - old_height) / 2;
1061 dx = old_width - szHint.width; 961 dx = old_width - szHint.width;
1062 dy = old_height - szHint.height; 962 dy = old_height - szHint.height;
1063 963
1064 /* Check position of the center of the window */ 964 /* Check position of the center of the window */
1065 if (x < x1) /* left half */ 965 if (x < x1) /* left half */
… …
1069 if (y < y1) /* top half */ 969 if (y < y1) /* top half */
1070 dy = 0; 970 dy = 0;
1071 else if (y == y1) /* exact center */ 971 else if (y == y1) /* exact center */
1072 dy /= 2; 972 dy /= 2;
1073 973
1074 XMoveResizeWindow (disp, parent[0], x + dx, y + dy, 974 XMoveResizeWindow (dpy, parent[0], x + dx, y + dy,
1075 szHint.width, szHint.height); 975 szHint.width, szHint.height);
1076#else 976#else
1077 XResizeWindow (disp, parent[0], szHint.width, szHint.height); 977 XResizeWindow (dpy, parent[0], szHint.width, szHint.height);
1078#endif 978#endif
1079 } 979 }
980
981 if (set_hint)
982 XSetWMNormalHints (dpy, parent[0], &szHint);
1080 983
1081 fix_screen = ncol != prev_ncol || nrow != prev_nrow; 984 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
1082 985
1083 if (fix_screen || newwidth != old_width || newheight != old_height) 986 if (fix_screen || newwidth != old_width || newheight != old_height)
1084 { 987 {
1085 if (scrollBar.state) 988 if (scrollBar.state)
1086 { 989 scrollBar.resize ();
1087 XMoveResizeWindow (disp, scrollBar.win,
1088 window_sb_x, 0,
1089 scrollbar_TotalWidth (), szHint.height);
1090 resize_scrollbar ();
1091 }
1092 990
1093 XMoveResizeWindow (disp, vt, 991 XMoveResizeWindow (dpy, vt,
1094 window_vt_x, window_vt_y, 992 window_vt_x, window_vt_y,
1095 width, height); 993 width, height);
1096 994
1097 scr_clear (); 995#ifdef HAVE_BG_PIXMAP
1098#ifdef XPM_BACKGROUND 996 if (bgPixmap.window_size_sensitive ())
1099 resize_pixmap (); 997 update_background ();
1100#endif 998#endif
1101 } 999 }
1102 1000
1103 if (fix_screen || old_height == 0) 1001 if (fix_screen || old_height == 0)
1104 scr_reset (); 1002 scr_reset ();
1105 1003
1106#ifdef XPM_BACKGROUND 1004#ifdef HAVE_BG_PIXMAP
1107 if (pixmap) 1005// TODO: this don't seem to have any effect - do we still need it ? If so - in which case exactly ?
1006// if (bgPixmap.pixmap)
1108 scr_touch (false); 1007// scr_touch (false);
1109#endif 1008#endif
1110 1009
1111#ifdef USE_XIM 1010#ifdef USE_XIM
1112 IMSetStatusPosition (); 1011 IMSetPosition ();
1113#endif 1012#endif
1114} 1013}
1115 1014
1116/* 1015/*
1117 * Set the width/height of the vt window in characters. Units are pixels. 1016 * Set the width/height of the vt window in characters. Units are pixels.
… …
1122{ 1021{
1123 XWindowAttributes wattr; 1022 XWindowAttributes wattr;
1124 1023
1125 if (newwidth == 0 || newheight == 0) 1024 if (newwidth == 0 || newheight == 0)
1126 { 1025 {
1127 XGetWindowAttributes (display->display, display->root, &wattr); 1026 XGetWindowAttributes (dpy, display->root, &wattr);
1128 1027
1129 if (newwidth == 0) 1028 if (newwidth == 0)
1130 newwidth = wattr.width - szHint.base_width; 1029 newwidth = wattr.width - szHint.base_width;
1131 if (newheight == 0) 1030 if (newheight == 0)
1132 newheight = wattr.height - szHint.base_height; 1031 newheight = wattr.height - szHint.base_height;
… …
1146#ifdef USE_XIM 1045#ifdef USE_XIM
1147 1046
1148void 1047void
1149rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg) 1048rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg)
1150{ 1049{
1151 fg = pix_colors[Color_fg]; 1050 fg = pix_colors [Color_fg];
1152 bg = pix_colors[Color_bg]; 1051 bg = pix_colors [Color_bg];
1153} 1052}
1154 1053
1155void 1054void
1156rxvt_term::im_set_size (XRectangle &size) 1055rxvt_term::im_set_size (XRectangle &size)
1157{ 1056{
… …
1180 1079
1181/* Checking whether input method is running. */ 1080/* Checking whether input method is running. */
1182bool 1081bool
1183rxvt_term::IMisRunning () 1082rxvt_term::IMisRunning ()
1184{ 1083{
1185 char *p;
1186 Atom atom; 1084 Atom atom;
1187 Window win; 1085 Window win;
1188 char server[IMBUFSIZ]; 1086 char server[IMBUFSIZ];
1189 1087
1190 /* get current locale modifier */ 1088 /* get current locale modifier */
1191 if ((p = XSetLocaleModifiers (NULL)) != NULL) 1089 if (char *p = XSetLocaleModifiers (0))
1192 { 1090 {
1193 strcpy (server, "@server="); 1091 strcpy (server, "@server=");
1194 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */ 1092 strncat (server, p + 4, IMBUFSIZ - 9); /* skip "@im=" */
1195 1093
1196 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */ 1094 if (p = strchr (server + 1, '@')) /* first one only */
1197 *p = '\0'; 1095 *p = '\0';
1198 1096
1199 atom = XInternAtom (display->display, server, False); 1097 atom = XInternAtom (dpy, server, False);
1200 win = XGetSelectionOwner (display->display, atom); 1098 win = XGetSelectionOwner (dpy, atom);
1201 1099
1202 if (win != None) 1100 if (win != None)
1203 return True; 1101 return True;
1204 } 1102 }
1205 1103
… …
1212 XPoint nspot; 1110 XPoint nspot;
1213 XVaNestedList preedit_attr; 1111 XVaNestedList preedit_attr;
1214 1112
1215 if (!Input_Context 1113 if (!Input_Context
1216 || !focus 1114 || !focus
1217 || !(input_style & XIMPreeditPosition)) 1115 || !(input_style & (XIMPreeditPosition | XIMPreeditCallbacks)))
1218 return; 1116 return;
1219 1117
1220 im_set_position (nspot); 1118 im_set_position (nspot);
1221 1119
1222 if (nspot.x == spot.x && nspot.y == spot.y) 1120 if (nspot.x == spot.x && nspot.y == spot.y)
… …
1241 input_method = 0; 1139 input_method = 0;
1242 } 1140 }
1243 1141
1244 Input_Context = 0; 1142 Input_Context = 0;
1245} 1143}
1144
1145#ifdef ENABLE_XIM_ONTHESPOT
1146
1147static void
1148xim_preedit_start (XIC ic, XPointer client_data, XPointer call_data)
1149{
1150 ((rxvt_term *)client_data)->make_current ();
1151 HOOK_INVOKE (((rxvt_term *)client_data, HOOK_XIM_PREEDIT_START, DT_END));
1152}
1153
1154static void
1155xim_preedit_done (XIC ic, XPointer client_data, XPointer call_data)
1156{
1157 ((rxvt_term *)client_data)->make_current ();
1158 HOOK_INVOKE (((rxvt_term *)client_data, HOOK_XIM_PREEDIT_DONE, DT_END));
1159}
1160
1161static void
1162xim_preedit_draw (XIC ic, XPointer client_data, XIMPreeditDrawCallbackStruct *call_data)
1163{
1164 rxvt_term *term = (rxvt_term *)client_data;
1165 XIMText *text = call_data->text;
1166
1167 term->make_current ();
1168
1169 if (text)
1170 {
1171 wchar_t *str;
1172
1173 if (!text->encoding_is_wchar && text->string.multi_byte)
1174 {
1175 // of course, X makes it ugly again
1176 if (term->rs[Rs_imLocale])
1177 SET_LOCALE (term->rs[Rs_imLocale]);
1178
1179 str = rxvt_temp_buf<wchar_t> (text->length + 1);
1180 mbstowcs (str, text->string.multi_byte, text->length + 1);
1181
1182 if (term->rs[Rs_imLocale])
1183 SET_LOCALE (term->locale);
1184 }
1185 else
1186 str = text->string.wide_char;
1187
1188 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
1189 DT_INT, call_data->caret,
1190 DT_INT, call_data->chg_first,
1191 DT_INT, call_data->chg_length,
1192 DT_LCS_LEN, (void *)text->feedback, text->feedback ? (int)text->length : 0,
1193 DT_WCS_LEN, str, str ? (int)text->length : 0,
1194 DT_END));
1195 }
1196 else
1197 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
1198 DT_INT, call_data->caret,
1199 DT_INT, call_data->chg_first,
1200 DT_INT, call_data->chg_length,
1201 DT_END));
1202}
1203
1204#if 0
1205static void
1206xim_preedit_caret (XIC ic, XPointer client_data, XIMPreeditCaretCallbackStruct *call_data)
1207{
1208 ((rxvt_term *)client_data)->make_current ();
1209 HOOK_INVOKE (((rxvt_term *)client_data, HOOK_XIM_PREEDIT_CARET,
1210 DT_INT, call_data->position,
1211 DT_INT, call_data->direction,
1212 DT_INT, call_data->style,
1213 DT_END));
1214}
1215#endif
1216
1217#endif
1246 1218
1247/* 1219/*
1248 * Try to open a XIM with the current modifiers, then see if we can 1220 * Try to open a XIM with the current modifiers, then see if we can
1249 * open a suitable preedit type 1221 * open a suitable preedit type
1250 */ 1222 */
… …
1257 XRectangle rect, status_rect, needed_rect; 1229 XRectangle rect, status_rect, needed_rect;
1258 unsigned long fg, bg; 1230 unsigned long fg, bg;
1259 const char *p; 1231 const char *p;
1260 char **s; 1232 char **s;
1261 XIMStyles *xim_styles; 1233 XIMStyles *xim_styles;
1234#ifdef ENABLE_XIM_ONTHESPOT
1235 XIMCallback xcb[4];
1236#endif
1262 1237
1263 set_environ (envv); 1238 set_environ (envv);
1264 1239
1265 if (! ((p = XSetLocaleModifiers (modifiers)) && *p)) 1240 if (! ((p = XSetLocaleModifiers (modifiers)) && *p))
1266 return false; 1241 return false;
… …
1292 s = rxvt_splitcommastring (p); 1267 s = rxvt_splitcommastring (p);
1293 1268
1294 for (i = found = 0; !found && s[i]; i++) 1269 for (i = found = 0; !found && s[i]; i++)
1295 { 1270 {
1296 if (!strcmp (s[i], "OverTheSpot")) 1271 if (!strcmp (s[i], "OverTheSpot"))
1297 input_style = (XIMPreeditPosition | XIMStatusNothing); 1272 input_style = XIMPreeditPosition | XIMStatusNothing;
1298 else if (!strcmp (s[i], "OffTheSpot")) 1273 else if (!strcmp (s[i], "OffTheSpot"))
1299 input_style = (XIMPreeditArea | XIMStatusArea); 1274 input_style = XIMPreeditArea | XIMStatusArea;
1300 else if (!strcmp (s[i], "Root")) 1275 else if (!strcmp (s[i], "Root"))
1301 input_style = (XIMPreeditNothing | XIMStatusNothing); 1276 input_style = XIMPreeditNothing | XIMStatusNothing;
1302 else if (!strcmp (s[i], "None")) 1277 else if (!strcmp (s[i], "None"))
1303 input_style = (XIMPreeditNone | XIMStatusNone); 1278 input_style = XIMPreeditNone | XIMStatusNone;
1279#ifdef ENABLE_XIM_ONTHESPOT
1280 else if (SHOULD_INVOKE (HOOK_XIM_PREEDIT_START) && !strcmp (s[i], "OnTheSpot"))
1281 input_style = XIMPreeditCallbacks | XIMStatusNothing;
1282#endif
1283 else
1284 input_style = XIMPreeditNothing | XIMStatusNothing;
1304 1285
1305 for (j = 0; j < xim_styles->count_styles; j++) 1286 for (j = 0; j < xim_styles->count_styles; j++)
1306 if (input_style == xim_styles->supported_styles[j]) 1287 if (input_style == xim_styles->supported_styles[j])
1307 { 1288 {
1308 rxvt_freecommastring (s); 1289 rxvt_freecommastring (s);
… …
1346 "*", 1327 "*",
1347 fheight, 1328 fheight,
1348 fheight + 1, fheight - 1, 1329 fheight + 1, fheight - 1,
1349 fheight - 2, fheight + 2); 1330 fheight - 2, fheight + 2);
1350 1331
1351 fs = XCreateFontSet (display->display, rs[Rs_imFont] ? rs[Rs_imFont] : pat, 1332 fs = XCreateFontSet (dpy, rs[Rs_imFont] ? rs[Rs_imFont] : pat,
1352 &missing_charset_list, &missing_charset_count, &def_string); 1333 &missing_charset_list, &missing_charset_count, &def_string);
1353 1334
1354 if (missing_charset_list) 1335 if (missing_charset_list)
1355 XFreeStringList (missing_charset_list); 1336 XFreeStringList (missing_charset_list);
1356 1337
… …
1397 XNBackground, bg, 1378 XNBackground, bg,
1398 XNArea, &status_rect, 1379 XNArea, &status_rect,
1399 XNFontSet, fs, 1380 XNFontSet, fs,
1400 NULL); 1381 NULL);
1401 } 1382 }
1383#if ENABLE_XIM_ONTHESPOT
1384 else if (input_style & XIMPreeditCallbacks)
1385 {
1386 im_set_position (spot);
1387
1388 xcb[0].client_data = (XPointer)this; xcb[0].callback = (XIMProc)xim_preedit_start;
1389 xcb[1].client_data = (XPointer)this; xcb[1].callback = (XIMProc)xim_preedit_done;
1390 xcb[2].client_data = (XPointer)this; xcb[2].callback = (XIMProc)xim_preedit_draw;
1391# if 0
1392 xcb[3].client_data = (XPointer)this; xcb[3].callback = (XIMProc)xim_preedit_caret;
1393# endif
1394
1395 preedit_attr = XVaCreateNestedList (0,
1396 XNSpotLocation, &spot,
1397 XNPreeditStartCallback, &xcb[0],
1398 XNPreeditDoneCallback , &xcb[1],
1399 XNPreeditDrawCallback , &xcb[2],
1400# if 0
1401 XNPreeditCaretCallback, &xcb[3],
1402# endif
1403 NULL);
1404 }
1405#endif
1402 1406
1403 Input_Context = XCreateIC (xim, 1407 Input_Context = XCreateIC (xim,
1404 XNInputStyle, input_style, 1408 XNInputStyle, input_style,
1405 XNClientWindow, vt, 1409 XNClientWindow, vt,
1406 XNFocusWindow, parent[0], 1410 XNFocusWindow, parent[0],
… …
1408 preedit_attr, 1412 preedit_attr,
1409 status_attr ? XNStatusAttributes : NULL, 1413 status_attr ? XNStatusAttributes : NULL,
1410 status_attr, NULL); 1414 status_attr, NULL);
1411 1415
1412 if (preedit_attr) XFree (preedit_attr); 1416 if (preedit_attr) XFree (preedit_attr);
1413 if (status_attr) XFree (status_attr); 1417 if (status_attr) XFree (status_attr);
1414 if (fs) XFreeFontSet (display->display, fs); 1418 if (fs) XFreeFontSet (dpy, fs);
1415 1419
1416 if (Input_Context == NULL) 1420 if (Input_Context == NULL)
1417 { 1421 {
1418 rxvt_warn ("failed to create input context, continuing without XIM.\n"); 1422 rxvt_warn ("failed to create input context, continuing without XIM.\n");
1419 im_destroy (); 1423 im_destroy ();
1420 return false; 1424 return false;
1421 } 1425 }
1422 1426
1427#if 0
1428 // unfortunately, only the focus window is used by XIM, hard to fix
1423 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL)) 1429 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL))
1424 vt_select_input (); 1430 vt_select_input ();
1431#endif
1425 1432
1426 if (input_style & XIMPreeditArea)
1427 IMSetStatusPosition (); 1433 IMSetPosition ();
1428 1434
1429 return true; 1435 return true;
1430} 1436}
1431 1437
1432void 1438void
… …
1490 SET_LOCALE (locale); 1496 SET_LOCALE (locale);
1491#endif 1497#endif
1492} 1498}
1493 1499
1494void 1500void
1495rxvt_term::IMSetStatusPosition () 1501rxvt_term::IMSetPosition ()
1496{ 1502{
1497 XRectangle preedit_rect, status_rect, *needed_rect; 1503 XRectangle preedit_rect, status_rect, *needed_rect;
1498 XVaNestedList preedit_attr, status_attr; 1504 XVaNestedList preedit_attr, status_attr;
1499 1505
1500 if (!Input_Context 1506 if (!Input_Context
1501 || !focus 1507 || !focus
1502 || !(input_style & XIMPreeditArea) 1508 || !(input_style & (XIMPreeditArea | XIMPreeditPosition))
1503 || !IMisRunning ()) 1509 || !IMisRunning ())
1504 return; 1510 return;
1505 1511
1512 if (input_style & XIMPreeditPosition)
1513 {
1514 im_set_size (preedit_rect);
1515 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);
1516
1517 XSetICValues (Input_Context,
1518 XNPreeditAttributes, preedit_attr, NULL);
1519 }
1520 else
1521 {
1506 /* Getting the necessary width of preedit area */ 1522 /* Getting the necessary width of preedit area */
1507 status_attr = XVaCreateNestedList (0, XNAreaNeeded, &needed_rect, NULL); 1523 status_attr = XVaCreateNestedList (0, XNAreaNeeded, &needed_rect, NULL);
1508 XGetICValues (Input_Context, XNStatusAttributes, status_attr, NULL); 1524 XGetICValues (Input_Context, XNStatusAttributes, status_attr, NULL);
1509 XFree (status_attr); 1525 XFree (status_attr);
1510 1526
1511 im_set_preedit_area (preedit_rect, status_rect, *needed_rect); 1527 im_set_preedit_area (preedit_rect, status_rect, *needed_rect);
1512 XFree (needed_rect); 1528 XFree (needed_rect);
1513 1529
1514 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL); 1530 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);
1515 status_attr = XVaCreateNestedList (0, XNArea, &status_rect, NULL); 1531 status_attr = XVaCreateNestedList (0, XNArea, &status_rect, NULL);
1516 1532
1517 XSetICValues (Input_Context, 1533 XSetICValues (Input_Context,
1518 XNPreeditAttributes, preedit_attr, 1534 XNPreeditAttributes, preedit_attr,
1519 XNStatusAttributes, status_attr, NULL); 1535 XNStatusAttributes, status_attr,
1536 NULL);
1520 1537
1538 XFree (status_attr);
1539 }
1540
1521 XFree (preedit_attr); 1541 XFree (preedit_attr);
1522 XFree (status_attr);
1523} 1542}
1524#endif /* USE_XIM */ 1543#endif /* USE_XIM */
1544
1545void
1546rxvt_term::get_window_origin (int &x, int &y)
1547{
1548 Window cr;
1549 XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr);
1550/* fprintf (stderr, "origin is %+d%+d\n", x, y);*/
1551}
1552
1553Pixmap
1554rxvt_term::get_pixmap_property (int prop_id)
1555{
1556 if (prop_id > 0 && prop_id < NUM_XA)
1557 if (xa[prop_id])
1558 {
1559 int aformat;
1560 unsigned long nitems, bytes_after;
1561 Atom atype;
1562 unsigned char *prop = NULL;
1563 int result = XGetWindowProperty (dpy, display->root, xa[prop_id],
1564 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1565 &nitems, &bytes_after, &prop);
1566 if (result == Success && prop && atype == XA_PIXMAP)
1567 return *(Pixmap *)prop;
1568 }
1569
1570 return None;
1571}
1572
1573#ifdef HAVE_BG_PIXMAP
1574# if TRACE_PIXMAPS
1575# undef update_background
1576void
1577rxvt_term::trace_update_background (const char *file, int line)
1578{
1579 fprintf (stderr, "%s:%d:update_background()\n", file, line);
1580 update_background ();
1581}
1582# endif
1583
1584void
1585rxvt_term::update_background ()
1586{
1587 if (update_background_ev.is_active ())
1588 return;
1589
1590 bgPixmap.invalidate ();
1591
1592 ev_tstamp to_wait = 0.5 - (ev::now () - bgPixmap.valid_since);
1593
1594 if (to_wait <= 0.)
1595 bgPixmap.render ();
1596 else
1597 update_background_ev.start (to_wait);
1598}
1599
1600void
1601rxvt_term::update_background_cb (ev::timer &w, int revents)
1602{
1603 make_current ();
1604
1605 update_background_ev.stop ();
1606 bgPixmap.render ();
1607 refresh_check ();
1608}
1609
1610#endif /* HAVE_BG_PIXMAP */
1525 1611
1526/*----------------------- end-of-file (C source) -----------------------*/ 1612/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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