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

Diff Legend

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