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.15 by pcg, Thu Dec 18 05:45:11 2003 UTC vs.
Revision 1.30 by pcg, Thu Feb 12 01:53:25 2004 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines