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

Diff Legend

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