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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines