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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines