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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines