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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines