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

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines