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.14 by pcg, Thu Dec 18 00:29:29 2003 UTC vs.
Revision 1.31 by pcg, Fri Feb 13 12:11:05 2004 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines