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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines