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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines