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.67 by pcg, Sun May 9 18:19:49 2004 UTC vs.
Revision 1.136 by root, Mon Feb 14 18:47:54 2005 UTC

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 "main.intpro" /* PROTOS for internal routines */
36 36
37#include <signal.h> 37#include <csignal>
38#include <cstring>
38 39
39#ifdef TTY_GID_SUPPORT 40#ifdef TTY_GID_SUPPORT
40# include <grp.h> 41# include <grp.h>
41#endif 42#endif
42 43
43#ifdef HAVE_TERMIOS_H 44#ifdef HAVE_TERMIOS_H
44# include <termios.h> 45# include <termios.h>
45#endif 46#endif
46 47
47#include <cstring> 48#ifdef KEYSYM_RESOURCE
49# include "keyboard.h"
50#endif
48 51
49vector<rxvt_term *> rxvt_term::termlist; 52vector<rxvt_term *> rxvt_term::termlist;
50 53
51static char curlocale[128]; 54static char curlocale[128];
52 55
53bool 56bool
54rxvt_set_locale (const char *locale) 57rxvt_set_locale (const char *locale)
55{ 58{
56 if (!locale || !STRNCMP (locale, curlocale, 128)) 59 if (!locale || !strncmp (locale, curlocale, 128))
57 return false; 60 return false;
58 61
59 STRNCPY (curlocale, locale, 128); 62 strncpy (curlocale, locale, 128);
60 setlocale (LC_CTYPE, curlocale); 63 setlocale (LC_CTYPE, curlocale);
61 return true; 64 return true;
62} 65}
63 66
64#if ENABLE_COMBINING 67#if ENABLE_COMBINING
123 return len; 126 return len;
124 127
125} 128}
126#endif 129#endif
127 130
128void *
129rxvt_term::operator new (size_t s)
130{
131 void *p = malloc (s);
132
133 MEMSET (p, 0, s);
134 return p;
135}
136
137void
138rxvt_term::operator delete (void *p, size_t s)
139{
140 free (p);
141}
142
143rxvt_term::rxvt_term () 131rxvt_term::rxvt_term ()
144 : 132 :
133#if TRANSPARENT
145 rootwin_ev (this, &rxvt_term::rootwin_cb), 134 rootwin_ev (this, &rxvt_term::rootwin_cb),
135#endif
136#ifdef HAVE_SCROLLBARS
137 scrollbar_ev (this, &rxvt_term::x_cb),
138#endif
139#ifdef MENUBAR
140 menubar_ev (this, &rxvt_term::x_cb),
141#endif
142#ifdef CURSOR_BLINK
143 cursor_blink_ev (this, &rxvt_term::cursor_blink_cb),
144#endif
145#ifdef TEXT_BLINK
146 text_blink_ev (this, &rxvt_term::text_blink_cb),
147#endif
148#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
149 cont_scroll_ev (this, &rxvt_term::cont_scroll_cb),
150#endif
151#ifdef SELECTION_SCROLLING
152 sel_scroll_ev (this, &rxvt_term::sel_scroll_cb),
153#endif
154#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
155 slip_wheel_ev (this, &rxvt_term::slip_wheel_cb),
156#endif
157#ifdef POINTER_BLANK
158 pointer_ev (this, &rxvt_term::pointer_cb),
159#endif
160#ifdef USE_XIM
161 im_ev (this, &rxvt_term::im_cb),
162#endif
163 sw_term (this, &rxvt_term::sig_term),
164 sw_int (this, &rxvt_term::sig_term),
165 sw_chld (this, &rxvt_term::sig_chld),
146 termwin_ev (this, &rxvt_term::x_cb), 166 termwin_ev (this, &rxvt_term::x_cb),
147 vt_ev (this, &rxvt_term::x_cb), 167 vt_ev (this, &rxvt_term::x_cb),
148#ifdef HAVE_SCROLLBARS
149 scrollbar_ev (this, &rxvt_term::x_cb),
150#endif
151#ifdef MENUBAR
152 menubar_ev (this, &rxvt_term::x_cb),
153#endif
154#ifdef CURSOR_BLINK
155 cursor_blink_ev (this, &rxvt_term::cursor_blink_cb),
156#endif
157#ifdef TEXT_BLINK
158 text_blink_ev (this, &rxvt_term::text_blink_cb),
159#endif
160#ifdef POINTER_BLANK
161 pointer_ev (this, &rxvt_term::pointer_cb),
162#endif
163#ifdef USE_XIM
164 im_ev (this, &rxvt_term::im_cb),
165#endif
166 check_ev (this, &rxvt_term::check_cb), 168 check_ev (this, &rxvt_term::check_cb),
169 flush_ev (this, &rxvt_term::flush_cb),
167 destroy_ev (this, &rxvt_term::destroy_cb), 170 destroy_ev (this, &rxvt_term::destroy_cb),
168 pty_ev (this, &rxvt_term::pty_cb), 171 pty_ev (this, &rxvt_term::pty_cb),
169 incr_ev (this, &rxvt_term::incr_cb) 172 incr_ev (this, &rxvt_term::incr_cb)
170{ 173{
171 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base; 174 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base;
172 175
173 termlist.push_back (this); 176 termlist.push_back (this);
174}
175 177
176rxvt_term::~rxvt_term () 178#ifdef KEYSYM_RESOURCE
177{ 179 keyboard = new keyboard_manager;
178 termlist.erase (find (termlist.begin (), termlist.end(), this));
179 180
181 if (!keyboard)
182 rxvt_fatal ("out of memory, aborting.\n");
183#endif
184}
185
186// clean up the most important stuff, do *not* call x or free mem etc.
187// for use before an emergency exit
188void rxvt_term::emergency_cleanup ()
189{
180 if (cmd_fd >= 0) 190 if (cmd_pid)
181 close (cmd_fd); 191 kill (-cmd_pid, SIGHUP);
182 192
183#ifndef NO_SETOWNER_TTYDEV
184 privileged_ttydev (RESTORE);
185#endif
186#ifdef UTMP_SUPPORT 193#ifdef UTMP_SUPPORT
187 privileged_utmp (RESTORE); 194 privileged_utmp (RESTORE);
188#endif 195#endif
189 196
197 pty.put ();
198}
199
200rxvt_term::~rxvt_term ()
201{
202 termlist.erase (find (termlist.begin (), termlist.end(), this));
203
204 emergency_cleanup ();
205
206#if ENABLE_STYLES
207 for (int i = RS_styleCount; --i; )
208 if (TermWin.fontset[i] != TermWin.fontset[0])
209 delete TermWin.fontset[i];
210#endif
190 delete TermWin.fontset; 211 delete TermWin.fontset[0];
191 212
192 if (display) 213 if (display)
193 { 214 {
215 dDisp;
216
194 selection_clear (); 217 selection_clear ();
195 218
219#ifdef USE_XIM
220 im_destroy ();
221#endif
196#ifdef MENUBAR 222#ifdef MENUBAR
197 if (menubarGC) XFreeGC (display->display, menubarGC); 223 if (menubarGC) XFreeGC (disp, menubarGC);
198#endif 224#endif
199#ifdef XTERM_SCROLLBAR 225#ifdef XTERM_SCROLLBAR
200 if (xscrollbarGC) XFreeGC (display->display, xscrollbarGC); 226 if (xscrollbarGC) XFreeGC (disp, xscrollbarGC);
201 if (ShadowGC) XFreeGC (display->display, ShadowGC); 227 if (ShadowGC) XFreeGC (disp, ShadowGC);
202#endif 228#endif
203#ifdef PLAIN_SCROLLBAR 229#ifdef PLAIN_SCROLLBAR
204 if (pscrollbarGC) XFreeGC (display->display, pscrollbarGC); 230 if (pscrollbarGC) XFreeGC (disp, pscrollbarGC);
205#endif 231#endif
206#ifdef NEXT_SCROLLBAR 232#ifdef NEXT_SCROLLBAR
207 if (blackGC) XFreeGC (display->display, blackGC); 233 if (blackGC) XFreeGC (disp, blackGC);
208 if (whiteGC) XFreeGC (display->display, whiteGC); 234 if (whiteGC) XFreeGC (disp, whiteGC);
209 if (grayGC) XFreeGC (display->display, grayGC); 235 if (grayGC) XFreeGC (disp, grayGC);
210 if (darkGC) XFreeGC (display->display, darkGC); 236 if (darkGC) XFreeGC (disp, darkGC);
211 if (stippleGC) XFreeGC (display->display, stippleGC); 237 if (stippleGC) XFreeGC (disp, stippleGC);
212 if (dimple) XFreePixmap (display->display, dimple); 238 if (dimple) XFreePixmap (disp, dimple);
213 if (upArrow) XFreePixmap (display->display, upArrow); 239 if (upArrow) XFreePixmap (disp, upArrow);
214 if (downArrow) XFreePixmap (display->display, downArrow); 240 if (downArrow) XFreePixmap (disp, downArrow);
215 if (upArrowHi) XFreePixmap (display->display, upArrowHi); 241 if (upArrowHi) XFreePixmap (disp, upArrowHi);
216 if (downArrowHi) XFreePixmap (display->display, downArrowHi); 242 if (downArrowHi) XFreePixmap (disp, downArrowHi);
217#endif 243#endif
218#if defined(MENUBAR) || defined(RXVT_SCROLLBAR) 244#if defined(MENUBAR) || defined(RXVT_SCROLLBAR)
219 if (topShadowGC) XFreeGC (display->display, topShadowGC); 245 if (topShadowGC) XFreeGC (disp, topShadowGC);
220 if (botShadowGC) XFreeGC (display->display, botShadowGC); 246 if (botShadowGC) XFreeGC (disp, botShadowGC);
221 if (scrollbarGC) XFreeGC (display->display, scrollbarGC); 247 if (scrollbarGC) XFreeGC (disp, scrollbarGC);
222#endif 248#endif
223 if (TermWin.gc) XFreeGC (display->display, TermWin.gc); 249 if (TermWin.gc) XFreeGC (disp, TermWin.gc);
224 250
225#if defined(MENUBAR) && (MENUBAR_MAX > 1) 251#if defined(MENUBAR) && (MENUBAR_MAX > 1)
226 delete menuBar.drawable; 252 delete menuBar.drawable;
227 //if (menuBar.win) 253 //if (menuBar.win)
228 // XDestroyWindow (display->display, menuBar.win); 254 // XDestroyWindow (disp, menuBar.win);
229#endif 255#endif
230 delete TermWin.drawable; 256 delete TermWin.drawable;
231 // destroy all windows 257 // destroy all windows
232 if (TermWin.parent[0]) 258 if (TermWin.parent[0] && !rs[Rs_embed])
233 XDestroyWindow (display->display, TermWin.parent[0]); 259 XDestroyWindow (disp, TermWin.parent[0]);
234 } 260 }
235 261
236 // TODO: free pixcolours, colours should become part of rxvt_display 262 // TODO: free pixcolours, colours should become part of rxvt_display
237 263
238 delete PixColors; 264 delete pix_colors_focused;
265#ifdef OFF_FOCUS_FADING
266 delete pix_colors_unfocused;
267#endif
239 268
240 displays.put (display); 269 displays.put (display);
241 270
242 scr_release (); 271 scr_release ();
243 272
244 /* clear all resources */ 273 /* clear all resources */
245 for (int i = 0; i < allocated.size (); i++) 274 for (int i = 0; i < allocated.size (); i++)
246 free (allocated[i]); 275 free (allocated [i]);
247 276
248 free (selection.text); 277 free (selection.text);
249 // TODO: manage env vars in child only(!) 278 // TODO: manage env vars in child only(!)
250 free (env_windowid); 279 free (env_windowid);
251 free (env_display); 280 free (env_display);
252 free (env_term); 281 free (env_term);
253 free (env_colorfgbg); 282 free (env_colorfgbg);
254 free (locale); 283 free (locale);
255#if 0 284 free (v_buffer);
256 free (codeset); 285 free (incr_buf);
257#endif
258 286
259 delete envv; 287 delete envv;
260 delete argv; 288 delete argv;
289
290#ifdef KEYSYM_RESOURCE
291 delete keyboard;
292#endif
261} 293}
262 294
263void 295void
264rxvt_term::destroy () 296rxvt_term::destroy ()
265{ 297{
298 if (destroy_ev.active)
299 return;
300
301#if ENABLE_OVERLAY
302 scr_overlay_off ();
303#endif
304
266 if (display) 305 if (display)
267 { 306 {
307#if USE_XIM
308 im_ev.stop (display);
309#endif
310#if HAVE_SCROLLBARS
311 scrollbar_ev.stop (display);
312#endif
313#if MENUBAR
314 menubar_ev.stop (display);
315#endif
316#if TRANSPARENT
268 rootwin_ev.stop (display); 317 rootwin_ev.stop (display);
318#endif
319 incr_ev.stop ();
269 termwin_ev.stop (display); 320 termwin_ev.stop (display);
270 vt_ev.stop (display); 321 vt_ev.stop (display);
271#ifdef USE_XIM
272 im_destroy ();
273 im_ev.stop (display);
274#endif
275#ifdef HAVE_SCROLLBARS
276 scrollbar_ev.stop (display);
277#endif
278#ifdef MENUBAR
279 menubar_ev.stop (display);
280#endif
281 } 322 }
282 323
283 check_ev.stop (); 324 check_ev.stop ();
284 pty_ev.stop (); 325 pty_ev.stop ();
285#ifdef CURSOR_BLINK 326#ifdef CURSOR_BLINK
286 cursor_blink_ev.stop (); 327 cursor_blink_ev.stop ();
287#endif 328#endif
288#ifdef TEXT_BLINK 329#ifdef TEXT_BLINK
289 text_blink_ev.stop (); 330 text_blink_ev.stop ();
290#endif 331#endif
332#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
333 cont_scroll_ev.stop ();
334#endif
335#ifdef SELECTION_SCROLLING
336 sel_scroll_ev.stop ();
337#endif
291#ifdef POINTER_BLANK 338#ifdef POINTER_BLANK
292 pointer_ev.stop (); 339 pointer_ev.stop ();
293#endif 340#endif
294 341
295 destroy_ev.start (0); 342 destroy_ev.start (0);
299rxvt_term::destroy_cb (time_watcher &w) 346rxvt_term::destroy_cb (time_watcher &w)
300{ 347{
301 SET_R (this); 348 SET_R (this);
302 349
303 delete this; 350 delete this;
351}
352
353/*----------------------------------------------------------------------*/
354/*
355 * Exit gracefully, clearing the utmp entry and restoring tty attributes
356 * TODO: if debugging, this should free up any known resources if we can
357 */
358static XErrorHandler old_xerror_handler;
359
360static void
361rxvt_emergency_cleanup ()
362{
363 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)
364 (*t)->emergency_cleanup ();
365}
366
367#if ENABLE_FRILLS
368static void
369print_x_error (Display *dpy, XErrorEvent *event)
370{
371 char buffer[BUFSIZ];
372 char mesg[BUFSIZ];
373 char number[32];
374 char *mtype = "XlibMessage";
375 XGetErrorText(dpy, event->error_code, buffer, BUFSIZ);
376 XGetErrorDatabaseText(dpy, mtype, "XError", "X Error", mesg, BUFSIZ);
377 rxvt_warn ("An X Error occured, trying to continue after report.\n");
378 rxvt_warn ("%s: %s\n", mesg, buffer);
379 XGetErrorDatabaseText(dpy, mtype, "MajorCode", "Request Major code %d", mesg, BUFSIZ);
380 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->request_code);
381 sprintf(number, "%d", event->request_code);
382 XGetErrorDatabaseText(dpy, "XRequest", number, "", buffer, BUFSIZ);
383 rxvt_warn ("(which is %s)\n", buffer);
384 if (event->request_code >= 128) {
385 XGetErrorDatabaseText(dpy, mtype, "MinorCode", "Request Minor code %d",
386 mesg, BUFSIZ);
387 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->minor_code);
388 }
389 if ((event->error_code == BadWindow) ||
390 (event->error_code == BadPixmap) ||
391 (event->error_code == BadCursor) ||
392 (event->error_code == BadFont) ||
393 (event->error_code == BadDrawable) ||
394 (event->error_code == BadColor) ||
395 (event->error_code == BadGC) ||
396 (event->error_code == BadIDChoice) ||
397 (event->error_code == BadValue) ||
398 (event->error_code == BadAtom)) {
399 if (event->error_code == BadValue)
400 XGetErrorDatabaseText(dpy, mtype, "Value", "Value 0x%x",
401 mesg, BUFSIZ);
402 else if (event->error_code == BadAtom)
403 XGetErrorDatabaseText(dpy, mtype, "AtomID", "AtomID 0x%x",
404 mesg, BUFSIZ);
405 else
406 XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x",
407 mesg, BUFSIZ);
408 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid);
409 }
410 XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d",
411 mesg, BUFSIZ);
412 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial);
413}
414#endif
415
416int
417rxvt_xerror_handler (Display *display, XErrorEvent *event)
418{
419 if (GET_R->allowedxerror == -1)
420 GET_R->allowedxerror = event->error_code;
421 else
422 {
423 //TODO: GET_R is most likely not the terminal which caused the error
424 //TODO: maybe just output the error and continue?
425#if ENABLE_FRILLS
426 print_x_error (display, event);
427#else
428 old_xerror_handler (display, event);
429#endif
430 }
431
432 return 0;
433}
434
435int
436rxvt_xioerror_handler (Display *display)
437{
438 rxvt_warn ("X connection to '%s' broken, unable to recover, exiting.\n",
439 DisplayString (display));
440 rxvt_emergency_cleanup ();
441 _exit (EXIT_FAILURE);
442}
443
444/*
445 * Catch a fatal signal and tidy up before quitting
446 */
447void
448rxvt_term::sig_term (sig_watcher &w)
449{
450#ifdef DEBUG_CMD
451 rxvt_warn ("caught signal %d, exiting.\n", w.signum);
452#endif
453 rxvt_emergency_cleanup ();
454 signal (w.signum, SIG_DFL);
455 kill (getpid (), w.signum);
304} 456}
305 457
306/*----------------------------------------------------------------------*/ 458/*----------------------------------------------------------------------*/
307/* rxvt_init () */ 459/* rxvt_init () */
308bool 460bool
309rxvt_term::init (int argc, const char *const *argv) 461rxvt_term::init (int argc, const char *const *argv)
310{ 462{
311 SET_R (this); 463 SET_R (this);
312 464
465 set_locale ("");
466
313 if (!init_vars ()) 467 if (!init_vars ())
314 return false; 468 return false;
315 469
470 init_secondary ();
471
472 const char **cmd_argv = init_resources (argc, argv);
473
474#ifdef KEYSYM_RESOURCE
475 keyboard->register_done ();
476#endif
477
478#if MENUBAR_MAX
479 menubar_read (rs[Rs_menu]);
480#endif
481#ifdef HAVE_SCROLLBARS
482 if (options & Opt_scrollBar)
483 scrollBar.setIdle (); /* set existence for size calculations */
484#endif
485
486 create_windows (argc, argv);
487
488 dDisp;
489
490 init_xlocale ();
491
492 scr_reset (); /* initialize screen */
493
494#if 0
495 XSynchronize (disp, True);
496#endif
497
498#ifdef HAVE_SCROLLBARS
499 if (options & Opt_scrollBar)
500 resize_scrollbar (); /* create and map scrollbar */
501#endif
502#if (MENUBAR_MAX)
503 if (menubar_visible ())
504 XMapWindow (disp, menuBar.win);
505#endif
506#ifdef TRANSPARENT
507 if (options & Opt_transparent)
508 {
509 XSelectInput (disp, display->root, PropertyChangeMask);
510 check_our_parents ();
511 rootwin_ev.start (display, display->root);
512 }
513#endif
514
515 XMapWindow (disp, TermWin.vt);
516 XMapWindow (disp, TermWin.parent[0]);
517
518 set_colorfgbg ();
519
520 init_command (cmd_argv);
521
522 free (cmd_argv);
523
524 pty_ev.start (pty.pty, EVENT_READ);
525
526 check_ev.start ();
527
528 return true;
529}
530
531void
532rxvt_init ()
533{
316 /* 534 /*
317 * Save and then give up any super-user privileges 535 * Save and then give up any super-user privileges
318 * If we need privileges in any area then we must specifically request it. 536 * If we need privileges in any area then we must specifically request it.
319 * We should only need to be root in these cases: 537 * We should only need to be root in these cases:
320 * 1. write utmp entries on some systems 538 * 1. write utmp entries on some systems
321 * 2. chown tty on some systems 539 * 2. chown tty on some systems
322 */ 540 */
323 privileges (SAVE); 541 rxvt_privileges (SAVE);
324 privileges (IGNORE); 542 rxvt_privileges (IGNORE);
325 543
326 init_secondary (); 544 signal (SIGHUP, SIG_IGN);
327 545 signal (SIGPIPE, SIG_IGN);
328 const char **cmd_argv = init_resources (argc, argv);
329
330 set_locale ("");
331
332#if MENUBAR_MAX
333 menubar_read (rs[Rs_menu]);
334#endif
335#ifdef HAVE_SCROLLBARS
336 if (Options & Opt_scrollBar)
337 scrollBar.setIdle (); /* set existence for size calculations */
338#endif
339
340 create_windows (argc, argv);
341
342 init_xlocale ();
343
344 scr_reset (); /* initialize screen */
345
346#if 0
347 XSynchronize (display->display, True);
348#endif
349
350#ifdef HAVE_SCROLLBARS
351 if (Options & Opt_scrollBar)
352 resize_scrollbar (); /* create and map scrollbar */
353#endif
354#if (MENUBAR_MAX)
355 if (menubar_visible ())
356 XMapWindow (display->display, menuBar.win);
357#endif
358#ifdef TRANSPARENT
359 if (Options & Opt_transparent)
360 {
361 XSelectInput (display->display, display->root, PropertyChangeMask);
362 check_our_parents ();
363 }
364#endif
365
366 rootwin_ev.start (display, display->root);
367
368 XMapWindow (display->display, TermWin.vt);
369 XMapWindow (display->display, TermWin.parent[0]);
370
371 init_command (cmd_argv);
372
373 pty_ev.start (cmd_fd, EVENT_READ);
374
375 check_ev.start ();
376
377 return true;
378}
379
380static int (*old_xerror_handler) (Display *dpy, XErrorEvent *event);
381
382void
383rxvt_init_signals ()
384{
385 /* install exit handler for cleanup */
386#if 0
387#ifdef HAVE_ATEXIT
388 atexit (rxvt_clean_exit);
389#else
390#endif
391#endif
392
393 struct sigaction sa;
394
395 sigfillset (&sa.sa_mask);
396 sa.sa_flags = SA_NOCLDSTOP | SA_RESTART;
397 sa.sa_handler = SIG_IGN; sigaction (SIGHUP , &sa, 0);
398 sa.sa_handler = SIG_IGN; sigaction (SIGPIPE, &sa, 0);
399 sa.sa_handler = rxvt_Exit_signal; sigaction (SIGINT , &sa, 0);
400 sa.sa_handler = rxvt_Exit_signal; sigaction (SIGQUIT, &sa, 0);
401 sa.sa_handler = rxvt_Exit_signal; sigaction (SIGTERM, &sa, 0);
402 sa.sa_handler = rxvt_Child_signal; sigaction (SIGCHLD, &sa, 0);
403 546
404 /* need to trap SIGURG for SVR4 (Unixware) rlogin */ 547 /* need to trap SIGURG for SVR4 (Unixware) rlogin */
405 /* signal (SIGURG, SIG_DFL); */ 548 /* signal (SIGURG, SIG_DFL); */
406 549
407 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); 550 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
551 // TODO: handle this with exceptions and tolerate the memory loss
408 //XSetIOErrorHandler ((XErrorHandler) rxvt_xioerror_handler); 552 XSetIOErrorHandler (rxvt_xioerror_handler);
409} 553}
410 554
411/* ------------------------------------------------------------------------- * 555/* ------------------------------------------------------------------------- *
412 * SIGNAL HANDLING & EXIT HANDLER * 556 * SIGNAL HANDLING & EXIT HANDLER *
413 * ------------------------------------------------------------------------- */ 557 * ------------------------------------------------------------------------- */
414/* 558/*
415 * Catch a SIGCHLD signal and exit if the direct child has died 559 * Catch a SIGCHLD signal and exit if the direct child has died
416 */ 560 */
417 561
418void rxvt_term::child_exited (int pid) 562void
563rxvt_term::sig_chld (sig_watcher &w)
419{ 564{
420 for (rxvt_term **t = termlist.begin (); t < termlist.end (); t++) 565 // we are being called for every SIGCHLD, not just ours
421 if (pid == (*t)->cmd_pid) 566 int pid;
422 {
423 (*t)->destroy ();
424 break;
425 }
426}
427
428/* ARGSUSED */
429/* EXTPROTO */
430RETSIGTYPE
431rxvt_Child_signal (int sig __attribute__ ((unused)))
432{
433 int pid, save_errno = errno;
434 567
435 while ((pid = waitpid (-1, NULL, WNOHANG)) > 0) 568 while ((pid = waitpid (-1, NULL, WNOHANG)) > 0)
436 rxvt_term::child_exited (pid); 569 for (rxvt_term **t = termlist.begin (); t < termlist.end (); t++)
437 570 if (pid == (*t)->cmd_pid)
438 errno = save_errno; 571 {
439} 572 (*t)->destroy ();
440 573 break;
441/* 574 }
442 * Catch a fatal signal and tidy up before quitting
443 */
444/* EXTPROTO */
445RETSIGTYPE
446rxvt_Exit_signal (int sig)
447{
448 signal (sig, SIG_DFL);
449#ifdef DEBUG_CMD
450 rxvt_warn ("caught signal %d, exiting.\n", sig);
451#endif
452 rxvt_clean_exit ();
453 kill (getpid (), sig);
454}
455
456/* INTPROTO */
457int
458rxvt_xerror_handler (Display *display, XErrorEvent *event)
459{
460 if (GET_R->allowedxerror == -1)
461 GET_R->allowedxerror = event->error_code;
462 else
463 {
464 old_xerror_handler (display, event);
465 GET_R->destroy ();
466 }
467
468 return 0;
469}
470
471/*----------------------------------------------------------------------*/
472/*
473 * Exit gracefully, clearing the utmp entry and restoring tty attributes
474 * TODO: if debugging, this should free up any known resources if we can
475 */
476/* EXTPROTO */
477void
478rxvt_clean_exit ()
479{
480 // TODO: rxvtd should clean up all ressources
481 if (GET_R)
482 GET_R->destroy ();
483} 575}
484 576
485/* ------------------------------------------------------------------------- * 577/* ------------------------------------------------------------------------- *
486 * MEMORY ALLOCATION WRAPPERS * 578 * MEMORY ALLOCATION WRAPPERS *
487 * ------------------------------------------------------------------------- */ 579 * ------------------------------------------------------------------------- */
488/* EXTPROTO */ 580void *
489void *
490rxvt_malloc (size_t size) 581rxvt_malloc (size_t size)
491{ 582{
492 void *p;
493
494 p = malloc (size); 583 void *p = malloc (size);
584
495 if (p) 585 if (!p)
586 rxvt_fatal ("memory allocation failure. aborting.\n");
587
496 return p; 588 return p;
497
498 fprintf (stderr, RESNAME ": memory allocation failure. Aborting");
499 rxvt_clean_exit ();
500 exit (EXIT_FAILURE);
501 /* NOTREACHED */
502} 589}
503 590
504/* EXTPROTO */ 591/* INTPROTO */
505void * 592void *
506rxvt_calloc (size_t number, size_t size) 593rxvt_calloc (size_t number, size_t size)
507{ 594{
508 void *p;
509
510 p = calloc (number, size); 595 void *p = calloc (number, size);
596
511 if (p) 597 if (!p)
598 rxvt_fatal ("memory allocation failure. aborting.\n");
599
512 return p; 600 return p;
513
514 fprintf (stderr, RESNAME ": memory allocation failure. Aborting");
515 rxvt_clean_exit ();
516 exit (EXIT_FAILURE);
517 /* NOTREACHED */
518} 601}
519 602
520/* EXTPROTO */ 603/* INTPROTO */
521void * 604void *
522rxvt_realloc (void *ptr, size_t size) 605rxvt_realloc (void *ptr, size_t size)
523{ 606{
524 void *p;
525
526 if (ptr)
527 p = realloc (ptr, size); 607 void *p = realloc (ptr, size);
528 else 608
529 p = malloc (size);
530 if (p) 609 if (!p)
610 rxvt_fatal ("memory allocation failure. aborting.\n");
611
531 return p; 612 return p;
532
533 fprintf (stderr, RESNAME ": memory allocation failure. Aborting");
534 rxvt_clean_exit ();
535 exit (EXIT_FAILURE);
536 /* NOTREACHED */
537} 613}
538 614
539/* ------------------------------------------------------------------------- * 615/* ------------------------------------------------------------------------- *
540 * PRIVILEGED OPERATIONS * 616 * PRIVILEGED OPERATIONS *
541 * ------------------------------------------------------------------------- */ 617 * ------------------------------------------------------------------------- */
542/* take care of suid/sgid super-user (root) privileges */ 618/* take care of suid/sgid super-user (root) privileges */
543void 619void
544rxvt_term::privileges (int mode) 620rxvt_privileges (rxvt_privaction action)
545{ 621{
622#if (defined(HAVE_SETEUID) || defined(HAVE_SETREUID)) && !defined(__CYGWIN32__)
623 static uid_t euid;
624 static gid_t egid;
625#endif
626
546#if ! defined(__CYGWIN32__) 627#if ! defined(__CYGWIN32__)
547# if !defined(HAVE_SETEUID) && defined(HAVE_SETREUID) 628# if !defined(HAVE_SETEUID) && defined(HAVE_SETREUID)
548 /* setreuid () is the poor man's setuid (), seteuid () */ 629 /* setreuid () is the poor man's setuid (), seteuid () */
549# define seteuid(a) setreuid(-1, (a)) 630# define seteuid(a) setreuid(-1, (a))
550# define setegid(a) setregid(-1, (a)) 631# define setegid(a) setregid(-1, (a))
551# define HAVE_SETEUID 632# define HAVE_SETEUID
552# endif 633# endif
553# ifdef HAVE_SETEUID 634# ifdef HAVE_SETEUID
554 switch (mode) 635 switch (action)
555 { 636 {
556 case IGNORE: 637 case IGNORE:
557 /* 638 /*
558 * change effective uid/gid - not real uid/gid - so we can switch 639 * change effective uid/gid - not real uid/gid - so we can switch
559 * back to root later, as required 640 * back to root later, as required
569 seteuid (euid); 650 seteuid (euid);
570 setegid (egid); 651 setegid (egid);
571 break; 652 break;
572 } 653 }
573# else 654# else
574 switch (mode) 655 switch (action)
575 { 656 {
576 case IGNORE: 657 case IGNORE:
577 setuid (getuid ()); 658 setuid (getuid ());
578 setgid (getgid ()); 659 setgid (getgid ());
579 /* FALLTHROUGH */ 660 /* FALLTHROUGH */
586#endif 667#endif
587} 668}
588 669
589#ifdef UTMP_SUPPORT 670#ifdef UTMP_SUPPORT
590void 671void
591rxvt_term::privileged_utmp (char action) 672rxvt_term::privileged_utmp (rxvt_privaction action)
592{ 673{
593 D_MAIN ((stderr, "rxvt_privileged_utmp (%c); waiting for: %c (pid: %d)",
594 action, next_utmp_action, getpid ()));
595 if (next_utmp_action != action || (action != SAVE && action != RESTORE)
596 || (Options & Opt_utmpInhibit) 674 if ((options & Opt_utmpInhibit)
597 || ttydev == NULL || *ttydev == '\0') 675 || !pty.name || !*pty.name)
598 return; 676 return;
599 677
600 privileges (RESTORE); 678 rxvt_privileges (RESTORE);
679
601 if (action == SAVE) 680 if (action == SAVE)
602 {
603 next_utmp_action = RESTORE;
604 makeutent (ttydev, rs[Rs_display_name]); 681 makeutent (pty.name, rs[Rs_display_name]);
605 }
606 else 682 else
607 { /* action == RESTORE */
608 next_utmp_action = IGNORE;
609 cleanutent (); 683 cleanutent ();
610 } 684
611 privileges (IGNORE); 685 rxvt_privileges (IGNORE);
612}
613#endif
614
615#ifndef NO_SETOWNER_TTYDEV
616void
617rxvt_term::privileged_ttydev (char action)
618{
619 D_MAIN ((stderr,
620 "privileged_ttydev (%c); waiting for: %c (pid: %d)",
621 action, next_tty_action, getpid ()));
622 if (next_tty_action != action || (action != SAVE && action != RESTORE)
623 || ttydev == NULL || *ttydev == '\0')
624 return;
625
626 privileges (RESTORE);
627
628 if (action == SAVE)
629 {
630 next_tty_action = RESTORE;
631# ifndef RESET_TTY_TO_COMMON_DEFAULTS
632 /* store original tty status for restoration rxvt_clean_exit () -- rgg 04/12/95 */
633 if (lstat (ttydev, &ttyfd_stat) < 0) /* you lose out */
634 next_tty_action = IGNORE;
635 else
636# endif
637
638 {
639 chown (ttydev, getuid (), ttygid); /* fail silently */
640 chmod (ttydev, ttymode);
641# ifdef HAVE_REVOKE
642 revoke (ttydev);
643# endif
644
645 }
646 }
647 else
648 { /* action == RESTORE */
649 next_tty_action = IGNORE;
650# ifndef RESET_TTY_TO_COMMON_DEFAULTS
651 chmod (ttydev, ttyfd_stat.st_mode);
652 chown (ttydev, ttyfd_stat.st_uid, ttyfd_stat.st_gid);
653# else
654 chmod (ttydev,
655 (S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH | S_IWOTH));
656 chown (ttydev, 0, 0);
657# endif
658
659 }
660
661 privileges (IGNORE);
662
663# ifndef RESET_TTY_TO_COMMON_DEFAULTS
664 D_MAIN ((stderr, "%s \"%s\": mode %03o, uid %d, gid %d",
665 action == RESTORE ? "Restoring" : (action ==
666 SAVE ? "Saving" :
667 "UNKNOWN ERROR for"), ttydev,
668 ttyfd_stat.st_mode, ttyfd_stat.st_uid,
669 ttyfd_stat.st_gid));
670# endif
671} 686}
672#endif 687#endif
673 688
674/*----------------------------------------------------------------------*/ 689/*----------------------------------------------------------------------*/
675/* 690/*
677 * if width/height are non-zero then override calculated width/height 692 * if width/height are non-zero then override calculated width/height
678 */ 693 */
679void 694void
680rxvt_term::window_calc (unsigned int width, unsigned int height) 695rxvt_term::window_calc (unsigned int width, unsigned int height)
681{ 696{
682 short recalc_x, recalc_y; 697 short recalc_x, recalc_y;
683 int x, y, sb_w, mb_h, flags; 698 int x, y, sb_w, mb_h, flags;
684 unsigned int w, h; 699 unsigned int w, h;
685 unsigned int max_width, max_height; 700 unsigned int max_width, max_height;
701 dDisp;
686 702
687 D_SIZE ((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d", 703 D_SIZE ((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
688 TermWin.ncol, TermWin.nrow, szHint.width, 704 TermWin.ncol, TermWin.nrow, szHint.width,
689 szHint.height)); 705 szHint.height));
690 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity; 706 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity;
696 if (!parsed_geometry) 712 if (!parsed_geometry)
697 { 713 {
698 parsed_geometry = 1; 714 parsed_geometry = 1;
699 if (rs[Rs_geometry]) 715 if (rs[Rs_geometry])
700 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h); 716 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h);
717
701 if (flags & WidthValue) 718 if (flags & WidthValue)
702 { 719 {
703 TermWin.ncol = BOUND_POSITIVE_INT16 (w); 720 TermWin.ncol = BOUND_POSITIVE_INT16 (w);
704 szHint.flags |= USSize; 721 szHint.flags |= USSize;
705 } 722 }
723
706 if (flags & HeightValue) 724 if (flags & HeightValue)
707 { 725 {
708 TermWin.nrow = BOUND_POSITIVE_INT16 (h); 726 TermWin.nrow = BOUND_POSITIVE_INT16 (h);
709 szHint.flags |= USSize; 727 szHint.flags |= USSize;
710 } 728 }
729
711 if (flags & XValue) 730 if (flags & XValue)
712 { 731 {
713 szHint.x = x; 732 szHint.x = x;
714 szHint.flags |= USPosition; 733 szHint.flags |= USPosition;
715 if (flags & XNegative) 734 if (flags & XNegative)
716 { 735 {
717 recalc_x = 1; 736 recalc_x = 1;
718 szHint.win_gravity = NorthEastGravity; 737 szHint.win_gravity = NorthEastGravity;
719 } 738 }
720 } 739 }
740
721 if (flags & YValue) 741 if (flags & YValue)
722 { 742 {
723 szHint.y = y; 743 szHint.y = y;
724 szHint.flags |= USPosition; 744 szHint.flags |= USPosition;
725 if (flags & YNegative) 745 if (flags & YNegative)
740 max_height = MAX_ROWS * TermWin.fheight; 760 max_height = MAX_ROWS * TermWin.fheight;
741 761
742 szHint.base_width = szHint.base_height = 2 * TermWin.int_bwidth; 762 szHint.base_width = szHint.base_height = 2 * TermWin.int_bwidth;
743 763
744 sb_w = mb_h = 0; 764 sb_w = mb_h = 0;
745 window_vt_x = window_vt_y = 0; 765 window_vt_x = window_vt_y = TermWin.int_bwidth;
746 766
747 if (scrollbar_visible ()) 767 if (scrollbar_visible ())
748 { 768 {
749 sb_w = scrollbar_TotalWidth (); 769 sb_w = scrollbar_TotalWidth ();
750 szHint.base_width += sb_w; 770 szHint.base_width += sb_w;
751 if (! (Options & Opt_scrollBar_right)) 771 if (!(options & Opt_scrollBar_right))
752 window_vt_x = sb_w; 772 window_vt_x += sb_w;
753 } 773 }
754 774
755 if (menubar_visible ()) 775 if (menubar_visible ())
756 { 776 {
757 mb_h = menuBar_TotalHeight (); 777 mb_h = menuBar_TotalHeight ();
758 szHint.base_height += mb_h; 778 szHint.base_height += mb_h;
759 window_vt_y = mb_h; 779 window_vt_y += mb_h;
760 } 780 }
761 781
762 szHint.width_inc = TermWin.fwidth; 782 szHint.width_inc = TermWin.fwidth;
763 szHint.height_inc = TermWin.fheight; 783 szHint.height_inc = TermWin.fheight;
764 szHint.min_width = szHint.base_width + szHint.width_inc; 784 szHint.min_width = szHint.base_width + szHint.width_inc;
784 { 804 {
785 MIN_IT (TermWin.height, max_height); 805 MIN_IT (TermWin.height, max_height);
786 szHint.height = szHint.base_height + TermWin.height; 806 szHint.height = szHint.base_height + TermWin.height;
787 } 807 }
788 808
789 if (scrollbar_visible () && (Options & Opt_scrollBar_right)) 809 if (scrollbar_visible () && (options & Opt_scrollBar_right))
790 window_sb_x = szHint.width - sb_w; 810 window_sb_x = szHint.width - sb_w;
791 811
792 if (recalc_x) 812 if (recalc_x)
793 szHint.x += (DisplayWidth (display->display, DefaultScreen (display->display)) 813 szHint.x += (DisplayWidth (disp, display->screen)
794 - szHint.width - 2 * TermWin.ext_bwidth); 814 - szHint.width - 2 * TermWin.ext_bwidth);
795 if (recalc_y) 815 if (recalc_y)
796 szHint.y += (DisplayHeight (display->display, DefaultScreen (display->display)) 816 szHint.y += (DisplayHeight (disp, display->screen)
797 - szHint.height - 2 * TermWin.ext_bwidth); 817 - szHint.height - 2 * TermWin.ext_bwidth);
798 818
799 TermWin.ncol = TermWin.width / TermWin.fwidth; 819 TermWin.ncol = TermWin.width / TermWin.fwidth;
800 TermWin.nrow = TermWin.height / TermWin.fheight; 820 TermWin.nrow = TermWin.height / TermWin.fheight;
801 D_SIZE ((stderr, "> Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d", 821 D_SIZE ((stderr, "> Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
810 * Called after a window size change. 830 * Called after a window size change.
811 */ 831 */
812void 832void
813rxvt_term::tt_winch () 833rxvt_term::tt_winch ()
814{ 834{
835 if (pty.pty < 0)
836 return;
837
815 struct winsize ws; 838 struct winsize ws;
816
817 if (cmd_fd < 0)
818 return;
819 839
820 ws.ws_col = TermWin.ncol; 840 ws.ws_col = TermWin.ncol;
821 ws.ws_row = TermWin.nrow; 841 ws.ws_row = TermWin.nrow;
822 ws.ws_xpixel = ws.ws_ypixel = 0; 842 ws.ws_xpixel = TermWin.width;
823#ifndef DEBUG_SIZE 843 ws.ws_ypixel = TermWin.height;
824 (void)ioctl (cmd_fd, TIOCSWINSZ, &ws); 844 (void)ioctl (pty.pty, TIOCSWINSZ, &ws);
825#else 845
826 if (ioctl (cmd_fd, TIOCSWINSZ, &ws) < 0) 846#if 0
827 D_SIZE ((stderr, "Failed to send TIOCSWINSZ to fd %d", fd)); 847 // TIOCSWINSZ⎈ is supposed to do this automatically and correctly
828# ifdef SIGWINCH
829 else if (cmd_pid) /* force through to the command */ 848 if (cmd_pid) /* force through to the command */
830 kill (cmd_pid, SIGWINCH); 849 kill (cmd_pid, SIGWINCH);
831# endif
832#endif 850#endif
833} 851}
834 852
835/*----------------------------------------------------------------------*/ 853/*----------------------------------------------------------------------*/
836/* rxvt_change_font () - Switch to a new font */ 854/* set_fonts () - load and set the various fonts
837/* 855/*
838 * init = 1 - initialize 856 * init = 1 - initialize
839 * 857 *
840 * fontname == FONT_UP - switch to bigger font 858 * fontname == FONT_UP - switch to bigger font
841 * fontname == FONT_DN - switch to smaller font 859 * fontname == FONT_DN - switch to smaller font
842 */ 860 */
843bool 861bool
844rxvt_term::change_font (const char *fontname) 862rxvt_term::set_fonts ()
845{ 863{
846 if (fontname == FONT_UP)
847 {
848 // TODO
849 }
850 else if (fontname == FONT_DN)
851 {
852 // TODO
853 }
854 else
855 {
856 rxvt_fontset *fs = new rxvt_fontset (this); 864 rxvt_fontset *fs = new rxvt_fontset (this);
865 rxvt_fontprop prop;
857 866
858 if (fs && fs->populate (fontname ? fontname : "fixed")) 867 if (!fs
868 || !fs->populate (rs[Rs_font] ? rs[Rs_font] : "fixed")
869 || !fs->realize_font (1))
870 {
871 delete fs;
872 return false;
873 }
874
875#if ENABLE_STYLES
876 for (int i = RS_styleCount; --i; )
877 if (TermWin.fontset[i] != TermWin.fontset[0])
878 delete TermWin.fontset[i];
879#endif
880
881 delete TermWin.fontset[0];
882 TermWin.fontset[0] = fs;
883
884 prop = (*fs)[1]->properties ();
885 prop.height += TermWin.lineSpace;
886 fs->set_prop (prop);
887
888 TermWin.fwidth = prop.width;
889 TermWin.fheight = prop.height;
890 TermWin.fweight = prop.weight;
891 TermWin.fslant = prop.slant;
892 TermWin.fbase = (*fs)[1]->ascent;
893
894 for (int style = 1; style < 4; style++)
895 {
896#if ENABLE_STYLES
897 const char *res = rs[Rs_font + style];
898
899 if (res && !*res)
900 TermWin.fontset[style] = TermWin.fontset[0];
901 else
859 { 902 {
860 delete TermWin.fontset; 903 TermWin.fontset[style] = fs = new rxvt_fontset (this);
861 TermWin.fontset = fs; 904 rxvt_fontprop prop2 = prop;
862 TermWin.fwidth = fs->base_font ()->width;
863 TermWin.fheight = fs->base_font ()->height;
864 TermWin.fbase = fs->base_font ()->ascent;
865 905
866 if (TermWin.parent[0]) 906 if (res)
907 prop2.weight = prop2.slant = rxvt_fontprop::unset;
908 else
867 { 909 {
868 resize_all_windows (0, 0, 0); 910 res = TermWin.fontset[0]->fontdesc;
869 scr_remap_chars (); 911
870 scr_touch (true); 912 if (SET_STYLE (0, style) & RS_Bold) prop2.weight = rxvt_fontprop::bold;
913 if (SET_STYLE (0, style) & RS_Italic) prop2.slant = rxvt_fontprop::italic;
871 } 914 }
872 915
873 return true; 916 fs->populate (res);
917 fs->set_prop (prop2);
874 } 918 }
919#else
920 TermWin.fontset[style] = TermWin.fontset[0];
921#endif
922 }
923
924 if (TermWin.parent[0])
875 } 925 {
926 resize_all_windows (0, 0, 0);
927 scr_remap_chars ();
928 scr_touch (true);
929 }
876 930
877 return false; 931 return true;
878} 932}
879 933
880bool 934void rxvt_term::set_string_property (Atom prop, const char *str, int len)
881rxvt_term::font_up_down (int n, int direction)
882{ 935{
883 return false; 936 // TODO: SMART_WINDOW_TITLE
937 XChangeProperty (display->display, TermWin.parent[0],
938 prop, XA_STRING, 8, PropModeReplace,
939 (const unsigned char *)str, len >= 0 ? len : strlen (str));
940}
941
942void rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
943{
944 // TODO: SMART_WINDOW_TITLE
945 wchar_t *ws = rxvt_mbstowcs (str, len);
946 char *s = rxvt_wcstoutf8 (ws);
947
948 XChangeProperty (display->display, TermWin.parent[0],
949 prop, xa[XA_UTF8_STRING], 8, PropModeReplace,
950 (const unsigned char *)s, strlen (s));
951
952 free (s);
953 free (ws);
884} 954}
885 955
886/*----------------------------------------------------------------------*/ 956/*----------------------------------------------------------------------*/
887/*----------------------------------------------------------------------*/ 957/*----------------------------------------------------------------------*/
888/* xterm sequences - title, iconName, color (exptl) */ 958/* xterm sequences - title, iconName, color (exptl) */
889void 959void
890rxvt_term::set_title (const char *str) 960rxvt_term::set_title (const char *str)
891{ 961{
892#ifdef SMART_WINDOW_TITLE 962 set_string_property (XA_WM_NAME, str);
893 char *name; 963#if ENABLE_FRILLS
894 964 set_utf8_property (xa[XA_NET_WM_NAME], str);
895 if (!XFetchName (display->display, TermWin.parent[0], &name))
896 name = NULL;
897
898 if (name == NULL || STRCMP (name, str))
899#endif
900 XStoreName (display->display, TermWin.parent[0], str);
901
902#ifdef SMART_WINDOW_TITLE
903 if (name)
904 XFree (name);
905#endif 965#endif
906} 966}
907 967
908void 968void
909rxvt_term::set_icon_name (const char *str) 969rxvt_term::set_icon_name (const char *str)
910{ 970{
911#ifdef SMART_WINDOW_TITLE 971 set_string_property (XA_WM_ICON_NAME, str);
912 char *name; 972#if ENABLE_FRILLS
913 973 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str);
914 if (!XGetIconName (display->display, TermWin.parent[0], &name))
915 name = NULL;
916
917 if (name == NULL || STRCMP (name, str))
918#endif
919 XSetIconName (display->display, TermWin.parent[0], str);
920
921#ifdef SMART_WINDOW_TITLE
922 if (name)
923 XFree (name);
924#endif 974#endif
925} 975}
926 976
927#ifdef XTERM_COLOR_CHANGE 977#ifdef XTERM_COLOR_CHANGE
928void 978void
936 986
937 /* handle color aliases */ 987 /* handle color aliases */
938 if (isdigit (*color)) 988 if (isdigit (*color))
939 { 989 {
940 i = atoi (color); 990 i = atoi (color);
991
941 if (i >= 8 && i <= 15) 992 if (i >= 8 && i <= 15)
942 { /* bright colors */ 993 { /* bright colors */
943 i -= 8; 994 i -= 8;
944# ifndef NO_BRIGHTCOLOR 995# ifndef NO_BRIGHTCOLOR
945 PixColors[idx] = PixColors[minBrightCOLOR + i]; 996 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i];
946 SET_PIXCOLOR (idx); 997 SET_PIXCOLOR (idx);
947 goto Done; 998 goto Done;
948# endif 999# endif
949
950 } 1000 }
1001
951 if (i >= 0 && i <= 7) 1002 if (i >= 0 && i <= 7)
952 { /* normal colors */ 1003 { /* normal colors */
953 PixColors[idx] = PixColors[minCOLOR + i]; 1004 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];
954 SET_PIXCOLOR (idx); 1005 SET_PIXCOLOR (idx);
955 goto Done; 1006 goto Done;
956 } 1007 }
957 } 1008 }
958 1009
959 if (!rXParseAllocColor (& xcol, color)) 1010 if (!rXParseAllocColor (&xcol, color))
960 return; 1011 return;
961 1012
962 /* XStoreColor (display->display, XCMAP, XColor*); */ 1013 /* XStoreColor (display->display, display->cmap, XColor*); */
963 1014
964 /* 1015 /*
965 * FIXME: should free colors here, but no idea how to do it so instead, 1016 * FIXME: should free colors here, but no idea how to do it so instead,
966 * so just keep gobbling up the colormap 1017 * so just keep gobbling up the colormap
967 */ 1018 */
968# if 0 1019# if 0
969 for (i = Color_Black; i <= Color_White; i++) 1020 for (i = Color_Black; i <= Color_White; i++)
970 if (PixColors[idx] == PixColors[i]) 1021 if (pix_colors[idx] == pix_colors[i])
971 break; 1022 break;
972 if (i > Color_White) 1023 if (i > Color_White)
973 { 1024 {
974 /* fprintf (stderr, "XFreeColors: PixColors [%d] = %lu\n", idx, PixColors [idx]); */ 1025 /* fprintf (stderr, "XFreeColors: pix_colors [%d] = %lu\n", idx, pix_colors [idx]); */
975 XFreeColors (display->display, XCMAP, (PixColors + idx), 1, 1026 XFreeColors (display->display, display->cmap, (pix_colors + idx), 1,
976 DisplayPlanes (display->display, display->screen)); 1027 DisplayPlanes (display->display, display->screen));
977 } 1028 }
978# endif 1029# endif
979 1030
980 PixColors[idx] = xcol; 1031 pix_colors_focused[idx] = xcol;
981 SET_PIXCOLOR (idx); 1032 SET_PIXCOLOR (idx);
982 1033
983 /* XSetWindowAttributes attr; */ 1034 /* XSetWindowAttributes attr; */
984 /* Cursor cursor; */ 1035 /* Cursor cursor; */
985Done: 1036Done:
986 if (idx == Color_bg && ! (Options & Opt_transparent)) 1037#ifdef OFF_FOCUS_FADING
987 XSetWindowBackground (display->display, TermWin.vt, 1038 if (rs[Rs_fade])
988 PixColors[Color_bg]); 1039 pix_colors_unfocused[idx] = pix_colors_focused[idx].fade (display, atoi (rs[Rs_fade]));
1040#endif
989 1041
990 /* handle Color_BD, scrollbar background, etc. */ 1042 /*TODO: handle Color_BD, scrollbar background, etc. */
991 1043
992 set_colorfgbg ();
993 recolour_cursor (); 1044 recolour_cursor ();
994 scr_touch (true); 1045 scr_recolour ();
995} 1046}
996 1047
997#else 1048#else
998# define set_window_color (idx,color) ((void)0) 1049# define set_window_color (idx,color) ((void)0)
999#endif /* XTERM_COLOR_CHANGE */ 1050#endif /* XTERM_COLOR_CHANGE */
1001void 1052void
1002rxvt_term::recolour_cursor () 1053rxvt_term::recolour_cursor ()
1003{ 1054{
1004 XColor xcol[2]; 1055 XColor xcol[2];
1005 1056
1006 xcol[0].pixel = ISSET_PIXCOLOR (Color_pointer_fg) ? PixColors[Color_pointer_fg] : PixColors[Color_fg]; 1057 xcol[0].pixel = ISSET_PIXCOLOR (Color_pointer_fg)
1007 xcol[1].pixel = ISSET_PIXCOLOR (Color_pointer_bg) ? PixColors[Color_pointer_bg] : PixColors[Color_bg]; 1058 ? pix_colors_focused[Color_pointer_fg]
1059 : pix_colors_focused[Color_fg];
1060 xcol[1].pixel = ISSET_PIXCOLOR (Color_pointer_bg)
1061 ? pix_colors_focused[Color_pointer_bg]
1062 : pix_colors_focused[Color_bg];
1063
1008 XQueryColors (display->display, XCMAP, xcol, 2); 1064 XQueryColors (display->display, display->cmap, xcol, 2);
1009 XRecolorCursor (display->display, TermWin_cursor, xcol + 0, xcol + 1); 1065 XRecolorCursor (display->display, TermWin_cursor, xcol + 0, xcol + 1);
1010} 1066}
1011 1067
1012/*----------------------------------------------------------------------*/ 1068/*----------------------------------------------------------------------*/
1013/* 1069/*
1014 * find if fg/bg matches any of the normal (low-intensity) colors 1070 * find if fg/bg matches any of the normal (low-intensity) colors
1015 */ 1071 */
1016void 1072void
1017rxvt_term::set_colorfgbg () 1073rxvt_term::set_colorfgbg ()
1018{ 1074{
1019 unsigned int i; 1075 unsigned int i;
1020 const char *xpmb = "\0"; 1076 const char *xpmb = "\0";
1021 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1]; 1077 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1];
1022 1078
1023 env_colorfgbg =
1024 (char *)rxvt_malloc (sizeof ("COLORFGBG=default;default;bg") + 1); 1079 env_colorfgbg = (char *)rxvt_malloc (sizeof ("COLORFGBG=default;default;bg") + 1);
1025 STRCPY (fstr, "default"); 1080 strcpy (fstr, "default");
1026 STRCPY (bstr, "default"); 1081 strcpy (bstr, "default");
1027 for (i = Color_Black; i <= Color_White; i++) 1082 for (i = Color_Black; i <= Color_White; i++)
1028 if (PixColors[Color_fg] == PixColors[i]) 1083 if (pix_colors[Color_fg] == pix_colors[i])
1029 { 1084 {
1030 sprintf (fstr, "%d", (i - Color_Black)); 1085 sprintf (fstr, "%d", (i - Color_Black));
1031 break; 1086 break;
1032 } 1087 }
1088
1033 for (i = Color_Black; i <= Color_White; i++) 1089 for (i = Color_Black; i <= Color_White; i++)
1034 if (PixColors[Color_bg] == PixColors[i]) 1090 if (pix_colors[Color_bg] == pix_colors[i])
1035 { 1091 {
1036 sprintf (bstr, "%d", (i - Color_Black)); 1092 sprintf (bstr, "%d", (i - Color_Black));
1037#ifdef XPM_BACKGROUND 1093#ifdef XPM_BACKGROUND
1038 xpmb = "default;"; 1094 xpmb = "default;";
1039#endif 1095#endif
1040 break; 1096 break;
1041 } 1097 }
1042 1098
1043 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr); 1099 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr);
1044
1045#ifndef NO_BRIGHTCOLOR
1046 colorfgbg = DEFAULT_RSTYLE;
1047 for (i = minCOLOR; i <= maxCOLOR; i++)
1048 {
1049 if (PixColors[Color_fg] == PixColors[i])
1050 colorfgbg = SET_FGCOLOR (colorfgbg, i);
1051 if (PixColors[Color_bg] == PixColors[i])
1052 colorfgbg = SET_BGCOLOR (colorfgbg, i);
1053 }
1054#endif
1055} 1100}
1056 1101
1057/*----------------------------------------------------------------------*/ 1102/*----------------------------------------------------------------------*/
1058/*
1059 * Colour determination for low colour displays, routine from
1060 * Hans de Goede <hans@highrise.nl>
1061 */
1062 1103
1063int 1104int
1064rxvt_term::rXParseAllocColor (rxvt_color *screen_in_out, const char *colour) 1105rxvt_term::rXParseAllocColor (rxvt_color *screen_in_out, const char *colour)
1065{ 1106{
1066 if (!screen_in_out->set (display, colour)) 1107 if (!screen_in_out->set (display, colour))
1077 * -------------------------------------------------------------------- */ 1118 * -------------------------------------------------------------------- */
1078void 1119void
1079rxvt_term::resize_all_windows (unsigned int width, unsigned int height, int ignoreparent) 1120rxvt_term::resize_all_windows (unsigned int width, unsigned int height, int ignoreparent)
1080{ 1121{
1081 int fix_screen; 1122 int fix_screen;
1082
1083#ifdef SMART_RESIZE 1123#ifdef SMART_RESIZE
1084 int old_width = szHint.width, old_height = szHint.height; 1124 int old_width = szHint.width, old_height = szHint.height;
1085#endif 1125#endif
1126 dDisp;
1086 1127
1087 window_calc (width, height); 1128 window_calc (width, height);
1088 XSetWMNormalHints (display->display, TermWin.parent[0], &szHint); 1129 XSetWMNormalHints (disp, TermWin.parent[0], &szHint);
1089 1130
1090 if (!ignoreparent) 1131 if (!ignoreparent)
1091 { 1132 {
1092#ifdef SMART_RESIZE 1133#ifdef SMART_RESIZE
1093 /* 1134 /*
1097 int x, y, x1, y1; 1138 int x, y, x1, y1;
1098 int dx, dy; 1139 int dx, dy;
1099 unsigned int unused_w1, unused_h1, unused_b1, unused_d1; 1140 unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
1100 Window unused_cr; 1141 Window unused_cr;
1101 1142
1102 XTranslateCoordinates (display->display, TermWin.parent[0], display->root, 1143 XTranslateCoordinates (disp, TermWin.parent[0], display->root,
1103 0, 0, &x, &y, &unused_cr); 1144 0, 0, &x, &y, &unused_cr);
1104 XGetGeometry (display->display, TermWin.parent[0], &unused_cr, &x1, &y1, 1145 XGetGeometry (disp, TermWin.parent[0], &unused_cr, &x1, &y1,
1105 &unused_w1, &unused_h1, &unused_b1, &unused_d1); 1146 &unused_w1, &unused_h1, &unused_b1, &unused_d1);
1106 /* 1147 /*
1107 * if display->root isn't the parent window, a WM will probably have offset 1148 * if display->root isn't the parent window, a WM will probably have offset
1108 * our position for handles and decorations. Counter it 1149 * our position for handles and decorations. Counter it
1109 */ 1150 */
1111 { 1152 {
1112 x -= x1; 1153 x -= x1;
1113 y -= y1; 1154 y -= y1;
1114 } 1155 }
1115 1156
1116 x1 = (DisplayWidth (display->display, display->screen) - old_width) / 2; 1157 x1 = (DisplayWidth (disp, display->screen) - old_width) / 2;
1117 y1 = (DisplayHeight (display->display, display->screen) - old_height) / 2; 1158 y1 = (DisplayHeight (disp, display->screen) - old_height) / 2;
1118 dx = old_width - szHint.width; 1159 dx = old_width - szHint.width;
1119 dy = old_height - szHint.height; 1160 dy = old_height - szHint.height;
1120 1161
1121 /* Check position of the center of the window */ 1162 /* Check position of the center of the window */
1122 if (x < x1) /* left half */ 1163 if (x < x1) /* left half */
1126 if (y < y1) /* top half */ 1167 if (y < y1) /* top half */
1127 dy = 0; 1168 dy = 0;
1128 else if (y == y1) /* exact center */ 1169 else if (y == y1) /* exact center */
1129 dy /= 2; 1170 dy /= 2;
1130 1171
1131 XMoveResizeWindow (display->display, TermWin.parent[0], x + dx, y + dy, 1172 XMoveResizeWindow (disp, TermWin.parent[0], x + dx, y + dy,
1132 szHint.width, szHint.height); 1173 szHint.width, szHint.height);
1133#else 1174#else
1134 XResizeWindow (display->display, TermWin.parent[0], szHint.width, szHint.height); 1175 XResizeWindow (disp, TermWin.parent[0], szHint.width, szHint.height);
1135#endif 1176#endif
1136 } 1177 }
1137 1178
1138 fix_screen = TermWin.ncol != prev_ncol || TermWin.nrow != prev_nrow; 1179 fix_screen = TermWin.ncol != prev_ncol || TermWin.nrow != prev_nrow;
1139 1180
1140 if (fix_screen || width != old_width || height != old_height) 1181 if (fix_screen || width != old_width || height != old_height)
1141 { 1182 {
1142 if (scrollbar_visible ()) 1183 if (scrollbar_visible ())
1143 { 1184 {
1144 XMoveResizeWindow (display->display, scrollBar.win, 1185 XMoveResizeWindow (disp, scrollBar.win,
1145 window_sb_x, 0, 1186 window_sb_x, 0,
1146 scrollbar_TotalWidth (), szHint.height); 1187 scrollbar_TotalWidth (), szHint.height);
1147 resize_scrollbar (); 1188 resize_scrollbar ();
1148 } 1189 }
1149 1190
1150 if (menubar_visible ()) 1191 if (menubar_visible ())
1151 XMoveResizeWindow (display->display, menuBar.win, 1192 XMoveResizeWindow (disp, menuBar.win,
1152 window_vt_x, 0, 1193 window_vt_x, 0,
1153 TermWin_TotalWidth (), menuBar_TotalHeight ()); 1194 TermWin_TotalWidth (), menuBar_TotalHeight ());
1154 1195
1155 XMoveResizeWindow (display->display, TermWin.vt, 1196 XMoveResizeWindow (disp, TermWin.vt,
1156 window_vt_x, window_vt_y, 1197 window_vt_x, window_vt_y,
1157 TermWin_TotalWidth (), TermWin_TotalHeight ()); 1198 TermWin_TotalWidth (), TermWin_TotalHeight ());
1199
1158 scr_clear (); 1200 scr_clear ();
1159#ifdef XPM_BACKGROUND 1201#ifdef XPM_BACKGROUND
1160 resize_pixmap (); 1202 resize_pixmap ();
1161#endif 1203#endif
1162 } 1204 }
1185 } 1227 }
1186 1228
1187 old_width = szHint.width; 1229 old_width = szHint.width;
1188 old_height = szHint.height; 1230 old_height = szHint.height;
1189 1231
1232#ifdef XPM_BACKGROUND
1233 if (TermWin.pixmap)
1234 scr_touch (false);
1235#endif
1236
1190#ifdef USE_XIM 1237#ifdef USE_XIM
1191 IMSetStatusPosition (); 1238 IMSetStatusPosition ();
1192#endif 1239#endif
1193} 1240}
1194 1241
1207 if (width == 0) 1254 if (width == 0)
1208 width = wattr.width - szHint.base_width; 1255 width = wattr.width - szHint.base_width;
1209 if (height == 0) 1256 if (height == 0)
1210 height = wattr.height - szHint.base_height; 1257 height = wattr.height - szHint.base_height;
1211 } 1258 }
1259
1212 if (width != TermWin.width || height != TermWin.height) 1260 if (width != TermWin.width || height != TermWin.height)
1213 { 1261 {
1214 width += szHint.base_width; 1262 width += szHint.base_width;
1215 height += szHint.base_height; 1263 height += szHint.base_height;
1216 resize_all_windows (width, height, 0); 1264 resize_all_windows (width, height, 0);
1221 * - X INPUT METHOD ROUTINES - * 1269 * - X INPUT METHOD ROUTINES - *
1222 * -------------------------------------------------------------------- */ 1270 * -------------------------------------------------------------------- */
1223#ifdef USE_XIM 1271#ifdef USE_XIM
1224 1272
1225void 1273void
1274rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg)
1275{
1276 fg = pix_colors[Color_fg];
1277 bg = pix_colors[Color_bg];
1278}
1279
1280void
1226rxvt_term::im_set_size (XRectangle *size) 1281rxvt_term::im_set_size (XRectangle &size)
1227{ 1282{
1283 // the int_bwidth terms make no sense to me
1228 size->x = TermWin.int_bwidth; 1284 size.x = TermWin.int_bwidth;
1229 size->y = TermWin.int_bwidth; 1285 size.y = TermWin.int_bwidth;
1230 size->width = Width2Pixel (TermWin.ncol); 1286 size.width = Width2Pixel (TermWin.ncol) + TermWin.int_bwidth;
1231 size->height = Height2Pixel (TermWin.nrow); 1287 size.height = Height2Pixel (TermWin.nrow) + TermWin.int_bwidth;
1232} 1288}
1233 1289
1234void 1290void
1235rxvt_term::im_set_color (unsigned long *fg, unsigned long *bg) 1291rxvt_term::im_set_preedit_area (XRectangle &preedit_rect,
1292 XRectangle &status_rect,
1293 const XRectangle &needed_rect)
1236{ 1294{
1237 *fg = PixColors[Color_fg]; 1295 preedit_rect.x = needed_rect.width;
1238 *bg = PixColors[Color_bg]; 1296 preedit_rect.y = 0;
1297 preedit_rect.width = Width2Pixel (TermWin.ncol) - needed_rect.width + 1;
1298 preedit_rect.height = TermWin.fheight;
1299
1300 status_rect.x = 0;
1301 status_rect.y = 0;
1302 status_rect.width = needed_rect.width ? needed_rect.width : Width2Pixel (TermWin.ncol) + 1;
1303 status_rect.height = TermWin.fheight;
1239} 1304}
1240 1305
1241/* Checking whether input method is running. */ 1306/* Checking whether input method is running. */
1242bool 1307bool
1243rxvt_term::IMisRunning () 1308rxvt_term::IMisRunning ()
1244{ 1309{
1245 char *p; 1310 char *p;
1246 Atom atom; 1311 Atom atom;
1247 Window win; 1312 Window win;
1248 char server[IMBUFSIZ]; 1313 char server[IMBUFSIZ];
1249 1314
1250 /* get current locale modifier */ 1315 /* get current locale modifier */
1251 if ((p = XSetLocaleModifiers (NULL)) != NULL) 1316 if ((p = XSetLocaleModifiers (NULL)) != NULL)
1252 { 1317 {
1253 STRCPY (server, "@server="); 1318 strcpy (server, "@server=");
1254 STRNCAT (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */ 1319 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */
1320
1255 if ((p = STRCHR (server + 1, '@')) != NULL) /* first one only */ 1321 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */
1256 *p = '\0'; 1322 *p = '\0';
1257 1323
1258 atom = XInternAtom (display->display, server, False); 1324 atom = XInternAtom (display->display, server, False);
1259 win = XGetSelectionOwner (display->display, atom); 1325 win = XGetSelectionOwner (display->display, atom);
1326
1260 if (win != None) 1327 if (win != None)
1261 return True; 1328 return True;
1262 } 1329 }
1330
1263 return False; 1331 return False;
1264} 1332}
1265 1333
1266void 1334void
1267rxvt_term::IMSendSpot () 1335rxvt_term::IMSendSpot ()
1268{ 1336{
1269 XPoint spot; 1337 XPoint nspot;
1270 XVaNestedList preedit_attr; 1338 XVaNestedList preedit_attr;
1271 1339
1272 if (Input_Context == NULL 1340 if (!Input_Context
1341 || !TermWin.focus
1273 || !TermWin.focus || ! (input_style & XIMPreeditPosition) 1342 || !(input_style & XIMPreeditPosition))
1274 || ! (event_type == KeyPress
1275 || event_type == Expose
1276 || event_type == NoExpose
1277 || event_type == SelectionNotify
1278 || event_type == ButtonRelease || event_type == FocusIn)
1279 || !IMisRunning ())
1280 return; 1343 return;
1281 1344
1282 im_set_position (&spot); 1345 im_set_position (nspot);
1346
1347 if (nspot.x == spot.x && nspot.y == spot.y)
1348 return;
1349
1350 spot = nspot;
1283 1351
1284 preedit_attr = XVaCreateNestedList (0, XNSpotLocation, &spot, NULL); 1352 preedit_attr = XVaCreateNestedList (0, XNSpotLocation, &spot, NULL);
1285 XSetICValues (Input_Context, XNPreeditAttributes, preedit_attr, NULL); 1353 XSetICValues (Input_Context, XNPreeditAttributes, preedit_attr, NULL);
1286 XFree (preedit_attr); 1354 XFree (preedit_attr);
1287} 1355}
1288 1356
1289void 1357void
1290rxvt_term::im_set_preedit_area (XRectangle * preedit_rect, XRectangle * status_rect,
1291 XRectangle * needed_rect)
1292{
1293 int mbh, vtx = 0;
1294
1295 if (scrollbar_visible () && ! (Options & Opt_scrollBar_right))
1296 vtx = scrollbar_TotalWidth ();
1297
1298 mbh = menubar_visible () ? menuBar_TotalHeight () : 0;
1299 mbh -= TermWin.lineSpace;
1300
1301 preedit_rect->x = needed_rect->width + vtx;
1302 preedit_rect->y = Height2Pixel (TermWin.nrow - 1) + mbh;
1303
1304 preedit_rect->width = Width2Pixel (TermWin.ncol + 1) - needed_rect->width + vtx;
1305 preedit_rect->height = Height2Pixel (1);
1306
1307 status_rect->x = vtx;
1308 status_rect->y = Height2Pixel (TermWin.nrow - 1) + mbh;
1309
1310 status_rect->width = needed_rect->width ? needed_rect->width : Width2Pixel (TermWin.ncol + 1);
1311 status_rect->height = Height2Pixel (1);
1312}
1313
1314void
1315rxvt_term::im_destroy () 1358rxvt_term::im_destroy ()
1316{ 1359{
1317 if (Input_Context)
1318 {
1319 XDestroyIC (Input_Context);
1320 Input_Context = NULL;
1321 }
1322
1323 if (input_method) 1360 if (input_method)
1324 { 1361 {
1362 if (Input_Context && input_method->xim)
1363 XDestroyIC (Input_Context);
1364
1325 display->put_xim (input_method); 1365 display->put_xim (input_method);
1326 input_method = 0; 1366 input_method = 0;
1327 } 1367 }
1368
1369 Input_Context = 0;
1328} 1370}
1329 1371
1330/* 1372/*
1331 * Try to open a XIM with the current modifiers, then see if we can 1373 * Try to open a XIM with the current modifiers, then see if we can
1332 * open a suitable preedit type 1374 * open a suitable preedit type
1333 */ 1375 */
1334bool 1376bool
1335rxvt_term::IM_get_IC (const char *modifiers) 1377rxvt_term::IM_get_IC (const char *modifiers)
1336{ 1378{
1337 int i, j, found; 1379 int i, j, found;
1338 XIM xim; 1380 XIM xim;
1339 XPoint spot; 1381 XPoint spot;
1340 XRectangle rect, status_rect, needed_rect; 1382 XRectangle rect, status_rect, needed_rect;
1341 unsigned long fg, bg; 1383 unsigned long fg, bg;
1342 const char *p; 1384 const char *p;
1343 char **s; 1385 char **s;
1344 XIMStyles *xim_styles; 1386 XIMStyles *xim_styles;
1345 XVaNestedList preedit_attr, status_attr;
1346 1387
1347 if (! ((p = XSetLocaleModifiers (modifiers)) && *p)) 1388 if (! ((p = XSetLocaleModifiers (modifiers)) && *p))
1348 return false; 1389 return false;
1349 1390
1350 D_MAIN ((stderr, "rxvt_IM_get_IC ()")); 1391 D_MAIN ((stderr, "rxvt_IM_get_IC ()"));
1351 input_method = display->get_xim (locale, modifiers); 1392 input_method = display->get_xim (locale, modifiers);
1352 if (input_method == NULL) 1393 if (input_method == NULL)
1353 return false; 1394 return false;
1354 1395
1355 xim = input_method->xim; 1396 xim = input_method->xim;
1397 spot.x = spot.y = -1;
1356 1398
1357 xim_styles = NULL; 1399 xim_styles = NULL;
1358 if (XGetIMValues (xim, XNQueryInputStyle, &xim_styles, NULL) 1400 if (XGetIMValues (xim, XNQueryInputStyle, &xim_styles, NULL)
1359 || !xim_styles || !xim_styles->count_styles) 1401 || !xim_styles || !xim_styles->count_styles)
1360 { 1402 {
1361 display->put_xim (input_method); 1403 im_destroy ();
1362 return false; 1404 return false;
1363 } 1405 }
1364 1406
1365 p = rs[Rs_preeditType] ? rs[Rs_preeditType] : "OverTheSpot,OffTheSpot,Root"; 1407 const char *pet[] = { rs[Rs_preeditType], "OverTheSpot,OffTheSpot,Root,None" };
1408
1409 for (int pi = 0; pi < 2; pi++)
1410 {
1411 p = pet[pi];
1412
1413 if (!p)
1414 continue;
1415
1366 s = rxvt_splitcommastring (p); 1416 s = rxvt_splitcommastring (p);
1417
1367 for (i = found = 0; !found && s[i]; i++) 1418 for (i = found = 0; !found && s[i]; i++)
1368 { 1419 {
1369 if (!STRCMP (s[i], "OverTheSpot")) 1420 if (!strcmp (s[i], "OverTheSpot"))
1370 input_style = (XIMPreeditPosition | XIMStatusNothing); 1421 input_style = (XIMPreeditPosition | XIMStatusNothing);
1371 else if (!STRCMP (s[i], "OffTheSpot")) 1422 else if (!strcmp (s[i], "OffTheSpot"))
1372 input_style = (XIMPreeditArea | XIMStatusArea); 1423 input_style = (XIMPreeditArea | XIMStatusArea);
1373 else if (!STRCMP (s[i], "Root")) 1424 else if (!strcmp (s[i], "Root"))
1374 input_style = (XIMPreeditNothing | XIMStatusNothing); 1425 input_style = (XIMPreeditNothing | XIMStatusNothing);
1426 else if (!strcmp (s[i], "None"))
1427 input_style = (XIMPreeditNone | XIMStatusNone);
1375 1428
1376 for (j = 0; j < xim_styles->count_styles; j++) 1429 for (j = 0; j < xim_styles->count_styles; j++)
1377 if (input_style == xim_styles->supported_styles[j]) 1430 if (input_style == xim_styles->supported_styles[j])
1378 { 1431 {
1432 rxvt_freecommastring (s);
1433
1379 found = 1; 1434 found = 1;
1380 break; 1435 goto foundpet;
1436 }
1437
1381 } 1438 }
1382 }
1383 1439
1384 for (i = 0; s[i]; i++) 1440 rxvt_freecommastring (s);
1385 free (s[i]); 1441 }
1386 1442
1387 free (s); 1443foundpet:
1444
1388 XFree (xim_styles); 1445 XFree (xim_styles);
1389 1446
1390 if (!found) 1447 if (!found)
1391 { 1448 {
1392 display->put_xim (input_method); 1449 im_destroy ();
1393 return false; 1450 return false;
1394 } 1451 }
1395 1452
1396 preedit_attr = status_attr = NULL; 1453 XFontSet fs = 0;
1454 XVaNestedList preedit_attr = 0, status_attr = 0;
1455
1456 if (input_style & (XIMPreeditPosition | XIMPreeditArea))
1457 {
1458 // fake us a font-set, please
1459 char **missing_charset_list;
1460 int missing_charset_count;
1461 char *def_string;
1462 char pat[512];
1463
1464 sprintf (pat,
1465 "-*-*-*-R-*-*-%d-*-*-*-*-*-*,"
1466 "-*-*-*-R-*-*-%d-*-*-*-*-*-*,"
1467 "-*-*-*-R-*-*-%d-*-*-*-*-*-*,"
1468 "-*-*-*-R-*-*-%d-*-*-*-*-*-*,"
1469 "-*-*-*-R-*-*-%d-*-*-*-*-*-*,"
1470 "*",
1471 TermWin.fheight,
1472 TermWin.fheight + 1, TermWin.fheight - 1,
1473 TermWin.fheight - 2, TermWin.fheight + 2);
1474
1475 fs = XCreateFontSet (display->display, rs[Rs_imFont] ? rs[Rs_imFont] : pat,
1476 &missing_charset_list, &missing_charset_count, &def_string);
1477
1478 if (missing_charset_list)
1479 XFreeStringList (missing_charset_list);
1480
1481 if (!fs)
1482 {
1483 input_style &= ~(XIMPreeditPosition | XIMPreeditArea);
1484 rxvt_warn ("unable to create fontset for input method, try \"-pt Root\". Continuing.\n");
1485 }
1486 }
1397 1487
1398 if (input_style & XIMPreeditPosition) 1488 if (input_style & XIMPreeditPosition)
1399 { 1489 {
1400 im_set_size (&rect); 1490 im_set_size (rect);
1401 im_set_position (&spot); 1491 im_set_position (spot);
1402 im_set_color (&fg, &bg); 1492 im_set_color (fg, bg);
1403 1493
1404 preedit_attr = XVaCreateNestedList (0, XNArea, &rect, 1494 preedit_attr = XVaCreateNestedList (0,
1495 XNForeground, fg,
1496 XNBackground, bg,
1497 XNArea, &rect,
1405 XNSpotLocation, &spot, 1498 XNSpotLocation, &spot,
1406 XNForeground, fg, XNBackground, bg,
1407 //XNFontSet, TermWin.fontset, 1499 XNFontSet, fs,
1408 NULL); 1500 NULL);
1409 } 1501 }
1410 else if (input_style & XIMPreeditArea) 1502 else if (input_style & XIMPreeditArea)
1411 { 1503 {
1412 im_set_color (&fg, &bg); 1504 im_set_color (fg, bg);
1413 1505
1414 /* 1506 /*
1415 * The necessary width of preedit area is unknown 1507 * The necessary width of preedit area is unknown
1416 * until create input context. 1508 * until create input context.
1417 */ 1509 */
1418 needed_rect.width = 0; 1510 needed_rect.width = 0;
1419
1420 im_set_preedit_area (&rect, &status_rect, &needed_rect); 1511 im_set_preedit_area (rect, status_rect, needed_rect);
1421 1512
1422 preedit_attr = XVaCreateNestedList (0, XNArea, &rect, 1513 preedit_attr = XVaCreateNestedList (0,
1514 XNForeground, fg,
1423 XNForeground, fg, XNBackground, bg, 1515 XNBackground, bg,
1516 XNArea, &rect,
1517 XNFontSet, fs,
1518 NULL);
1519 status_attr = XVaCreateNestedList (0,
1520 XNForeground, fg,
1521 XNBackground, bg,
1522 XNArea, &status_rect,
1424 //XNFontSet, TermWin.fontset, 1523 XNFontSet, fs,
1425 NULL); 1524 NULL);
1426 status_attr = XVaCreateNestedList (0, XNArea, &status_rect,
1427 XNForeground, fg, XNBackground, bg,
1428 //XNFontSet, TermWin.fontset,
1429 NULL);
1430 } 1525 }
1431 1526
1432 Input_Context = XCreateIC (xim, XNInputStyle, input_style, 1527 Input_Context = XCreateIC (xim,
1528 XNInputStyle, input_style,
1433 XNClientWindow, TermWin.parent[0], 1529 XNClientWindow, TermWin.vt,
1434 XNFocusWindow, TermWin.parent[0], 1530 XNFocusWindow, TermWin.parent[0],
1435 preedit_attr ? XNPreeditAttributes : NULL, 1531 preedit_attr ? XNPreeditAttributes : NULL,
1436 preedit_attr, 1532 preedit_attr,
1437 status_attr ? XNStatusAttributes : NULL, 1533 status_attr ? XNStatusAttributes : NULL,
1438 status_attr, NULL); 1534 status_attr, NULL);
1535
1439 if (preedit_attr) XFree (preedit_attr); 1536 if (preedit_attr) XFree (preedit_attr);
1440 if (status_attr) XFree (status_attr); 1537 if (status_attr) XFree (status_attr);
1538 if (fs) XFreeFontSet (display->display, fs);
1441 1539
1442 if (Input_Context == NULL) 1540 if (Input_Context == NULL)
1443 { 1541 {
1444 rxvt_warn ("failed to create input context, continuing without XIM.\n"); 1542 rxvt_warn ("failed to create input context, continuing without XIM.\n");
1445 display->put_xim (input_method); 1543 im_destroy ();
1446 return false; 1544 return false;
1447 } 1545 }
1448 1546
1449 if (input_style & XIMPreeditArea) 1547 if (input_style & XIMPreeditArea)
1450 IMSetStatusPosition (); 1548 IMSetStatusPosition ();
1459 int i, found, had_im; 1557 int i, found, had_im;
1460 const char *p; 1558 const char *p;
1461 char **s; 1559 char **s;
1462 char buf[IMBUFSIZ]; 1560 char buf[IMBUFSIZ];
1463 1561
1562 SET_R (this);
1563
1464 im_destroy (); 1564 im_destroy ();
1465 1565
1466 D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()")); 1566 D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()"));
1467 if (Input_Context) 1567 if (Input_Context)
1468 return; 1568 return;
1476 if (p && *p) 1576 if (p && *p)
1477 { 1577 {
1478 bool found = false; 1578 bool found = false;
1479 1579
1480 s = rxvt_splitcommastring (p); 1580 s = rxvt_splitcommastring (p);
1581
1481 for (i = 0; s[i]; i++) 1582 for (i = 0; s[i]; i++)
1482 { 1583 {
1483 if (*s[i]) 1584 if (*s[i])
1484 { 1585 {
1485 STRCPY (buf, "@im="); 1586 strcpy (buf, "@im=");
1486 STRNCAT (buf, s[i], IMBUFSIZ - 5); 1587 strncat (buf, s[i], IMBUFSIZ - 5);
1487 if (IM_get_IC (buf)) 1588 if (IM_get_IC (buf))
1488 { 1589 {
1489 found = true; 1590 found = true;
1490 break; 1591 break;
1491 } 1592 }
1492 } 1593 }
1493 } 1594 }
1494 for (i = 0; s[i]; i++) 1595
1495 free (s[i]); 1596 rxvt_freecommastring (s);
1496 free (s);
1497 1597
1498 if (found) 1598 if (found)
1499 goto done; 1599 goto done;
1500 } 1600 }
1501 1601
1515} 1615}
1516 1616
1517void 1617void
1518rxvt_term::IMSetStatusPosition () 1618rxvt_term::IMSetStatusPosition ()
1519{ 1619{
1520 XRectangle preedit_rect, status_rect, *needed_rect; 1620 XRectangle preedit_rect, status_rect, *needed_rect;
1521 XVaNestedList preedit_attr, status_attr; 1621 XVaNestedList preedit_attr, status_attr;
1522 1622
1523 if (Input_Context == NULL 1623 if (!Input_Context
1624 || !TermWin.focus
1524 || !TermWin.focus || ! (input_style & XIMPreeditArea) 1625 || !(input_style & XIMPreeditArea)
1525 || !IMisRunning ()) 1626 || !IMisRunning ())
1526 return; 1627 return;
1527 1628
1528 /* Getting the necessary width of preedit area */ 1629 /* Getting the necessary width of preedit area */
1529 status_attr = XVaCreateNestedList (0, XNAreaNeeded, &needed_rect, NULL); 1630 status_attr = XVaCreateNestedList (0, XNAreaNeeded, &needed_rect, NULL);
1530 XGetICValues (Input_Context, XNStatusAttributes, status_attr, NULL); 1631 XGetICValues (Input_Context, XNStatusAttributes, status_attr, NULL);
1531 XFree (status_attr); 1632 XFree (status_attr);
1532 1633
1533 im_set_preedit_area (&preedit_rect, &status_rect, needed_rect); 1634 im_set_preedit_area (preedit_rect, status_rect, *needed_rect);
1635 XFree (needed_rect);
1534 1636
1535 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL); 1637 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);
1536 status_attr = XVaCreateNestedList (0, XNArea, &status_rect, NULL); 1638 status_attr = XVaCreateNestedList (0, XNArea, &status_rect, NULL);
1537 1639
1538 XSetICValues (Input_Context, 1640 XSetICValues (Input_Context,
1539 XNPreeditAttributes, preedit_attr, 1641 XNPreeditAttributes, preedit_attr,
1540 XNStatusAttributes, status_attr, NULL); 1642 XNStatusAttributes, status_attr, NULL);
1541 1643
1542 XFree (preedit_attr); 1644 XFree (preedit_attr);
1543 XFree (status_attr); 1645 XFree (status_attr);
1544} 1646}
1545#endif /* USE_XIM */ 1647#endif /* USE_XIM */

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines