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

Diff Legend

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