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.66 by pcg, Thu Apr 8 20:31:45 2004 UTC vs.
Revision 1.154 by root, Sat Dec 31 17:16:17 2005 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines