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.205 by root, Wed Jan 25 13:24:45 2006 UTC vs.
Revision 1.321 by sf-exg, Sun Feb 14 11:11:10 2010 UTC

1/*--------------------------------*-C-*---------------------------------* 1/*----------------------------------------------------------------------*
2 * File: main.C 2 * File: main.C
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * 4 *
5 * All portions of code are copyright by their respective author/s. 5 * All portions of code are copyright by their respective author/s.
6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk> 6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk>
… …
11 * Copyright (c) 1997 mj olesen <olesen@me.QueensU.CA> 11 * Copyright (c) 1997 mj olesen <olesen@me.QueensU.CA>
12 * - extensive modifications 12 * - extensive modifications
13 * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de> 13 * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de>
14 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com> 14 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com>
15 * - extensive modifications 15 * - extensive modifications
16 * Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com> 16 * Copyright (c) 2003-2008 Marc Lehmann <pcg@goof.com>
17 * 17 *
18 * This program is free software; you can redistribute it and/or modify 18 * This program is free software; you can redistribute it and/or modify
19 * it under the terms of the GNU General Public License as published by 19 * it under the terms of the GNU General Public License as published by
20 * the Free Software Foundation; either version 2 of the License, or 20 * the Free Software Foundation; either version 2 of the License, or
21 * (at your option) any later version. 21 * (at your option) any later version.
… …
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 ();
242 selection_clear (true);
224 243
225#ifdef USE_XIM 244#ifdef USE_XIM
226 im_destroy (); 245 im_destroy ();
227#endif 246#endif
228#ifdef XTERM_SCROLLBAR 247 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); 248 if (gc) XFreeGC (dpy, gc);
253 249
254 delete drawable; 250 delete drawable;
255 // destroy all windows 251 // destroy all windows
256 if (parent[0]) 252 if (parent[0])
257 XDestroyWindow (disp, parent[0]); 253 XDestroyWindow (dpy, parent[0]);
258 }
259 254
260 // TODO: free pixcolours, colours should become part of rxvt_display 255 for (int i = 0; i < TOTAL_COLORS; i++)
261 delete pix_colors_focused; 256 if (ISSET_PIXCOLOR (i))
257 {
258 pix_colors_focused [i].free (this);
262#if OFF_FOCUS_FADING 259#if OFF_FOCUS_FADING
263 delete pix_colors_unfocused; 260 pix_colors_unfocused [i].free (this);
264#endif 261#endif
262 }
265 263
264 clear ();
265
266 display->flush (); /* ideally .put should do this */
266 displays.put (display); 267 displays.put (display);
268 }
267 269
268 scr_release (); 270 scr_release ();
269 271
270 /* clear all resources */ 272 /* clear all resources */
271 for (int i = 0; i < allocated.size (); i++) 273 for (int i = 0; i < allocated.size (); i++)
272 free (allocated [i]); 274 free (allocated [i]);
273 275
274 free (selection.text); 276 free (selection.text);
277 free (selection.clip_text);
275 // TODO: manage env vars in child only(!) 278 // TODO: manage env vars in child only(!)
276 free (env_display); 279 free (env_display);
277 free (env_term); 280 free (env_term);
278 free (locale); 281 free (locale);
279 free (v_buffer); 282 free (v_buffer);
… …
283 delete argv; 286 delete argv;
284 287
285#ifdef KEYSYM_RESOURCE 288#ifdef KEYSYM_RESOURCE
286 delete keyboard; 289 delete keyboard;
287#endif 290#endif
291#ifndef NO_RESOURCES
292 XrmDestroyDatabase (option_db);
293#endif
288} 294}
289 295
290// child has exited, usually destroys 296// child has exited, usually destroys
291void 297void
292rxvt_term::child_cb (child_watcher &w, int status) 298rxvt_term::child_cb (ev::child &w, int status)
293{ 299{
294 HOOK_INVOKE ((this, HOOK_CHILD_EXIT, DT_INT, status, DT_END)); 300 HOOK_INVOKE ((this, HOOK_CHILD_EXIT, DT_INT, status, DT_END));
295 301
296 cmd_pid = 0; 302 cmd_pid = 0;
297 303
298 if (!OPTION (Opt_hold)) 304 if (!option (Opt_hold))
299 destroy (); 305 destroy ();
300} 306}
301 307
302void 308void
303rxvt_term::destroy () 309rxvt_term::destroy ()
304{ 310{
305 if (destroy_ev.active) 311 if (destroy_ev.is_active ())
306 return; 312 return;
307 313
308 HOOK_INVOKE ((this, HOOK_DESTROY, DT_END)); 314 HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));
309 315
310#if ENABLE_OVERLAY 316#if ENABLE_OVERLAY
… …
314 if (display) 320 if (display)
315 { 321 {
316#if USE_XIM 322#if USE_XIM
317 im_ev.stop (display); 323 im_ev.stop (display);
318#endif 324#endif
319#if HAVE_SCROLLBARS
320 scrollbar_ev.stop (display); 325 scrollbar_ev.stop (display);
321#endif 326#if ENABLE_TRANSPARENCY || ENABLE_PERL
322#if TRANSPARENT
323 rootwin_ev.stop (display); 327 rootwin_ev.stop (display);
324#endif 328#endif
325 incr_ev.stop (); 329 incr_ev.stop ();
326 termwin_ev.stop (display); 330 termwin_ev.stop (display);
327 vt_ev.stop (display); 331 vt_ev.stop (display);
328 } 332 }
329 333
330 check_ev.stop (); 334 flush_ev.stop ();
331 pty_ev.stop (); 335 pty_ev.stop ();
332#ifdef CURSOR_BLINK 336#ifdef CURSOR_BLINK
333 cursor_blink_ev.stop (); 337 cursor_blink_ev.stop ();
334#endif 338#endif
335#ifdef TEXT_BLINK 339#ifdef TEXT_BLINK
… …
343#endif 347#endif
344#ifdef POINTER_BLANK 348#ifdef POINTER_BLANK
345 pointer_ev.stop (); 349 pointer_ev.stop ();
346#endif 350#endif
347 351
348 destroy_ev.start (0); 352 destroy_ev.start ();
349} 353}
350 354
351void 355void
352rxvt_term::destroy_cb (time_watcher &w) 356rxvt_term::destroy_cb (ev::idle &w, int revents)
353{ 357{
354 make_current (); 358 make_current ();
355 359
356 delete this; 360 delete this;
357} 361}
… …
368{ 372{
369 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++) 373 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)
370 (*t)->emergency_cleanup (); 374 (*t)->emergency_cleanup ();
371} 375}
372 376
373#if ENABLE_FRILLS 377#if !ENABLE_MINIMAL
374static void 378static void
375print_x_error (Display *dpy, XErrorEvent *event) 379print_x_error (Display *dpy, XErrorEvent *event)
376{ 380{
377 char buffer[BUFSIZ]; 381 char buffer[BUFSIZ];
378 char mesg[BUFSIZ]; 382 char mesg[BUFSIZ];
… …
411 else 415 else
412 XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x", 416 XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x",
413 mesg, BUFSIZ); 417 mesg, BUFSIZ);
414 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid); 418 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid);
415 } 419 }
416 XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d", 420 XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d",
417 mesg, BUFSIZ); 421 mesg, BUFSIZ);
418 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial); 422 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial);
419} 423}
420#endif 424#endif
421 425
… …
426 GET_R->allowedxerror = event->error_code; 430 GET_R->allowedxerror = event->error_code;
427 else 431 else
428 { 432 {
429 // GET_R is most likely not the terminal which caused the error, 433 // GET_R is most likely not the terminal which caused the error,
430 // so just output the error and continue 434 // so just output the error and continue
431#if ENABLE_FRILLS 435#if ENABLE_MINIMAL
436 old_xerror_handler (display, event);
437#else
432 print_x_error (display, event); 438 print_x_error (display, event);
433#else
434 old_xerror_handler (display, event);
435#endif 439#endif
436 } 440 }
437 441
438 return 0; 442 return 0;
439} 443}
… …
445 DisplayString (display)); 449 DisplayString (display));
446 rxvt_emergency_cleanup (); 450 rxvt_emergency_cleanup ();
447 _exit (EXIT_FAILURE); 451 _exit (EXIT_FAILURE);
448} 452}
449 453
450/*----------------------------------------------------------------------*/
451bool
452rxvt_term::init (int argc, const char *const *argv, stringvec *envv)
453{
454 this->envv = envv;
455
456 SET_R (this);
457 set_locale ("");
458 set_environ (envv); // few things in X do not call setlocale :(
459
460 if (!init_vars ())
461 return false;
462
463 init_secondary ();
464
465 const char **cmd_argv = init_resources (argc, argv);
466
467#ifdef KEYSYM_RESOURCE
468 keyboard->register_done ();
469#endif
470
471#ifdef HAVE_SCROLLBARS
472 if (OPTION (Opt_scrollBar))
473 scrollBar.setIdle (); /* set existence for size calculations */
474#endif
475
476 pty = ptytty::create ();
477
478 create_windows (argc, argv);
479
480 dDisp;
481
482 init_xlocale ();
483
484 scr_reset (); // initialize screen
485
486#if 0
487 XSynchronize (disp, True);
488#endif
489
490#ifdef HAVE_SCROLLBARS
491 if (OPTION (Opt_scrollBar))
492 resize_scrollbar (); /* create and map scrollbar */
493#endif
494#ifdef TRANSPARENT
495 if (OPTION (Opt_transparent))
496 {
497 XSelectInput (disp, display->root, PropertyChangeMask);
498 check_our_parents ();
499 rootwin_ev.start (display, display->root);
500 }
501#endif
502
503 set_colorfgbg ();
504
505 init_command (cmd_argv);
506
507 free (cmd_argv);
508
509 if (pty->pty >= 0)
510 pty_ev.start (pty->pty, EVENT_READ);
511
512 check_ev.start ();
513
514 HOOK_INVOKE ((this, HOOK_START, DT_END));
515
516#if ENABLE_XEMBED
517 if (rs[Rs_embed])
518 {
519 long info[2] = { 0, XEMBED_MAPPED };
520
521 XChangeProperty (display->display, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
522 32, PropModeReplace, (unsigned char *)&info, 2);
523 }
524#endif
525
526 XMapWindow (disp, vt);
527 XMapWindow (disp, parent[0]);
528
529 return true;
530}
531
532static struct sig_handlers 454static struct sig_handlers
533{ 455{
534 sig_watcher sw_term, sw_int; 456 ev::sig sw_term, sw_int;
535 457
536 /* 458 /*
537 * Catch a fatal signal and tidy up before quitting 459 * Catch a fatal signal and tidy up before quitting
538 */ 460 */
539 void 461 void sig_term (ev::sig &w, int revents);
540 sig_term (sig_watcher &w) 462
463 sig_handlers ()
541 { 464 {
542 rxvt_emergency_cleanup (); 465 sw_term.set<sig_handlers, &sig_handlers::sig_term> (this);
543 signal (w.signum, SIG_DFL);
544 kill (getpid (), w.signum);
545 }
546
547 sig_handlers ()
548 : sw_term (this, &sig_handlers::sig_term),
549 sw_int (this, &sig_handlers::sig_term) 466 sw_int .set<sig_handlers, &sig_handlers::sig_term> (this);
550 {
551 } 467 }
552} sig_handlers; 468} sig_handlers;
553 469
470void
471sig_handlers::sig_term (ev::sig &w, int revents)
472{
473 rxvt_emergency_cleanup ();
474 w.stop ();
475 kill (getpid (), w.signum);
476}
477
554char **rxvt_environ; // startup environment 478char **rxvt_environ; // startup environment
555 479
556void 480void
557rxvt_init () 481rxvt_init ()
558{ 482{
559 ptytty::init (); 483 ptytty::init ();
484
485 if (!ev_default_loop (0))
486 rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n");
560 487
561 rxvt_environ = environ; 488 rxvt_environ = environ;
562 489
563 signal (SIGHUP, SIG_IGN); 490 signal (SIGHUP, SIG_IGN);
564 signal (SIGPIPE, SIG_IGN); 491 signal (SIGPIPE, SIG_IGN);
565 492
566 sig_handlers.sw_term.start (SIGTERM); 493 sig_handlers.sw_term.start (SIGTERM); ev_unref ();
567 sig_handlers.sw_int.start (SIGINT); 494 sig_handlers.sw_int.start (SIGINT); ev_unref ();
568 495
569 /* need to trap SIGURG for SVR4 (Unixware) rlogin */ 496 /* need to trap SIGURG for SVR4 (Unixware) rlogin */
570 /* signal (SIGURG, SIG_DFL); */ 497 /* signal (SIGURG, SIG_DFL); */
571 498
572 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); 499 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
… …
574 XSetIOErrorHandler (rxvt_xioerror_handler); 501 XSetIOErrorHandler (rxvt_xioerror_handler);
575 502
576 XrmInitialize (); 503 XrmInitialize ();
577} 504}
578 505
579/* ------------------------------------------------------------------------- *
580 * MEMORY ALLOCATION WRAPPERS *
581 * ------------------------------------------------------------------------- */
582void *
583rxvt_malloc (size_t size)
584{
585 void *p = malloc (size);
586
587 if (!p)
588 rxvt_fatal ("memory allocation failure. aborting.\n");
589
590 return p;
591}
592
593void *
594rxvt_calloc (size_t number, size_t size)
595{
596 void *p = calloc (number, size);
597
598 if (!p)
599 rxvt_fatal ("memory allocation failure. aborting.\n");
600
601 return p;
602}
603
604void *
605rxvt_realloc (void *ptr, size_t size)
606{
607 void *p = realloc (ptr, size);
608
609 if (!p)
610 rxvt_fatal ("memory allocation failure. aborting.\n");
611
612 return p;
613}
614
615/*----------------------------------------------------------------------*/ 506/*----------------------------------------------------------------------*/
616/* 507/*
617 * window size/position calculcations for XSizeHint and other storage. 508 * window size/position calculations for XSizeHint and other storage.
618 * if width/height are non-zero then override calculated width/height 509 * if width/height are non-zero then override calculated width/height
619 */ 510 */
620void 511void
621rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight) 512rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
622{ 513{
623 short recalc_x, recalc_y; 514 short recalc_x, recalc_y;
624 int x, y, sb_w, flags; 515 int x, y, flags;
625 unsigned int w, h; 516 unsigned int w, h;
626 unsigned int max_width, max_height; 517 unsigned int max_width, max_height;
627 dDisp;
628 518
629 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity; 519 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity;
630 szHint.win_gravity = NorthWestGravity; 520 szHint.win_gravity = NorthWestGravity;
631 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */ 521 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */
632 522
… …
640 if (rs[Rs_geometry]) 530 if (rs[Rs_geometry])
641 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h); 531 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h);
642 532
643 if (flags & WidthValue) 533 if (flags & WidthValue)
644 { 534 {
535 if (!w)
536 rxvt_fatal ("illegal window geometry (width and height must be non-zero), aborting.\n");
537
645 ncol = clamp (w, 0, std::numeric_limits<int16_t>::max ()); 538 ncol = clamp (w, 1, std::numeric_limits<int16_t>::max ());
646 szHint.flags |= USSize; 539 szHint.flags |= USSize;
647 } 540 }
648 541
649 if (flags & HeightValue) 542 if (flags & HeightValue)
650 { 543 {
544 if (!h)
545 rxvt_fatal ("illegal window geometry (width and height must be non-zero), aborting.\n");
546
651 nrow = clamp (h, 0, std::numeric_limits<int16_t>::max ()); 547 nrow = clamp (h, 1, std::numeric_limits<int16_t>::max ());
652 szHint.flags |= USSize; 548 szHint.flags |= USSize;
653 } 549 }
654 550
655 if (flags & XValue) 551 if (flags & XValue)
656 { 552 {
… …
687 max_width = MAX_COLS * fwidth; 583 max_width = MAX_COLS * fwidth;
688 max_height = MAX_ROWS * fheight; 584 max_height = MAX_ROWS * fheight;
689 585
690 szHint.base_width = szHint.base_height = 2 * int_bwidth; 586 szHint.base_width = szHint.base_height = 2 * int_bwidth;
691 587
692 sb_w = 0;
693 window_vt_x = window_vt_y = int_bwidth; 588 window_vt_x = window_vt_y = int_bwidth;
694 589
695 if (scrollBar.state) 590 if (scrollBar.state)
696 { 591 {
697 sb_w = scrollbar_TotalWidth (); 592 int sb_w = scrollBar.total_width ();
698 szHint.base_width += sb_w; 593 szHint.base_width += sb_w;
594
699 if (!OPTION (Opt_scrollBar_right)) 595 if (!option (Opt_scrollBar_right))
700 window_vt_x += sb_w; 596 window_vt_x += sb_w;
701 } 597 }
702 598
703 szHint.width_inc = fwidth; 599 szHint.width_inc = fwidth;
704 szHint.height_inc = fheight; 600 szHint.height_inc = fheight;
705 szHint.min_width = szHint.base_width + szHint.width_inc; 601 szHint.min_width = szHint.base_width + szHint.width_inc;
706 szHint.min_height = szHint.base_height + szHint.height_inc; 602 szHint.min_height = szHint.base_height + szHint.height_inc;
707 603
708 if (newwidth && newwidth - szHint.base_width < max_width) 604 if (newwidth && newwidth - szHint.base_width < max_width)
709 { 605 {
710 szHint.width = newwidth; 606 szHint.width = newwidth;
… …
725 { 621 {
726 min_it (height, max_height); 622 min_it (height, max_height);
727 szHint.height = szHint.base_height + height; 623 szHint.height = szHint.base_height + height;
728 } 624 }
729 625
730 if (scrollBar.state && OPTION (Opt_scrollBar_right))
731 window_sb_x = szHint.width - sb_w;
732
733 if (recalc_x) 626 if (recalc_x)
734 szHint.x += DisplayWidth (disp, display->screen) - szHint.width - 2 * ext_bwidth; 627 szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth;
628
735 if (recalc_y) 629 if (recalc_y)
736 szHint.y += DisplayHeight (disp, display->screen) - szHint.height - 2 * ext_bwidth; 630 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth;
737 631
738 ncol = width / fwidth; 632 ncol = width / fwidth;
739 nrow = height / fheight; 633 nrow = height / fheight;
740} 634}
741 635
742/*----------------------------------------------------------------------*/ 636/*----------------------------------------------------------------------*/
743/* 637/*
… …
754 648
755 ws.ws_col = ncol; 649 ws.ws_col = ncol;
756 ws.ws_row = nrow; 650 ws.ws_row = nrow;
757 ws.ws_xpixel = width; 651 ws.ws_xpixel = width;
758 ws.ws_ypixel = height; 652 ws.ws_ypixel = height;
759 (void)ioctl (pty->pty, TIOCSWINSZ, &ws); 653 ioctl (pty->pty, TIOCSWINSZ, &ws);
760 654
761#if 0 655#if 0
762 // TIOCSWINSZ⎈ is supposed to do this automatically and correctly 656 // TIOCSWINSZ is supposed to do this automatically and correctly
763 if (cmd_pid) /* force through to the command */ 657 if (cmd_pid) /* force through to the command */
764 kill (-cmd_pid, SIGWINCH); 658 kill (-cmd_pid, SIGWINCH);
765#endif 659#endif
766} 660}
767 661
… …
796 delete fontset[0]; 690 delete fontset[0];
797 fontset[0] = fs; 691 fontset[0] = fs;
798 692
799 prop = (*fs)[1]->properties (); 693 prop = (*fs)[1]->properties ();
800 prop.height += lineSpace; 694 prop.height += lineSpace;
695 prop.width += letterSpace;
696
801 fs->set_prop (prop); 697 fs->set_prop (prop, false);
802 698
803 fwidth = prop.width; 699 fwidth = prop.width;
804 fheight = prop.height; 700 fheight = prop.height;
805 fbase = prop.ascent; 701 fbase = prop.ascent;
806 702
… …
815 { 711 {
816 fontset[style] = fs = new rxvt_fontset (this); 712 fontset[style] = fs = new rxvt_fontset (this);
817 rxvt_fontprop prop2 = prop; 713 rxvt_fontprop prop2 = prop;
818 714
819 if (res) 715 if (res)
820 prop2.weight = prop2.slant = rxvt_fontprop::unset; 716 {
717 fs->populate (res);
718 fs->set_prop (prop2, false);
719 }
821 else 720 else
822 { 721 {
823 res = fontset[0]->fontdesc; 722 fs->populate (fontset[0]->fontdesc);
824 723
825 if (SET_STYLE (0, style) & RS_Bold) prop2.weight = rxvt_fontprop::bold; 724 if (SET_STYLE (0, style) & RS_Bold) prop2.weight = rxvt_fontprop::bold;
826 if (SET_STYLE (0, style) & RS_Italic) prop2.slant = rxvt_fontprop::italic; 725 if (SET_STYLE (0, style) & RS_Italic) prop2.slant = rxvt_fontprop::italic;
726
727 fs->set_prop (prop2, true);
827 } 728 }
828 729
829 fs->populate (res);
830 fs->set_prop (prop2);
831 } 730 }
832#else 731#else
833 fontset[style] = fontset[0]; 732 fontset[style] = fontset[0];
834#endif 733#endif
835 } 734 }
… …
837 if (parent[0]) 736 if (parent[0])
838 { 737 {
839 resize_all_windows (0, 0, 0); 738 resize_all_windows (0, 0, 0);
840 scr_remap_chars (); 739 scr_remap_chars ();
841 scr_touch (true); 740 scr_touch (true);
842 } 741 }
843 742
844 return true; 743 return true;
845} 744}
846 745
746void
847void rxvt_term::set_string_property (Atom prop, const char *str, int len) 747rxvt_term::set_string_property (Atom prop, const char *str, int len)
848{ 748{
849 XChangeProperty (display->display, parent[0], 749 XChangeProperty (dpy, parent[0],
850 prop, XA_STRING, 8, PropModeReplace, 750 prop, XA_STRING, 8, PropModeReplace,
851 (const unsigned char *)str, len >= 0 ? len : strlen (str)); 751 (const unsigned char *)str, len >= 0 ? len : strlen (str));
852} 752}
853 753
754void
854void rxvt_term::set_utf8_property (Atom prop, const char *str, int len) 755rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
855{ 756{
856 wchar_t *ws = rxvt_mbstowcs (str, len); 757 wchar_t *ws = rxvt_mbstowcs (str, len);
857 char *s = rxvt_wcstoutf8 (ws); 758 char *s = rxvt_wcstoutf8 (ws);
858 759
859 XChangeProperty (display->display, parent[0], 760 XChangeProperty (dpy, parent[0],
860 prop, xa[XA_UTF8_STRING], 8, PropModeReplace, 761 prop, xa[XA_UTF8_STRING], 8, PropModeReplace,
861 (const unsigned char *)s, strlen (s)); 762 (const unsigned char *)s, strlen (s));
862 763
863 free (s); 764 free (s);
864 free (ws); 765 free (ws);
… …
883#if ENABLE_EWMH 784#if ENABLE_EWMH
884 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str); 785 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str);
885#endif 786#endif
886} 787}
887 788
789void
790rxvt_term::set_window_color (int idx, const char *color)
791{
888#ifdef XTERM_COLOR_CHANGE 792#ifdef XTERM_COLOR_CHANGE
889void
890rxvt_term::set_window_color (int idx, const char *color)
891{
892 rxvt_color xcol; 793 rxvt_color xcol;
893 int i;
894 794
895 if (color == NULL || *color == '\0') 795 if (color == NULL || *color == '\0')
896 return; 796 return;
897 797
798 color = strdup (color);
799 allocated.push_back ((void *)color);
800 rs[Rs_color + idx] = color;
801
898 /* handle color aliases */ 802 /* handle color aliases */
899 if (isdigit (*color)) 803 if (isdigit (*color))
900 { 804 {
901 i = atoi (color); 805 int i = atoi (color);
902 806
903 if (i >= 8 && i <= 15) 807 if (i >= 8 && i <= 15)
808 {
904 { /* bright colors */ 809 /* bright colors */
905 i -= 8;
906 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i]; 810 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i - 8];
907 SET_PIXCOLOR (idx);
908 goto done; 811 goto done;
909 } 812 }
910 813
911 if (i >= 0 && i <= 7) 814 if (i >= 0 && i <= 7)
815 {
912 { /* normal colors */ 816 /* normal colors */
913 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i]; 817 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];
914 SET_PIXCOLOR (idx);
915 goto done; 818 goto done;
916 } 819 }
917 } 820 }
918 821
919 if (!rXParseAllocColor (&xcol, color)) 822 set_color (xcol, color);
920 return;
921
922 /* XStoreColor (display->display, display->cmap, XColor*); */
923 823
924 /* 824 /*
925 * FIXME: should free colors here, but no idea how to do it so instead, 825 * FIXME: should free colors here, but no idea how to do it so instead,
926 * so just keep gobbling up the colormap 826 * so just keep gobbling up the colormap
927 */ 827 */
928# if 0
929 for (i = Color_Black; i <= Color_White; i++)
930 if (pix_colors[idx] == pix_colors[i])
931 break;
932 if (i > Color_White)
933 {
934 /* fprintf (stderr, "XFreeColors: pix_colors [%d] = %lu\n", idx, pix_colors [idx]); */
935 XFreeColors (display->display, display->cmap, (pix_colors + idx), 1,
936 DisplayPlanes (display->display, display->screen));
937 }
938# endif
939 828
940 pix_colors_focused[idx] = xcol; 829 pix_colors_focused[idx] = xcol;
941 SET_PIXCOLOR (idx);
942 830
943 /* XSetWindowAttributes attr; */
944 /* Cursor cursor; */
945done: 831done:
946
947#if OFF_FOCUS_FADING
948 if (rs[Rs_fade])
949 pix_colors_unfocused[idx] = pix_colors_focused[idx].fade (display, atoi (rs[Rs_fade]), pix_colors[Color_fade]);
950#endif
951
952 /*TODO: handle Color_BD, scrollbar background, etc. */ 832 /*TODO: handle Color_BD, scrollbar background, etc. */
953 833
834 update_fade_color (idx);
954 recolour_cursor (); 835 recolour_cursor ();
955 scr_recolour (); 836 scr_recolour ();
837#endif /* XTERM_COLOR_CHANGE */
956} 838}
957
958#else
959# define set_window_color (idx,color) ((void)0)
960#endif /* XTERM_COLOR_CHANGE */
961 839
962void 840void
963rxvt_term::recolour_cursor () 841rxvt_term::recolour_cursor ()
964{ 842{
965 XColor xcol[2]; 843 XColor fg, bg;
966 844
967 xcol[0].pixel = ISSET_PIXCOLOR (Color_pointer_fg) 845 (ISSET_PIXCOLOR (Color_pointer_fg)
968 ? pix_colors_focused[Color_pointer_fg] 846 ? pix_colors_focused[Color_pointer_fg]
969 : pix_colors_focused[Color_fg]; 847 : pix_colors_focused[Color_fg]).get (fg);
848
970 xcol[1].pixel = ISSET_PIXCOLOR (Color_pointer_bg) 849 (ISSET_PIXCOLOR (Color_pointer_bg)
971 ? pix_colors_focused[Color_pointer_bg] 850 ? pix_colors_focused[Color_pointer_bg]
972 : pix_colors_focused[Color_bg]; 851 : pix_colors_focused[Color_bg]).get (bg);
973 852
974 XQueryColors (display->display, display->cmap, xcol, 2); 853 XRecolorCursor (dpy, TermWin_cursor, &fg, &bg);
975 XRecolorCursor (display->display, TermWin_cursor, xcol + 0, xcol + 1);
976} 854}
977 855
978/*----------------------------------------------------------------------*/ 856/*----------------------------------------------------------------------*/
979/* 857/*
980 * find if fg/bg matches any of the normal (low-intensity) colors 858 * find if fg/bg matches any of the normal (low-intensity) colors
981 */ 859 */
982void 860void
983rxvt_term::set_colorfgbg () 861rxvt_term::set_colorfgbg ()
984{ 862{
985 unsigned int i; 863 unsigned int i;
986 const char *xpmb = "\0"; 864 const char *xpmb = "";
987 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1]; 865 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1];
988 866
989 strcpy (fstr, "default"); 867 strcpy (fstr, "default");
990 strcpy (bstr, "default"); 868 strcpy (bstr, "default");
991 for (i = Color_Black; i <= Color_White; i++) 869 for (i = Color_Black; i <= Color_White; i++)
… …
997 875
998 for (i = Color_Black; i <= Color_White; i++) 876 for (i = Color_Black; i <= Color_White; i++)
999 if (pix_colors[Color_bg] == pix_colors[i]) 877 if (pix_colors[Color_bg] == pix_colors[i])
1000 { 878 {
1001 sprintf (bstr, "%d", (i - Color_Black)); 879 sprintf (bstr, "%d", (i - Color_Black));
1002#ifdef XPM_BACKGROUND 880#ifdef BG_IMAGE_FROM_FILE
1003 xpmb = "default;"; 881 xpmb = "default;";
1004#endif 882#endif
1005 break; 883 break;
1006 } 884 }
1007 885
1008 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr); 886 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr);
1009} 887}
1010 888
1011/*----------------------------------------------------------------------*/ 889/*----------------------------------------------------------------------*/
1012 890
1013int 891bool
1014rxvt_term::rXParseAllocColor (rxvt_color *screen_in_out, const char *colour) 892rxvt_term::set_color (rxvt_color &color, const char *name)
1015{ 893{
1016 if (!screen_in_out->set (display, colour)) 894 if (color.set (this, name))
1017 {
1018 rxvt_warn ("can't get colour '%s', continuing without.\n", colour);
1019 return false;
1020 }
1021
1022 return true; 895 return true;
896
897 rxvt_warn ("can't get colour '%s', continuing without.\n", name);
898 return false;
899}
900
901void
902rxvt_term::alias_color (int dst, int src)
903{
904 pix_colors[dst].set (this, rs[Rs_color + dst] = rs[Rs_color + src]);
1023} 905}
1024 906
1025/* -------------------------------------------------------------------- * 907/* -------------------------------------------------------------------- *
1026 * - WINDOW RESIZING - * 908 * - WINDOW RESIZING - *
1027 * -------------------------------------------------------------------- */ 909 * -------------------------------------------------------------------- */
… …
1029rxvt_term::resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent) 911rxvt_term::resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent)
1030{ 912{
1031 int fix_screen; 913 int fix_screen;
1032 int old_width = szHint.width; 914 int old_width = szHint.width;
1033 int old_height = szHint.height; 915 int old_height = szHint.height;
1034 dDisp;
1035 916
1036 window_calc (newwidth, newheight); 917 window_calc (newwidth, newheight);
918
919 bool set_hint = !HOOK_INVOKE ((this, HOOK_RESIZE_ALL_WINDOWS, DT_INT, newwidth, DT_INT, newheight, DT_END));
920
921 // to avoid races between us and the wm, we clear the incremental size hints around the xresizewindow
922 if (set_hint)
923 {
924 szHint.flags &= ~(PBaseSize | PResizeInc);
1037 XSetWMNormalHints (disp, parent[0], &szHint); 925 XSetWMNormalHints (dpy, parent[0], &szHint);
926 szHint.flags |= PBaseSize | PResizeInc;
927 }
1038 928
1039 if (!ignoreparent) 929 if (!ignoreparent)
1040 { 930 {
1041#ifdef SMART_RESIZE 931#ifdef SMART_RESIZE
1042 /* 932 /*
… …
1046 int x, y, x1, y1; 936 int x, y, x1, y1;
1047 int dx, dy; 937 int dx, dy;
1048 unsigned int unused_w1, unused_h1, unused_b1, unused_d1; 938 unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
1049 Window unused_cr; 939 Window unused_cr;
1050 940
1051 XTranslateCoordinates (disp, parent[0], display->root, 941 XTranslateCoordinates (dpy, parent[0], display->root,
1052 0, 0, &x, &y, &unused_cr); 942 0, 0, &x, &y, &unused_cr);
1053 XGetGeometry (disp, parent[0], &unused_cr, &x1, &y1, 943 XGetGeometry (dpy, parent[0], &unused_cr, &x1, &y1,
1054 &unused_w1, &unused_h1, &unused_b1, &unused_d1); 944 &unused_w1, &unused_h1, &unused_b1, &unused_d1);
1055 /* 945 /*
1056 * if display->root isn't the parent window, a WM will probably have offset 946 * if display->root isn't the parent window, a WM will probably have offset
1057 * our position for handles and decorations. Counter it 947 * our position for handles and decorations. Counter it
1058 */ 948 */
… …
1060 { 950 {
1061 x -= x1; 951 x -= x1;
1062 y -= y1; 952 y -= y1;
1063 } 953 }
1064 954
1065 x1 = (DisplayWidth (disp, display->screen) - old_width ) / 2; 955 x1 = (DisplayWidth (dpy, display->screen) - old_width ) / 2;
1066 y1 = (DisplayHeight (disp, display->screen) - old_height) / 2; 956 y1 = (DisplayHeight (dpy, display->screen) - old_height) / 2;
1067 dx = old_width - szHint.width; 957 dx = old_width - szHint.width;
1068 dy = old_height - szHint.height; 958 dy = old_height - szHint.height;
1069 959
1070 /* Check position of the center of the window */ 960 /* Check position of the center of the window */
1071 if (x < x1) /* left half */ 961 if (x < x1) /* left half */
… …
1075 if (y < y1) /* top half */ 965 if (y < y1) /* top half */
1076 dy = 0; 966 dy = 0;
1077 else if (y == y1) /* exact center */ 967 else if (y == y1) /* exact center */
1078 dy /= 2; 968 dy /= 2;
1079 969
1080 XMoveResizeWindow (disp, parent[0], x + dx, y + dy, 970 XMoveResizeWindow (dpy, parent[0], x + dx, y + dy,
1081 szHint.width, szHint.height); 971 szHint.width, szHint.height);
1082#else 972#else
1083 XResizeWindow (disp, parent[0], szHint.width, szHint.height); 973 XResizeWindow (dpy, parent[0], szHint.width, szHint.height);
1084#endif 974#endif
1085 } 975 }
976
977 if (set_hint)
978 XSetWMNormalHints (dpy, parent[0], &szHint);
1086 979
1087 fix_screen = ncol != prev_ncol || nrow != prev_nrow; 980 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
1088 981
1089 if (fix_screen || newwidth != old_width || newheight != old_height) 982 if (fix_screen || newwidth != old_width || newheight != old_height)
1090 { 983 {
1091 if (scrollBar.state) 984 if (scrollBar.state)
1092 { 985 scrollBar.resize ();
1093 XMoveResizeWindow (disp, scrollBar.win,
1094 window_sb_x, 0,
1095 scrollbar_TotalWidth (), szHint.height);
1096 resize_scrollbar ();
1097 }
1098 986
1099 XMoveResizeWindow (disp, vt, 987 XMoveResizeWindow (dpy, vt,
1100 window_vt_x, window_vt_y, 988 window_vt_x, window_vt_y,
1101 width, height); 989 width, height);
1102 990
1103 scr_clear (); 991#ifdef HAVE_BG_PIXMAP
1104#ifdef XPM_BACKGROUND 992 if (bgPixmap.window_size_sensitive ())
1105 resize_pixmap (); 993 update_background ();
1106#endif 994#endif
1107 } 995 }
1108 996
1109 if (fix_screen || old_height == 0) 997 if (fix_screen || old_height == 0)
1110 scr_reset (); 998 scr_reset ();
1111 999
1112#ifdef XPM_BACKGROUND 1000#ifdef HAVE_BG_PIXMAP
1113 if (pixmap) 1001// TODO: this don't seem to have any effect - do we still need it ? If so - in which case exactly ?
1002// if (bgPixmap.pixmap)
1114 scr_touch (false); 1003// scr_touch (false);
1115#endif 1004#endif
1116 1005
1117#ifdef USE_XIM 1006#ifdef USE_XIM
1118 IMSetStatusPosition (); 1007 IMSetPosition ();
1119#endif 1008#endif
1120} 1009}
1121 1010
1122/* 1011/*
1123 * Set the width/height of the vt window in characters. Units are pixels. 1012 * Set the width/height of the vt window in characters. Units are pixels.
… …
1128{ 1017{
1129 XWindowAttributes wattr; 1018 XWindowAttributes wattr;
1130 1019
1131 if (newwidth == 0 || newheight == 0) 1020 if (newwidth == 0 || newheight == 0)
1132 { 1021 {
1133 XGetWindowAttributes (display->display, display->root, &wattr); 1022 XGetWindowAttributes (dpy, display->root, &wattr);
1134 1023
1135 if (newwidth == 0) 1024 if (newwidth == 0)
1136 newwidth = wattr.width - szHint.base_width; 1025 newwidth = wattr.width - szHint.base_width;
1137 if (newheight == 0) 1026 if (newheight == 0)
1138 newheight = wattr.height - szHint.base_height; 1027 newheight = wattr.height - szHint.base_height;
… …
1152#ifdef USE_XIM 1041#ifdef USE_XIM
1153 1042
1154void 1043void
1155rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg) 1044rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg)
1156{ 1045{
1157 fg = pix_colors[Color_fg]; 1046 fg = pix_colors [Color_fg];
1158 bg = pix_colors[Color_bg]; 1047 bg = pix_colors [Color_bg];
1159} 1048}
1160 1049
1161void 1050void
1162rxvt_term::im_set_size (XRectangle &size) 1051rxvt_term::im_set_size (XRectangle &size)
1163{ 1052{
… …
1186 1075
1187/* Checking whether input method is running. */ 1076/* Checking whether input method is running. */
1188bool 1077bool
1189rxvt_term::IMisRunning () 1078rxvt_term::IMisRunning ()
1190{ 1079{
1191 char *p;
1192 Atom atom; 1080 Atom atom;
1193 Window win; 1081 Window win;
1194 char server[IMBUFSIZ]; 1082 char server[IMBUFSIZ];
1195 1083
1196 /* get current locale modifier */ 1084 /* get current locale modifier */
1197 if ((p = XSetLocaleModifiers (NULL)) != NULL) 1085 if (char *p = XSetLocaleModifiers (0))
1198 { 1086 {
1199 strcpy (server, "@server="); 1087 strcpy (server, "@server=");
1200 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */ 1088 strncat (server, p + 4, IMBUFSIZ - 9); /* skip "@im=" */
1201 1089
1202 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */ 1090 if (p = strchr (server + 1, '@')) /* first one only */
1203 *p = '\0'; 1091 *p = '\0';
1204 1092
1205 atom = XInternAtom (display->display, server, False); 1093 atom = XInternAtom (dpy, server, False);
1206 win = XGetSelectionOwner (display->display, atom); 1094 win = XGetSelectionOwner (dpy, atom);
1207 1095
1208 if (win != None) 1096 if (win != None)
1209 return True; 1097 return True;
1210 } 1098 }
1211 1099
… …
1274 1162
1275 term->make_current (); 1163 term->make_current ();
1276 1164
1277 if (text) 1165 if (text)
1278 { 1166 {
1279 void *str; 1167 wchar_t *str;
1280 1168
1281 if (!text->encoding_is_wchar && text->string.multi_byte) 1169 if (!text->encoding_is_wchar && text->string.multi_byte)
1282 { 1170 {
1283 // of course, X makes it ugly again 1171 // of course, X makes it ugly again
1284 if (term->rs[Rs_imLocale]) 1172 if (term->rs[Rs_imLocale])
1285 SET_LOCALE (term->rs[Rs_imLocale]); 1173 SET_LOCALE (term->rs[Rs_imLocale]);
1286 1174
1287 str = rxvt_temp_buf ((text->length + 1) * sizeof (wchar_t)); 1175 str = rxvt_temp_buf<wchar_t> (text->length + 1);
1288 mbstowcs ((wchar_t *)str, text->string.multi_byte, text->length + 1); 1176 mbstowcs (str, text->string.multi_byte, text->length + 1);
1289 1177
1290 if (term->rs[Rs_imLocale]) 1178 if (term->rs[Rs_imLocale])
1291 SET_LOCALE (term->locale); 1179 SET_LOCALE (term->locale);
1292 } 1180 }
1293 else 1181 else
1294 str = (void *)text->string.wide_char; 1182 str = text->string.wide_char;
1295 1183
1296 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW, 1184 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
1297 DT_INT, call_data->caret, 1185 DT_INT, call_data->caret,
1298 DT_INT, call_data->chg_first, 1186 DT_INT, call_data->chg_first,
1299 DT_INT, call_data->chg_length, 1187 DT_INT, call_data->chg_length,
1300 DT_LCS_LEN, (void *)text->feedback, text->feedback ? (int)text->length : 0, 1188 DT_LCS_LEN, (void *)text->feedback, text->feedback ? (int)text->length : 0,
… …
1435 "*", 1323 "*",
1436 fheight, 1324 fheight,
1437 fheight + 1, fheight - 1, 1325 fheight + 1, fheight - 1,
1438 fheight - 2, fheight + 2); 1326 fheight - 2, fheight + 2);
1439 1327
1440 fs = XCreateFontSet (display->display, rs[Rs_imFont] ? rs[Rs_imFont] : pat, 1328 fs = XCreateFontSet (dpy, rs[Rs_imFont] ? rs[Rs_imFont] : pat,
1441 &missing_charset_list, &missing_charset_count, &def_string); 1329 &missing_charset_list, &missing_charset_count, &def_string);
1442 1330
1443 if (missing_charset_list) 1331 if (missing_charset_list)
1444 XFreeStringList (missing_charset_list); 1332 XFreeStringList (missing_charset_list);
1445 1333
… …
1520 preedit_attr, 1408 preedit_attr,
1521 status_attr ? XNStatusAttributes : NULL, 1409 status_attr ? XNStatusAttributes : NULL,
1522 status_attr, NULL); 1410 status_attr, NULL);
1523 1411
1524 if (preedit_attr) XFree (preedit_attr); 1412 if (preedit_attr) XFree (preedit_attr);
1525 if (status_attr) XFree (status_attr); 1413 if (status_attr) XFree (status_attr);
1526 if (fs) XFreeFontSet (display->display, fs); 1414 if (fs) XFreeFontSet (dpy, fs);
1527 1415
1528 if (Input_Context == NULL) 1416 if (Input_Context == NULL)
1529 { 1417 {
1530 rxvt_warn ("failed to create input context, continuing without XIM.\n"); 1418 rxvt_warn ("failed to create input context, continuing without XIM.\n");
1531 im_destroy (); 1419 im_destroy ();
… …
1536 // unfortunately, only the focus window is used by XIM, hard to fix 1424 // unfortunately, only the focus window is used by XIM, hard to fix
1537 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL)) 1425 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL))
1538 vt_select_input (); 1426 vt_select_input ();
1539#endif 1427#endif
1540 1428
1541 if (input_style & XIMPreeditArea)
1542 IMSetStatusPosition (); 1429 IMSetPosition ();
1543 1430
1544 return true; 1431 return true;
1545} 1432}
1546 1433
1547void 1434void
… …
1605 SET_LOCALE (locale); 1492 SET_LOCALE (locale);
1606#endif 1493#endif
1607} 1494}
1608 1495
1609void 1496void
1610rxvt_term::IMSetStatusPosition () 1497rxvt_term::IMSetPosition ()
1611{ 1498{
1612 XRectangle preedit_rect, status_rect, *needed_rect; 1499 XRectangle preedit_rect, status_rect, *needed_rect;
1613 XVaNestedList preedit_attr, status_attr; 1500 XVaNestedList preedit_attr, status_attr;
1614 1501
1615 if (!Input_Context 1502 if (!Input_Context
1616 || !focus 1503 || !focus
1617 || !(input_style & XIMPreeditArea) 1504 || !(input_style & (XIMPreeditArea | XIMPreeditPosition))
1618 || !IMisRunning ()) 1505 || !IMisRunning ())
1619 return; 1506 return;
1620 1507
1508 if (input_style & XIMPreeditPosition)
1509 {
1510 im_set_size (preedit_rect);
1511 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);
1512
1513 XSetICValues (Input_Context,
1514 XNPreeditAttributes, preedit_attr, NULL);
1515 }
1516 else
1517 {
1621 /* Getting the necessary width of preedit area */ 1518 /* Getting the necessary width of preedit area */
1622 status_attr = XVaCreateNestedList (0, XNAreaNeeded, &needed_rect, NULL); 1519 status_attr = XVaCreateNestedList (0, XNAreaNeeded, &needed_rect, NULL);
1623 XGetICValues (Input_Context, XNStatusAttributes, status_attr, NULL); 1520 XGetICValues (Input_Context, XNStatusAttributes, status_attr, NULL);
1624 XFree (status_attr); 1521 XFree (status_attr);
1625 1522
1626 im_set_preedit_area (preedit_rect, status_rect, *needed_rect); 1523 im_set_preedit_area (preedit_rect, status_rect, *needed_rect);
1627 XFree (needed_rect); 1524 XFree (needed_rect);
1628 1525
1629 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL); 1526 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);
1630 status_attr = XVaCreateNestedList (0, XNArea, &status_rect, NULL); 1527 status_attr = XVaCreateNestedList (0, XNArea, &status_rect, NULL);
1631 1528
1632 XSetICValues (Input_Context, 1529 XSetICValues (Input_Context,
1633 XNPreeditAttributes, preedit_attr, 1530 XNPreeditAttributes, preedit_attr,
1634 XNStatusAttributes, status_attr, NULL); 1531 XNStatusAttributes, status_attr,
1532 NULL);
1635 1533
1534 XFree (status_attr);
1535 }
1536
1636 XFree (preedit_attr); 1537 XFree (preedit_attr);
1637 XFree (status_attr);
1638} 1538}
1639#endif /* USE_XIM */ 1539#endif /* USE_XIM */
1540
1541void
1542rxvt_term::get_window_origin (int &x, int &y)
1543{
1544 Window cr;
1545 XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr);
1546/* fprintf (stderr, "origin is %+d%+d\n", x, y);*/
1547}
1548
1549Pixmap
1550rxvt_term::get_pixmap_property (int prop_id)
1551{
1552 if (prop_id > 0 && prop_id < NUM_XA)
1553 if (xa[prop_id])
1554 {
1555 int aformat;
1556 unsigned long nitems, bytes_after;
1557 Atom atype;
1558 unsigned char *prop = NULL;
1559 int result = XGetWindowProperty (dpy, display->root, xa[prop_id],
1560 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1561 &nitems, &bytes_after, &prop);
1562 if (result == Success && prop && atype == XA_PIXMAP)
1563 return *(Pixmap *)prop;
1564 }
1565
1566 return None;
1567}
1568
1569#ifdef HAVE_BG_PIXMAP
1570# if TRACE_PIXMAPS
1571# undef update_background
1572void
1573rxvt_term::trace_update_background (const char *file, int line)
1574{
1575 fprintf (stderr, "%s:%d:update_background()\n", file, line);
1576 update_background ();
1577}
1578# endif
1579
1580void
1581rxvt_term::update_background ()
1582{
1583 if (update_background_ev.is_active ())
1584 return;
1585
1586 bgPixmap.invalidate ();
1587
1588 ev_tstamp to_wait = 0.5 - (ev::now () - bgPixmap.valid_since);
1589
1590 if (to_wait <= 0.)
1591 bgPixmap.render ();
1592 else
1593 update_background_ev.start (to_wait);
1594}
1595
1596void
1597rxvt_term::update_background_cb (ev::timer &w, int revents)
1598{
1599 make_current ();
1600
1601 update_background_ev.stop ();
1602 bgPixmap.render ();
1603 refresh_check ();
1604}
1605
1606#endif /* HAVE_BG_PIXMAP */
1640 1607
1641/*----------------------- end-of-file (C source) -----------------------*/ 1608/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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