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.136 by root, Mon Feb 14 18:47:54 2005 UTC vs.
Revision 1.217 by root, Thu Feb 2 18:00:23 2006 UTC

… …
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-2004 Marc Lehmann <pcg@goof.com> 16 * Copyright (c) 2003-2006 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.
… …
30 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 30 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
31 *---------------------------------------------------------------------*/ 31 *---------------------------------------------------------------------*/
32 32
33#include "../config.h" /* NECESSARY */ 33#include "../config.h" /* NECESSARY */
34#include "rxvt.h" /* NECESSARY */ 34#include "rxvt.h" /* NECESSARY */
35#include "main.intpro" /* PROTOS for internal routines */ 35#include "keyboard.h"
36#include "rxvtperl.h"
37
38#include <limits>
36 39
37#include <csignal> 40#include <csignal>
38#include <cstring> 41#include <cstring>
39 42
40#ifdef TTY_GID_SUPPORT 43#ifdef TTY_GID_SUPPORT
… …
43 46
44#ifdef HAVE_TERMIOS_H 47#ifdef HAVE_TERMIOS_H
45# include <termios.h> 48# include <termios.h>
46#endif 49#endif
47 50
48#ifdef KEYSYM_RESOURCE
49# include "keyboard.h"
50#endif
51
52vector<rxvt_term *> rxvt_term::termlist; 51vector<rxvt_term *> rxvt_term::termlist;
53 52
53// used to tell global functions which terminal instance is "active"
54rxvt_t rxvt_current_term;
55
54static char curlocale[128]; 56static char curlocale[128], savelocale[128];
55 57
56bool 58bool
57rxvt_set_locale (const char *locale) 59rxvt_set_locale (const char *locale) NOTHROW
58{ 60{
59 if (!locale || !strncmp (locale, curlocale, 128)) 61 if (!locale || !strncmp (locale, curlocale, 128))
60 return false; 62 return false;
61 63
62 strncpy (curlocale, locale, 128); 64 strncpy (curlocale, locale, 128);
63 setlocale (LC_CTYPE, curlocale); 65 setlocale (LC_CTYPE, curlocale);
64 return true; 66 return true;
67}
68
69void
70rxvt_push_locale (const char *locale) NOTHROW
71{
72 strcpy (savelocale, curlocale);
73 rxvt_set_locale (locale);
74}
75
76void
77rxvt_pop_locale () NOTHROW
78{
79 rxvt_set_locale (savelocale);
65} 80}
66 81
67#if ENABLE_COMBINING 82#if ENABLE_COMBINING
68class rxvt_composite_vec rxvt_composite; 83class rxvt_composite_vec rxvt_composite;
69 84
… …
134 rootwin_ev (this, &rxvt_term::rootwin_cb), 149 rootwin_ev (this, &rxvt_term::rootwin_cb),
135#endif 150#endif
136#ifdef HAVE_SCROLLBARS 151#ifdef HAVE_SCROLLBARS
137 scrollbar_ev (this, &rxvt_term::x_cb), 152 scrollbar_ev (this, &rxvt_term::x_cb),
138#endif 153#endif
139#ifdef MENUBAR
140 menubar_ev (this, &rxvt_term::x_cb),
141#endif
142#ifdef CURSOR_BLINK 154#ifdef CURSOR_BLINK
143 cursor_blink_ev (this, &rxvt_term::cursor_blink_cb), 155 cursor_blink_ev (this, &rxvt_term::cursor_blink_cb),
144#endif 156#endif
145#ifdef TEXT_BLINK 157#ifdef TEXT_BLINK
146 text_blink_ev (this, &rxvt_term::text_blink_cb), 158 text_blink_ev (this, &rxvt_term::text_blink_cb),
… …
158 pointer_ev (this, &rxvt_term::pointer_cb), 170 pointer_ev (this, &rxvt_term::pointer_cb),
159#endif 171#endif
160#ifdef USE_XIM 172#ifdef USE_XIM
161 im_ev (this, &rxvt_term::im_cb), 173 im_ev (this, &rxvt_term::im_cb),
162#endif 174#endif
163 sw_term (this, &rxvt_term::sig_term), 175#ifndef NO_BELL
164 sw_int (this, &rxvt_term::sig_term), 176 bell_ev (this, &rxvt_term::bell_cb),
165 sw_chld (this, &rxvt_term::sig_chld), 177#endif
166 termwin_ev (this, &rxvt_term::x_cb), 178 termwin_ev (this, &rxvt_term::x_cb),
167 vt_ev (this, &rxvt_term::x_cb), 179 vt_ev (this, &rxvt_term::x_cb),
180 child_ev (this, &rxvt_term::child_cb),
168 check_ev (this, &rxvt_term::check_cb), 181 check_ev (this, &rxvt_term::check_cb),
169 flush_ev (this, &rxvt_term::flush_cb), 182 flush_ev (this, &rxvt_term::flush_cb),
170 destroy_ev (this, &rxvt_term::destroy_cb), 183 destroy_ev (this, &rxvt_term::destroy_cb),
171 pty_ev (this, &rxvt_term::pty_cb), 184 pty_ev (this, &rxvt_term::pty_cb),
172 incr_ev (this, &rxvt_term::incr_cb) 185 incr_ev (this, &rxvt_term::incr_cb)
… …
175 188
176 termlist.push_back (this); 189 termlist.push_back (this);
177 190
178#ifdef KEYSYM_RESOURCE 191#ifdef KEYSYM_RESOURCE
179 keyboard = new keyboard_manager; 192 keyboard = new keyboard_manager;
180
181 if (!keyboard)
182 rxvt_fatal ("out of memory, aborting.\n");
183#endif 193#endif
184} 194}
185 195
186// clean up the most important stuff, do *not* call x or free mem etc. 196// clean up the most important stuff, do *not* call x or free mem etc.
187// for use before an emergency exit 197// for use before an emergency exit
188void rxvt_term::emergency_cleanup () 198void rxvt_term::emergency_cleanup ()
189{ 199{
190 if (cmd_pid) 200 if (cmd_pid)
191 kill (-cmd_pid, SIGHUP); 201 kill (-cmd_pid, SIGHUP);
192 202
193#ifdef UTMP_SUPPORT 203 delete pty; pty = 0;
194 privileged_utmp (RESTORE);
195#endif
196
197 pty.put ();
198} 204}
199 205
200rxvt_term::~rxvt_term () 206rxvt_term::~rxvt_term ()
201{ 207{
202 termlist.erase (find (termlist.begin (), termlist.end(), this)); 208 termlist.erase (find (termlist.begin (), termlist.end(), this));
203 209
204 emergency_cleanup (); 210 emergency_cleanup ();
205 211
206#if ENABLE_STYLES 212#if ENABLE_STYLES
207 for (int i = RS_styleCount; --i; ) 213 for (int i = RS_styleCount; --i; )
208 if (TermWin.fontset[i] != TermWin.fontset[0]) 214 if (fontset[i] != fontset[0])
209 delete TermWin.fontset[i]; 215 delete fontset[i];
210#endif 216#endif
211 delete TermWin.fontset[0]; 217 delete fontset[0];
212 218
213 if (display) 219 if (display)
214 { 220 {
215 dDisp;
216
217 selection_clear (); 221 selection_clear ();
218 222
219#ifdef USE_XIM 223#ifdef USE_XIM
220 im_destroy (); 224 im_destroy ();
221#endif 225#endif
222#ifdef MENUBAR
223 if (menubarGC) XFreeGC (disp, menubarGC);
224#endif
225#ifdef XTERM_SCROLLBAR 226#ifdef XTERM_SCROLLBAR
226 if (xscrollbarGC) XFreeGC (disp, xscrollbarGC); 227 if (xscrollbarGC) XFreeGC (xdisp, xscrollbarGC);
227 if (ShadowGC) XFreeGC (disp, ShadowGC); 228 if (ShadowGC) XFreeGC (xdisp, ShadowGC);
228#endif 229#endif
229#ifdef PLAIN_SCROLLBAR 230#ifdef PLAIN_SCROLLBAR
230 if (pscrollbarGC) XFreeGC (disp, pscrollbarGC); 231 if (pscrollbarGC) XFreeGC (xdisp, pscrollbarGC);
231#endif 232#endif
232#ifdef NEXT_SCROLLBAR 233#ifdef NEXT_SCROLLBAR
233 if (blackGC) XFreeGC (disp, blackGC); 234 if (blackGC) XFreeGC (xdisp, blackGC);
234 if (whiteGC) XFreeGC (disp, whiteGC); 235 if (whiteGC) XFreeGC (xdisp, whiteGC);
235 if (grayGC) XFreeGC (disp, grayGC); 236 if (grayGC) XFreeGC (xdisp, grayGC);
236 if (darkGC) XFreeGC (disp, darkGC); 237 if (darkGC) XFreeGC (xdisp, darkGC);
237 if (stippleGC) XFreeGC (disp, stippleGC); 238 if (stippleGC) XFreeGC (xdisp, stippleGC);
238 if (dimple) XFreePixmap (disp, dimple); 239 if (dimple) XFreePixmap (xdisp, dimple);
239 if (upArrow) XFreePixmap (disp, upArrow); 240 if (upArrow) XFreePixmap (xdisp, upArrow);
240 if (downArrow) XFreePixmap (disp, downArrow); 241 if (downArrow) XFreePixmap (xdisp, downArrow);
241 if (upArrowHi) XFreePixmap (disp, upArrowHi); 242 if (upArrowHi) XFreePixmap (xdisp, upArrowHi);
242 if (downArrowHi) XFreePixmap (disp, downArrowHi); 243 if (downArrowHi) XFreePixmap (xdisp, downArrowHi);
243#endif 244#endif
244#if defined(MENUBAR) || defined(RXVT_SCROLLBAR) 245#ifdef RXVT_SCROLLBAR
245 if (topShadowGC) XFreeGC (disp, topShadowGC); 246 if (topShadowGC) XFreeGC (xdisp, topShadowGC);
246 if (botShadowGC) XFreeGC (disp, botShadowGC); 247 if (botShadowGC) XFreeGC (xdisp, botShadowGC);
247 if (scrollbarGC) XFreeGC (disp, scrollbarGC); 248 if (scrollbarGC) XFreeGC (xdisp, scrollbarGC);
248#endif 249#endif
249 if (TermWin.gc) XFreeGC (disp, TermWin.gc); 250 if (gc) XFreeGC (xdisp, gc);
250 251
251#if defined(MENUBAR) && (MENUBAR_MAX > 1)
252 delete menuBar.drawable; 252 delete drawable;
253 //if (menuBar.win)
254 // XDestroyWindow (disp, menuBar.win);
255#endif
256 delete TermWin.drawable;
257 // destroy all windows 253 // destroy all windows
258 if (TermWin.parent[0] && !rs[Rs_embed]) 254 if (parent[0])
259 XDestroyWindow (disp, TermWin.parent[0]); 255 XDestroyWindow (xdisp, parent[0]);
260 }
261 256
262 // TODO: free pixcolours, colours should become part of rxvt_display 257 for (int i = 0; i < TOTAL_COLORS; i++)
258 if (ISSET_PIXCOLOR (i))
259 {
260 pix_colors_focused [i].free (this);
261#if OFF_FOCUS_FADING
262 pix_colors_unfocused [i].free (this);
263#endif
264 }
265
266 clear ();
267 }
263 268
264 delete pix_colors_focused; 269 delete pix_colors_focused;
265#ifdef OFF_FOCUS_FADING 270#if OFF_FOCUS_FADING
266 delete pix_colors_unfocused; 271 delete pix_colors_unfocused;
267#endif 272#endif
268 273
269 displays.put (display); 274 displays.put (display);
270 275
… …
274 for (int i = 0; i < allocated.size (); i++) 279 for (int i = 0; i < allocated.size (); i++)
275 free (allocated [i]); 280 free (allocated [i]);
276 281
277 free (selection.text); 282 free (selection.text);
278 // TODO: manage env vars in child only(!) 283 // TODO: manage env vars in child only(!)
279 free (env_windowid);
280 free (env_display); 284 free (env_display);
281 free (env_term); 285 free (env_term);
282 free (env_colorfgbg);
283 free (locale); 286 free (locale);
284 free (v_buffer); 287 free (v_buffer);
285 free (incr_buf); 288 free (incr_buf);
286 289
287 delete envv; 290 delete envv;
… …
290#ifdef KEYSYM_RESOURCE 293#ifdef KEYSYM_RESOURCE
291 delete keyboard; 294 delete keyboard;
292#endif 295#endif
293} 296}
294 297
298// child has exited, usually destroys
299void
300rxvt_term::child_cb (child_watcher &w, int status)
301{
302 HOOK_INVOKE ((this, HOOK_CHILD_EXIT, DT_INT, status, DT_END));
303
304 cmd_pid = 0;
305
306 if (!OPTION (Opt_hold))
307 destroy ();
308}
309
295void 310void
296rxvt_term::destroy () 311rxvt_term::destroy ()
297{ 312{
298 if (destroy_ev.active) 313 if (destroy_ev.active)
299 return; 314 return;
300 315
316 HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));
317
301#if ENABLE_OVERLAY 318#if ENABLE_OVERLAY
302 scr_overlay_off (); 319 scr_overlay_off ();
303#endif 320#endif
304 321
305 if (display) 322 if (display)
… …
307#if USE_XIM 324#if USE_XIM
308 im_ev.stop (display); 325 im_ev.stop (display);
309#endif 326#endif
310#if HAVE_SCROLLBARS 327#if HAVE_SCROLLBARS
311 scrollbar_ev.stop (display); 328 scrollbar_ev.stop (display);
312#endif
313#if MENUBAR
314 menubar_ev.stop (display);
315#endif 329#endif
316#if TRANSPARENT 330#if TRANSPARENT
317 rootwin_ev.stop (display); 331 rootwin_ev.stop (display);
318#endif 332#endif
319 incr_ev.stop (); 333 incr_ev.stop ();
… …
343} 357}
344 358
345void 359void
346rxvt_term::destroy_cb (time_watcher &w) 360rxvt_term::destroy_cb (time_watcher &w)
347{ 361{
348 SET_R (this); 362 make_current ();
349 363
350 delete this; 364 delete this;
351} 365}
352 366
353/*----------------------------------------------------------------------*/ 367/*----------------------------------------------------------------------*/
… …
362{ 376{
363 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++) 377 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)
364 (*t)->emergency_cleanup (); 378 (*t)->emergency_cleanup ();
365} 379}
366 380
367#if ENABLE_FRILLS 381#if !ENABLE_MINIMAL
368static void 382static void
369print_x_error (Display *dpy, XErrorEvent *event) 383print_x_error (Display *dpy, XErrorEvent *event)
370{ 384{
371 char buffer[BUFSIZ]; 385 char buffer[BUFSIZ];
372 char mesg[BUFSIZ]; 386 char mesg[BUFSIZ];
… …
418{ 432{
419 if (GET_R->allowedxerror == -1) 433 if (GET_R->allowedxerror == -1)
420 GET_R->allowedxerror = event->error_code; 434 GET_R->allowedxerror = event->error_code;
421 else 435 else
422 { 436 {
423 //TODO: GET_R is most likely not the terminal which caused the error 437 // GET_R is most likely not the terminal which caused the error,
424 //TODO: maybe just output the error and continue? 438 // so just output the error and continue
425#if ENABLE_FRILLS 439#if ENABLE_MINIMAL
440 old_xerror_handler (display, event);
441#else
426 print_x_error (display, event); 442 print_x_error (display, event);
427#else
428 old_xerror_handler (display, event);
429#endif 443#endif
430 } 444 }
431 445
432 return 0; 446 return 0;
433} 447}
… …
439 DisplayString (display)); 453 DisplayString (display));
440 rxvt_emergency_cleanup (); 454 rxvt_emergency_cleanup ();
441 _exit (EXIT_FAILURE); 455 _exit (EXIT_FAILURE);
442} 456}
443 457
444/*
445 * Catch a fatal signal and tidy up before quitting
446 */
447void
448rxvt_term::sig_term (sig_watcher &w)
449{
450#ifdef DEBUG_CMD
451 rxvt_warn ("caught signal %d, exiting.\n", w.signum);
452#endif
453 rxvt_emergency_cleanup ();
454 signal (w.signum, SIG_DFL);
455 kill (getpid (), w.signum);
456}
457
458/*----------------------------------------------------------------------*/ 458/*----------------------------------------------------------------------*/
459/* rxvt_init () */
460bool 459bool
461rxvt_term::init (int argc, const char *const *argv) 460rxvt_term::init (int argc, const char *const *argv, stringvec *envv)
462{ 461{
462 this->envv = envv;
463
463 SET_R (this); 464 SET_R (this);
464
465 set_locale (""); 465 set_locale ("");
466 set_environ (envv); // few things in X do not call setlocale :(
466 467
467 if (!init_vars ()) 468 if (!init_vars ())
468 return false; 469 return false;
469 470
470 init_secondary (); 471 init_secondary ();
… …
473 474
474#ifdef KEYSYM_RESOURCE 475#ifdef KEYSYM_RESOURCE
475 keyboard->register_done (); 476 keyboard->register_done ();
476#endif 477#endif
477 478
478#if MENUBAR_MAX
479 menubar_read (rs[Rs_menu]);
480#endif
481#ifdef HAVE_SCROLLBARS 479#ifdef HAVE_SCROLLBARS
482 if (options & Opt_scrollBar) 480 if (OPTION (Opt_scrollBar))
483 scrollBar.setIdle (); /* set existence for size calculations */ 481 scrollBar.setIdle (); /* set existence for size calculations */
484#endif 482#endif
485 483
484 pty = ptytty::create ();
485
486 create_windows (argc, argv); 486 create_windows (argc, argv);
487 487
488 dDisp;
489
490 init_xlocale (); 488 init_xlocale ();
491 489
492 scr_reset (); /* initialize screen */ 490 scr_reset (); // initialize screen
493 491
494#if 0 492#if 0
495 XSynchronize (disp, True); 493 XSynchronize (xdisp, True);
496#endif 494#endif
497 495
498#ifdef HAVE_SCROLLBARS 496#ifdef HAVE_SCROLLBARS
499 if (options & Opt_scrollBar) 497 if (OPTION (Opt_scrollBar))
500 resize_scrollbar (); /* create and map scrollbar */ 498 resize_scrollbar (); /* create and map scrollbar */
501#endif 499#endif
502#if (MENUBAR_MAX)
503 if (menubar_visible ())
504 XMapWindow (disp, menuBar.win);
505#endif
506#ifdef TRANSPARENT 500#ifdef TRANSPARENT
507 if (options & Opt_transparent) 501 if (OPTION (Opt_transparent))
508 { 502 {
509 XSelectInput (disp, display->root, PropertyChangeMask); 503 XSelectInput (xdisp, display->root, PropertyChangeMask);
510 check_our_parents (); 504 check_our_parents ();
511 rootwin_ev.start (display, display->root); 505 rootwin_ev.start (display, display->root);
512 } 506 }
513#endif 507#endif
514 508
515 XMapWindow (disp, TermWin.vt);
516 XMapWindow (disp, TermWin.parent[0]);
517
518 set_colorfgbg (); 509 set_colorfgbg ();
519 510
520 init_command (cmd_argv); 511 init_command (cmd_argv);
521 512
522 free (cmd_argv); 513 free (cmd_argv);
523 514
515 if (pty->pty >= 0)
524 pty_ev.start (pty.pty, EVENT_READ); 516 pty_ev.start (pty->pty, EVENT_READ);
525 517
526 check_ev.start (); 518 check_ev.start ();
527 519
520 HOOK_INVOKE ((this, HOOK_START, DT_END));
521
522#if ENABLE_XEMBED
523 if (rs[Rs_embed])
524 {
525 long info[2] = { 0, XEMBED_MAPPED };
526
527 XChangeProperty (xdisp, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
528 32, PropModeReplace, (unsigned char *)&info, 2);
529 }
530#endif
531
532 XMapWindow (xdisp, vt);
533 XMapWindow (xdisp, parent[0]);
534
528 return true; 535 return true;
529} 536}
530 537
538static struct sig_handlers
539{
540 sig_watcher sw_term, sw_int;
541
542 /*
543 * Catch a fatal signal and tidy up before quitting
544 */
545 void
546 sig_term (sig_watcher &w)
547 {
548 rxvt_emergency_cleanup ();
549 signal (w.signum, SIG_DFL);
550 kill (getpid (), w.signum);
551 }
552
553 sig_handlers ()
554 : sw_term (this, &sig_handlers::sig_term),
555 sw_int (this, &sig_handlers::sig_term)
556 {
557 }
558} sig_handlers;
559
560char **rxvt_environ; // startup environment
561
531void 562void
532rxvt_init () 563rxvt_init ()
533{ 564{
534 /* 565 ptytty::init ();
535 * Save and then give up any super-user privileges 566
536 * If we need privileges in any area then we must specifically request it. 567 rxvt_environ = environ;
537 * We should only need to be root in these cases:
538 * 1. write utmp entries on some systems
539 * 2. chown tty on some systems
540 */
541 rxvt_privileges (SAVE);
542 rxvt_privileges (IGNORE);
543 568
544 signal (SIGHUP, SIG_IGN); 569 signal (SIGHUP, SIG_IGN);
545 signal (SIGPIPE, SIG_IGN); 570 signal (SIGPIPE, SIG_IGN);
571
572 sig_handlers.sw_term.start (SIGTERM);
573 sig_handlers.sw_int.start (SIGINT);
546 574
547 /* need to trap SIGURG for SVR4 (Unixware) rlogin */ 575 /* need to trap SIGURG for SVR4 (Unixware) rlogin */
548 /* signal (SIGURG, SIG_DFL); */ 576 /* signal (SIGURG, SIG_DFL); */
549 577
550 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); 578 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
551 // TODO: handle this with exceptions and tolerate the memory loss 579 // TODO: handle this with exceptions and tolerate the memory loss
552 XSetIOErrorHandler (rxvt_xioerror_handler); 580 XSetIOErrorHandler (rxvt_xioerror_handler);
553}
554 581
555/* ------------------------------------------------------------------------- * 582 XrmInitialize ();
556 * SIGNAL HANDLING & EXIT HANDLER *
557 * ------------------------------------------------------------------------- */
558/*
559 * Catch a SIGCHLD signal and exit if the direct child has died
560 */
561
562void
563rxvt_term::sig_chld (sig_watcher &w)
564{
565 // we are being called for every SIGCHLD, not just ours
566 int pid;
567
568 while ((pid = waitpid (-1, NULL, WNOHANG)) > 0)
569 for (rxvt_term **t = termlist.begin (); t < termlist.end (); t++)
570 if (pid == (*t)->cmd_pid)
571 {
572 (*t)->destroy ();
573 break;
574 }
575} 583}
576 584
577/* ------------------------------------------------------------------------- * 585/* ------------------------------------------------------------------------- *
578 * MEMORY ALLOCATION WRAPPERS * 586 * MEMORY ALLOCATION WRAPPERS *
579 * ------------------------------------------------------------------------- */ 587 * ------------------------------------------------------------------------- */
… …
586 rxvt_fatal ("memory allocation failure. aborting.\n"); 594 rxvt_fatal ("memory allocation failure. aborting.\n");
587 595
588 return p; 596 return p;
589} 597}
590 598
591/* INTPROTO */ 599void *
592void *
593rxvt_calloc (size_t number, size_t size) 600rxvt_calloc (size_t number, size_t size)
594{ 601{
595 void *p = calloc (number, size); 602 void *p = calloc (number, size);
596 603
597 if (!p) 604 if (!p)
598 rxvt_fatal ("memory allocation failure. aborting.\n"); 605 rxvt_fatal ("memory allocation failure. aborting.\n");
599 606
600 return p; 607 return p;
601} 608}
602 609
603/* INTPROTO */ 610void *
604void *
605rxvt_realloc (void *ptr, size_t size) 611rxvt_realloc (void *ptr, size_t size)
606{ 612{
607 void *p = realloc (ptr, size); 613 void *p = realloc (ptr, size);
608 614
609 if (!p) 615 if (!p)
610 rxvt_fatal ("memory allocation failure. aborting.\n"); 616 rxvt_fatal ("memory allocation failure. aborting.\n");
611 617
612 return p; 618 return p;
613} 619}
614
615/* ------------------------------------------------------------------------- *
616 * PRIVILEGED OPERATIONS *
617 * ------------------------------------------------------------------------- */
618/* take care of suid/sgid super-user (root) privileges */
619void
620rxvt_privileges (rxvt_privaction action)
621{
622#if (defined(HAVE_SETEUID) || defined(HAVE_SETREUID)) && !defined(__CYGWIN32__)
623 static uid_t euid;
624 static gid_t egid;
625#endif
626
627#if ! defined(__CYGWIN32__)
628# if !defined(HAVE_SETEUID) && defined(HAVE_SETREUID)
629 /* setreuid () is the poor man's setuid (), seteuid () */
630# define seteuid(a) setreuid(-1, (a))
631# define setegid(a) setregid(-1, (a))
632# define HAVE_SETEUID
633# endif
634# ifdef HAVE_SETEUID
635 switch (action)
636 {
637 case IGNORE:
638 /*
639 * change effective uid/gid - not real uid/gid - so we can switch
640 * back to root later, as required
641 */
642 seteuid (getuid ());
643 setegid (getgid ());
644 break;
645 case SAVE:
646 euid = geteuid ();
647 egid = getegid ();
648 break;
649 case RESTORE:
650 seteuid (euid);
651 setegid (egid);
652 break;
653 }
654# else
655 switch (action)
656 {
657 case IGNORE:
658 setuid (getuid ());
659 setgid (getgid ());
660 /* FALLTHROUGH */
661 case SAVE:
662 /* FALLTHROUGH */
663 case RESTORE:
664 break;
665 }
666# endif
667#endif
668}
669
670#ifdef UTMP_SUPPORT
671void
672rxvt_term::privileged_utmp (rxvt_privaction action)
673{
674 if ((options & Opt_utmpInhibit)
675 || !pty.name || !*pty.name)
676 return;
677
678 rxvt_privileges (RESTORE);
679
680 if (action == SAVE)
681 makeutent (pty.name, rs[Rs_display_name]);
682 else
683 cleanutent ();
684
685 rxvt_privileges (IGNORE);
686}
687#endif
688 620
689/*----------------------------------------------------------------------*/ 621/*----------------------------------------------------------------------*/
690/* 622/*
691 * window size/position calculcations for XSizeHint and other storage. 623 * window size/position calculcations for XSizeHint and other storage.
692 * if width/height are non-zero then override calculated width/height 624 * if width/height are non-zero then override calculated width/height
693 */ 625 */
694void 626void
695rxvt_term::window_calc (unsigned int width, unsigned int height) 627rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
696{ 628{
697 short recalc_x, recalc_y; 629 short recalc_x, recalc_y;
698 int x, y, sb_w, mb_h, flags; 630 int x, y, sb_w, flags;
699 unsigned int w, h; 631 unsigned int w, h;
700 unsigned int max_width, max_height; 632 unsigned int max_width, max_height;
701 dDisp;
702 633
703 D_SIZE ((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
704 TermWin.ncol, TermWin.nrow, szHint.width,
705 szHint.height));
706 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity; 634 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity;
707 szHint.win_gravity = NorthWestGravity; 635 szHint.win_gravity = NorthWestGravity;
708 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */ 636 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */
709 637
710 recalc_x = recalc_y = 0; 638 recalc_x = recalc_y = 0;
711 flags = 0; 639 flags = 0;
640
712 if (!parsed_geometry) 641 if (!parsed_geometry)
713 { 642 {
714 parsed_geometry = 1; 643 parsed_geometry = 1;
644
715 if (rs[Rs_geometry]) 645 if (rs[Rs_geometry])
716 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h); 646 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h);
717 647
718 if (flags & WidthValue) 648 if (flags & WidthValue)
719 { 649 {
720 TermWin.ncol = BOUND_POSITIVE_INT16 (w); 650 ncol = clamp (w, 0, std::numeric_limits<int16_t>::max ());
721 szHint.flags |= USSize; 651 szHint.flags |= USSize;
722 } 652 }
723 653
724 if (flags & HeightValue) 654 if (flags & HeightValue)
725 { 655 {
726 TermWin.nrow = BOUND_POSITIVE_INT16 (h); 656 nrow = clamp (h, 0, std::numeric_limits<int16_t>::max ());
727 szHint.flags |= USSize; 657 szHint.flags |= USSize;
728 } 658 }
729 659
730 if (flags & XValue) 660 if (flags & XValue)
731 { 661 {
732 szHint.x = x; 662 szHint.x = x;
733 szHint.flags |= USPosition; 663 szHint.flags |= USPosition;
664
734 if (flags & XNegative) 665 if (flags & XNegative)
735 { 666 {
736 recalc_x = 1; 667 recalc_x = 1;
737 szHint.win_gravity = NorthEastGravity; 668 szHint.win_gravity = NorthEastGravity;
738 } 669 }
… …
740 671
741 if (flags & YValue) 672 if (flags & YValue)
742 { 673 {
743 szHint.y = y; 674 szHint.y = y;
744 szHint.flags |= USPosition; 675 szHint.flags |= USPosition;
676
745 if (flags & YNegative) 677 if (flags & YNegative)
746 { 678 {
747 recalc_y = 1; 679 recalc_y = 1;
680
748 if (szHint.win_gravity == NorthEastGravity) 681 if (szHint.win_gravity == NorthEastGravity)
749 szHint.win_gravity = SouthEastGravity; 682 szHint.win_gravity = SouthEastGravity;
750 else 683 else
751 szHint.win_gravity = SouthWestGravity; 684 szHint.win_gravity = SouthWestGravity;
752 } 685 }
753 } 686 }
754 } 687 }
755 688
756 /* TODO: BOUNDS */ 689 /* TODO: BOUNDS */
757 TermWin.width = TermWin.ncol * TermWin.fwidth; 690 width = ncol * fwidth;
758 TermWin.height = TermWin.nrow * TermWin.fheight; 691 height = nrow * fheight;
759 max_width = MAX_COLS * TermWin.fwidth; 692 max_width = MAX_COLS * fwidth;
760 max_height = MAX_ROWS * TermWin.fheight; 693 max_height = MAX_ROWS * fheight;
761 694
762 szHint.base_width = szHint.base_height = 2 * TermWin.int_bwidth; 695 szHint.base_width = szHint.base_height = 2 * int_bwidth;
763 696
764 sb_w = mb_h = 0; 697 sb_w = 0;
765 window_vt_x = window_vt_y = TermWin.int_bwidth; 698 window_vt_x = window_vt_y = int_bwidth;
766 699
767 if (scrollbar_visible ()) 700 if (scrollBar.state)
768 { 701 {
769 sb_w = scrollbar_TotalWidth (); 702 sb_w = scrollbar_TotalWidth ();
770 szHint.base_width += sb_w; 703 szHint.base_width += sb_w;
704
771 if (!(options & Opt_scrollBar_right)) 705 if (!OPTION (Opt_scrollBar_right))
772 window_vt_x += sb_w; 706 window_vt_x += sb_w;
773 } 707 }
774 708
775 if (menubar_visible ())
776 {
777 mb_h = menuBar_TotalHeight ();
778 szHint.base_height += mb_h;
779 window_vt_y += mb_h;
780 }
781
782 szHint.width_inc = TermWin.fwidth; 709 szHint.width_inc = fwidth;
783 szHint.height_inc = TermWin.fheight; 710 szHint.height_inc = fheight;
784 szHint.min_width = szHint.base_width + szHint.width_inc; 711 szHint.min_width = szHint.base_width + szHint.width_inc;
785 szHint.min_height = szHint.base_height + szHint.height_inc; 712 szHint.min_height = szHint.base_height + szHint.height_inc;
786 713
787 if (width && width - szHint.base_width < max_width) 714 if (newwidth && newwidth - szHint.base_width < max_width)
788 { 715 {
789 szHint.width = width; 716 szHint.width = newwidth;
790 TermWin.width = width - szHint.base_width; 717 width = newwidth - szHint.base_width;
791 } 718 }
792 else 719 else
793 { 720 {
794 MIN_IT (TermWin.width, max_width); 721 min_it (width, max_width);
795 szHint.width = szHint.base_width + TermWin.width; 722 szHint.width = szHint.base_width + width;
796 } 723 }
797 724
798 if (height && height - szHint.base_height < max_height) 725 if (newheight && newheight - szHint.base_height < max_height)
799 { 726 {
800 szHint.height = height; 727 szHint.height = newheight;
801 TermWin.height = height - szHint.base_height; 728 height = newheight - szHint.base_height;
802 } 729 }
803 else 730 else
804 { 731 {
805 MIN_IT (TermWin.height, max_height); 732 min_it (height, max_height);
806 szHint.height = szHint.base_height + TermWin.height; 733 szHint.height = szHint.base_height + height;
807 } 734 }
808 735
809 if (scrollbar_visible () && (options & Opt_scrollBar_right)) 736 if (scrollBar.state && OPTION (Opt_scrollBar_right))
810 window_sb_x = szHint.width - sb_w; 737 window_sb_x = szHint.width - sb_w;
811 738
812 if (recalc_x) 739 if (recalc_x)
813 szHint.x += (DisplayWidth (disp, display->screen) 740 szHint.x += DisplayWidth (xdisp, display->screen) - szHint.width - 2 * ext_bwidth;
814 - szHint.width - 2 * TermWin.ext_bwidth); 741
815 if (recalc_y) 742 if (recalc_y)
816 szHint.y += (DisplayHeight (disp, display->screen) 743 szHint.y += DisplayHeight (xdisp, display->screen) - szHint.height - 2 * ext_bwidth;
817 - szHint.height - 2 * TermWin.ext_bwidth);
818 744
819 TermWin.ncol = TermWin.width / TermWin.fwidth; 745 ncol = width / fwidth;
820 TermWin.nrow = TermWin.height / TermWin.fheight; 746 nrow = height / fheight;
821 D_SIZE ((stderr, "> Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
822 TermWin.ncol, TermWin.nrow, szHint.width,
823 szHint.height));
824 return;
825} 747}
826 748
827/*----------------------------------------------------------------------*/ 749/*----------------------------------------------------------------------*/
828/* 750/*
829 * Tell the teletype handler what size the window is. 751 * Tell the teletype handler what size the window is.
830 * Called after a window size change. 752 * Called after a window size change.
831 */ 753 */
832void 754void
833rxvt_term::tt_winch () 755rxvt_term::tt_winch ()
834{ 756{
835 if (pty.pty < 0) 757 if (pty->pty < 0)
836 return; 758 return;
837 759
838 struct winsize ws; 760 struct winsize ws;
839 761
840 ws.ws_col = TermWin.ncol; 762 ws.ws_col = ncol;
841 ws.ws_row = TermWin.nrow; 763 ws.ws_row = nrow;
842 ws.ws_xpixel = TermWin.width; 764 ws.ws_xpixel = width;
843 ws.ws_ypixel = TermWin.height; 765 ws.ws_ypixel = height;
844 (void)ioctl (pty.pty, TIOCSWINSZ, &ws); 766 (void)ioctl (pty->pty, TIOCSWINSZ, &ws);
845 767
846#if 0 768#if 0
847 // TIOCSWINSZ⎈ is supposed to do this automatically and correctly 769 // TIOCSWINSZ⎈ is supposed to do this automatically and correctly
848 if (cmd_pid) /* force through to the command */ 770 if (cmd_pid) /* force through to the command */
849 kill (cmd_pid, SIGWINCH); 771 kill (-cmd_pid, SIGWINCH);
850#endif 772#endif
851} 773}
852 774
853/*----------------------------------------------------------------------*/ 775/*----------------------------------------------------------------------*/
854/* set_fonts () - load and set the various fonts 776/* set_fonts () - load and set the various fonts
855/* 777 *
856 * init = 1 - initialize 778 * init = 1 - initialize
857 * 779 *
858 * fontname == FONT_UP - switch to bigger font 780 * fontname == FONT_UP - switch to bigger font
859 * fontname == FONT_DN - switch to smaller font 781 * fontname == FONT_DN - switch to smaller font
860 */ 782 */
… …
872 return false; 794 return false;
873 } 795 }
874 796
875#if ENABLE_STYLES 797#if ENABLE_STYLES
876 for (int i = RS_styleCount; --i; ) 798 for (int i = RS_styleCount; --i; )
877 if (TermWin.fontset[i] != TermWin.fontset[0]) 799 if (fontset[i] != fontset[0])
878 delete TermWin.fontset[i]; 800 delete fontset[i];
879#endif 801#endif
880 802
881 delete TermWin.fontset[0]; 803 delete fontset[0];
882 TermWin.fontset[0] = fs; 804 fontset[0] = fs;
883 805
884 prop = (*fs)[1]->properties (); 806 prop = (*fs)[1]->properties ();
885 prop.height += TermWin.lineSpace; 807 prop.height += lineSpace;
886 fs->set_prop (prop); 808 fs->set_prop (prop);
887 809
888 TermWin.fwidth = prop.width; 810 fwidth = prop.width;
889 TermWin.fheight = prop.height; 811 fheight = prop.height;
890 TermWin.fweight = prop.weight; 812 fbase = prop.ascent;
891 TermWin.fslant = prop.slant;
892 TermWin.fbase = (*fs)[1]->ascent;
893 813
894 for (int style = 1; style < 4; style++) 814 for (int style = 1; style < 4; style++)
895 { 815 {
896#if ENABLE_STYLES 816#if ENABLE_STYLES
897 const char *res = rs[Rs_font + style]; 817 const char *res = rs[Rs_font + style];
898 818
899 if (res && !*res) 819 if (res && !*res)
900 TermWin.fontset[style] = TermWin.fontset[0]; 820 fontset[style] = fontset[0];
901 else 821 else
902 { 822 {
903 TermWin.fontset[style] = fs = new rxvt_fontset (this); 823 fontset[style] = fs = new rxvt_fontset (this);
904 rxvt_fontprop prop2 = prop; 824 rxvt_fontprop prop2 = prop;
905 825
906 if (res) 826 if (res)
907 prop2.weight = prop2.slant = rxvt_fontprop::unset; 827 prop2.weight = prop2.slant = rxvt_fontprop::unset;
908 else 828 else
909 { 829 {
910 res = TermWin.fontset[0]->fontdesc; 830 res = fontset[0]->fontdesc;
911 831
912 if (SET_STYLE (0, style) & RS_Bold) prop2.weight = rxvt_fontprop::bold; 832 if (SET_STYLE (0, style) & RS_Bold) prop2.weight = rxvt_fontprop::bold;
913 if (SET_STYLE (0, style) & RS_Italic) prop2.slant = rxvt_fontprop::italic; 833 if (SET_STYLE (0, style) & RS_Italic) prop2.slant = rxvt_fontprop::italic;
914 } 834 }
915 835
916 fs->populate (res); 836 fs->populate (res);
917 fs->set_prop (prop2); 837 fs->set_prop (prop2);
918 } 838 }
919#else 839#else
920 TermWin.fontset[style] = TermWin.fontset[0]; 840 fontset[style] = fontset[0];
921#endif 841#endif
922 } 842 }
923 843
924 if (TermWin.parent[0]) 844 if (parent[0])
925 { 845 {
926 resize_all_windows (0, 0, 0); 846 resize_all_windows (0, 0, 0);
927 scr_remap_chars (); 847 scr_remap_chars ();
928 scr_touch (true); 848 scr_touch (true);
929 } 849 }
… …
931 return true; 851 return true;
932} 852}
933 853
934void rxvt_term::set_string_property (Atom prop, const char *str, int len) 854void rxvt_term::set_string_property (Atom prop, const char *str, int len)
935{ 855{
936 // TODO: SMART_WINDOW_TITLE
937 XChangeProperty (display->display, TermWin.parent[0], 856 XChangeProperty (xdisp, parent[0],
938 prop, XA_STRING, 8, PropModeReplace, 857 prop, XA_STRING, 8, PropModeReplace,
939 (const unsigned char *)str, len >= 0 ? len : strlen (str)); 858 (const unsigned char *)str, len >= 0 ? len : strlen (str));
940} 859}
941 860
942void rxvt_term::set_utf8_property (Atom prop, const char *str, int len) 861void rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
943{ 862{
944 // TODO: SMART_WINDOW_TITLE
945 wchar_t *ws = rxvt_mbstowcs (str, len); 863 wchar_t *ws = rxvt_mbstowcs (str, len);
946 char *s = rxvt_wcstoutf8 (ws); 864 char *s = rxvt_wcstoutf8 (ws);
947 865
948 XChangeProperty (display->display, TermWin.parent[0], 866 XChangeProperty (xdisp, parent[0],
949 prop, xa[XA_UTF8_STRING], 8, PropModeReplace, 867 prop, xa[XA_UTF8_STRING], 8, PropModeReplace,
950 (const unsigned char *)s, strlen (s)); 868 (const unsigned char *)s, strlen (s));
951 869
952 free (s); 870 free (s);
953 free (ws); 871 free (ws);
… …
958/* xterm sequences - title, iconName, color (exptl) */ 876/* xterm sequences - title, iconName, color (exptl) */
959void 877void
960rxvt_term::set_title (const char *str) 878rxvt_term::set_title (const char *str)
961{ 879{
962 set_string_property (XA_WM_NAME, str); 880 set_string_property (XA_WM_NAME, str);
963#if ENABLE_FRILLS 881#if ENABLE_EWMH
964 set_utf8_property (xa[XA_NET_WM_NAME], str); 882 set_utf8_property (xa[XA_NET_WM_NAME], str);
965#endif 883#endif
966} 884}
967 885
968void 886void
969rxvt_term::set_icon_name (const char *str) 887rxvt_term::set_icon_name (const char *str)
970{ 888{
971 set_string_property (XA_WM_ICON_NAME, str); 889 set_string_property (XA_WM_ICON_NAME, str);
972#if ENABLE_FRILLS 890#if ENABLE_EWMH
973 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str); 891 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str);
974#endif 892#endif
975} 893}
976 894
977#ifdef XTERM_COLOR_CHANGE 895#ifdef XTERM_COLOR_CHANGE
978void 896void
979rxvt_term::set_window_color (int idx, const char *color) 897rxvt_term::set_window_color (int idx, const char *color)
980{ 898{
981 rxvt_color xcol; 899 rxvt_color xcol;
982 int i; 900 int i;
983 901
984 if (color == NULL || *color == '\0') 902 if (color == NULL || *color == '\0')
985 return; 903 return;
904
905 color = strdup (color);
906 allocated.push_back ((void *)color);
907 rs[Rs_color + idx] = color;
986 908
987 /* handle color aliases */ 909 /* handle color aliases */
988 if (isdigit (*color)) 910 if (isdigit (*color))
989 { 911 {
990 i = atoi (color); 912 i = atoi (color);
991 913
992 if (i >= 8 && i <= 15) 914 if (i >= 8 && i <= 15)
993 { /* bright colors */ 915 { /* bright colors */
994 i -= 8; 916 i -= 8;
995# ifndef NO_BRIGHTCOLOR
996 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i]; 917 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i];
997 SET_PIXCOLOR (idx);
998 goto Done; 918 goto done;
999# endif
1000 } 919 }
1001 920
1002 if (i >= 0 && i <= 7) 921 if (i >= 0 && i <= 7)
1003 { /* normal colors */ 922 { /* normal colors */
1004 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i]; 923 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];
1005 SET_PIXCOLOR (idx);
1006 goto Done; 924 goto done;
1007 } 925 }
1008 } 926 }
1009 927
1010 if (!rXParseAllocColor (&xcol, color)) 928 set_color (xcol, color);
1011 return;
1012
1013 /* XStoreColor (display->display, display->cmap, XColor*); */
1014 929
1015 /* 930 /*
1016 * FIXME: should free colors here, but no idea how to do it so instead, 931 * FIXME: should free colors here, but no idea how to do it so instead,
1017 * so just keep gobbling up the colormap 932 * so just keep gobbling up the colormap
1018 */ 933 */
1019# if 0
1020 for (i = Color_Black; i <= Color_White; i++)
1021 if (pix_colors[idx] == pix_colors[i])
1022 break;
1023 if (i > Color_White)
1024 {
1025 /* fprintf (stderr, "XFreeColors: pix_colors [%d] = %lu\n", idx, pix_colors [idx]); */
1026 XFreeColors (display->display, display->cmap, (pix_colors + idx), 1,
1027 DisplayPlanes (display->display, display->screen));
1028 }
1029# endif
1030 934
1031 pix_colors_focused[idx] = xcol; 935 pix_colors_focused[idx] = xcol;
1032 SET_PIXCOLOR (idx);
1033 936
1034 /* XSetWindowAttributes attr; */ 937 /* XSetWindowAttributes attr; */
1035 /* Cursor cursor; */ 938 /* Cursor cursor; */
1036Done: 939done:
940
1037#ifdef OFF_FOCUS_FADING 941#if OFF_FOCUS_FADING
1038 if (rs[Rs_fade]) 942 if (rs[Rs_fade])
1039 pix_colors_unfocused[idx] = pix_colors_focused[idx].fade (display, atoi (rs[Rs_fade])); 943 {
944 rgba c;
945 pix_colors [Color_fade].get (c);
946 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
947 }
1040#endif 948#endif
1041 949
1042 /*TODO: handle Color_BD, scrollbar background, etc. */ 950 /*TODO: handle Color_BD, scrollbar background, etc. */
1043 951
1044 recolour_cursor (); 952 recolour_cursor ();
… …
1050#endif /* XTERM_COLOR_CHANGE */ 958#endif /* XTERM_COLOR_CHANGE */
1051 959
1052void 960void
1053rxvt_term::recolour_cursor () 961rxvt_term::recolour_cursor ()
1054{ 962{
1055 XColor xcol[2]; 963 XColor fg, bg;
1056 964
1057 xcol[0].pixel = ISSET_PIXCOLOR (Color_pointer_fg) 965 (ISSET_PIXCOLOR (Color_pointer_fg)
1058 ? pix_colors_focused[Color_pointer_fg] 966 ? pix_colors_focused[Color_pointer_fg]
1059 : pix_colors_focused[Color_fg]; 967 : pix_colors_focused[Color_fg]).get (fg);
968
1060 xcol[1].pixel = ISSET_PIXCOLOR (Color_pointer_bg) 969 (ISSET_PIXCOLOR (Color_pointer_bg)
1061 ? pix_colors_focused[Color_pointer_bg] 970 ? pix_colors_focused[Color_pointer_bg]
1062 : pix_colors_focused[Color_bg]; 971 : pix_colors_focused[Color_bg]).get (bg);
1063 972
1064 XQueryColors (display->display, display->cmap, xcol, 2); 973 XRecolorCursor (xdisp, TermWin_cursor, &fg, &bg);
1065 XRecolorCursor (display->display, TermWin_cursor, xcol + 0, xcol + 1);
1066} 974}
1067 975
1068/*----------------------------------------------------------------------*/ 976/*----------------------------------------------------------------------*/
1069/* 977/*
1070 * find if fg/bg matches any of the normal (low-intensity) colors 978 * find if fg/bg matches any of the normal (low-intensity) colors
… …
1074{ 982{
1075 unsigned int i; 983 unsigned int i;
1076 const char *xpmb = "\0"; 984 const char *xpmb = "\0";
1077 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1]; 985 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1];
1078 986
1079 env_colorfgbg = (char *)rxvt_malloc (sizeof ("COLORFGBG=default;default;bg") + 1);
1080 strcpy (fstr, "default"); 987 strcpy (fstr, "default");
1081 strcpy (bstr, "default"); 988 strcpy (bstr, "default");
1082 for (i = Color_Black; i <= Color_White; i++) 989 for (i = Color_Black; i <= Color_White; i++)
1083 if (pix_colors[Color_fg] == pix_colors[i]) 990 if (pix_colors[Color_fg] == pix_colors[i])
1084 { 991 {
… …
1099 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr); 1006 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr);
1100} 1007}
1101 1008
1102/*----------------------------------------------------------------------*/ 1009/*----------------------------------------------------------------------*/
1103 1010
1104int 1011bool
1105rxvt_term::rXParseAllocColor (rxvt_color *screen_in_out, const char *colour) 1012rxvt_term::set_color (rxvt_color &color, const char *name)
1106{ 1013{
1107 if (!screen_in_out->set (display, colour)) 1014 if (color.set (this, name))
1108 {
1109 rxvt_warn ("can't get colour '%s', continuing without.\n", colour);
1110 return false;
1111 }
1112
1113 return true; 1015 return true;
1016
1017 rxvt_warn ("can't get colour '%s', continuing without.\n", name);
1018 return false;
1019}
1020
1021void
1022rxvt_term::alias_color (int dst, int src)
1023{
1024 pix_colors[dst].set (this, rs[Rs_color + dst] = rs[Rs_color + src]);
1114} 1025}
1115 1026
1116/* -------------------------------------------------------------------- * 1027/* -------------------------------------------------------------------- *
1117 * - WINDOW RESIZING - * 1028 * - WINDOW RESIZING - *
1118 * -------------------------------------------------------------------- */ 1029 * -------------------------------------------------------------------- */
1119void 1030void
1120rxvt_term::resize_all_windows (unsigned int width, unsigned int height, int ignoreparent) 1031rxvt_term::resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent)
1121{ 1032{
1122 int fix_screen; 1033 int fix_screen;
1123#ifdef SMART_RESIZE 1034 int old_width = szHint.width;
1124 int old_width = szHint.width, old_height = szHint.height; 1035 int old_height = szHint.height;
1125#endif
1126 dDisp;
1127 1036
1128 window_calc (width, height); 1037 window_calc (newwidth, newheight);
1129 XSetWMNormalHints (disp, TermWin.parent[0], &szHint); 1038 XSetWMNormalHints (xdisp, parent[0], &szHint);
1130 1039
1131 if (!ignoreparent) 1040 if (!ignoreparent)
1132 { 1041 {
1133#ifdef SMART_RESIZE 1042#ifdef SMART_RESIZE
1134 /* 1043 /*
… …
1138 int x, y, x1, y1; 1047 int x, y, x1, y1;
1139 int dx, dy; 1048 int dx, dy;
1140 unsigned int unused_w1, unused_h1, unused_b1, unused_d1; 1049 unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
1141 Window unused_cr; 1050 Window unused_cr;
1142 1051
1143 XTranslateCoordinates (disp, TermWin.parent[0], display->root, 1052 XTranslateCoordinates (xdisp, parent[0], display->root,
1144 0, 0, &x, &y, &unused_cr); 1053 0, 0, &x, &y, &unused_cr);
1145 XGetGeometry (disp, TermWin.parent[0], &unused_cr, &x1, &y1, 1054 XGetGeometry (xdisp, parent[0], &unused_cr, &x1, &y1,
1146 &unused_w1, &unused_h1, &unused_b1, &unused_d1); 1055 &unused_w1, &unused_h1, &unused_b1, &unused_d1);
1147 /* 1056 /*
1148 * if display->root isn't the parent window, a WM will probably have offset 1057 * if display->root isn't the parent window, a WM will probably have offset
1149 * our position for handles and decorations. Counter it 1058 * our position for handles and decorations. Counter it
1150 */ 1059 */
… …
1152 { 1061 {
1153 x -= x1; 1062 x -= x1;
1154 y -= y1; 1063 y -= y1;
1155 } 1064 }
1156 1065
1157 x1 = (DisplayWidth (disp, display->screen) - old_width) / 2; 1066 x1 = (DisplayWidth (xdisp, display->screen) - old_width ) / 2;
1158 y1 = (DisplayHeight (disp, display->screen) - old_height) / 2; 1067 y1 = (DisplayHeight (xdisp, display->screen) - old_height) / 2;
1159 dx = old_width - szHint.width; 1068 dx = old_width - szHint.width;
1160 dy = old_height - szHint.height; 1069 dy = old_height - szHint.height;
1161 1070
1162 /* Check position of the center of the window */ 1071 /* Check position of the center of the window */
1163 if (x < x1) /* left half */ 1072 if (x < x1) /* left half */
1164 dx = 0; 1073 dx = 0;
… …
1167 if (y < y1) /* top half */ 1076 if (y < y1) /* top half */
1168 dy = 0; 1077 dy = 0;
1169 else if (y == y1) /* exact center */ 1078 else if (y == y1) /* exact center */
1170 dy /= 2; 1079 dy /= 2;
1171 1080
1172 XMoveResizeWindow (disp, TermWin.parent[0], x + dx, y + dy, 1081 XMoveResizeWindow (xdisp, parent[0], x + dx, y + dy,
1173 szHint.width, szHint.height); 1082 szHint.width, szHint.height);
1174#else 1083#else
1175 XResizeWindow (disp, TermWin.parent[0], szHint.width, szHint.height); 1084 XResizeWindow (xdisp, parent[0], szHint.width, szHint.height);
1176#endif 1085#endif
1177 } 1086 }
1178 1087
1179 fix_screen = TermWin.ncol != prev_ncol || TermWin.nrow != prev_nrow; 1088 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
1180 1089
1181 if (fix_screen || width != old_width || height != old_height) 1090 if (fix_screen || newwidth != old_width || newheight != old_height)
1182 { 1091 {
1183 if (scrollbar_visible ()) 1092 if (scrollBar.state)
1184 { 1093 {
1185 XMoveResizeWindow (disp, scrollBar.win, 1094 XMoveResizeWindow (xdisp, scrollBar.win,
1186 window_sb_x, 0, 1095 window_sb_x, 0,
1187 scrollbar_TotalWidth (), szHint.height); 1096 scrollbar_TotalWidth (), szHint.height);
1188 resize_scrollbar (); 1097 resize_scrollbar ();
1189 } 1098 }
1190 1099
1191 if (menubar_visible ())
1192 XMoveResizeWindow (disp, menuBar.win,
1193 window_vt_x, 0,
1194 TermWin_TotalWidth (), menuBar_TotalHeight ());
1195
1196 XMoveResizeWindow (disp, TermWin.vt, 1100 XMoveResizeWindow (xdisp, vt,
1197 window_vt_x, window_vt_y, 1101 window_vt_x, window_vt_y,
1198 TermWin_TotalWidth (), TermWin_TotalHeight ()); 1102 width, height);
1199 1103
1200 scr_clear (); 1104 scr_clear ();
1201#ifdef XPM_BACKGROUND 1105#ifdef XPM_BACKGROUND
1202 resize_pixmap (); 1106 resize_pixmap ();
1203#endif 1107#endif
1204 } 1108 }
1205 1109
1206 if (fix_screen || old_height == 0) 1110 if (fix_screen || old_height == 0)
1207 {
1208 int curr_screen = -1;
1209 int old_ncol = prev_ncol;
1210
1211 /* scr_reset only works on the primary screen */
1212 if (old_height) /* this is not the first time through */
1213 {
1214 unsigned int ncol = TermWin.ncol;
1215 TermWin.ncol = prev_ncol; // save b/c scr_blank_screen_mem uses this
1216 curr_screen = scr_change_screen (PRIMARY);
1217 TermWin.ncol = ncol;
1218 }
1219
1220 scr_reset (); 1111 scr_reset ();
1221 1112
1222 if (curr_screen >= 0) /* this is not the first time through */ 1113 // TODO, with nvidia-8178, resizes kill the alpha channel, report if not fixed in newer version
1223 { 1114 //scr_touch (false);
1224 scr_change_screen (curr_screen);
1225 selection_check (old_ncol != TermWin.ncol ? 4 : 0);
1226 }
1227 }
1228
1229 old_width = szHint.width;
1230 old_height = szHint.height;
1231 1115
1232#ifdef XPM_BACKGROUND 1116#ifdef XPM_BACKGROUND
1233 if (TermWin.pixmap) 1117 if (pixmap)
1234 scr_touch (false); 1118 scr_touch (false);
1235#endif 1119#endif
1236 1120
1237#ifdef USE_XIM 1121#ifdef USE_XIM
1238 IMSetStatusPosition (); 1122 IMSetStatusPosition ();
… …
1242/* 1126/*
1243 * Set the width/height of the vt window in characters. Units are pixels. 1127 * Set the width/height of the vt window in characters. Units are pixels.
1244 * good for toggling 80/132 columns 1128 * good for toggling 80/132 columns
1245 */ 1129 */
1246void 1130void
1247rxvt_term::set_widthheight (unsigned int width, unsigned int height) 1131rxvt_term::set_widthheight (unsigned int newwidth, unsigned int newheight)
1248{ 1132{
1249 XWindowAttributes wattr; 1133 XWindowAttributes wattr;
1250 1134
1251 if (width == 0 || height == 0) 1135 if (newwidth == 0 || newheight == 0)
1252 { 1136 {
1253 XGetWindowAttributes (display->display, display->root, &wattr); 1137 XGetWindowAttributes (xdisp, display->root, &wattr);
1138
1254 if (width == 0) 1139 if (newwidth == 0)
1255 width = wattr.width - szHint.base_width; 1140 newwidth = wattr.width - szHint.base_width;
1256 if (height == 0) 1141 if (newheight == 0)
1257 height = wattr.height - szHint.base_height; 1142 newheight = wattr.height - szHint.base_height;
1258 }
1259
1260 if (width != TermWin.width || height != TermWin.height)
1261 { 1143 }
1144
1145 if (newwidth != width || newheight != height)
1146 {
1262 width += szHint.base_width; 1147 newwidth += szHint.base_width;
1263 height += szHint.base_height; 1148 newheight += szHint.base_height;
1264 resize_all_windows (width, height, 0); 1149 resize_all_windows (newwidth, newheight, 0);
1265 } 1150 }
1266} 1151}
1267 1152
1268/* -------------------------------------------------------------------- * 1153/* -------------------------------------------------------------------- *
1269 * - X INPUT METHOD ROUTINES - * 1154 * - X INPUT METHOD ROUTINES - *
… …
1271#ifdef USE_XIM 1156#ifdef USE_XIM
1272 1157
1273void 1158void
1274rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg) 1159rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg)
1275{ 1160{
1276 fg = pix_colors[Color_fg]; 1161 fg = pix_colors [Color_fg];
1277 bg = pix_colors[Color_bg]; 1162 bg = pix_colors [Color_bg];
1278} 1163}
1279 1164
1280void 1165void
1281rxvt_term::im_set_size (XRectangle &size) 1166rxvt_term::im_set_size (XRectangle &size)
1282{ 1167{
1283 // the int_bwidth terms make no sense to me 1168 // the int_bwidth terms make no sense to me
1284 size.x = TermWin.int_bwidth; 1169 size.x = int_bwidth;
1285 size.y = TermWin.int_bwidth; 1170 size.y = int_bwidth;
1286 size.width = Width2Pixel (TermWin.ncol) + TermWin.int_bwidth; 1171 size.width = Width2Pixel (ncol) + int_bwidth;
1287 size.height = Height2Pixel (TermWin.nrow) + TermWin.int_bwidth; 1172 size.height = Height2Pixel (nrow) + int_bwidth;
1288} 1173}
1289 1174
1290void 1175void
1291rxvt_term::im_set_preedit_area (XRectangle &preedit_rect, 1176rxvt_term::im_set_preedit_area (XRectangle &preedit_rect,
1292 XRectangle &status_rect, 1177 XRectangle &status_rect,
1293 const XRectangle &needed_rect) 1178 const XRectangle &needed_rect)
1294{ 1179{
1295 preedit_rect.x = needed_rect.width; 1180 preedit_rect.x = needed_rect.width;
1296 preedit_rect.y = 0; 1181 preedit_rect.y = 0;
1297 preedit_rect.width = Width2Pixel (TermWin.ncol) - needed_rect.width + 1; 1182 preedit_rect.width = Width2Pixel (ncol) - needed_rect.width + 1;
1298 preedit_rect.height = TermWin.fheight; 1183 preedit_rect.height = fheight;
1299 1184
1300 status_rect.x = 0; 1185 status_rect.x = 0;
1301 status_rect.y = 0; 1186 status_rect.y = 0;
1302 status_rect.width = needed_rect.width ? needed_rect.width : Width2Pixel (TermWin.ncol) + 1; 1187 status_rect.width = needed_rect.width ? needed_rect.width : Width2Pixel (ncol) + 1;
1303 status_rect.height = TermWin.fheight; 1188 status_rect.height = fheight;
1304} 1189}
1305 1190
1306/* Checking whether input method is running. */ 1191/* Checking whether input method is running. */
1307bool 1192bool
1308rxvt_term::IMisRunning () 1193rxvt_term::IMisRunning ()
… …
1319 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */ 1204 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */
1320 1205
1321 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */ 1206 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */
1322 *p = '\0'; 1207 *p = '\0';
1323 1208
1324 atom = XInternAtom (display->display, server, False); 1209 atom = XInternAtom (xdisp, server, False);
1325 win = XGetSelectionOwner (display->display, atom); 1210 win = XGetSelectionOwner (xdisp, atom);
1326 1211
1327 if (win != None) 1212 if (win != None)
1328 return True; 1213 return True;
1329 } 1214 }
1330 1215
… …
1336{ 1221{
1337 XPoint nspot; 1222 XPoint nspot;
1338 XVaNestedList preedit_attr; 1223 XVaNestedList preedit_attr;
1339 1224
1340 if (!Input_Context 1225 if (!Input_Context
1341 || !TermWin.focus 1226 || !focus
1342 || !(input_style & XIMPreeditPosition)) 1227 || !(input_style & (XIMPreeditPosition | XIMPreeditCallbacks)))
1343 return; 1228 return;
1344 1229
1345 im_set_position (nspot); 1230 im_set_position (nspot);
1346 1231
1347 if (nspot.x == spot.x && nspot.y == spot.y) 1232 if (nspot.x == spot.x && nspot.y == spot.y)
… …
1366 input_method = 0; 1251 input_method = 0;
1367 } 1252 }
1368 1253
1369 Input_Context = 0; 1254 Input_Context = 0;
1370} 1255}
1256
1257#ifdef ENABLE_XIM_ONTHESPOT
1258
1259static void
1260xim_preedit_start (XIC ic, XPointer client_data, XPointer call_data)
1261{
1262 ((rxvt_term *)client_data)->make_current ();
1263 HOOK_INVOKE (((rxvt_term *)client_data, HOOK_XIM_PREEDIT_START, DT_END));
1264}
1265
1266static void
1267xim_preedit_done (XIC ic, XPointer client_data, XPointer call_data)
1268{
1269 ((rxvt_term *)client_data)->make_current ();
1270 HOOK_INVOKE (((rxvt_term *)client_data, HOOK_XIM_PREEDIT_DONE, DT_END));
1271}
1272
1273static void
1274xim_preedit_draw (XIC ic, XPointer client_data, XIMPreeditDrawCallbackStruct *call_data)
1275{
1276 rxvt_term *term = (rxvt_term *)client_data;
1277 XIMText *text = call_data->text;
1278
1279 term->make_current ();
1280
1281 if (text)
1282 {
1283 void *str;
1284
1285 if (!text->encoding_is_wchar && text->string.multi_byte)
1286 {
1287 // of course, X makes it ugly again
1288 if (term->rs[Rs_imLocale])
1289 SET_LOCALE (term->rs[Rs_imLocale]);
1290
1291 str = rxvt_temp_buf ((text->length + 1) * sizeof (wchar_t));
1292 mbstowcs ((wchar_t *)str, text->string.multi_byte, text->length + 1);
1293
1294 if (term->rs[Rs_imLocale])
1295 SET_LOCALE (term->locale);
1296 }
1297 else
1298 str = (void *)text->string.wide_char;
1299
1300 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
1301 DT_INT, call_data->caret,
1302 DT_INT, call_data->chg_first,
1303 DT_INT, call_data->chg_length,
1304 DT_LCS_LEN, (void *)text->feedback, text->feedback ? (int)text->length : 0,
1305 DT_WCS_LEN, str, str ? (int)text->length : 0,
1306 DT_END));
1307 }
1308 else
1309 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
1310 DT_INT, call_data->caret,
1311 DT_INT, call_data->chg_first,
1312 DT_INT, call_data->chg_length,
1313 DT_END));
1314}
1315
1316#if 0
1317static void
1318xim_preedit_caret (XIC ic, XPointer client_data, XIMPreeditCaretCallbackStruct *call_data)
1319{
1320 ((rxvt_term *)client_data)->make_current ();
1321 HOOK_INVOKE (((rxvt_term *)client_data, HOOK_XIM_PREEDIT_CARET,
1322 DT_INT, call_data->position,
1323 DT_INT, call_data->direction,
1324 DT_INT, call_data->style,
1325 DT_END));
1326}
1327#endif
1328
1329#endif
1371 1330
1372/* 1331/*
1373 * Try to open a XIM with the current modifiers, then see if we can 1332 * Try to open a XIM with the current modifiers, then see if we can
1374 * open a suitable preedit type 1333 * open a suitable preedit type
1375 */ 1334 */
… …
1382 XRectangle rect, status_rect, needed_rect; 1341 XRectangle rect, status_rect, needed_rect;
1383 unsigned long fg, bg; 1342 unsigned long fg, bg;
1384 const char *p; 1343 const char *p;
1385 char **s; 1344 char **s;
1386 XIMStyles *xim_styles; 1345 XIMStyles *xim_styles;
1346#ifdef ENABLE_XIM_ONTHESPOT
1347 XIMCallback xcb[4];
1348#endif
1349
1350 set_environ (envv);
1387 1351
1388 if (! ((p = XSetLocaleModifiers (modifiers)) && *p)) 1352 if (! ((p = XSetLocaleModifiers (modifiers)) && *p))
1389 return false; 1353 return false;
1390 1354
1391 D_MAIN ((stderr, "rxvt_IM_get_IC ()"));
1392 input_method = display->get_xim (locale, modifiers); 1355 input_method = display->get_xim (locale, modifiers);
1393 if (input_method == NULL) 1356 if (input_method == NULL)
1394 return false; 1357 return false;
1395 1358
1396 xim = input_method->xim; 1359 xim = input_method->xim;
… …
1416 s = rxvt_splitcommastring (p); 1379 s = rxvt_splitcommastring (p);
1417 1380
1418 for (i = found = 0; !found && s[i]; i++) 1381 for (i = found = 0; !found && s[i]; i++)
1419 { 1382 {
1420 if (!strcmp (s[i], "OverTheSpot")) 1383 if (!strcmp (s[i], "OverTheSpot"))
1421 input_style = (XIMPreeditPosition | XIMStatusNothing); 1384 input_style = XIMPreeditPosition | XIMStatusNothing;
1422 else if (!strcmp (s[i], "OffTheSpot")) 1385 else if (!strcmp (s[i], "OffTheSpot"))
1423 input_style = (XIMPreeditArea | XIMStatusArea); 1386 input_style = XIMPreeditArea | XIMStatusArea;
1424 else if (!strcmp (s[i], "Root")) 1387 else if (!strcmp (s[i], "Root"))
1425 input_style = (XIMPreeditNothing | XIMStatusNothing); 1388 input_style = XIMPreeditNothing | XIMStatusNothing;
1426 else if (!strcmp (s[i], "None")) 1389 else if (!strcmp (s[i], "None"))
1427 input_style = (XIMPreeditNone | XIMStatusNone); 1390 input_style = XIMPreeditNone | XIMStatusNone;
1391#ifdef ENABLE_XIM_ONTHESPOT
1392 else if (SHOULD_INVOKE (HOOK_XIM_PREEDIT_START) && !strcmp (s[i], "OnTheSpot"))
1393 input_style = XIMPreeditCallbacks | XIMStatusNothing;
1394#endif
1395 else
1396 input_style = XIMPreeditNothing | XIMStatusNothing;
1428 1397
1429 for (j = 0; j < xim_styles->count_styles; j++) 1398 for (j = 0; j < xim_styles->count_styles; j++)
1430 if (input_style == xim_styles->supported_styles[j]) 1399 if (input_style == xim_styles->supported_styles[j])
1431 { 1400 {
1432 rxvt_freecommastring (s); 1401 rxvt_freecommastring (s);
… …
1466 "-*-*-*-R-*-*-%d-*-*-*-*-*-*," 1435 "-*-*-*-R-*-*-%d-*-*-*-*-*-*,"
1467 "-*-*-*-R-*-*-%d-*-*-*-*-*-*," 1436 "-*-*-*-R-*-*-%d-*-*-*-*-*-*,"
1468 "-*-*-*-R-*-*-%d-*-*-*-*-*-*," 1437 "-*-*-*-R-*-*-%d-*-*-*-*-*-*,"
1469 "-*-*-*-R-*-*-%d-*-*-*-*-*-*," 1438 "-*-*-*-R-*-*-%d-*-*-*-*-*-*,"
1470 "*", 1439 "*",
1471 TermWin.fheight, 1440 fheight,
1472 TermWin.fheight + 1, TermWin.fheight - 1, 1441 fheight + 1, fheight - 1,
1473 TermWin.fheight - 2, TermWin.fheight + 2); 1442 fheight - 2, fheight + 2);
1474 1443
1475 fs = XCreateFontSet (display->display, rs[Rs_imFont] ? rs[Rs_imFont] : pat, 1444 fs = XCreateFontSet (xdisp, rs[Rs_imFont] ? rs[Rs_imFont] : pat,
1476 &missing_charset_list, &missing_charset_count, &def_string); 1445 &missing_charset_list, &missing_charset_count, &def_string);
1477 1446
1478 if (missing_charset_list) 1447 if (missing_charset_list)
1479 XFreeStringList (missing_charset_list); 1448 XFreeStringList (missing_charset_list);
1480 1449
… …
1521 XNBackground, bg, 1490 XNBackground, bg,
1522 XNArea, &status_rect, 1491 XNArea, &status_rect,
1523 XNFontSet, fs, 1492 XNFontSet, fs,
1524 NULL); 1493 NULL);
1525 } 1494 }
1495#if ENABLE_XIM_ONTHESPOT
1496 else if (input_style & XIMPreeditCallbacks)
1497 {
1498 im_set_position (spot);
1499
1500 xcb[0].client_data = (XPointer)this; xcb[0].callback = (XIMProc)xim_preedit_start;
1501 xcb[1].client_data = (XPointer)this; xcb[1].callback = (XIMProc)xim_preedit_done;
1502 xcb[2].client_data = (XPointer)this; xcb[2].callback = (XIMProc)xim_preedit_draw;
1503# if 0
1504 xcb[3].client_data = (XPointer)this; xcb[3].callback = (XIMProc)xim_preedit_caret;
1505# endif
1506
1507 preedit_attr = XVaCreateNestedList (0,
1508 XNSpotLocation, &spot,
1509 XNPreeditStartCallback, &xcb[0],
1510 XNPreeditDoneCallback , &xcb[1],
1511 XNPreeditDrawCallback , &xcb[2],
1512# if 0
1513 XNPreeditCaretCallback, &xcb[3],
1514# endif
1515 NULL);
1516 }
1517#endif
1526 1518
1527 Input_Context = XCreateIC (xim, 1519 Input_Context = XCreateIC (xim,
1528 XNInputStyle, input_style, 1520 XNInputStyle, input_style,
1529 XNClientWindow, TermWin.vt, 1521 XNClientWindow, vt,
1530 XNFocusWindow, TermWin.parent[0], 1522 XNFocusWindow, parent[0],
1531 preedit_attr ? XNPreeditAttributes : NULL, 1523 preedit_attr ? XNPreeditAttributes : NULL,
1532 preedit_attr, 1524 preedit_attr,
1533 status_attr ? XNStatusAttributes : NULL, 1525 status_attr ? XNStatusAttributes : NULL,
1534 status_attr, NULL); 1526 status_attr, NULL);
1535 1527
1536 if (preedit_attr) XFree (preedit_attr); 1528 if (preedit_attr) XFree (preedit_attr);
1537 if (status_attr) XFree (status_attr); 1529 if (status_attr) XFree (status_attr);
1538 if (fs) XFreeFontSet (display->display, fs); 1530 if (fs) XFreeFontSet (xdisp, fs);
1539 1531
1540 if (Input_Context == NULL) 1532 if (Input_Context == NULL)
1541 { 1533 {
1542 rxvt_warn ("failed to create input context, continuing without XIM.\n"); 1534 rxvt_warn ("failed to create input context, continuing without XIM.\n");
1543 im_destroy (); 1535 im_destroy ();
1544 return false; 1536 return false;
1545 } 1537 }
1546 1538
1539#if 0
1540 // unfortunately, only the focus window is used by XIM, hard to fix
1541 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL))
1542 vt_select_input ();
1543#endif
1544
1547 if (input_style & XIMPreeditArea) 1545 if (input_style & XIMPreeditArea)
1548 IMSetStatusPosition (); 1546 IMSetStatusPosition ();
1549 1547
1550 D_MAIN ((stderr, "rxvt_IM_get_IC () - successful connection"));
1551 return true; 1548 return true;
1552} 1549}
1553 1550
1554void 1551void
1555rxvt_term::im_cb () 1552rxvt_term::im_cb ()
1556{ 1553{
1557 int i, found, had_im; 1554 int i;
1558 const char *p; 1555 const char *p;
1559 char **s; 1556 char **s;
1560 char buf[IMBUFSIZ]; 1557 char buf[IMBUFSIZ];
1561 1558
1562 SET_R (this); 1559 make_current ();
1563 1560
1564 im_destroy (); 1561 im_destroy ();
1565 1562
1566 D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()"));
1567 if (Input_Context) 1563 if (Input_Context)
1568 return; 1564 return;
1569 1565
1570#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE) 1566#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1571 if (rs[Rs_imLocale]) 1567 if (rs[Rs_imLocale])
… …
1619{ 1615{
1620 XRectangle preedit_rect, status_rect, *needed_rect; 1616 XRectangle preedit_rect, status_rect, *needed_rect;
1621 XVaNestedList preedit_attr, status_attr; 1617 XVaNestedList preedit_attr, status_attr;
1622 1618
1623 if (!Input_Context 1619 if (!Input_Context
1624 || !TermWin.focus 1620 || !focus
1625 || !(input_style & XIMPreeditArea) 1621 || !(input_style & XIMPreeditArea)
1626 || !IMisRunning ()) 1622 || !IMisRunning ())
1627 return; 1623 return;
1628 1624
1629 /* Getting the necessary width of preedit area */ 1625 /* Getting the necessary width of preedit area */
… …
1644 XFree (preedit_attr); 1640 XFree (preedit_attr);
1645 XFree (status_attr); 1641 XFree (status_attr);
1646} 1642}
1647#endif /* USE_XIM */ 1643#endif /* USE_XIM */
1648 1644
1649/*----------------------------------------------------------------------*/
1650rxvt_t rxvt_current_term;
1651
1652/*----------------------- end-of-file (C source) -----------------------*/ 1645/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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