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

Diff Legend

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