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.200 by root, Wed Jan 25 00:42:20 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 HOOK_INVOKE ((this, HOOK_DESTROY, DT_END)); 315 HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));
311 316
312#if ENABLE_OVERLAY 317#if ENABLE_OVERLAY
… …
316 if (display) 321 if (display)
317 { 322 {
318#if USE_XIM 323#if USE_XIM
319 im_ev.stop (display); 324 im_ev.stop (display);
320#endif 325#endif
321#if HAVE_SCROLLBARS
322 scrollbar_ev.stop (display); 326 scrollbar_ev.stop (display);
323#endif 327#if ENABLE_TRANSPARENCY || ENABLE_PERL
324#if TRANSPARENT
325 rootwin_ev.stop (display); 328 rootwin_ev.stop (display);
326#endif 329#endif
327 incr_ev.stop (); 330 incr_ev.stop ();
328 termwin_ev.stop (display); 331 termwin_ev.stop (display);
329 vt_ev.stop (display); 332 vt_ev.stop (display);
330 } 333 }
331 334
332 check_ev.stop (); 335 flush_ev.stop ();
333 pty_ev.stop (); 336 pty_ev.stop ();
334#ifdef CURSOR_BLINK 337#ifdef CURSOR_BLINK
335 cursor_blink_ev.stop (); 338 cursor_blink_ev.stop ();
336#endif 339#endif
337#ifdef TEXT_BLINK 340#ifdef TEXT_BLINK
… …
345#endif 348#endif
346#ifdef POINTER_BLANK 349#ifdef POINTER_BLANK
347 pointer_ev.stop (); 350 pointer_ev.stop ();
348#endif 351#endif
349 352
350 destroy_ev.start (0); 353 destroy_ev.start ();
351} 354}
352 355
353void 356void
354rxvt_term::destroy_cb (time_watcher &w) 357rxvt_term::destroy_cb (ev::idle &w, int revents)
355{ 358{
356 make_current (); 359 make_current ();
357 360
358 delete this; 361 delete this;
359} 362}
… …
370{ 373{
371 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++)
372 (*t)->emergency_cleanup (); 375 (*t)->emergency_cleanup ();
373} 376}
374 377
375#if ENABLE_FRILLS 378#if !ENABLE_MINIMAL
376static void 379static void
377print_x_error (Display *dpy, XErrorEvent *event) 380print_x_error (Display *dpy, XErrorEvent *event)
378{ 381{
379 char buffer[BUFSIZ]; 382 char buffer[BUFSIZ];
380 char mesg[BUFSIZ]; 383 char mesg[BUFSIZ];
… …
388 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->request_code); 391 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->request_code);
389 sprintf(number, "%d", event->request_code); 392 sprintf(number, "%d", event->request_code);
390 XGetErrorDatabaseText(dpy, "XRequest", number, "", buffer, BUFSIZ); 393 XGetErrorDatabaseText(dpy, "XRequest", number, "", buffer, BUFSIZ);
391 rxvt_warn ("(which is %s)\n", buffer); 394 rxvt_warn ("(which is %s)\n", buffer);
392 if (event->request_code >= 128) { 395 if (event->request_code >= 128) {
393 XGetErrorDatabaseText(dpy, mtype, "MinorCode", "Request Minor code %d", 396 XGetErrorDatabaseText(dpy, mtype, "MinorCode", "Request Minor code %d",
394 mesg, BUFSIZ); 397 mesg, BUFSIZ);
395 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->minor_code); 398 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->minor_code);
396 } 399 }
397 if ((event->error_code == BadWindow) || 400 if ((event->error_code == BadWindow) ||
398 (event->error_code == BadPixmap) || 401 (event->error_code == BadPixmap) ||
399 (event->error_code == BadCursor) || 402 (event->error_code == BadCursor) ||
400 (event->error_code == BadFont) || 403 (event->error_code == BadFont) ||
401 (event->error_code == BadDrawable) || 404 (event->error_code == BadDrawable) ||
402 (event->error_code == BadColor) || 405 (event->error_code == BadColor) ||
403 (event->error_code == BadGC) || 406 (event->error_code == BadGC) ||
404 (event->error_code == BadIDChoice) || 407 (event->error_code == BadIDChoice) ||
405 (event->error_code == BadValue) || 408 (event->error_code == BadValue) ||
406 (event->error_code == BadAtom)) { 409 (event->error_code == BadAtom)) {
407 if (event->error_code == BadValue) 410 if (event->error_code == BadValue)
408 XGetErrorDatabaseText(dpy, mtype, "Value", "Value 0x%x", 411 XGetErrorDatabaseText(dpy, mtype, "Value", "Value 0x%x",
409 mesg, BUFSIZ); 412 mesg, BUFSIZ);
410 else if (event->error_code == BadAtom) 413 else if (event->error_code == BadAtom)
411 XGetErrorDatabaseText(dpy, mtype, "AtomID", "AtomID 0x%x", 414 XGetErrorDatabaseText(dpy, mtype, "AtomID", "AtomID 0x%x",
412 mesg, BUFSIZ); 415 mesg, BUFSIZ);
413 else 416 else
414 XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x", 417 XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x",
415 mesg, BUFSIZ); 418 mesg, BUFSIZ);
416 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid); 419 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid);
417 } 420 }
418 XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d", 421 XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d",
419 mesg, BUFSIZ); 422 mesg, BUFSIZ);
420 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial); 423 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial);
421} 424}
422#endif 425#endif
423 426
424int 427int
… …
428 GET_R->allowedxerror = event->error_code; 431 GET_R->allowedxerror = event->error_code;
429 else 432 else
430 { 433 {
431 // 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,
432 // so just output the error and continue 435 // so just output the error and continue
433#if ENABLE_FRILLS 436#if ENABLE_MINIMAL
437 old_xerror_handler (display, event);
438#else
434 print_x_error (display, event); 439 print_x_error (display, event);
435#else
436 old_xerror_handler (display, event);
437#endif 440#endif
438 } 441 }
439 442
440 return 0; 443 return 0;
441} 444}
… …
447 DisplayString (display)); 450 DisplayString (display));
448 rxvt_emergency_cleanup (); 451 rxvt_emergency_cleanup ();
449 _exit (EXIT_FAILURE); 452 _exit (EXIT_FAILURE);
450} 453}
451 454
452/*----------------------------------------------------------------------*/
453bool
454rxvt_term::init (int argc, const char *const *argv, stringvec *envv)
455{
456 this->envv = envv;
457
458 SET_R (this);
459 set_locale ("");
460 set_environ (envv); // few things in X do not call setlocale :(
461
462 if (!init_vars ())
463 return false;
464
465 init_secondary ();
466
467 const char **cmd_argv = init_resources (argc, argv);
468
469#ifdef KEYSYM_RESOURCE
470 keyboard->register_done ();
471#endif
472
473#ifdef HAVE_SCROLLBARS
474 if (OPTION (Opt_scrollBar))
475 scrollBar.setIdle (); /* set existence for size calculations */
476#endif
477
478 pty = ptytty::create ();
479
480 create_windows (argc, argv);
481
482 dDisp;
483
484 init_xlocale ();
485
486 scr_reset (); // initialize screen
487
488#if 0
489 XSynchronize (disp, True);
490#endif
491
492#ifdef HAVE_SCROLLBARS
493 if (OPTION (Opt_scrollBar))
494 resize_scrollbar (); /* create and map scrollbar */
495#endif
496#ifdef TRANSPARENT
497 if (OPTION (Opt_transparent))
498 {
499 XSelectInput (disp, display->root, PropertyChangeMask);
500 check_our_parents ();
501 rootwin_ev.start (display, display->root);
502 }
503#endif
504
505 set_colorfgbg ();
506
507 init_command (cmd_argv);
508
509 free (cmd_argv);
510
511 if (pty->pty >= 0)
512 pty_ev.start (pty->pty, EVENT_READ);
513
514 check_ev.start ();
515
516 HOOK_INVOKE ((this, HOOK_START, DT_END));
517
518 XMapWindow (disp, vt);
519 XMapWindow (disp, parent[0]);
520
521 return true;
522}
523
524static struct sig_handlers 455static struct sig_handlers
525{ 456{
526 sig_watcher sw_term, sw_int; 457 ev::sig sw_term, sw_int;
527 458
528 /* 459 /*
529 * Catch a fatal signal and tidy up before quitting 460 * Catch a fatal signal and tidy up before quitting
530 */ 461 */
531 void 462 void sig_term (ev::sig &w, int revents);
532 sig_term (sig_watcher &w) 463
464 sig_handlers ()
533 { 465 {
534 rxvt_emergency_cleanup (); 466 sw_term.set<sig_handlers, &sig_handlers::sig_term> (this);
535 signal (w.signum, SIG_DFL);
536 kill (getpid (), w.signum);
537 }
538
539 sig_handlers ()
540 : sw_term (this, &sig_handlers::sig_term),
541 sw_int (this, &sig_handlers::sig_term) 467 sw_int .set<sig_handlers, &sig_handlers::sig_term> (this);
542 {
543 } 468 }
544} sig_handlers; 469} sig_handlers;
545 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
546char **rxvt_environ; // startup environment 479char **rxvt_environ; // startup environment
547 480
548void 481void
549rxvt_init () 482rxvt_init ()
550{ 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
551 ptytty::init (); 487 ptytty::init ();
488
489 if (!ev_default_loop (0))
490 rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n");
552 491
553 rxvt_environ = environ; 492 rxvt_environ = environ;
554 493
555 signal (SIGHUP, SIG_IGN); 494 signal (SIGHUP, SIG_IGN);
556 signal (SIGPIPE, SIG_IGN); 495 signal (SIGPIPE, SIG_IGN);
557 496
558 sig_handlers.sw_term.start (SIGTERM); 497 sig_handlers.sw_term.start (SIGTERM); ev_unref ();
559 sig_handlers.sw_int.start (SIGINT); 498 sig_handlers.sw_int.start (SIGINT); ev_unref ();
560 499
561 /* need to trap SIGURG for SVR4 (Unixware) rlogin */ 500 /* need to trap SIGURG for SVR4 (Unixware) rlogin */
562 /* signal (SIGURG, SIG_DFL); */ 501 /* signal (SIGURG, SIG_DFL); */
563 502
564 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); 503 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
… …
566 XSetIOErrorHandler (rxvt_xioerror_handler); 505 XSetIOErrorHandler (rxvt_xioerror_handler);
567 506
568 XrmInitialize (); 507 XrmInitialize ();
569} 508}
570 509
571/* ------------------------------------------------------------------------- *
572 * MEMORY ALLOCATION WRAPPERS *
573 * ------------------------------------------------------------------------- */
574void *
575rxvt_malloc (size_t size)
576{
577 void *p = malloc (size);
578
579 if (!p)
580 rxvt_fatal ("memory allocation failure. aborting.\n");
581
582 return p;
583}
584
585void *
586rxvt_calloc (size_t number, size_t size)
587{
588 void *p = calloc (number, size);
589
590 if (!p)
591 rxvt_fatal ("memory allocation failure. aborting.\n");
592
593 return p;
594}
595
596void *
597rxvt_realloc (void *ptr, size_t size)
598{
599 void *p = realloc (ptr, size);
600
601 if (!p)
602 rxvt_fatal ("memory allocation failure. aborting.\n");
603
604 return p;
605}
606
607/*----------------------------------------------------------------------*/ 510/*----------------------------------------------------------------------*/
608/* 511/*
609 * window size/position calculcations for XSizeHint and other storage. 512 * window size/position calculations for XSizeHint and other storage.
610 * if width/height are non-zero then override calculated width/height 513 * if width/height are non-zero then override calculated width/height
611 */ 514 */
612void 515void
613rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight) 516rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
614{ 517{
615 short recalc_x, recalc_y; 518 short recalc_x, recalc_y;
616 int x, y, sb_w, flags; 519 int x, y, flags;
617 unsigned int w, h; 520 unsigned int w, h;
618 unsigned int max_width, max_height; 521 unsigned int max_width, max_height;
619 dDisp;
620 522
621 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity; 523 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity;
622 szHint.win_gravity = NorthWestGravity; 524 szHint.win_gravity = NorthWestGravity;
623 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */ 525 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */
624 526
… …
632 if (rs[Rs_geometry]) 534 if (rs[Rs_geometry])
633 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h); 535 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h);
634 536
635 if (flags & WidthValue) 537 if (flags & WidthValue)
636 { 538 {
539 if (!w)
540 rxvt_fatal ("illegal window geometry (width and height must be non-zero), aborting.\n");
541
637 ncol = clamp (w, 0, std::numeric_limits<int16_t>::max ()); 542 ncol = clamp (w, 1, std::numeric_limits<int16_t>::max ());
638 szHint.flags |= USSize; 543 szHint.flags |= USSize;
639 } 544 }
640 545
641 if (flags & HeightValue) 546 if (flags & HeightValue)
642 { 547 {
548 if (!h)
549 rxvt_fatal ("illegal window geometry (width and height must be non-zero), aborting.\n");
550
643 nrow = clamp (h, 0, std::numeric_limits<int16_t>::max ()); 551 nrow = clamp (h, 1, std::numeric_limits<int16_t>::max ());
644 szHint.flags |= USSize; 552 szHint.flags |= USSize;
645 } 553 }
646 554
647 if (flags & XValue) 555 if (flags & XValue)
648 { 556 {
… …
679 max_width = MAX_COLS * fwidth; 587 max_width = MAX_COLS * fwidth;
680 max_height = MAX_ROWS * fheight; 588 max_height = MAX_ROWS * fheight;
681 589
682 szHint.base_width = szHint.base_height = 2 * int_bwidth; 590 szHint.base_width = szHint.base_height = 2 * int_bwidth;
683 591
684 sb_w = 0;
685 window_vt_x = window_vt_y = int_bwidth; 592 window_vt_x = window_vt_y = int_bwidth;
686 593
687 if (scrollBar.state) 594 if (scrollBar.state)
688 { 595 {
689 sb_w = scrollbar_TotalWidth (); 596 int sb_w = scrollBar.total_width ();
690 szHint.base_width += sb_w; 597 szHint.base_width += sb_w;
598
691 if (!OPTION (Opt_scrollBar_right)) 599 if (!option (Opt_scrollBar_right))
692 window_vt_x += sb_w; 600 window_vt_x += sb_w;
693 } 601 }
694 602
695 szHint.width_inc = fwidth; 603 szHint.width_inc = fwidth;
696 szHint.height_inc = fheight; 604 szHint.height_inc = fheight;
697 szHint.min_width = szHint.base_width + szHint.width_inc; 605 szHint.min_width = szHint.base_width + szHint.width_inc;
698 szHint.min_height = szHint.base_height + szHint.height_inc; 606 szHint.min_height = szHint.base_height + szHint.height_inc;
699 607
700 if (newwidth && newwidth - szHint.base_width < max_width) 608 if (newwidth && newwidth - szHint.base_width < max_width)
701 { 609 {
702 szHint.width = newwidth; 610 szHint.width = newwidth;
… …
717 { 625 {
718 min_it (height, max_height); 626 min_it (height, max_height);
719 szHint.height = szHint.base_height + height; 627 szHint.height = szHint.base_height + height;
720 } 628 }
721 629
722 if (scrollBar.state && OPTION (Opt_scrollBar_right))
723 window_sb_x = szHint.width - sb_w;
724
725 if (recalc_x) 630 if (recalc_x)
726 szHint.x += DisplayWidth (disp, display->screen) - szHint.width - 2 * ext_bwidth; 631 szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth;
632
727 if (recalc_y) 633 if (recalc_y)
728 szHint.y += DisplayHeight (disp, display->screen) - szHint.height - 2 * ext_bwidth; 634 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth;
729 635
730 ncol = width / fwidth; 636 ncol = width / fwidth;
731 nrow = height / fheight; 637 nrow = height / fheight;
732} 638}
733 639
734/*----------------------------------------------------------------------*/ 640/*----------------------------------------------------------------------*/
735/* 641/*
… …
746 652
747 ws.ws_col = ncol; 653 ws.ws_col = ncol;
748 ws.ws_row = nrow; 654 ws.ws_row = nrow;
749 ws.ws_xpixel = width; 655 ws.ws_xpixel = width;
750 ws.ws_ypixel = height; 656 ws.ws_ypixel = height;
751 (void)ioctl (pty->pty, TIOCSWINSZ, &ws); 657 ioctl (pty->pty, TIOCSWINSZ, &ws);
752 658
753#if 0 659#if 0
754 // TIOCSWINSZ⎈ is supposed to do this automatically and correctly 660 // TIOCSWINSZ is supposed to do this automatically and correctly
755 if (cmd_pid) /* force through to the command */ 661 if (cmd_pid) /* force through to the command */
756 kill (-cmd_pid, SIGWINCH); 662 kill (-cmd_pid, SIGWINCH);
757#endif 663#endif
758} 664}
759 665
… …
786#endif 692#endif
787 693
788 delete fontset[0]; 694 delete fontset[0];
789 fontset[0] = fs; 695 fontset[0] = fs;
790 696
791 prop = (*fs)[1]->properties (); 697 prop = (*fs)[rxvt_fontset::firstFont]->properties ();
792 prop.height += lineSpace; 698 prop.height += lineSpace;
699 prop.width += letterSpace;
700
793 fs->set_prop (prop); 701 fs->set_prop (prop, false);
794 702
795 fwidth = prop.width; 703 fwidth = prop.width;
796 fheight = prop.height; 704 fheight = prop.height;
797 fbase = prop.ascent; 705 fbase = prop.ascent;
798 706
… …
807 { 715 {
808 fontset[style] = fs = new rxvt_fontset (this); 716 fontset[style] = fs = new rxvt_fontset (this);
809 rxvt_fontprop prop2 = prop; 717 rxvt_fontprop prop2 = prop;
810 718
811 if (res) 719 if (res)
812 prop2.weight = prop2.slant = rxvt_fontprop::unset; 720 {
721 fs->populate (res);
722 fs->set_prop (prop2, false);
723 }
813 else 724 else
814 { 725 {
815 res = fontset[0]->fontdesc; 726 fs->populate (fontset[0]->fontdesc);
816 727
817 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;
818 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);
819 } 732 }
820 733
821 fs->populate (res);
822 fs->set_prop (prop2);
823 } 734 }
824#else 735#else
825 fontset[style] = fontset[0]; 736 fontset[style] = fontset[0];
826#endif 737#endif
827 } 738 }
… …
829 if (parent[0]) 740 if (parent[0])
830 { 741 {
831 resize_all_windows (0, 0, 0); 742 resize_all_windows (0, 0, 0);
832 scr_remap_chars (); 743 scr_remap_chars ();
833 scr_touch (true); 744 scr_touch (true);
834 } 745 }
835 746
836 return true; 747 return true;
837} 748}
838 749
750void
839void rxvt_term::set_string_property (Atom prop, const char *str, int len) 751rxvt_term::set_string_property (Atom prop, const char *str, int len)
840{ 752{
841 XChangeProperty (display->display, parent[0], 753 XChangeProperty (dpy, parent[0],
842 prop, XA_STRING, 8, PropModeReplace, 754 prop, XA_STRING, 8, PropModeReplace,
843 (const unsigned char *)str, len >= 0 ? len : strlen (str)); 755 (const unsigned char *)str, len >= 0 ? len : strlen (str));
844} 756}
845 757
758void
846void rxvt_term::set_utf8_property (Atom prop, const char *str, int len) 759rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
847{ 760{
848 wchar_t *ws = rxvt_mbstowcs (str, len); 761 wchar_t *ws = rxvt_mbstowcs (str, len);
849 char *s = rxvt_wcstoutf8 (ws); 762 char *s = rxvt_wcstoutf8 (ws);
850 763
851 XChangeProperty (display->display, parent[0], 764 XChangeProperty (dpy, parent[0],
852 prop, xa[XA_UTF8_STRING], 8, PropModeReplace, 765 prop, xa[XA_UTF8_STRING], 8, PropModeReplace,
853 (const unsigned char *)s, strlen (s)); 766 (const unsigned char *)s, strlen (s));
854 767
855 free (s); 768 free (s);
856 free (ws); 769 free (ws);
… …
875#if ENABLE_EWMH 788#if ENABLE_EWMH
876 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str); 789 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str);
877#endif 790#endif
878} 791}
879 792
793void
794rxvt_term::set_window_color (int idx, const char *color)
795{
880#ifdef XTERM_COLOR_CHANGE 796#ifdef XTERM_COLOR_CHANGE
881void
882rxvt_term::set_window_color (int idx, const char *color)
883{
884 rxvt_color xcol; 797 rxvt_color xcol;
885 int i;
886 798
887 if (color == NULL || *color == '\0') 799 if (color == NULL || *color == '\0')
888 return; 800 return;
889 801
802 color = strdup (color);
803 allocated.push_back ((void *)color);
804 rs[Rs_color + idx] = color;
805
890 /* handle color aliases */ 806 /* handle color aliases */
891 if (isdigit (*color)) 807 if (isdigit (*color))
892 { 808 {
893 i = atoi (color); 809 int i = atoi (color);
894 810
895 if (i >= 8 && i <= 15) 811 if (i >= 8 && i <= 15)
812 {
896 { /* bright colors */ 813 /* bright colors */
897 i -= 8;
898 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i]; 814 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i - 8];
899 SET_PIXCOLOR (idx);
900 goto done; 815 goto done;
901 } 816 }
902 817
903 if (i >= 0 && i <= 7) 818 if (i >= 0 && i <= 7)
819 {
904 { /* normal colors */ 820 /* normal colors */
905 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i]; 821 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];
906 SET_PIXCOLOR (idx);
907 goto done; 822 goto done;
908 } 823 }
909 } 824 }
910 825
911 if (!rXParseAllocColor (&xcol, color)) 826 set_color (xcol, color);
912 return;
913
914 /* XStoreColor (display->display, display->cmap, XColor*); */
915 827
916 /* 828 /*
917 * 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,
918 * so just keep gobbling up the colormap 830 * so just keep gobbling up the colormap
919 */ 831 */
920# if 0
921 for (i = Color_Black; i <= Color_White; i++)
922 if (pix_colors[idx] == pix_colors[i])
923 break;
924 if (i > Color_White)
925 {
926 /* fprintf (stderr, "XFreeColors: pix_colors [%d] = %lu\n", idx, pix_colors [idx]); */
927 XFreeColors (display->display, display->cmap, (pix_colors + idx), 1,
928 DisplayPlanes (display->display, display->screen));
929 }
930# endif
931 832
932 pix_colors_focused[idx] = xcol; 833 pix_colors_focused[idx] = xcol;
933 SET_PIXCOLOR (idx);
934 834
935 /* XSetWindowAttributes attr; */
936 /* Cursor cursor; */
937done: 835done:
938
939#if OFF_FOCUS_FADING
940 if (rs[Rs_fade])
941 pix_colors_unfocused[idx] = pix_colors_focused[idx].fade (display, atoi (rs[Rs_fade]), pix_colors[Color_fade]);
942#endif
943
944 /*TODO: handle Color_BD, scrollbar background, etc. */ 836 /*TODO: handle Color_BD, scrollbar background, etc. */
945 837
838 update_fade_color (idx);
946 recolour_cursor (); 839 recolour_cursor ();
947 scr_recolour (); 840 scr_recolour ();
841#endif /* XTERM_COLOR_CHANGE */
948} 842}
949
950#else
951# define set_window_color (idx,color) ((void)0)
952#endif /* XTERM_COLOR_CHANGE */
953 843
954void 844void
955rxvt_term::recolour_cursor () 845rxvt_term::recolour_cursor ()
956{ 846{
957 XColor xcol[2]; 847 XColor fg, bg;
958 848
959 xcol[0].pixel = ISSET_PIXCOLOR (Color_pointer_fg) 849 (ISSET_PIXCOLOR (Color_pointer_fg)
960 ? pix_colors_focused[Color_pointer_fg] 850 ? pix_colors_focused[Color_pointer_fg]
961 : pix_colors_focused[Color_fg]; 851 : pix_colors_focused[Color_fg]).get (fg);
852
962 xcol[1].pixel = ISSET_PIXCOLOR (Color_pointer_bg) 853 (ISSET_PIXCOLOR (Color_pointer_bg)
963 ? pix_colors_focused[Color_pointer_bg] 854 ? pix_colors_focused[Color_pointer_bg]
964 : pix_colors_focused[Color_bg]; 855 : pix_colors_focused[Color_bg]).get (bg);
965 856
966 XQueryColors (display->display, display->cmap, xcol, 2); 857 XRecolorCursor (dpy, TermWin_cursor, &fg, &bg);
967 XRecolorCursor (display->display, TermWin_cursor, xcol + 0, xcol + 1);
968} 858}
969 859
970/*----------------------------------------------------------------------*/ 860/*----------------------------------------------------------------------*/
971/* 861/*
972 * 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
973 */ 863 */
974void 864void
975rxvt_term::set_colorfgbg () 865rxvt_term::set_colorfgbg ()
976{ 866{
977 unsigned int i; 867 unsigned int i;
978 const char *xpmb = "\0"; 868 const char *xpmb = "";
979 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1]; 869 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1];
980 870
981 env_colorfgbg = (char *)rxvt_malloc (sizeof ("COLORFGBG=default;default;bg") + 1);
982 strcpy (fstr, "default"); 871 strcpy (fstr, "default");
983 strcpy (bstr, "default"); 872 strcpy (bstr, "default");
984 for (i = Color_Black; i <= Color_White; i++) 873 for (i = Color_Black; i <= Color_White; i++)
985 if (pix_colors[Color_fg] == pix_colors[i]) 874 if (pix_colors[Color_fg] == pix_colors[i])
986 { 875 {
… …
990 879
991 for (i = Color_Black; i <= Color_White; i++) 880 for (i = Color_Black; i <= Color_White; i++)
992 if (pix_colors[Color_bg] == pix_colors[i]) 881 if (pix_colors[Color_bg] == pix_colors[i])
993 { 882 {
994 sprintf (bstr, "%d", (i - Color_Black)); 883 sprintf (bstr, "%d", (i - Color_Black));
995#ifdef XPM_BACKGROUND 884#ifdef BG_IMAGE_FROM_FILE
996 xpmb = "default;"; 885 xpmb = "default;";
997#endif 886#endif
998 break; 887 break;
999 } 888 }
1000 889
1001 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr); 890 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr);
1002} 891}
1003 892
1004/*----------------------------------------------------------------------*/ 893/*----------------------------------------------------------------------*/
1005 894
1006int 895bool
1007rxvt_term::rXParseAllocColor (rxvt_color *screen_in_out, const char *colour) 896rxvt_term::set_color (rxvt_color &color, const char *name)
1008{ 897{
1009 if (!screen_in_out->set (display, colour)) 898 if (color.set (this, name))
1010 {
1011 rxvt_warn ("can't get colour '%s', continuing without.\n", colour);
1012 return false;
1013 }
1014
1015 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]);
1016} 909}
1017 910
1018/* -------------------------------------------------------------------- * 911/* -------------------------------------------------------------------- *
1019 * - WINDOW RESIZING - * 912 * - WINDOW RESIZING - *
1020 * -------------------------------------------------------------------- */ 913 * -------------------------------------------------------------------- */
… …
1022rxvt_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)
1023{ 916{
1024 int fix_screen; 917 int fix_screen;
1025 int old_width = szHint.width; 918 int old_width = szHint.width;
1026 int old_height = szHint.height; 919 int old_height = szHint.height;
1027 dDisp;
1028 920
1029 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);
1030 XSetWMNormalHints (disp, parent[0], &szHint); 929 XSetWMNormalHints (dpy, parent[0], &szHint);
930 szHint.flags |= PBaseSize | PResizeInc;
931 }
1031 932
1032 if (!ignoreparent) 933 if (!ignoreparent)
1033 { 934 {
1034#ifdef SMART_RESIZE 935#ifdef SMART_RESIZE
1035 /* 936 /*
… …
1039 int x, y, x1, y1; 940 int x, y, x1, y1;
1040 int dx, dy; 941 int dx, dy;
1041 unsigned int unused_w1, unused_h1, unused_b1, unused_d1; 942 unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
1042 Window unused_cr; 943 Window unused_cr;
1043 944
1044 XTranslateCoordinates (disp, parent[0], display->root, 945 XTranslateCoordinates (dpy, parent[0], display->root,
1045 0, 0, &x, &y, &unused_cr); 946 0, 0, &x, &y, &unused_cr);
1046 XGetGeometry (disp, parent[0], &unused_cr, &x1, &y1, 947 XGetGeometry (dpy, parent[0], &unused_cr, &x1, &y1,
1047 &unused_w1, &unused_h1, &unused_b1, &unused_d1); 948 &unused_w1, &unused_h1, &unused_b1, &unused_d1);
1048 /* 949 /*
1049 * 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
1050 * our position for handles and decorations. Counter it 951 * our position for handles and decorations. Counter it
1051 */ 952 */
… …
1053 { 954 {
1054 x -= x1; 955 x -= x1;
1055 y -= y1; 956 y -= y1;
1056 } 957 }
1057 958
1058 x1 = (DisplayWidth (disp, display->screen) - old_width ) / 2; 959 x1 = (DisplayWidth (dpy, display->screen) - old_width ) / 2;
1059 y1 = (DisplayHeight (disp, display->screen) - old_height) / 2; 960 y1 = (DisplayHeight (dpy, display->screen) - old_height) / 2;
1060 dx = old_width - szHint.width; 961 dx = old_width - szHint.width;
1061 dy = old_height - szHint.height; 962 dy = old_height - szHint.height;
1062 963
1063 /* Check position of the center of the window */ 964 /* Check position of the center of the window */
1064 if (x < x1) /* left half */ 965 if (x < x1) /* left half */
… …
1068 if (y < y1) /* top half */ 969 if (y < y1) /* top half */
1069 dy = 0; 970 dy = 0;
1070 else if (y == y1) /* exact center */ 971 else if (y == y1) /* exact center */
1071 dy /= 2; 972 dy /= 2;
1072 973
1073 XMoveResizeWindow (disp, parent[0], x + dx, y + dy, 974 XMoveResizeWindow (dpy, parent[0], x + dx, y + dy,
1074 szHint.width, szHint.height); 975 szHint.width, szHint.height);
1075#else 976#else
1076 XResizeWindow (disp, parent[0], szHint.width, szHint.height); 977 XResizeWindow (dpy, parent[0], szHint.width, szHint.height);
1077#endif 978#endif
1078 } 979 }
980
981 if (set_hint)
982 XSetWMNormalHints (dpy, parent[0], &szHint);
1079 983
1080 fix_screen = ncol != prev_ncol || nrow != prev_nrow; 984 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
1081 985
1082 if (fix_screen || newwidth != old_width || newheight != old_height) 986 if (fix_screen || newwidth != old_width || newheight != old_height)
1083 { 987 {
1084 if (scrollBar.state) 988 if (scrollBar.state)
1085 { 989 scrollBar.resize ();
1086 XMoveResizeWindow (disp, scrollBar.win,
1087 window_sb_x, 0,
1088 scrollbar_TotalWidth (), szHint.height);
1089 resize_scrollbar ();
1090 }
1091 990
1092 XMoveResizeWindow (disp, vt, 991 XMoveResizeWindow (dpy, vt,
1093 window_vt_x, window_vt_y, 992 window_vt_x, window_vt_y,
1094 width, height); 993 width, height);
1095 994
1096 scr_clear (); 995#ifdef HAVE_BG_PIXMAP
1097#ifdef XPM_BACKGROUND 996 if (bgPixmap.window_size_sensitive ())
1098 resize_pixmap (); 997 update_background ();
1099#endif 998#endif
1100 } 999 }
1101 1000
1102 if (fix_screen || old_height == 0) 1001 if (fix_screen || old_height == 0)
1103 scr_reset (); 1002 scr_reset ();
1104 1003
1105#ifdef XPM_BACKGROUND 1004#ifdef HAVE_BG_PIXMAP
1106 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)
1107 scr_touch (false); 1007// scr_touch (false);
1108#endif 1008#endif
1109 1009
1110#ifdef USE_XIM 1010#ifdef USE_XIM
1111 IMSetStatusPosition (); 1011 IMSetPosition ();
1112#endif 1012#endif
1113} 1013}
1114 1014
1115/* 1015/*
1116 * 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.
… …
1121{ 1021{
1122 XWindowAttributes wattr; 1022 XWindowAttributes wattr;
1123 1023
1124 if (newwidth == 0 || newheight == 0) 1024 if (newwidth == 0 || newheight == 0)
1125 { 1025 {
1126 XGetWindowAttributes (display->display, display->root, &wattr); 1026 XGetWindowAttributes (dpy, display->root, &wattr);
1127 1027
1128 if (newwidth == 0) 1028 if (newwidth == 0)
1129 newwidth = wattr.width - szHint.base_width; 1029 newwidth = wattr.width - szHint.base_width;
1130 if (newheight == 0) 1030 if (newheight == 0)
1131 newheight = wattr.height - szHint.base_height; 1031 newheight = wattr.height - szHint.base_height;
… …
1145#ifdef USE_XIM 1045#ifdef USE_XIM
1146 1046
1147void 1047void
1148rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg) 1048rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg)
1149{ 1049{
1150 fg = pix_colors[Color_fg]; 1050 fg = pix_colors [Color_fg];
1151 bg = pix_colors[Color_bg]; 1051 bg = pix_colors [Color_bg];
1152} 1052}
1153 1053
1154void 1054void
1155rxvt_term::im_set_size (XRectangle &size) 1055rxvt_term::im_set_size (XRectangle &size)
1156{ 1056{
… …
1179 1079
1180/* Checking whether input method is running. */ 1080/* Checking whether input method is running. */
1181bool 1081bool
1182rxvt_term::IMisRunning () 1082rxvt_term::IMisRunning ()
1183{ 1083{
1184 char *p;
1185 Atom atom; 1084 Atom atom;
1186 Window win; 1085 Window win;
1187 char server[IMBUFSIZ]; 1086 char server[IMBUFSIZ];
1188 1087
1189 /* get current locale modifier */ 1088 /* get current locale modifier */
1190 if ((p = XSetLocaleModifiers (NULL)) != NULL) 1089 if (char *p = XSetLocaleModifiers (0))
1191 { 1090 {
1192 strcpy (server, "@server="); 1091 strcpy (server, "@server=");
1193 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */ 1092 strncat (server, p + 4, IMBUFSIZ - 9); /* skip "@im=" */
1194 1093
1195 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */ 1094 if (p = strchr (server + 1, '@')) /* first one only */
1196 *p = '\0'; 1095 *p = '\0';
1197 1096
1198 atom = XInternAtom (display->display, server, False); 1097 atom = XInternAtom (dpy, server, False);
1199 win = XGetSelectionOwner (display->display, atom); 1098 win = XGetSelectionOwner (dpy, atom);
1200 1099
1201 if (win != None) 1100 if (win != None)
1202 return True; 1101 return True;
1203 } 1102 }
1204 1103
… …
1211 XPoint nspot; 1110 XPoint nspot;
1212 XVaNestedList preedit_attr; 1111 XVaNestedList preedit_attr;
1213 1112
1214 if (!Input_Context 1113 if (!Input_Context
1215 || !focus 1114 || !focus
1216 || !(input_style & XIMPreeditPosition)) 1115 || !(input_style & (XIMPreeditPosition | XIMPreeditCallbacks)))
1217 return; 1116 return;
1218 1117
1219 im_set_position (nspot); 1118 im_set_position (nspot);
1220 1119
1221 if (nspot.x == spot.x && nspot.y == spot.y) 1120 if (nspot.x == spot.x && nspot.y == spot.y)
… …
1267 1166
1268 term->make_current (); 1167 term->make_current ();
1269 1168
1270 if (text) 1169 if (text)
1271 { 1170 {
1272 void *str; 1171 wchar_t *str;
1273 1172
1274 if (!text->encoding_is_wchar && text->string.multi_byte) 1173 if (!text->encoding_is_wchar && text->string.multi_byte)
1275 { 1174 {
1276 // of course, X makes it ugly again 1175 // of course, X makes it ugly again
1277 if (term->rs[Rs_imLocale]) 1176 if (term->rs[Rs_imLocale])
1278 SET_LOCALE (term->rs[Rs_imLocale]); 1177 SET_LOCALE (term->rs[Rs_imLocale]);
1279 1178
1280 str = rxvt_temp_buf ((text->length + 1) * sizeof (wchar_t)); 1179 str = rxvt_temp_buf<wchar_t> (text->length + 1);
1281 mbstowcs ((wchar_t *)str, text->string.multi_byte, text->length + 1); 1180 mbstowcs (str, text->string.multi_byte, text->length + 1);
1282 1181
1283 if (term->rs[Rs_imLocale]) 1182 if (term->rs[Rs_imLocale])
1284 SET_LOCALE (term->locale); 1183 SET_LOCALE (term->locale);
1285 } 1184 }
1286 else 1185 else
1287 str = (void *)text->string.wide_char; 1186 str = text->string.wide_char;
1288 1187
1289 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW, 1188 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
1290 DT_INT, call_data->caret, 1189 DT_INT, call_data->caret,
1291 DT_INT, call_data->chg_first, 1190 DT_INT, call_data->chg_first,
1292 DT_INT, call_data->chg_length, 1191 DT_INT, call_data->chg_length,
1293 DT_LCS_LEN, (void *)text->feedback, text->feedback ? (int)text->length : 0, 1192 DT_LCS_LEN, (void *)text->feedback, text->feedback ? (int)text->length : 0,
… …
1300 DT_INT, call_data->chg_first, 1199 DT_INT, call_data->chg_first,
1301 DT_INT, call_data->chg_length, 1200 DT_INT, call_data->chg_length,
1302 DT_END)); 1201 DT_END));
1303} 1202}
1304 1203
1204#if 0
1305static void 1205static void
1306xim_preedit_caret (XIC ic, XPointer client_data, XIMPreeditCaretCallbackStruct *call_data) 1206xim_preedit_caret (XIC ic, XPointer client_data, XIMPreeditCaretCallbackStruct *call_data)
1307{ 1207{
1308 ((rxvt_term *)client_data)->make_current (); 1208 ((rxvt_term *)client_data)->make_current ();
1309 HOOK_INVOKE (((rxvt_term *)client_data, HOOK_XIM_PREEDIT_CARET, 1209 HOOK_INVOKE (((rxvt_term *)client_data, HOOK_XIM_PREEDIT_CARET,
1310 DT_INT, call_data->position, 1210 DT_INT, call_data->position,
1311 DT_INT, call_data->direction, 1211 DT_INT, call_data->direction,
1312 DT_INT, call_data->style, 1212 DT_INT, call_data->style,
1313 DT_END)); 1213 DT_END));
1314} 1214}
1215#endif
1315 1216
1316#endif 1217#endif
1317 1218
1318/* 1219/*
1319 * 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
… …
1426 "*", 1327 "*",
1427 fheight, 1328 fheight,
1428 fheight + 1, fheight - 1, 1329 fheight + 1, fheight - 1,
1429 fheight - 2, fheight + 2); 1330 fheight - 2, fheight + 2);
1430 1331
1431 fs = XCreateFontSet (display->display, rs[Rs_imFont] ? rs[Rs_imFont] : pat, 1332 fs = XCreateFontSet (dpy, rs[Rs_imFont] ? rs[Rs_imFont] : pat,
1432 &missing_charset_list, &missing_charset_count, &def_string); 1333 &missing_charset_list, &missing_charset_count, &def_string);
1433 1334
1434 if (missing_charset_list) 1335 if (missing_charset_list)
1435 XFreeStringList (missing_charset_list); 1336 XFreeStringList (missing_charset_list);
1436 1337
… …
1477 XNBackground, bg, 1378 XNBackground, bg,
1478 XNArea, &status_rect, 1379 XNArea, &status_rect,
1479 XNFontSet, fs, 1380 XNFontSet, fs,
1480 NULL); 1381 NULL);
1481 } 1382 }
1383#if ENABLE_XIM_ONTHESPOT
1482 else if (input_style & XIMPreeditCallbacks) 1384 else if (input_style & XIMPreeditCallbacks)
1483 { 1385 {
1386 im_set_position (spot);
1387
1484 xcb[0].client_data = (XPointer)this; xcb[0].callback = (XIMProc)xim_preedit_start; 1388 xcb[0].client_data = (XPointer)this; xcb[0].callback = (XIMProc)xim_preedit_start;
1485 xcb[1].client_data = (XPointer)this; xcb[1].callback = (XIMProc)xim_preedit_done; 1389 xcb[1].client_data = (XPointer)this; xcb[1].callback = (XIMProc)xim_preedit_done;
1486 xcb[2].client_data = (XPointer)this; xcb[2].callback = (XIMProc)xim_preedit_draw; 1390 xcb[2].client_data = (XPointer)this; xcb[2].callback = (XIMProc)xim_preedit_draw;
1391# if 0
1487 xcb[3].client_data = (XPointer)this; xcb[3].callback = (XIMProc)xim_preedit_caret; 1392 xcb[3].client_data = (XPointer)this; xcb[3].callback = (XIMProc)xim_preedit_caret;
1393# endif
1488 1394
1489 preedit_attr = XVaCreateNestedList (0, 1395 preedit_attr = XVaCreateNestedList (0,
1396 XNSpotLocation, &spot,
1490 XNPreeditStartCallback, &xcb[0], 1397 XNPreeditStartCallback, &xcb[0],
1491 XNPreeditDoneCallback , &xcb[1], 1398 XNPreeditDoneCallback , &xcb[1],
1492 XNPreeditDrawCallback , &xcb[2], 1399 XNPreeditDrawCallback , &xcb[2],
1400# if 0
1493 XNPreeditCaretCallback, &xcb[3], 1401 XNPreeditCaretCallback, &xcb[3],
1402# endif
1494 NULL); 1403 NULL);
1495 } 1404 }
1405#endif
1496 1406
1497 Input_Context = XCreateIC (xim, 1407 Input_Context = XCreateIC (xim,
1498 XNInputStyle, input_style, 1408 XNInputStyle, input_style,
1499 XNClientWindow, vt, 1409 XNClientWindow, vt,
1500 XNFocusWindow, parent[0], 1410 XNFocusWindow, parent[0],
… …
1502 preedit_attr, 1412 preedit_attr,
1503 status_attr ? XNStatusAttributes : NULL, 1413 status_attr ? XNStatusAttributes : NULL,
1504 status_attr, NULL); 1414 status_attr, NULL);
1505 1415
1506 if (preedit_attr) XFree (preedit_attr); 1416 if (preedit_attr) XFree (preedit_attr);
1507 if (status_attr) XFree (status_attr); 1417 if (status_attr) XFree (status_attr);
1508 if (fs) XFreeFontSet (display->display, fs); 1418 if (fs) XFreeFontSet (dpy, fs);
1509 1419
1510 if (Input_Context == NULL) 1420 if (Input_Context == NULL)
1511 { 1421 {
1512 rxvt_warn ("failed to create input context, continuing without XIM.\n"); 1422 rxvt_warn ("failed to create input context, continuing without XIM.\n");
1513 im_destroy (); 1423 im_destroy ();
… …
1518 // unfortunately, only the focus window is used by XIM, hard to fix 1428 // unfortunately, only the focus window is used by XIM, hard to fix
1519 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL)) 1429 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL))
1520 vt_select_input (); 1430 vt_select_input ();
1521#endif 1431#endif
1522 1432
1523 if (input_style & XIMPreeditArea)
1524 IMSetStatusPosition (); 1433 IMSetPosition ();
1525 1434
1526 return true; 1435 return true;
1527} 1436}
1528 1437
1529void 1438void
… …
1587 SET_LOCALE (locale); 1496 SET_LOCALE (locale);
1588#endif 1497#endif
1589} 1498}
1590 1499
1591void 1500void
1592rxvt_term::IMSetStatusPosition () 1501rxvt_term::IMSetPosition ()
1593{ 1502{
1594 XRectangle preedit_rect, status_rect, *needed_rect; 1503 XRectangle preedit_rect, status_rect, *needed_rect;
1595 XVaNestedList preedit_attr, status_attr; 1504 XVaNestedList preedit_attr, status_attr;
1596 1505
1597 if (!Input_Context 1506 if (!Input_Context
1598 || !focus 1507 || !focus
1599 || !(input_style & XIMPreeditArea) 1508 || !(input_style & (XIMPreeditArea | XIMPreeditPosition))
1600 || !IMisRunning ()) 1509 || !IMisRunning ())
1601 return; 1510 return;
1602 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 {
1603 /* Getting the necessary width of preedit area */ 1522 /* Getting the necessary width of preedit area */
1604 status_attr = XVaCreateNestedList (0, XNAreaNeeded, &needed_rect, NULL); 1523 status_attr = XVaCreateNestedList (0, XNAreaNeeded, &needed_rect, NULL);
1605 XGetICValues (Input_Context, XNStatusAttributes, status_attr, NULL); 1524 XGetICValues (Input_Context, XNStatusAttributes, status_attr, NULL);
1606 XFree (status_attr); 1525 XFree (status_attr);
1607 1526
1608 im_set_preedit_area (preedit_rect, status_rect, *needed_rect); 1527 im_set_preedit_area (preedit_rect, status_rect, *needed_rect);
1609 XFree (needed_rect); 1528 XFree (needed_rect);
1610 1529
1611 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL); 1530 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);
1612 status_attr = XVaCreateNestedList (0, XNArea, &status_rect, NULL); 1531 status_attr = XVaCreateNestedList (0, XNArea, &status_rect, NULL);
1613 1532
1614 XSetICValues (Input_Context, 1533 XSetICValues (Input_Context,
1615 XNPreeditAttributes, preedit_attr, 1534 XNPreeditAttributes, preedit_attr,
1616 XNStatusAttributes, status_attr, NULL); 1535 XNStatusAttributes, status_attr,
1536 NULL);
1617 1537
1538 XFree (status_attr);
1539 }
1540
1618 XFree (preedit_attr); 1541 XFree (preedit_attr);
1619 XFree (status_attr);
1620} 1542}
1621#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 */
1622 1611
1623/*----------------------- end-of-file (C source) -----------------------*/ 1612/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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