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

Diff Legend

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