ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/main.C
(Generate patch)

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines