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

Diff Legend

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