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.192 by root, Fri Jan 20 12:16:28 2006 UTC vs.
Revision 1.300 by root, Sat Jan 19 00:24:53 2008 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-2007 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.
38#include <limits> 38#include <limits>
39 39
40#include <csignal> 40#include <csignal>
41#include <cstring> 41#include <cstring>
42 42
43#ifdef TTY_GID_SUPPORT
44# include <grp.h>
45#endif
46
47#ifdef HAVE_TERMIOS_H
48# include <termios.h> 43#include <termios.h>
44
45#ifdef HAVE_XSETLOCALE
46# define X_LOCALE
47# include <X11/Xlocale.h>
48#else
49# ifdef HAVE_SETLOCALE
50# include <clocale>
51# endif
49#endif 52#endif
50 53
51vector<rxvt_term *> rxvt_term::termlist; 54vector<rxvt_term *> rxvt_term::termlist;
52 55
53// used to tell global functions which terminal instance is "active" 56// used to tell global functions which terminal instance is "active"
56static char curlocale[128], savelocale[128]; 59static char curlocale[128], savelocale[128];
57 60
58bool 61bool
59rxvt_set_locale (const char *locale) NOTHROW 62rxvt_set_locale (const char *locale) NOTHROW
60{ 63{
64 int size = strlen (locale) + 1;
65
66 if (size > sizeof (curlocale))
67 rxvt_fatal ("locale string too long, aborting.\n");
68
61 if (!locale || !strncmp (locale, curlocale, 128)) 69 if (!locale || !memcmp (locale, curlocale, size))
62 return false; 70 return false;
63 71
64 strncpy (curlocale, locale, 128); 72 memcpy (curlocale, locale, size);
65 setlocale (LC_CTYPE, curlocale); 73 setlocale (LC_CTYPE, curlocale);
66 return true; 74 return true;
67} 75}
68 76
69void 77void
83class rxvt_composite_vec rxvt_composite; 91class rxvt_composite_vec rxvt_composite;
84 92
85text_t rxvt_composite_vec::compose (unicode_t c1, unicode_t c2) 93text_t rxvt_composite_vec::compose (unicode_t c1, unicode_t c2)
86{ 94{
87 compose_char *cc; 95 compose_char *cc;
88 96
89 // break compose chains, as stupid readline really likes to duplicate 97 // break compose chains, as stupid readline really likes to duplicate
90 // composing characters for some reason near the end of a line. 98 // composing characters for some reason near the end of a line.
91 cc = (*this)[c1]; 99 cc = (*this)[c1];
92 while (cc) 100 while (cc)
93 { 101 {
142 150
143} 151}
144#endif 152#endif
145 153
146rxvt_term::rxvt_term () 154rxvt_term::rxvt_term ()
147 : 155{
148#if TRANSPARENT 156#if HAVE_BG_PIXMAP
149 rootwin_ev (this, &rxvt_term::rootwin_cb), 157 update_background_ev.set<rxvt_term, &rxvt_term::update_background_cb> (this);
158#endif
159#ifdef CURSOR_BLINK
160 cursor_blink_ev.set <rxvt_term, &rxvt_term::cursor_blink_cb> (this); cursor_blink_ev.set (0., CURSOR_BLINK_INTERVAL);
161#endif
162#ifdef TEXT_BLINK
163 text_blink_ev.set <rxvt_term, &rxvt_term::text_blink_cb> (this); text_blink_ev.set (0., TEXT_BLINK_INTERVAL);
164#endif
165#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
166 cont_scroll_ev.set <rxvt_term, &rxvt_term::cont_scroll_cb> (this);
167#endif
168#ifdef SELECTION_SCROLLING
169 sel_scroll_ev.set <rxvt_term, &rxvt_term::sel_scroll_cb> (this);
170#endif
171#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
172 slip_wheel_ev.set <rxvt_term, &rxvt_term::slip_wheel_cb> (this);
173#endif
174#if ENABLE_TRANSPARENCY || ENABLE_PERL
175 rootwin_ev.set <rxvt_term, &rxvt_term::rootwin_cb> (this),
150#endif 176#endif
151#ifdef HAVE_SCROLLBARS 177#ifdef HAVE_SCROLLBARS
152 scrollbar_ev (this, &rxvt_term::x_cb), 178 scrollbar_ev.set <rxvt_term, &rxvt_term::x_cb> (this),
153#endif 179#endif
154#ifdef CURSOR_BLINK 180#ifdef USE_XIM
155 cursor_blink_ev (this, &rxvt_term::cursor_blink_cb), 181 im_ev.set <rxvt_term, &rxvt_term::im_cb> (this),
156#endif
157#ifdef TEXT_BLINK
158 text_blink_ev (this, &rxvt_term::text_blink_cb),
159#endif
160#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
161 cont_scroll_ev (this, &rxvt_term::cont_scroll_cb),
162#endif
163#ifdef SELECTION_SCROLLING
164 sel_scroll_ev (this, &rxvt_term::sel_scroll_cb),
165#endif
166#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
167 slip_wheel_ev (this, &rxvt_term::slip_wheel_cb),
168#endif 182#endif
169#ifdef POINTER_BLANK 183#ifdef POINTER_BLANK
170 pointer_ev (this, &rxvt_term::pointer_cb), 184 pointer_ev.set <rxvt_term, &rxvt_term::pointer_cb> (this);
171#endif 185#endif
172#ifdef USE_XIM 186#ifndef NO_BELL
173 im_ev (this, &rxvt_term::im_cb), 187 bell_ev.set <rxvt_term, &rxvt_term::bell_cb> (this);
174#endif 188#endif
175 termwin_ev (this, &rxvt_term::x_cb), 189 child_ev.set <rxvt_term, &rxvt_term::child_cb> (this);
176 vt_ev (this, &rxvt_term::x_cb), 190 flush_ev.set <rxvt_term, &rxvt_term::flush_cb> (this);
177 child_ev (this, &rxvt_term::child_cb), 191 destroy_ev.set <rxvt_term, &rxvt_term::destroy_cb> (this);
178 check_ev (this, &rxvt_term::check_cb), 192 pty_ev.set <rxvt_term, &rxvt_term::pty_cb> (this);
179 flush_ev (this, &rxvt_term::flush_cb), 193 incr_ev.set <rxvt_term, &rxvt_term::incr_cb> (this);
180 destroy_ev (this, &rxvt_term::destroy_cb), 194 termwin_ev.set <rxvt_term, &rxvt_term::x_cb> (this);
181 pty_ev (this, &rxvt_term::pty_cb), 195 vt_ev.set <rxvt_term, &rxvt_term::x_cb> (this);
182 incr_ev (this, &rxvt_term::incr_cb) 196
183{
184 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base; 197 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base;
185 198
186 termlist.push_back (this); 199 termlist.push_back (this);
187 200
188#ifdef KEYSYM_RESOURCE 201#ifdef KEYSYM_RESOURCE
190#endif 203#endif
191} 204}
192 205
193// clean up the most important stuff, do *not* call x or free mem etc. 206// clean up the most important stuff, do *not* call x or free mem etc.
194// for use before an emergency exit 207// for use before an emergency exit
208void
195void rxvt_term::emergency_cleanup () 209rxvt_term::emergency_cleanup ()
196{ 210{
197 if (cmd_pid) 211 if (cmd_pid)
198 kill (-cmd_pid, SIGHUP); 212 kill (-cmd_pid, SIGHUP);
199 213
214 pty_ev.stop ();
200 delete pty; pty = 0; 215 delete pty; pty = 0;
201} 216}
202 217
203rxvt_term::~rxvt_term () 218rxvt_term::~rxvt_term ()
204{ 219{
211 if (fontset[i] != fontset[0]) 226 if (fontset[i] != fontset[0])
212 delete fontset[i]; 227 delete fontset[i];
213#endif 228#endif
214 delete fontset[0]; 229 delete fontset[0];
215 230
231#ifdef HAVE_BG_PIXMAP
232 bgPixmap.destroy ();
233#endif
234
216 if (display) 235 if (display)
217 { 236 {
218 dDisp;
219
220 selection_clear (); 237 selection_clear ();
221 238
222#ifdef USE_XIM 239#ifdef USE_XIM
223 im_destroy (); 240 im_destroy ();
224#endif 241#endif
225#ifdef XTERM_SCROLLBAR 242#ifdef XTERM_SCROLLBAR
226 if (xscrollbarGC) XFreeGC (disp, xscrollbarGC); 243 if (xscrollbarGC) XFreeGC (dpy, xscrollbarGC);
227 if (ShadowGC) XFreeGC (disp, ShadowGC); 244 if (ShadowGC) XFreeGC (dpy, ShadowGC);
228#endif 245#endif
229#ifdef PLAIN_SCROLLBAR 246#ifdef PLAIN_SCROLLBAR
230 if (pscrollbarGC) XFreeGC (disp, pscrollbarGC); 247 if (pscrollbarGC) XFreeGC (dpy, pscrollbarGC);
231#endif 248#endif
232#ifdef NEXT_SCROLLBAR 249#ifdef NEXT_SCROLLBAR
233 if (blackGC) XFreeGC (disp, blackGC); 250 if (blackGC) XFreeGC (dpy, blackGC);
234 if (whiteGC) XFreeGC (disp, whiteGC); 251 if (whiteGC) XFreeGC (dpy, whiteGC);
235 if (grayGC) XFreeGC (disp, grayGC); 252 if (grayGC) XFreeGC (dpy, grayGC);
236 if (darkGC) XFreeGC (disp, darkGC); 253 if (darkGC) XFreeGC (dpy, darkGC);
237 if (stippleGC) XFreeGC (disp, stippleGC); 254 if (stippleGC) XFreeGC (dpy, stippleGC);
238 if (dimple) XFreePixmap (disp, dimple); 255 if (dimple) XFreePixmap (dpy, dimple);
239 if (upArrow) XFreePixmap (disp, upArrow); 256 if (upArrow) XFreePixmap (dpy, upArrow);
240 if (downArrow) XFreePixmap (disp, downArrow); 257 if (downArrow) XFreePixmap (dpy, downArrow);
241 if (upArrowHi) XFreePixmap (disp, upArrowHi); 258 if (upArrowHi) XFreePixmap (dpy, upArrowHi);
242 if (downArrowHi) XFreePixmap (disp, downArrowHi); 259 if (downArrowHi) XFreePixmap (dpy, downArrowHi);
243#endif 260#endif
244#ifdef RXVT_SCROLLBAR 261#ifdef RXVT_SCROLLBAR
245 if (topShadowGC) XFreeGC (disp, topShadowGC); 262 if (topShadowGC) XFreeGC (dpy, topShadowGC);
246 if (botShadowGC) XFreeGC (disp, botShadowGC); 263 if (botShadowGC) XFreeGC (dpy, botShadowGC);
247 if (scrollbarGC) XFreeGC (disp, scrollbarGC); 264 if (scrollbarGC) XFreeGC (dpy, scrollbarGC);
248#endif 265#endif
249 if (gc) XFreeGC (disp, gc); 266 if (gc) XFreeGC (dpy, gc);
250 267
251 delete drawable; 268 delete drawable;
252 // destroy all windows 269 // destroy all windows
253 if (parent[0]) 270 if (parent[0])
254 XDestroyWindow (disp, parent[0]); 271 XDestroyWindow (dpy, parent[0]);
255 }
256 272
257 // TODO: free pixcolours, colours should become part of rxvt_display 273 for (int i = 0; i < TOTAL_COLORS; i++)
258 delete pix_colors_focused; 274 if (ISSET_PIXCOLOR (i))
275 {
276 pix_colors_focused [i].free (this);
259#if OFF_FOCUS_FADING 277#if OFF_FOCUS_FADING
260 delete pix_colors_unfocused; 278 pix_colors_unfocused [i].free (this);
261#endif 279#endif
280 }
262 281
282 clear ();
283
284 display->flush (); /* ideally .put should do this */
263 displays.put (display); 285 displays.put (display);
286 }
264 287
265 scr_release (); 288 scr_release ();
266 289
267 /* clear all resources */ 290 /* clear all resources */
268 for (int i = 0; i < allocated.size (); i++) 291 for (int i = 0; i < allocated.size (); i++)
269 free (allocated [i]); 292 free (allocated [i]);
270 293
271 free (selection.text); 294 free (selection.text);
272 // TODO: manage env vars in child only(!) 295 // TODO: manage env vars in child only(!)
273 free (env_windowid);
274 free (env_display); 296 free (env_display);
275 free (env_term); 297 free (env_term);
276 free (env_colorfgbg);
277 free (locale); 298 free (locale);
278 free (v_buffer); 299 free (v_buffer);
279 free (incr_buf); 300 free (incr_buf);
280 301
281 delete envv; 302 delete envv;
282 delete argv; 303 delete argv;
283 304
284#ifdef KEYSYM_RESOURCE 305#ifdef KEYSYM_RESOURCE
285 delete keyboard; 306 delete keyboard;
286#endif 307#endif
308#ifndef NO_RESOURCES
309 XrmDestroyDatabase (option_db);
310#endif
287} 311}
288 312
289// child has exited, usually destroys 313// child has exited, usually destroys
290void 314void
291rxvt_term::child_cb (child_watcher &w, int status) 315rxvt_term::child_cb (ev::child &w, int status)
292{ 316{
293 HOOK_INVOKE ((this, HOOK_CHILD_EXIT, DT_INT, status, DT_END)); 317 HOOK_INVOKE ((this, HOOK_CHILD_EXIT, DT_INT, status, DT_END));
294 318
295 cmd_pid = 0; 319 cmd_pid = 0;
296 320
297 if (!OPTION (Opt_hold)) 321 if (!option (Opt_hold))
298 destroy (); 322 destroy ();
299} 323}
300 324
301void 325void
302rxvt_term::destroy () 326rxvt_term::destroy ()
303{ 327{
304 if (destroy_ev.active) 328 if (destroy_ev.is_active ())
305 return; 329 return;
306 330
307 if (HOOK_INVOKE ((this, HOOK_DESTROY, DT_END))) 331 HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));
308 return;
309 332
310#if ENABLE_OVERLAY 333#if ENABLE_OVERLAY
311 scr_overlay_off (); 334 scr_overlay_off ();
312#endif 335#endif
313 336
317 im_ev.stop (display); 340 im_ev.stop (display);
318#endif 341#endif
319#if HAVE_SCROLLBARS 342#if HAVE_SCROLLBARS
320 scrollbar_ev.stop (display); 343 scrollbar_ev.stop (display);
321#endif 344#endif
322#if TRANSPARENT 345#if ENABLE_TRANSPARENCY || ENABLE_PERL
323 rootwin_ev.stop (display); 346 rootwin_ev.stop (display);
324#endif 347#endif
325 incr_ev.stop (); 348 incr_ev.stop ();
326 termwin_ev.stop (display); 349 termwin_ev.stop (display);
327 vt_ev.stop (display); 350 vt_ev.stop (display);
328 } 351 }
329 352
330 check_ev.stop (); 353 flush_ev.stop ();
331 pty_ev.stop (); 354 pty_ev.stop ();
332#ifdef CURSOR_BLINK 355#ifdef CURSOR_BLINK
333 cursor_blink_ev.stop (); 356 cursor_blink_ev.stop ();
334#endif 357#endif
335#ifdef TEXT_BLINK 358#ifdef TEXT_BLINK
343#endif 366#endif
344#ifdef POINTER_BLANK 367#ifdef POINTER_BLANK
345 pointer_ev.stop (); 368 pointer_ev.stop ();
346#endif 369#endif
347 370
348 destroy_ev.start (0); 371 destroy_ev.start ();
349} 372}
350 373
351void 374void
352rxvt_term::destroy_cb (time_watcher &w) 375rxvt_term::destroy_cb (ev::idle &w, int revents)
353{ 376{
354 make_current (); 377 make_current ();
355 378
356 delete this; 379 delete this;
357} 380}
368{ 391{
369 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++) 392 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)
370 (*t)->emergency_cleanup (); 393 (*t)->emergency_cleanup ();
371} 394}
372 395
373#if ENABLE_FRILLS 396#if !ENABLE_MINIMAL
374static void 397static void
375print_x_error (Display *dpy, XErrorEvent *event) 398print_x_error (Display *dpy, XErrorEvent *event)
376{ 399{
377 char buffer[BUFSIZ]; 400 char buffer[BUFSIZ];
378 char mesg[BUFSIZ]; 401 char mesg[BUFSIZ];
411 else 434 else
412 XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x", 435 XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x",
413 mesg, BUFSIZ); 436 mesg, BUFSIZ);
414 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid); 437 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid);
415 } 438 }
416 XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d", 439 XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d",
417 mesg, BUFSIZ); 440 mesg, BUFSIZ);
418 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial); 441 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial);
419} 442}
420#endif 443#endif
421 444
426 GET_R->allowedxerror = event->error_code; 449 GET_R->allowedxerror = event->error_code;
427 else 450 else
428 { 451 {
429 // GET_R is most likely not the terminal which caused the error, 452 // GET_R is most likely not the terminal which caused the error,
430 // so just output the error and continue 453 // so just output the error and continue
431#if ENABLE_FRILLS 454#if ENABLE_MINIMAL
455 old_xerror_handler (display, event);
456#else
432 print_x_error (display, event); 457 print_x_error (display, event);
433#else
434 old_xerror_handler (display, event);
435#endif 458#endif
436 } 459 }
437 460
438 return 0; 461 return 0;
439} 462}
446 rxvt_emergency_cleanup (); 469 rxvt_emergency_cleanup ();
447 _exit (EXIT_FAILURE); 470 _exit (EXIT_FAILURE);
448} 471}
449 472
450/*----------------------------------------------------------------------*/ 473/*----------------------------------------------------------------------*/
451bool 474void
452rxvt_term::init (int argc, const char *const *argv) 475rxvt_term::init (int argc, const char *const *argv, stringvec *envv)
453{ 476{
477 this->envv = envv;
478
454 SET_R (this); 479 SET_R (this);
455 set_locale (""); 480 set_locale ("");
456 set_environ (envv); // few things in X do not call setlocale :( 481 set_environ (envv); // few things in X do not call setlocale :(
457 482
458 if (!init_vars ()) 483 init_vars ();
459 return false;
460 484
461 init_secondary (); 485 init_secondary ();
462 486
463 const char **cmd_argv = init_resources (argc, argv); 487 const char **cmd_argv = init_resources (argc, argv);
464 488
465#ifdef KEYSYM_RESOURCE 489#ifdef KEYSYM_RESOURCE
466 keyboard->register_done (); 490 keyboard->register_done ();
467#endif 491#endif
468 492
469#ifdef HAVE_SCROLLBARS 493#ifdef HAVE_SCROLLBARS
470 if (OPTION (Opt_scrollBar)) 494 if (option (Opt_scrollBar))
471 scrollBar.setIdle (); /* set existence for size calculations */ 495 scrollBar.setIdle (); /* set existence for size calculations */
472#endif 496#endif
473 497
474 pty = rxvt_new_ptytty (); 498 pty = ptytty::create ();
475 499
476 create_windows (argc, argv); 500 create_windows (argc, argv);
477 501
478 dDisp;
479
480 init_xlocale (); 502 init_xlocale ();
481 503
482 scr_reset (); // initialize screen 504 scr_reset (); // initialize screen
483 505
484#if 0 506#if 0
485 XSynchronize (disp, True); 507 XSynchronize (dpy, True);
486#endif 508#endif
487 509
488#ifdef HAVE_SCROLLBARS 510#ifdef HAVE_SCROLLBARS
489 if (OPTION (Opt_scrollBar)) 511 if (option (Opt_scrollBar))
490 resize_scrollbar (); /* create and map scrollbar */ 512 resize_scrollbar (); /* create and map scrollbar */
491#endif 513#endif
514#ifdef HAVE_BG_PIXMAP
515 {
516 bgPixmap.set_target (this);
517 bgPixmap.invalidate ();
518
492#ifdef TRANSPARENT 519#ifdef ENABLE_TRANSPARENCY
493 if (OPTION (Opt_transparent)) 520 if (option (Opt_transparent))
494 { 521 {
522 bgPixmap.set_transparent ();
523
524#ifdef HAVE_AFTERIMAGE
525 if (rs [Rs_blurradius])
526 bgPixmap.set_blur_radius (rs [Rs_blurradius]);
527#endif
528 if (ISSET_PIXCOLOR (Color_tint))
529 bgPixmap.set_tint (pix_colors_focused [Color_tint]);
530
531 if (rs [Rs_shade])
532 bgPixmap.set_shade (rs [Rs_shade]);
533
534 bgPixmap.set_root_pixmap ();
495 XSelectInput (disp, display->root, PropertyChangeMask); 535 XSelectInput (dpy, display->root, PropertyChangeMask);
496 check_our_parents ();
497 rootwin_ev.start (display, display->root); 536 rootwin_ev.start (display, display->root);
498 } 537 }
538#endif
539
540#ifdef BG_IMAGE_FROM_FILE
541 if (rs[Rs_backgroundPixmap])
542 {
543 const char *p = rs[Rs_backgroundPixmap];
544
545 if ((p = strchr (p, ';')) != 0)
546 {
547 p++;
548 bgPixmap.set_geometry (p);
549 }
550 else
551 bgPixmap.set_defaultGeometry ();
552
553 if (bgPixmap.set_file (rs[Rs_backgroundPixmap]))
554 if (!bgPixmap.window_position_sensitive ())
555 update_background ();
556 }
557#endif
558 }
559#endif
560
561#if ENABLE_PERL
562 rootwin_ev.start (display, display->root);
499#endif 563#endif
500 564
501 set_colorfgbg (); 565 set_colorfgbg ();
502 566
503 init_command (cmd_argv); 567 init_command (cmd_argv);
504 568
505 free (cmd_argv); 569 free (cmd_argv);
506 570
507 if (pty->pty >= 0) 571 if (pty->pty >= 0)
508 pty_ev.start (pty->pty, EVENT_READ); 572 pty_ev.start (pty->pty, ev::READ);
509
510 check_ev.start ();
511 573
512 HOOK_INVOKE ((this, HOOK_START, DT_END)); 574 HOOK_INVOKE ((this, HOOK_START, DT_END));
513 575
576#if ENABLE_XEMBED
577 if (rs[Rs_embed])
578 {
579 long info[2] = { 0, XEMBED_MAPPED };
580
581 XChangeProperty (dpy, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
582 32, PropModeReplace, (unsigned char *)&info, 2);
583 }
584#endif
585
514 XMapWindow (disp, vt); 586 XMapWindow (dpy, vt);
515 XMapWindow (disp, parent[0]); 587 XMapWindow (dpy, parent[0]);
516 588
517 return true; 589 refresh_check ();
518} 590}
519 591
520static struct sig_handlers 592static struct sig_handlers
521{ 593{
522 sig_watcher sw_term, sw_int; 594 ev::sig sw_term, sw_int;
523 595
524 /* 596 /*
525 * Catch a fatal signal and tidy up before quitting 597 * Catch a fatal signal and tidy up before quitting
526 */ 598 */
527 void 599 void sig_term (ev::sig &w, int revents);
528 sig_term (sig_watcher &w) 600
601 sig_handlers ()
529 { 602 {
530#ifdef DEBUG_CMD 603 sw_term.set<sig_handlers, &sig_handlers::sig_term> (this);
531 rxvt_warn ("caught signal %d, exiting.\n", w.signum);
532#endif
533 rxvt_emergency_cleanup ();
534 signal (w.signum, SIG_DFL);
535 kill (getpid (), w.signum);
536 }
537
538 sig_handlers ()
539 : sw_term (this, &sig_handlers::sig_term),
540 sw_int (this, &sig_handlers::sig_term) 604 sw_int .set<sig_handlers, &sig_handlers::sig_term> (this);
541 {
542 } 605 }
543} sig_handlers; 606} sig_handlers;
544 607
608void
609sig_handlers::sig_term (ev::sig &w, int revents)
610{
611 rxvt_emergency_cleanup ();
612 w.stop ();
613 kill (getpid (), w.signum);
614}
615
545char **rxvt_environ; // startup environment 616char **rxvt_environ; // startup environment
546 617
547void 618void
548rxvt_init () 619rxvt_init ()
549{ 620{
550 uid_t uid = getuid (); 621 ptytty::init ();
551 gid_t gid = getgid ();
552
553 // before doing anything else, check for setuid/setgid operation,
554 // start the helper process and drop privileges
555 if (uid != geteuid ()
556 || gid != getegid ())
557 {
558#if PTYTTY_HELPER
559 rxvt_ptytty_server ();
560#else
561 rxvt_warn ("running setuid/setgid without pty helper compiled in, continuing unprivileged.\n");
562#endif
563 622
564 // drop privileges 623 if (!ev_default_loop (0))
565#if HAVE_SETRESUID 624 rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n");
566 setresgid (gid, gid, gid);
567 setresuid (uid, uid, uid);
568#elif HAVE_SETREUID
569 setregid (gid, gid);
570 setreuid (uid, uid);
571#elif HAVE_SETUID
572 setgid (gid);
573 setuid (uid);
574#endif
575
576 if (uid != geteuid ()
577 || gid != getegid ())
578 rxvt_fatal ("unable to drop privileges, aborting.\n");
579 }
580 625
581 rxvt_environ = environ; 626 rxvt_environ = environ;
582 627
583 signal (SIGHUP, SIG_IGN); 628 signal (SIGHUP, SIG_IGN);
584 signal (SIGPIPE, SIG_IGN); 629 signal (SIGPIPE, SIG_IGN);
585 630
586 sig_handlers.sw_term.start (SIGTERM); 631 sig_handlers.sw_term.start (SIGTERM); ev_unref ();
587 sig_handlers.sw_int.start (SIGINT); 632 sig_handlers.sw_int.start (SIGINT); ev_unref ();
588 633
589 /* need to trap SIGURG for SVR4 (Unixware) rlogin */ 634 /* need to trap SIGURG for SVR4 (Unixware) rlogin */
590 /* signal (SIGURG, SIG_DFL); */ 635 /* signal (SIGURG, SIG_DFL); */
591 636
592 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); 637 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
594 XSetIOErrorHandler (rxvt_xioerror_handler); 639 XSetIOErrorHandler (rxvt_xioerror_handler);
595 640
596 XrmInitialize (); 641 XrmInitialize ();
597} 642}
598 643
599/* ------------------------------------------------------------------------- *
600 * MEMORY ALLOCATION WRAPPERS *
601 * ------------------------------------------------------------------------- */
602void *
603rxvt_malloc (size_t size)
604{
605 void *p = malloc (size);
606
607 if (!p)
608 rxvt_fatal ("memory allocation failure. aborting.\n");
609
610 return p;
611}
612
613void *
614rxvt_calloc (size_t number, size_t size)
615{
616 void *p = calloc (number, size);
617
618 if (!p)
619 rxvt_fatal ("memory allocation failure. aborting.\n");
620
621 return p;
622}
623
624void *
625rxvt_realloc (void *ptr, size_t size)
626{
627 void *p = realloc (ptr, size);
628
629 if (!p)
630 rxvt_fatal ("memory allocation failure. aborting.\n");
631
632 return p;
633}
634
635/*----------------------------------------------------------------------*/ 644/*----------------------------------------------------------------------*/
636/* 645/*
637 * window size/position calculcations for XSizeHint and other storage. 646 * window size/position calculations for XSizeHint and other storage.
638 * if width/height are non-zero then override calculated width/height 647 * if width/height are non-zero then override calculated width/height
639 */ 648 */
640void 649void
641rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight) 650rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
642{ 651{
643 short recalc_x, recalc_y; 652 short recalc_x, recalc_y;
644 int x, y, sb_w, flags; 653 int x, y, sb_w, flags;
645 unsigned int w, h; 654 unsigned int w, h;
646 unsigned int max_width, max_height; 655 unsigned int max_width, max_height;
647 dDisp;
648
649 D_SIZE ((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
650 ncol, nrow, szHint.width, szHint.height));
651 656
652 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity; 657 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity;
653 szHint.win_gravity = NorthWestGravity; 658 szHint.win_gravity = NorthWestGravity;
654 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */ 659 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */
655 660
717 722
718 if (scrollBar.state) 723 if (scrollBar.state)
719 { 724 {
720 sb_w = scrollbar_TotalWidth (); 725 sb_w = scrollbar_TotalWidth ();
721 szHint.base_width += sb_w; 726 szHint.base_width += sb_w;
727
722 if (!OPTION (Opt_scrollBar_right)) 728 if (!option (Opt_scrollBar_right))
723 window_vt_x += sb_w; 729 window_vt_x += sb_w;
724 } 730 }
725 731
726 szHint.width_inc = fwidth; 732 szHint.width_inc = fwidth;
727 szHint.height_inc = fheight; 733 szHint.height_inc = fheight;
728 szHint.min_width = szHint.base_width + szHint.width_inc; 734 szHint.min_width = szHint.base_width + szHint.width_inc;
729 szHint.min_height = szHint.base_height + szHint.height_inc; 735 szHint.min_height = szHint.base_height + szHint.height_inc;
730 736
731 if (newwidth && newwidth - szHint.base_width < max_width) 737 if (newwidth && newwidth - szHint.base_width < max_width)
732 { 738 {
733 szHint.width = newwidth; 739 szHint.width = newwidth;
748 { 754 {
749 min_it (height, max_height); 755 min_it (height, max_height);
750 szHint.height = szHint.base_height + height; 756 szHint.height = szHint.base_height + height;
751 } 757 }
752 758
753 if (scrollBar.state && OPTION (Opt_scrollBar_right)) 759 if (scrollBar.state && option (Opt_scrollBar_right))
754 window_sb_x = szHint.width - sb_w; 760 window_sb_x = szHint.width - sb_w;
755 761
756 if (recalc_x) 762 if (recalc_x)
757 szHint.x += DisplayWidth (disp, display->screen) - szHint.width - 2 * ext_bwidth; 763 szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth;
764
758 if (recalc_y) 765 if (recalc_y)
759 szHint.y += DisplayHeight (disp, display->screen) - szHint.height - 2 * ext_bwidth; 766 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth;
760 767
761 ncol = width / fwidth; 768 ncol = width / fwidth;
762 nrow = height / fheight; 769 nrow = height / fheight;
763 D_SIZE ((stderr, "> Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
764 ncol, nrow, szHint.width,
765 szHint.height));
766 return;
767} 770}
768 771
769/*----------------------------------------------------------------------*/ 772/*----------------------------------------------------------------------*/
770/* 773/*
771 * Tell the teletype handler what size the window is. 774 * Tell the teletype handler what size the window is.
784 ws.ws_xpixel = width; 787 ws.ws_xpixel = width;
785 ws.ws_ypixel = height; 788 ws.ws_ypixel = height;
786 (void)ioctl (pty->pty, TIOCSWINSZ, &ws); 789 (void)ioctl (pty->pty, TIOCSWINSZ, &ws);
787 790
788#if 0 791#if 0
789 // TIOCSWINSZ⎈ is supposed to do this automatically and correctly 792 // TIOCSWINSZ is supposed to do this automatically and correctly
790 if (cmd_pid) /* force through to the command */ 793 if (cmd_pid) /* force through to the command */
791 kill (-cmd_pid, SIGWINCH); 794 kill (-cmd_pid, SIGWINCH);
792#endif 795#endif
793} 796}
794 797
823 delete fontset[0]; 826 delete fontset[0];
824 fontset[0] = fs; 827 fontset[0] = fs;
825 828
826 prop = (*fs)[1]->properties (); 829 prop = (*fs)[1]->properties ();
827 prop.height += lineSpace; 830 prop.height += lineSpace;
831
828 fs->set_prop (prop); 832 fs->set_prop (prop, false);
829 833
830 fwidth = prop.width; 834 fwidth = prop.width;
831 fheight = prop.height; 835 fheight = prop.height;
832 fbase = prop.ascent; 836 fbase = prop.ascent;
833 837
842 { 846 {
843 fontset[style] = fs = new rxvt_fontset (this); 847 fontset[style] = fs = new rxvt_fontset (this);
844 rxvt_fontprop prop2 = prop; 848 rxvt_fontprop prop2 = prop;
845 849
846 if (res) 850 if (res)
847 prop2.weight = prop2.slant = rxvt_fontprop::unset; 851 {
852 fs->populate (res);
853 fs->set_prop (prop2, false);
854 }
848 else 855 else
849 { 856 {
850 res = fontset[0]->fontdesc; 857 fs->populate (fontset[0]->fontdesc);
851 858
852 if (SET_STYLE (0, style) & RS_Bold) prop2.weight = rxvt_fontprop::bold; 859 if (SET_STYLE (0, style) & RS_Bold) prop2.weight = rxvt_fontprop::bold;
853 if (SET_STYLE (0, style) & RS_Italic) prop2.slant = rxvt_fontprop::italic; 860 if (SET_STYLE (0, style) & RS_Italic) prop2.slant = rxvt_fontprop::italic;
861
862 fs->set_prop (prop2, true);
854 } 863 }
855 864
856 fs->populate (res);
857 fs->set_prop (prop2);
858 } 865 }
859#else 866#else
860 fontset[style] = fontset[0]; 867 fontset[style] = fontset[0];
861#endif 868#endif
862 } 869 }
864 if (parent[0]) 871 if (parent[0])
865 { 872 {
866 resize_all_windows (0, 0, 0); 873 resize_all_windows (0, 0, 0);
867 scr_remap_chars (); 874 scr_remap_chars ();
868 scr_touch (true); 875 scr_touch (true);
869 } 876 }
870 877
871 return true; 878 return true;
872} 879}
873 880
881void
874void rxvt_term::set_string_property (Atom prop, const char *str, int len) 882rxvt_term::set_string_property (Atom prop, const char *str, int len)
875{ 883{
876 XChangeProperty (display->display, parent[0], 884 XChangeProperty (dpy, parent[0],
877 prop, XA_STRING, 8, PropModeReplace, 885 prop, XA_STRING, 8, PropModeReplace,
878 (const unsigned char *)str, len >= 0 ? len : strlen (str)); 886 (const unsigned char *)str, len >= 0 ? len : strlen (str));
879} 887}
880 888
889void
881void rxvt_term::set_utf8_property (Atom prop, const char *str, int len) 890rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
882{ 891{
883 wchar_t *ws = rxvt_mbstowcs (str, len); 892 wchar_t *ws = rxvt_mbstowcs (str, len);
884 char *s = rxvt_wcstoutf8 (ws); 893 char *s = rxvt_wcstoutf8 (ws);
885 894
886 XChangeProperty (display->display, parent[0], 895 XChangeProperty (dpy, parent[0],
887 prop, xa[XA_UTF8_STRING], 8, PropModeReplace, 896 prop, xa[XA_UTF8_STRING], 8, PropModeReplace,
888 (const unsigned char *)s, strlen (s)); 897 (const unsigned char *)s, strlen (s));
889 898
890 free (s); 899 free (s);
891 free (ws); 900 free (ws);
910#if ENABLE_EWMH 919#if ENABLE_EWMH
911 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str); 920 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str);
912#endif 921#endif
913} 922}
914 923
924void
925rxvt_term::set_window_color (int idx, const char *color)
926{
915#ifdef XTERM_COLOR_CHANGE 927#ifdef XTERM_COLOR_CHANGE
916void
917rxvt_term::set_window_color (int idx, const char *color)
918{
919 rxvt_color xcol; 928 rxvt_color xcol;
920 int i; 929 int i;
921 930
922 if (color == NULL || *color == '\0') 931 if (color == NULL || *color == '\0')
923 return; 932 return;
924 933
934 color = strdup (color);
935 allocated.push_back ((void *)color);
936 rs[Rs_color + idx] = color;
937
925 /* handle color aliases */ 938 /* handle color aliases */
926 if (isdigit (*color)) 939 if (isdigit (*color))
927 { 940 {
928 i = atoi (color); 941 i = atoi (color);
929 942
930 if (i >= 8 && i <= 15) 943 if (i >= 8 && i <= 15)
944 {
931 { /* bright colors */ 945 /* bright colors */
932 i -= 8;
933 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i]; 946 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i - 8];
934 SET_PIXCOLOR (idx);
935 goto done; 947 goto done;
936 } 948 }
937 949
938 if (i >= 0 && i <= 7) 950 if (i >= 0 && i <= 7)
951 {
939 { /* normal colors */ 952 /* normal colors */
940 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i]; 953 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];
941 SET_PIXCOLOR (idx);
942 goto done; 954 goto done;
943 } 955 }
944 } 956 }
945 957
946 if (!rXParseAllocColor (&xcol, color)) 958 set_color (xcol, color);
947 return;
948
949 /* XStoreColor (display->display, display->cmap, XColor*); */
950 959
951 /* 960 /*
952 * FIXME: should free colors here, but no idea how to do it so instead, 961 * FIXME: should free colors here, but no idea how to do it so instead,
953 * so just keep gobbling up the colormap 962 * so just keep gobbling up the colormap
954 */ 963 */
955# if 0
956 for (i = Color_Black; i <= Color_White; i++)
957 if (pix_colors[idx] == pix_colors[i])
958 break;
959 if (i > Color_White)
960 {
961 /* fprintf (stderr, "XFreeColors: pix_colors [%d] = %lu\n", idx, pix_colors [idx]); */
962 XFreeColors (display->display, display->cmap, (pix_colors + idx), 1,
963 DisplayPlanes (display->display, display->screen));
964 }
965# endif
966 964
967 pix_colors_focused[idx] = xcol; 965 pix_colors_focused[idx] = xcol;
968 SET_PIXCOLOR (idx);
969 966
970 /* XSetWindowAttributes attr; */
971 /* Cursor cursor; */
972done: 967done:
973
974#if OFF_FOCUS_FADING
975 if (rs[Rs_fade])
976 pix_colors_unfocused[idx] = pix_colors_focused[idx].fade (display, atoi (rs[Rs_fade]), pix_colors[Color_fade]);
977#endif
978
979 /*TODO: handle Color_BD, scrollbar background, etc. */ 968 /*TODO: handle Color_BD, scrollbar background, etc. */
980 969
970 update_fade_color (idx);
981 recolour_cursor (); 971 recolour_cursor ();
982 scr_recolour (); 972 scr_recolour ();
973#endif /* XTERM_COLOR_CHANGE */
983} 974}
984
985#else
986# define set_window_color (idx,color) ((void)0)
987#endif /* XTERM_COLOR_CHANGE */
988 975
989void 976void
990rxvt_term::recolour_cursor () 977rxvt_term::recolour_cursor ()
991{ 978{
992 XColor xcol[2]; 979 XColor fg, bg;
993 980
994 xcol[0].pixel = ISSET_PIXCOLOR (Color_pointer_fg) 981 (ISSET_PIXCOLOR (Color_pointer_fg)
995 ? pix_colors_focused[Color_pointer_fg] 982 ? pix_colors_focused[Color_pointer_fg]
996 : pix_colors_focused[Color_fg]; 983 : pix_colors_focused[Color_fg]).get (fg);
984
997 xcol[1].pixel = ISSET_PIXCOLOR (Color_pointer_bg) 985 (ISSET_PIXCOLOR (Color_pointer_bg)
998 ? pix_colors_focused[Color_pointer_bg] 986 ? pix_colors_focused[Color_pointer_bg]
999 : pix_colors_focused[Color_bg]; 987 : pix_colors_focused[Color_bg]).get (bg);
1000 988
1001 XQueryColors (display->display, display->cmap, xcol, 2); 989 XRecolorCursor (dpy, TermWin_cursor, &fg, &bg);
1002 XRecolorCursor (display->display, TermWin_cursor, xcol + 0, xcol + 1);
1003} 990}
1004 991
1005/*----------------------------------------------------------------------*/ 992/*----------------------------------------------------------------------*/
1006/* 993/*
1007 * find if fg/bg matches any of the normal (low-intensity) colors 994 * find if fg/bg matches any of the normal (low-intensity) colors
1008 */ 995 */
1009void 996void
1010rxvt_term::set_colorfgbg () 997rxvt_term::set_colorfgbg ()
1011{ 998{
1012 unsigned int i; 999 unsigned int i;
1013 const char *xpmb = "\0"; 1000 const char *xpmb = "";
1014 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1]; 1001 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1];
1015 1002
1016 env_colorfgbg = (char *)rxvt_malloc (sizeof ("COLORFGBG=default;default;bg") + 1);
1017 strcpy (fstr, "default"); 1003 strcpy (fstr, "default");
1018 strcpy (bstr, "default"); 1004 strcpy (bstr, "default");
1019 for (i = Color_Black; i <= Color_White; i++) 1005 for (i = Color_Black; i <= Color_White; i++)
1020 if (pix_colors[Color_fg] == pix_colors[i]) 1006 if (pix_colors[Color_fg] == pix_colors[i])
1021 { 1007 {
1025 1011
1026 for (i = Color_Black; i <= Color_White; i++) 1012 for (i = Color_Black; i <= Color_White; i++)
1027 if (pix_colors[Color_bg] == pix_colors[i]) 1013 if (pix_colors[Color_bg] == pix_colors[i])
1028 { 1014 {
1029 sprintf (bstr, "%d", (i - Color_Black)); 1015 sprintf (bstr, "%d", (i - Color_Black));
1030#ifdef XPM_BACKGROUND 1016#ifdef BG_IMAGE_FROM_FILE
1031 xpmb = "default;"; 1017 xpmb = "default;";
1032#endif 1018#endif
1033 break; 1019 break;
1034 } 1020 }
1035 1021
1036 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr); 1022 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr);
1037} 1023}
1038 1024
1039/*----------------------------------------------------------------------*/ 1025/*----------------------------------------------------------------------*/
1040 1026
1041int 1027bool
1042rxvt_term::rXParseAllocColor (rxvt_color *screen_in_out, const char *colour) 1028rxvt_term::set_color (rxvt_color &color, const char *name)
1043{ 1029{
1044 if (!screen_in_out->set (display, colour)) 1030 if (color.set (this, name))
1045 {
1046 rxvt_warn ("can't get colour '%s', continuing without.\n", colour);
1047 return false;
1048 }
1049
1050 return true; 1031 return true;
1032
1033 rxvt_warn ("can't get colour '%s', continuing without.\n", name);
1034 return false;
1035}
1036
1037void
1038rxvt_term::alias_color (int dst, int src)
1039{
1040 pix_colors[dst].set (this, rs[Rs_color + dst] = rs[Rs_color + src]);
1051} 1041}
1052 1042
1053/* -------------------------------------------------------------------- * 1043/* -------------------------------------------------------------------- *
1054 * - WINDOW RESIZING - * 1044 * - WINDOW RESIZING - *
1055 * -------------------------------------------------------------------- */ 1045 * -------------------------------------------------------------------- */
1056void 1046void
1057rxvt_term::resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent) 1047rxvt_term::resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent)
1058{ 1048{
1059 int fix_screen; 1049 int fix_screen;
1060 int old_width = szHint.width, old_height = szHint.height; 1050 int old_width = szHint.width;
1061 dDisp; 1051 int old_height = szHint.height;
1062 1052
1063 window_calc (newwidth, newheight); 1053 window_calc (newwidth, newheight);
1054
1055 if (!HOOK_INVOKE ((this, HOOK_RESIZE_ALL_WINDOWS, DT_INT, newwidth, DT_INT, newheight, DT_END)))
1064 XSetWMNormalHints (disp, parent[0], &szHint); 1056 XSetWMNormalHints (dpy, parent[0], &szHint);
1065 1057
1066 if (!ignoreparent) 1058 if (!ignoreparent)
1067 { 1059 {
1068#ifdef SMART_RESIZE 1060#ifdef SMART_RESIZE
1069 /* 1061 /*
1073 int x, y, x1, y1; 1065 int x, y, x1, y1;
1074 int dx, dy; 1066 int dx, dy;
1075 unsigned int unused_w1, unused_h1, unused_b1, unused_d1; 1067 unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
1076 Window unused_cr; 1068 Window unused_cr;
1077 1069
1078 XTranslateCoordinates (disp, parent[0], display->root, 1070 XTranslateCoordinates (dpy, parent[0], display->root,
1079 0, 0, &x, &y, &unused_cr); 1071 0, 0, &x, &y, &unused_cr);
1080 XGetGeometry (disp, parent[0], &unused_cr, &x1, &y1, 1072 XGetGeometry (dpy, parent[0], &unused_cr, &x1, &y1,
1081 &unused_w1, &unused_h1, &unused_b1, &unused_d1); 1073 &unused_w1, &unused_h1, &unused_b1, &unused_d1);
1082 /* 1074 /*
1083 * if display->root isn't the parent window, a WM will probably have offset 1075 * if display->root isn't the parent window, a WM will probably have offset
1084 * our position for handles and decorations. Counter it 1076 * our position for handles and decorations. Counter it
1085 */ 1077 */
1087 { 1079 {
1088 x -= x1; 1080 x -= x1;
1089 y -= y1; 1081 y -= y1;
1090 } 1082 }
1091 1083
1092 x1 = (DisplayWidth (disp, display->screen) - old_width) / 2; 1084 x1 = (DisplayWidth (dpy, display->screen) - old_width ) / 2;
1093 y1 = (DisplayHeight (disp, display->screen) - old_height) / 2; 1085 y1 = (DisplayHeight (dpy, display->screen) - old_height) / 2;
1094 dx = old_width - szHint.width; 1086 dx = old_width - szHint.width;
1095 dy = old_height - szHint.height; 1087 dy = old_height - szHint.height;
1096 1088
1097 /* Check position of the center of the window */ 1089 /* Check position of the center of the window */
1098 if (x < x1) /* left half */ 1090 if (x < x1) /* left half */
1099 dx = 0; 1091 dx = 0;
1102 if (y < y1) /* top half */ 1094 if (y < y1) /* top half */
1103 dy = 0; 1095 dy = 0;
1104 else if (y == y1) /* exact center */ 1096 else if (y == y1) /* exact center */
1105 dy /= 2; 1097 dy /= 2;
1106 1098
1107 XMoveResizeWindow (disp, parent[0], x + dx, y + dy, 1099 XMoveResizeWindow (dpy, parent[0], x + dx, y + dy,
1108 szHint.width, szHint.height); 1100 szHint.width, szHint.height);
1109#else 1101#else
1110 XResizeWindow (disp, parent[0], szHint.width, szHint.height); 1102 XResizeWindow (dpy, parent[0], szHint.width, szHint.height);
1111#endif 1103#endif
1112 } 1104 }
1113 1105
1114 fix_screen = ncol != prev_ncol || nrow != prev_nrow; 1106 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
1115 1107
1116 if (fix_screen || newwidth != old_width || newheight != old_height) 1108 if (fix_screen || newwidth != old_width || newheight != old_height)
1117 { 1109 {
1118 if (scrollBar.state) 1110 if (scrollBar.state)
1119 { 1111 {
1120 XMoveResizeWindow (disp, scrollBar.win, 1112 XMoveResizeWindow (dpy, scrollBar.win,
1121 window_sb_x, 0, 1113 window_sb_x, 0,
1122 scrollbar_TotalWidth (), szHint.height); 1114 scrollbar_TotalWidth (), szHint.height);
1123 resize_scrollbar (); 1115 resize_scrollbar ();
1124 } 1116 }
1125 1117
1126 XMoveResizeWindow (disp, vt, 1118 XMoveResizeWindow (dpy, vt,
1127 window_vt_x, window_vt_y, 1119 window_vt_x, window_vt_y,
1128 width, height); 1120 width, height);
1129 1121
1122#ifdef HAVE_BG_PIXMAP
1123 if (bgPixmap.window_size_sensitive ())
1124 update_background ();
1125#endif
1126
1130 scr_clear (); 1127 scr_clear ();
1131#ifdef XPM_BACKGROUND
1132 resize_pixmap ();
1133#endif
1134 } 1128 }
1135 1129
1136 if (fix_screen || old_height == 0) 1130 if (fix_screen || old_height == 0)
1137 {
1138 int curr_screen = -1;
1139 int old_ncol = prev_ncol;
1140
1141 /* scr_reset only works on the primary screen */
1142 if (old_height) /* this is not the first time through */
1143 {
1144 unsigned int ocol = ncol;
1145 ncol = prev_ncol; // save b/c scr_blank_screen_mem uses this
1146 curr_screen = scr_change_screen (PRIMARY);
1147 ncol = ocol;
1148 }
1149
1150 scr_reset (); 1131 scr_reset ();
1151 1132
1152 if (curr_screen >= 0) /* this is not the first time through */ 1133 // TODO, with nvidia-8178, resizes kill the alpha channel, report if not fixed in newer version
1153 { 1134 //scr_touch (false);
1154 scr_change_screen (curr_screen);
1155 selection_check (old_ncol != ncol ? 4 : 0);
1156 }
1157 }
1158 1135
1159 old_width = szHint.width; 1136#ifdef HAVE_BG_PIXMAP
1160 old_height = szHint.height; 1137// TODO: this don't seem to have any effect - do we still need it ? If so - in which case exactly ?
1161 1138// if (bgPixmap.pixmap)
1162#ifdef XPM_BACKGROUND
1163 if (pixmap)
1164 scr_touch (false); 1139// scr_touch (false);
1165#endif 1140#endif
1166 1141
1167#ifdef USE_XIM 1142#ifdef USE_XIM
1168 IMSetStatusPosition (); 1143 IMSetPosition ();
1169#endif 1144#endif
1170} 1145}
1171 1146
1172/* 1147/*
1173 * Set the width/height of the vt window in characters. Units are pixels. 1148 * Set the width/height of the vt window in characters. Units are pixels.
1178{ 1153{
1179 XWindowAttributes wattr; 1154 XWindowAttributes wattr;
1180 1155
1181 if (newwidth == 0 || newheight == 0) 1156 if (newwidth == 0 || newheight == 0)
1182 { 1157 {
1183 XGetWindowAttributes (display->display, display->root, &wattr); 1158 XGetWindowAttributes (dpy, display->root, &wattr);
1184 1159
1185 if (newwidth == 0) 1160 if (newwidth == 0)
1186 newwidth = wattr.width - szHint.base_width; 1161 newwidth = wattr.width - szHint.base_width;
1187 if (newheight == 0) 1162 if (newheight == 0)
1188 newheight = wattr.height - szHint.base_height; 1163 newheight = wattr.height - szHint.base_height;
1202#ifdef USE_XIM 1177#ifdef USE_XIM
1203 1178
1204void 1179void
1205rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg) 1180rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg)
1206{ 1181{
1207 fg = pix_colors[Color_fg]; 1182 fg = pix_colors [Color_fg];
1208 bg = pix_colors[Color_bg]; 1183 bg = pix_colors [Color_bg];
1209} 1184}
1210 1185
1211void 1186void
1212rxvt_term::im_set_size (XRectangle &size) 1187rxvt_term::im_set_size (XRectangle &size)
1213{ 1188{
1250 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */ 1225 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */
1251 1226
1252 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */ 1227 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */
1253 *p = '\0'; 1228 *p = '\0';
1254 1229
1255 atom = XInternAtom (display->display, server, False); 1230 atom = XInternAtom (dpy, server, False);
1256 win = XGetSelectionOwner (display->display, atom); 1231 win = XGetSelectionOwner (dpy, atom);
1257 1232
1258 if (win != None) 1233 if (win != None)
1259 return True; 1234 return True;
1260 } 1235 }
1261 1236
1268 XPoint nspot; 1243 XPoint nspot;
1269 XVaNestedList preedit_attr; 1244 XVaNestedList preedit_attr;
1270 1245
1271 if (!Input_Context 1246 if (!Input_Context
1272 || !focus 1247 || !focus
1273 || !(input_style & XIMPreeditPosition)) 1248 || !(input_style & (XIMPreeditPosition | XIMPreeditCallbacks)))
1274 return; 1249 return;
1275 1250
1276 im_set_position (nspot); 1251 im_set_position (nspot);
1277 1252
1278 if (nspot.x == spot.x && nspot.y == spot.y) 1253 if (nspot.x == spot.x && nspot.y == spot.y)
1297 input_method = 0; 1272 input_method = 0;
1298 } 1273 }
1299 1274
1300 Input_Context = 0; 1275 Input_Context = 0;
1301} 1276}
1277
1278#ifdef ENABLE_XIM_ONTHESPOT
1279
1280static void
1281xim_preedit_start (XIC ic, XPointer client_data, XPointer call_data)
1282{
1283 ((rxvt_term *)client_data)->make_current ();
1284 HOOK_INVOKE (((rxvt_term *)client_data, HOOK_XIM_PREEDIT_START, DT_END));
1285}
1286
1287static void
1288xim_preedit_done (XIC ic, XPointer client_data, XPointer call_data)
1289{
1290 ((rxvt_term *)client_data)->make_current ();
1291 HOOK_INVOKE (((rxvt_term *)client_data, HOOK_XIM_PREEDIT_DONE, DT_END));
1292}
1293
1294static void
1295xim_preedit_draw (XIC ic, XPointer client_data, XIMPreeditDrawCallbackStruct *call_data)
1296{
1297 rxvt_term *term = (rxvt_term *)client_data;
1298 XIMText *text = call_data->text;
1299
1300 term->make_current ();
1301
1302 if (text)
1303 {
1304 void *str;
1305
1306 if (!text->encoding_is_wchar && text->string.multi_byte)
1307 {
1308 // of course, X makes it ugly again
1309 if (term->rs[Rs_imLocale])
1310 SET_LOCALE (term->rs[Rs_imLocale]);
1311
1312 str = rxvt_temp_buf ((text->length + 1) * sizeof (wchar_t));
1313 mbstowcs ((wchar_t *)str, text->string.multi_byte, text->length + 1);
1314
1315 if (term->rs[Rs_imLocale])
1316 SET_LOCALE (term->locale);
1317 }
1318 else
1319 str = (void *)text->string.wide_char;
1320
1321 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
1322 DT_INT, call_data->caret,
1323 DT_INT, call_data->chg_first,
1324 DT_INT, call_data->chg_length,
1325 DT_LCS_LEN, (void *)text->feedback, text->feedback ? (int)text->length : 0,
1326 DT_WCS_LEN, str, str ? (int)text->length : 0,
1327 DT_END));
1328 }
1329 else
1330 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
1331 DT_INT, call_data->caret,
1332 DT_INT, call_data->chg_first,
1333 DT_INT, call_data->chg_length,
1334 DT_END));
1335}
1336
1337#if 0
1338static void
1339xim_preedit_caret (XIC ic, XPointer client_data, XIMPreeditCaretCallbackStruct *call_data)
1340{
1341 ((rxvt_term *)client_data)->make_current ();
1342 HOOK_INVOKE (((rxvt_term *)client_data, HOOK_XIM_PREEDIT_CARET,
1343 DT_INT, call_data->position,
1344 DT_INT, call_data->direction,
1345 DT_INT, call_data->style,
1346 DT_END));
1347}
1348#endif
1349
1350#endif
1302 1351
1303/* 1352/*
1304 * Try to open a XIM with the current modifiers, then see if we can 1353 * Try to open a XIM with the current modifiers, then see if we can
1305 * open a suitable preedit type 1354 * open a suitable preedit type
1306 */ 1355 */
1313 XRectangle rect, status_rect, needed_rect; 1362 XRectangle rect, status_rect, needed_rect;
1314 unsigned long fg, bg; 1363 unsigned long fg, bg;
1315 const char *p; 1364 const char *p;
1316 char **s; 1365 char **s;
1317 XIMStyles *xim_styles; 1366 XIMStyles *xim_styles;
1367#ifdef ENABLE_XIM_ONTHESPOT
1368 XIMCallback xcb[4];
1369#endif
1318 1370
1319 set_environ (envv); 1371 set_environ (envv);
1320 1372
1321 if (! ((p = XSetLocaleModifiers (modifiers)) && *p)) 1373 if (! ((p = XSetLocaleModifiers (modifiers)) && *p))
1322 return false; 1374 return false;
1323 1375
1324 D_MAIN ((stderr, "rxvt_IM_get_IC ()"));
1325 input_method = display->get_xim (locale, modifiers); 1376 input_method = display->get_xim (locale, modifiers);
1326 if (input_method == NULL) 1377 if (input_method == NULL)
1327 return false; 1378 return false;
1328 1379
1329 xim = input_method->xim; 1380 xim = input_method->xim;
1349 s = rxvt_splitcommastring (p); 1400 s = rxvt_splitcommastring (p);
1350 1401
1351 for (i = found = 0; !found && s[i]; i++) 1402 for (i = found = 0; !found && s[i]; i++)
1352 { 1403 {
1353 if (!strcmp (s[i], "OverTheSpot")) 1404 if (!strcmp (s[i], "OverTheSpot"))
1354 input_style = (XIMPreeditPosition | XIMStatusNothing); 1405 input_style = XIMPreeditPosition | XIMStatusNothing;
1355 else if (!strcmp (s[i], "OffTheSpot")) 1406 else if (!strcmp (s[i], "OffTheSpot"))
1356 input_style = (XIMPreeditArea | XIMStatusArea); 1407 input_style = XIMPreeditArea | XIMStatusArea;
1357 else if (!strcmp (s[i], "Root")) 1408 else if (!strcmp (s[i], "Root"))
1358 input_style = (XIMPreeditNothing | XIMStatusNothing); 1409 input_style = XIMPreeditNothing | XIMStatusNothing;
1359 else if (!strcmp (s[i], "None")) 1410 else if (!strcmp (s[i], "None"))
1360 input_style = (XIMPreeditNone | XIMStatusNone); 1411 input_style = XIMPreeditNone | XIMStatusNone;
1412#ifdef ENABLE_XIM_ONTHESPOT
1413 else if (SHOULD_INVOKE (HOOK_XIM_PREEDIT_START) && !strcmp (s[i], "OnTheSpot"))
1414 input_style = XIMPreeditCallbacks | XIMStatusNothing;
1415#endif
1416 else
1417 input_style = XIMPreeditNothing | XIMStatusNothing;
1361 1418
1362 for (j = 0; j < xim_styles->count_styles; j++) 1419 for (j = 0; j < xim_styles->count_styles; j++)
1363 if (input_style == xim_styles->supported_styles[j]) 1420 if (input_style == xim_styles->supported_styles[j])
1364 { 1421 {
1365 rxvt_freecommastring (s); 1422 rxvt_freecommastring (s);
1403 "*", 1460 "*",
1404 fheight, 1461 fheight,
1405 fheight + 1, fheight - 1, 1462 fheight + 1, fheight - 1,
1406 fheight - 2, fheight + 2); 1463 fheight - 2, fheight + 2);
1407 1464
1408 fs = XCreateFontSet (display->display, rs[Rs_imFont] ? rs[Rs_imFont] : pat, 1465 fs = XCreateFontSet (dpy, rs[Rs_imFont] ? rs[Rs_imFont] : pat,
1409 &missing_charset_list, &missing_charset_count, &def_string); 1466 &missing_charset_list, &missing_charset_count, &def_string);
1410 1467
1411 if (missing_charset_list) 1468 if (missing_charset_list)
1412 XFreeStringList (missing_charset_list); 1469 XFreeStringList (missing_charset_list);
1413 1470
1454 XNBackground, bg, 1511 XNBackground, bg,
1455 XNArea, &status_rect, 1512 XNArea, &status_rect,
1456 XNFontSet, fs, 1513 XNFontSet, fs,
1457 NULL); 1514 NULL);
1458 } 1515 }
1516#if ENABLE_XIM_ONTHESPOT
1517 else if (input_style & XIMPreeditCallbacks)
1518 {
1519 im_set_position (spot);
1520
1521 xcb[0].client_data = (XPointer)this; xcb[0].callback = (XIMProc)xim_preedit_start;
1522 xcb[1].client_data = (XPointer)this; xcb[1].callback = (XIMProc)xim_preedit_done;
1523 xcb[2].client_data = (XPointer)this; xcb[2].callback = (XIMProc)xim_preedit_draw;
1524# if 0
1525 xcb[3].client_data = (XPointer)this; xcb[3].callback = (XIMProc)xim_preedit_caret;
1526# endif
1527
1528 preedit_attr = XVaCreateNestedList (0,
1529 XNSpotLocation, &spot,
1530 XNPreeditStartCallback, &xcb[0],
1531 XNPreeditDoneCallback , &xcb[1],
1532 XNPreeditDrawCallback , &xcb[2],
1533# if 0
1534 XNPreeditCaretCallback, &xcb[3],
1535# endif
1536 NULL);
1537 }
1538#endif
1459 1539
1460 Input_Context = XCreateIC (xim, 1540 Input_Context = XCreateIC (xim,
1461 XNInputStyle, input_style, 1541 XNInputStyle, input_style,
1462 XNClientWindow, vt, 1542 XNClientWindow, vt,
1463 XNFocusWindow, parent[0], 1543 XNFocusWindow, parent[0],
1465 preedit_attr, 1545 preedit_attr,
1466 status_attr ? XNStatusAttributes : NULL, 1546 status_attr ? XNStatusAttributes : NULL,
1467 status_attr, NULL); 1547 status_attr, NULL);
1468 1548
1469 if (preedit_attr) XFree (preedit_attr); 1549 if (preedit_attr) XFree (preedit_attr);
1470 if (status_attr) XFree (status_attr); 1550 if (status_attr) XFree (status_attr);
1471 if (fs) XFreeFontSet (display->display, fs); 1551 if (fs) XFreeFontSet (dpy, fs);
1472 1552
1473 if (Input_Context == NULL) 1553 if (Input_Context == NULL)
1474 { 1554 {
1475 rxvt_warn ("failed to create input context, continuing without XIM.\n"); 1555 rxvt_warn ("failed to create input context, continuing without XIM.\n");
1476 im_destroy (); 1556 im_destroy ();
1477 return false; 1557 return false;
1478 } 1558 }
1479 1559
1480 if (input_style & XIMPreeditArea) 1560#if 0
1561 // unfortunately, only the focus window is used by XIM, hard to fix
1562 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL))
1563 vt_select_input ();
1564#endif
1565
1481 IMSetStatusPosition (); 1566 IMSetPosition ();
1482 1567
1483 D_MAIN ((stderr, "rxvt_IM_get_IC () - successful connection"));
1484 return true; 1568 return true;
1485} 1569}
1486 1570
1487void 1571void
1488rxvt_term::im_cb () 1572rxvt_term::im_cb ()
1494 1578
1495 make_current (); 1579 make_current ();
1496 1580
1497 im_destroy (); 1581 im_destroy ();
1498 1582
1499 D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()"));
1500 if (Input_Context) 1583 if (Input_Context)
1501 return; 1584 return;
1502 1585
1503#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE) 1586#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1504 if (rs[Rs_imLocale]) 1587 if (rs[Rs_imLocale])
1546 SET_LOCALE (locale); 1629 SET_LOCALE (locale);
1547#endif 1630#endif
1548} 1631}
1549 1632
1550void 1633void
1551rxvt_term::IMSetStatusPosition () 1634rxvt_term::IMSetPosition ()
1552{ 1635{
1553 XRectangle preedit_rect, status_rect, *needed_rect; 1636 XRectangle preedit_rect, status_rect, *needed_rect;
1554 XVaNestedList preedit_attr, status_attr; 1637 XVaNestedList preedit_attr, status_attr;
1555 1638
1556 if (!Input_Context 1639 if (!Input_Context
1557 || !focus 1640 || !focus
1558 || !(input_style & XIMPreeditArea) 1641 || !(input_style & (XIMPreeditArea | XIMPreeditPosition))
1559 || !IMisRunning ()) 1642 || !IMisRunning ())
1560 return; 1643 return;
1561 1644
1645 if (input_style & XIMPreeditPosition)
1646 {
1647 im_set_size (preedit_rect);
1648 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);
1649
1650 XSetICValues (Input_Context,
1651 XNPreeditAttributes, preedit_attr, NULL);
1652 }
1653 else
1654 {
1562 /* Getting the necessary width of preedit area */ 1655 /* Getting the necessary width of preedit area */
1563 status_attr = XVaCreateNestedList (0, XNAreaNeeded, &needed_rect, NULL); 1656 status_attr = XVaCreateNestedList (0, XNAreaNeeded, &needed_rect, NULL);
1564 XGetICValues (Input_Context, XNStatusAttributes, status_attr, NULL); 1657 XGetICValues (Input_Context, XNStatusAttributes, status_attr, NULL);
1565 XFree (status_attr); 1658 XFree (status_attr);
1566 1659
1567 im_set_preedit_area (preedit_rect, status_rect, *needed_rect); 1660 im_set_preedit_area (preedit_rect, status_rect, *needed_rect);
1568 XFree (needed_rect); 1661 XFree (needed_rect);
1569 1662
1570 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL); 1663 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);
1571 status_attr = XVaCreateNestedList (0, XNArea, &status_rect, NULL); 1664 status_attr = XVaCreateNestedList (0, XNArea, &status_rect, NULL);
1572 1665
1573 XSetICValues (Input_Context, 1666 XSetICValues (Input_Context,
1574 XNPreeditAttributes, preedit_attr, 1667 XNPreeditAttributes, preedit_attr,
1575 XNStatusAttributes, status_attr, NULL); 1668 XNStatusAttributes, status_attr,
1669 NULL);
1576 1670
1671 XFree (status_attr);
1672 }
1673
1577 XFree (preedit_attr); 1674 XFree (preedit_attr);
1578 XFree (status_attr);
1579} 1675}
1580#endif /* USE_XIM */ 1676#endif /* USE_XIM */
1677
1678void
1679rxvt_term::get_window_origin (int &x, int &y)
1680{
1681 Window cr;
1682 XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr);
1683/* fprintf (stderr, "origin is %+d%+d\n", x, y);*/
1684}
1685
1686Pixmap
1687rxvt_term::get_pixmap_property (int prop_id)
1688{
1689 if (prop_id > 0 && prop_id < NUM_XA)
1690 if (xa[prop_id])
1691 {
1692 int aformat;
1693 unsigned long nitems, bytes_after;
1694 Atom atype;
1695 unsigned char *prop = NULL;
1696 int result = XGetWindowProperty (dpy, display->root, xa[prop_id],
1697 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1698 &nitems, &bytes_after, &prop);
1699 if (result == Success && prop && atype == XA_PIXMAP)
1700 return *(Pixmap *)prop;
1701 }
1702
1703 return None;
1704}
1705
1706#ifdef HAVE_BG_PIXMAP
1707# if TRACE_PIXMAPS
1708# undef update_background
1709void
1710rxvt_term::trace_update_background (const char *file, int line)
1711{
1712 fprintf (stderr, "%s:%d:update_background()\n", file, line);
1713 update_background ();
1714}
1715# endif
1716
1717void
1718rxvt_term::update_background ()
1719{
1720 if (update_background_ev.is_active ())
1721 return;
1722
1723 bgPixmap.invalidate ();
1724
1725 ev_tstamp to_wait = 0.5 - (ev::now () - bgPixmap.valid_since);
1726
1727 if (to_wait <= 0.)
1728 bgPixmap.render ();
1729 else
1730 update_background_ev.start (to_wait);
1731}
1732
1733void
1734rxvt_term::update_background_cb (ev::timer &w, int revents)
1735{
1736 make_current ();
1737
1738 update_background_ev.stop ();
1739 bgPixmap.render ();
1740 refresh_check ();
1741}
1742
1743#endif /* HAVE_BG_PIXMAP */
1581 1744
1582/*----------------------- end-of-file (C source) -----------------------*/ 1745/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines