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.26 by pcg, Sun Feb 1 01:34:41 2004 UTC vs.
Revision 1.117 by root, Mon Nov 29 01:20:42 2004 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines