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.18 by pcg, Fri Dec 19 06:17:03 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.18 2003/12/19 06:17:03 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 ()
77: destroy_ev (this, &rxvt_term::destroy_cb), 76 :
77 rootwin_ev (this, &rxvt_term::rootwin_cb),
78 termwin_ev (this, &rxvt_term::x_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),
85 check_ev (this, &rxvt_term::check_cb), 95 check_ev (this, &rxvt_term::check_cb),
96 destroy_ev (this, &rxvt_term::destroy_cb),
97 pty_ev (this, &rxvt_term::pty_cb),
86 incr_ev (this, &rxvt_term::incr_cb), 98 incr_ev (this, &rxvt_term::incr_cb),
99#ifdef USE_XIM
87 pty_ev (this, &rxvt_term::pty_cb) 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
… …
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 resize_scrollbar (); /* 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/*----------------------------------------------------------------------*/
… …
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 */
526void 557void
527rxvt_term::window_calc (unsigned int width, unsigned int height) 558rxvt_term::window_calc (unsigned int width, unsigned int height)
528{ 559{
529 short recalc_x, recalc_y; 560 short recalc_x, recalc_y;
530 int x, y, sb_w, mb_h, flags; 561 int x, y, sb_w, mb_h, flags;
531 unsigned int w, h; 562 unsigned int w, h;
532 unsigned int max_width, max_height; 563 unsigned int max_width, max_height;
533 564
534 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",
535 TermWin.ncol, TermWin.nrow, szHint.width, 566 TermWin.ncol, TermWin.nrow, szHint.width,
536 szHint.height)); 567 szHint.height));
537 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity; 568 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity;
538 szHint.win_gravity = NorthWestGravity; 569 szHint.win_gravity = NorthWestGravity;
539/* szHint.min_aspect.x = szHint.min_aspect.y = 1; */ 570 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */
540 571
541 recalc_x = recalc_y = 0; 572 recalc_x = recalc_y = 0;
542 flags = 0; 573 flags = 0;
543 if (!parsed_geometry) { 574 if (!parsed_geometry)
575 {
544 parsed_geometry = 1; 576 parsed_geometry = 1;
545 if (rs[Rs_geometry]) 577 if (rs[Rs_geometry])
546 flags = XParseGeometry(rs[Rs_geometry], &x, &y, &w, &h); 578 flags = XParseGeometry(rs[Rs_geometry], &x, &y, &w, &h);
547 if (flags & WidthValue) { 579 if (flags & WidthValue)
580 {
548 TermWin.ncol = BOUND_POSITIVE_INT16(w); 581 TermWin.ncol = BOUND_POSITIVE_INT16(w);
549 szHint.flags |= USSize; 582 szHint.flags |= USSize;
550 } 583 }
551 if (flags & HeightValue) { 584 if (flags & HeightValue)
585 {
552 TermWin.nrow = BOUND_POSITIVE_INT16(h); 586 TermWin.nrow = BOUND_POSITIVE_INT16(h);
553 szHint.flags |= USSize; 587 szHint.flags |= USSize;
554 } 588 }
555 if (flags & XValue) { 589 if (flags & XValue)
590 {
556 szHint.x = x; 591 szHint.x = x;
557 szHint.flags |= USPosition; 592 szHint.flags |= USPosition;
558 if (flags & XNegative) { 593 if (flags & XNegative)
594 {
559 recalc_x = 1; 595 recalc_x = 1;
560 szHint.win_gravity = NorthEastGravity; 596 szHint.win_gravity = NorthEastGravity;
561 } 597 }
562 } 598 }
563 if (flags & YValue) { 599 if (flags & YValue)
600 {
564 szHint.y = y; 601 szHint.y = y;
565 szHint.flags |= USPosition; 602 szHint.flags |= USPosition;
566 if (flags & YNegative) { 603 if (flags & YNegative)
604 {
567 recalc_y = 1; 605 recalc_y = 1;
568 if (szHint.win_gravity == NorthEastGravity) 606 if (szHint.win_gravity == NorthEastGravity)
569 szHint.win_gravity = SouthEastGravity; 607 szHint.win_gravity = SouthEastGravity;
570 else 608 else
571 szHint.win_gravity = SouthWestGravity; 609 szHint.win_gravity = SouthWestGravity;
572 } 610 }
573 } 611 }
574 } 612 }
575/* TODO: BOUNDS */ 613 /* TODO: BOUNDS */
576 TermWin.width = TermWin.ncol * TermWin.fwidth; 614 TermWin.width = TermWin.ncol * TermWin.fwidth;
577 TermWin.height = TermWin.nrow * TermWin.fheight; 615 TermWin.height = TermWin.nrow * TermWin.fheight;
578 max_width = MAX_COLS * TermWin.fwidth; 616 max_width = MAX_COLS * TermWin.fwidth;
579 max_height = MAX_ROWS * TermWin.fheight; 617 max_height = MAX_ROWS * TermWin.fheight;
580 618
581 szHint.base_width = szHint.base_height = 2 * TermWin.int_bwidth; 619 szHint.base_width = szHint.base_height = 2 * TermWin.int_bwidth;
582 620
583 sb_w = mb_h = 0; 621 sb_w = mb_h = 0;
584 window_vt_x = window_vt_y = 0; 622 window_vt_x = window_vt_y = 0;
585 if (scrollbar_visible (this)) { 623 if (scrollbar_visible ())
624 {
586 sb_w = scrollbar_TotalWidth(); 625 sb_w = scrollbar_TotalWidth();
587 szHint.base_width += sb_w; 626 szHint.base_width += sb_w;
588 if (!(Options & Opt_scrollBar_right)) 627 if (!(Options & Opt_scrollBar_right))
589 window_vt_x = sb_w; 628 window_vt_x = sb_w;
590 } 629 }
591 if (menubar_visible (this)) { 630 if (menubar_visible ())
631 {
592 mb_h = menuBar_TotalHeight(); 632 mb_h = menuBar_TotalHeight();
593 szHint.base_height += mb_h; 633 szHint.base_height += mb_h;
594 window_vt_y = mb_h; 634 window_vt_y = mb_h;
595 } 635 }
596 szHint.width_inc = TermWin.fwidth; 636 szHint.width_inc = TermWin.fwidth;
597 szHint.height_inc = TermWin.fheight; 637 szHint.height_inc = TermWin.fheight;
598 szHint.min_width = szHint.base_width + szHint.width_inc; 638 szHint.min_width = szHint.base_width + szHint.width_inc;
599 szHint.min_height = szHint.base_height + szHint.height_inc; 639 szHint.min_height = szHint.base_height + szHint.height_inc;
600 640
601 if (width && width - szHint.base_width < max_width) { 641 if (width && width - szHint.base_width < max_width)
642 {
602 szHint.width = width; 643 szHint.width = width;
603 TermWin.width = width - szHint.base_width; 644 TermWin.width = width - szHint.base_width;
604 } else { 645 }
646 else
647 {
605 MIN_IT(TermWin.width, max_width); 648 MIN_IT(TermWin.width, max_width);
606 szHint.width = szHint.base_width + TermWin.width; 649 szHint.width = szHint.base_width + TermWin.width;
607 } 650 }
608 if (height && height - szHint.base_height < max_height) { 651 if (height && height - szHint.base_height < max_height)
652 {
609 szHint.height = height; 653 szHint.height = height;
610 TermWin.height = height - szHint.base_height; 654 TermWin.height = height - szHint.base_height;
611 } else { 655 }
656 else
657 {
612 MIN_IT(TermWin.height, max_height); 658 MIN_IT(TermWin.height, max_height);
613 szHint.height = szHint.base_height + TermWin.height; 659 szHint.height = szHint.base_height + TermWin.height;
614 } 660 }
615 if (scrollbar_visible (this) && (Options & Opt_scrollBar_right)) 661 if (scrollbar_visible () && (Options & Opt_scrollBar_right))
616 window_sb_x = szHint.width - sb_w; 662 window_sb_x = szHint.width - sb_w;
617 663
618 if (recalc_x) 664 if (recalc_x)
619 szHint.x += (DisplayWidth (Xdisplay, DefaultScreen (Xdisplay)) 665 szHint.x += (DisplayWidth (display->display, DefaultScreen (display->display))
620 - szHint.width - 2 * TermWin.ext_bwidth); 666 - szHint.width - 2 * TermWin.ext_bwidth);
621 if (recalc_y) 667 if (recalc_y)
622 szHint.y += (DisplayHeight (Xdisplay, DefaultScreen (Xdisplay)) 668 szHint.y += (DisplayHeight (display->display, DefaultScreen (display->display))
623 - szHint.height - 2 * TermWin.ext_bwidth); 669 - szHint.height - 2 * TermWin.ext_bwidth);
624 670
625 TermWin.ncol = TermWin.width / TermWin.fwidth; 671 TermWin.ncol = TermWin.width / TermWin.fwidth;
626 TermWin.nrow = TermWin.height / TermWin.fheight; 672 TermWin.nrow = TermWin.height / TermWin.fheight;
627 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",
628 TermWin.ncol, TermWin.nrow, szHint.width, 674 TermWin.ncol, TermWin.nrow, szHint.width,
629 szHint.height)); 675 szHint.height));
630 return; 676 return;
631} 677}
632 678
633/*----------------------------------------------------------------------*/ 679/*----------------------------------------------------------------------*/
634/* 680/*
635 * Tell the teletype handler what size the window is. 681 * Tell the teletype handler what size the window is.
636 * Called after a window size change. 682 * Called after a window size change.
637 */ 683 */
638void 684void
639rxvt_term::tt_winch () 685rxvt_term::tt_winch ()
640{ 686{
641 struct winsize ws; 687 struct winsize ws;
642 688
643 if (cmd_fd < 0) 689 if (cmd_fd < 0)
644 return; 690 return;
645 691
646 ws.ws_col = TermWin.ncol; 692 ws.ws_col = TermWin.ncol;
… …
664 * init = 1 - initialize 710 * init = 1 - initialize
665 * 711 *
666 * fontname == FONT_UP - switch to bigger font 712 * fontname == FONT_UP - switch to bigger font
667 * fontname == FONT_DN - switch to smaller font 713 * fontname == FONT_DN - switch to smaller font
668 */ 714 */
669/* EXTPROTO */
670void 715void
671rxvt_change_font(pR_ int init, const char *fontname) 716rxvt_term::change_font (int init, const char *fontname)
672{ 717{}
673}
674 718
675/* INTPROTO */
676void 719void
677rxvt_font_up_down(pR_ int n, int direction) 720rxvt_term::font_up_down (int n, int direction)
678{ 721{}
679}
680 722
681/*----------------------------------------------------------------------*/ 723/*----------------------------------------------------------------------*/
682/*----------------------------------------------------------------------*/ 724/*----------------------------------------------------------------------*/
683/* xterm sequences - title, iconName, color (exptl) */ 725/* xterm sequences - title, iconName, color (exptl) */
684/* EXTPROTO */
685void 726void
686rxvt_set_title(pR_ const char *str) 727rxvt_term::set_title (const char *str)
687{ 728{
688#ifndef SMART_WINDOW_TITLE 729#ifndef SMART_WINDOW_TITLE
689 XStoreName(R->Xdisplay, R->TermWin.parent[0], str); 730 XStoreName(display->display, TermWin.parent[0], str);
690#else 731#else
691 char *name; 732 char *name;
692 733
693 if (XFetchName(R->Xdisplay, R->TermWin.parent[0], &name) == 0) 734 if (XFetchName(display->display, TermWin.parent[0], &name) == 0)
694 name = NULL; 735 name = NULL;
695 if (name == NULL || STRCMP(name, str)) 736 if (name == NULL || STRCMP(name, str))
696 XStoreName(R->Xdisplay, R->TermWin.parent[0], str); 737 XStoreName(display->display, TermWin.parent[0], str);
697 if (name) 738 if (name)
698 XFree(name); 739 XFree(name);
699#endif 740#endif
700} 741}
701 742
702/* EXTPROTO */
703void 743void
704rxvt_set_iconName(pR_ const char *str) 744rxvt_term::set_iconName (const char *str)
705{ 745{
706#ifndef SMART_WINDOW_TITLE 746#ifndef SMART_WINDOW_TITLE
707 XSetIconName(R->Xdisplay, R->TermWin.parent[0], str); 747 XSetIconName(display->display, TermWin.parent[0], str);
708#else 748#else
709 char *name; 749 char *name;
710 750
711 if (XGetIconName(R->Xdisplay, R->TermWin.parent[0], &name)) 751 if (XGetIconName(display->display, TermWin.parent[0], &name))
712 name = NULL; 752 name = NULL;
713 if (name == NULL || STRCMP(name, str)) 753 if (name == NULL || STRCMP(name, str))
714 XSetIconName(R->Xdisplay, R->TermWin.parent[0], str); 754 XSetIconName(display->display, TermWin.parent[0], str);
715 if (name) 755 if (name)
716 XFree(name); 756 XFree(name);
717#endif 757#endif
718} 758}
719 759
720#ifdef XTERM_COLOR_CHANGE 760#ifdef XTERM_COLOR_CHANGE
721/* EXTPROTO */
722void 761void
723rxvt_set_window_color(pR_ int idx, const char *color) 762rxvt_term::set_window_color (int idx, const char *color)
724{ 763{
725 rxvt_color xcol; 764 rxvt_color xcol;
726 int i; 765 int i;
727 766
728 if (color == NULL || *color == '\0') 767 if (color == NULL || *color == '\0')
729 return; 768 return;
730 769
731/* handle color aliases */ 770 /* handle color aliases */
732 if (isdigit(*color)) { 771 if (isdigit(*color))
772 {
733 i = atoi(color); 773 i = atoi(color);
774 if (i >= 8 && i <= 15)
734 if (i >= 8 && i <= 15) { /* bright colors */ 775 { /* bright colors */
735 i -= 8; 776 i -= 8;
736# ifndef NO_BRIGHTCOLOR 777# ifndef NO_BRIGHTCOLOR
737 R->PixColors[idx] = R->PixColors[minBrightCOLOR + i]; 778 PixColors[idx] = PixColors[minBrightCOLOR + i];
738 SET_PIXCOLOR(R, idx); 779 SET_PIXCOLOR(idx);
739 goto Done; 780 goto Done;
740# endif 781# endif
782
741 } 783 }
742 if (i >= 0 && i <= 7) { /* normal colors */ 784 if (i >= 0 && i <= 7)
785 { /* normal colors */
743 R->PixColors[idx] = R->PixColors[minCOLOR + i]; 786 PixColors[idx] = PixColors[minCOLOR + i];
744 SET_PIXCOLOR(R, idx); 787 SET_PIXCOLOR(idx);
745 goto Done; 788 goto Done;
746 } 789 }
747 } 790 }
748 if (!rxvt_rXParseAllocColor(aR_ & xcol, color)) 791 if (!rXParseAllocColor (& xcol, color))
749 return; 792 return;
750/* XStoreColor (R->Xdisplay, XCMAP, XColor*); */ 793 /* XStoreColor (display->display, XCMAP, XColor*); */
751 794
752/* 795 /*
753 * 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,
754 * so just keep gobbling up the colormap 797 * so just keep gobbling up the colormap
755 */ 798 */
756# if 0 799# if 0
757 for (i = Color_Black; i <= Color_White; i++) 800 for (i = Color_Black; i <= Color_White; i++)
758 if (R->PixColors[idx] == R->PixColors[i]) 801 if (PixColors[idx] == PixColors[i])
759 break; 802 break;
760 if (i > Color_White) { 803 if (i > Color_White)
804 {
761 /* fprintf (stderr, "XFreeColors: R->PixColors [%d] = %lu\n", idx, R->PixColors [idx]); */ 805 /* fprintf (stderr, "XFreeColors: PixColors [%d] = %lu\n", idx, PixColors [idx]); */
762 XFreeColors(R->Xdisplay, XCMAP, (R->PixColors + idx), 1, 806 XFreeColors(display->display, XCMAP, (PixColors + idx), 1,
763 DisplayPlanes(R->Xdisplay, Xscreen)); 807 DisplayPlanes(display->display, display->screen));
764 } 808 }
765# endif 809# endif
766 810
767 R->PixColors[idx] = xcol; 811 PixColors[idx] = xcol;
768 SET_PIXCOLOR(R, idx); 812 SET_PIXCOLOR(idx);
769 813
770/* XSetWindowAttributes attr; */ 814 /* XSetWindowAttributes attr; */
771/* Cursor cursor; */ 815 /* Cursor cursor; */
772 Done: 816Done:
773 if (idx == Color_bg && !(R->Options & Opt_transparent)) 817 if (idx == Color_bg && !(Options & Opt_transparent))
774 XSetWindowBackground(R->Xdisplay, R->TermWin.vt, 818 XSetWindowBackground(display->display, TermWin.vt,
775 R->PixColors[Color_bg]); 819 PixColors[Color_bg]);
776 820
777/* handle Color_BD, scrollbar background, etc. */ 821 /* handle Color_BD, scrollbar background, etc. */
778 822
779 rxvt_set_colorfgbg (aR); 823 set_colorfgbg ();
780 R->recolour_cursor (); 824 recolour_cursor ();
781/* the only reasonable way to enforce a clean update */ 825 /* the only reasonable way to enforce a clean update */
782 rxvt_scr_poweron (aR); 826 scr_poweron ();
783} 827}
784 828
785#else 829#else
786# define rxvt_set_window_color(aR_ idx,color) ((void)0) 830# define set_window_color (idx,color) ((void)0)
787#endif /* XTERM_COLOR_CHANGE */ 831#endif /* XTERM_COLOR_CHANGE */
788 832
789void 833void
790rxvt_term::recolour_cursor () 834rxvt_term::recolour_cursor ()
791{ 835{
792#if TODO 836#if TODO
793 rxvt_color xcol[2]; 837 rxvt_color xcol[2];
794 838
795 xcol[0] = PixColors[Color_pointer]; 839 xcol[0] = PixColors[Color_pointer];
796 xcol[1] = PixColors[Color_bg]; 840 xcol[1] = PixColors[Color_bg];
797 XQueryColors (Xdisplay, XCMAP, xcol, 2); 841 XQueryColors (display->display, XCMAP, xcol, 2);
798 XRecolorCursor (Xdisplay, TermWin_cursor, &(xcol[0]), &(xcol[1])); 842 XRecolorCursor (display->display, TermWin_cursor, &(xcol[0]), &(xcol[1]));
799#endif 843#endif
800} 844}
801 845
802/*----------------------------------------------------------------------*/ 846/*----------------------------------------------------------------------*/
803/* 847/*
804 * 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
805 */ 849 */
806/* INTPROTO */
807void 850void
808rxvt_set_colorfgbg(pR) 851rxvt_term::set_colorfgbg ()
809{ 852{
810 unsigned int i; 853 unsigned int i;
811 const char *xpmb = "\0"; 854 const char *xpmb = "\0";
812 char fstr[sizeof("default") + 1], bstr[sizeof("default") + 1]; 855 char fstr[sizeof("default") + 1], bstr[sizeof("default") + 1];
813 856
814 R->env_colorfgbg = 857 env_colorfgbg =
815 (char *)rxvt_malloc(sizeof("COLORFGBG=default;default;bg") + 1); 858 (char *)rxvt_malloc(sizeof("COLORFGBG=default;default;bg") + 1);
816 STRCPY(fstr, "default"); 859 STRCPY(fstr, "default");
817 STRCPY(bstr, "default"); 860 STRCPY(bstr, "default");
818 for (i = Color_Black; i <= Color_White; i++) 861 for (i = Color_Black; i <= Color_White; i++)
819 if (R->PixColors[Color_fg] == R->PixColors[i]) { 862 if (PixColors[Color_fg] == PixColors[i])
863 {
820 sprintf(fstr, "%d", (i - Color_Black)); 864 sprintf(fstr, "%d", (i - Color_Black));
821 break; 865 break;
822 } 866 }
823 for (i = Color_Black; i <= Color_White; i++) 867 for (i = Color_Black; i <= Color_White; i++)
824 if (R->PixColors[Color_bg] == R->PixColors[i]) { 868 if (PixColors[Color_bg] == PixColors[i])
869 {
825 sprintf(bstr, "%d", (i - Color_Black)); 870 sprintf(bstr, "%d", (i - Color_Black));
826#ifdef XPM_BACKGROUND 871#ifdef XPM_BACKGROUND
827 xpmb = "default;"; 872 xpmb = "default;";
828#endif 873#endif
829 break; 874 break;
830 } 875 }
831 sprintf(R->env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr); 876 sprintf(env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr);
832 putenv(R->env_colorfgbg); 877 putenv(env_colorfgbg);
833 878
834#ifndef NO_BRIGHTCOLOR 879#ifndef NO_BRIGHTCOLOR
835 R->colorfgbg = DEFAULT_RSTYLE; 880 colorfgbg = DEFAULT_RSTYLE;
836 for (i = minCOLOR; i <= maxCOLOR; i++) { 881 for (i = minCOLOR; i <= maxCOLOR; i++)
882 {
837 if (R->PixColors[Color_fg] == R->PixColors[i]) 883 if (PixColors[Color_fg] == PixColors[i])
838 R->colorfgbg = SET_FGCOLOR(R->colorfgbg, i); 884 colorfgbg = SET_FGCOLOR(colorfgbg, i);
839 if (R->PixColors[Color_bg] == R->PixColors[i]) 885 if (PixColors[Color_bg] == PixColors[i])
840 R->colorfgbg = SET_BGCOLOR(R->colorfgbg, i); 886 colorfgbg = SET_BGCOLOR(colorfgbg, i);
841 } 887 }
842#endif 888#endif
843} 889}
844 890
845/*----------------------------------------------------------------------*/ 891/*----------------------------------------------------------------------*/
846/* 892/*
847 * Colour determination for low colour displays, routine from 893 * Colour determination for low colour displays, routine from
848 * Hans de Goede <hans@highrise.nl> 894 * Hans de Goede <hans@highrise.nl>
849 */ 895 */
850 896
851/* EXTPROTO */
852int 897int
853rxvt_rXParseAllocColor(pR_ rxvt_color * screen_in_out, const char *colour) 898rxvt_term::rXParseAllocColor (rxvt_color *screen_in_out, const char *colour)
854{ 899{
855 screen_in_out->set(aR_ colour);
856
857 if (!screen_in_out->set(aR_ colour)) { 900 if (!screen_in_out->set (display, colour))
901 {
858 rxvt_print_error("can't allocate colour: %s", colour); 902 rxvt_print_error("can't allocate colour: %s", colour);
859 return false; 903 return false;
860 } 904 }
861 905
862 return true; 906 return true;
863} 907}
864 908
865/* -------------------------------------------------------------------- * 909/* -------------------------------------------------------------------- *
866 * - WINDOW RESIZING - * 910 * - WINDOW RESIZING - *
867 * -------------------------------------------------------------------- */ 911 * -------------------------------------------------------------------- */
… …
873#ifdef SMART_RESIZE 917#ifdef SMART_RESIZE
874 int old_width = szHint.width, old_height = szHint.height; 918 int old_width = szHint.width, old_height = szHint.height;
875#endif 919#endif
876 920
877 window_calc (width, height); 921 window_calc (width, height);
878 XSetWMNormalHints (Xdisplay, TermWin.parent[0], &szHint); 922 XSetWMNormalHints (display->display, TermWin.parent[0], &szHint);
879 if (!ignoreparent) 923 if (!ignoreparent)
880 { 924 {
881#ifdef SMART_RESIZE 925#ifdef SMART_RESIZE
882 /* 926 /*
883 * resize by Marius Gedminas <marius.gedminas@uosis.mif.vu.lt> 927 * resize by Marius Gedminas <marius.gedminas@uosis.mif.vu.lt>
… …
886 int x, y, x1, y1; 930 int x, y, x1, y1;
887 int dx, dy; 931 int dx, dy;
888 unsigned int unused_w1, unused_h1, unused_b1, unused_d1; 932 unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
889 Window unused_cr; 933 Window unused_cr;
890 934
891 XTranslateCoordinates (Xdisplay, TermWin.parent[0], Xroot, 935 XTranslateCoordinates (display->display, TermWin.parent[0], display->root,
892 0, 0, &x, &y, &unused_cr); 936 0, 0, &x, &y, &unused_cr);
893 XGetGeometry (Xdisplay, TermWin.parent[0], &unused_cr, &x1, &y1, 937 XGetGeometry (display->display, TermWin.parent[0], &unused_cr, &x1, &y1,
894 &unused_w1, &unused_h1, &unused_b1, &unused_d1); 938 &unused_w1, &unused_h1, &unused_b1, &unused_d1);
895 /* 939 /*
896 * 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
897 * our position for handles and decorations. Counter it 941 * our position for handles and decorations. Counter it
898 */ 942 */
899 if (x1 != x || y1 != y) { 943 if (x1 != x || y1 != y)
944 {
900 x -= x1; 945 x -= x1;
901 y -= y1; 946 y -= y1;
902 } 947 }
903 948
904 x1 = (DisplayWidth (Xdisplay, Xscreen) - old_width) / 2; 949 x1 = (DisplayWidth (display->display, display->screen) - old_width) / 2;
905 y1 = (DisplayHeight (Xdisplay, Xscreen) - old_height) / 2; 950 y1 = (DisplayHeight (display->display, display->screen) - old_height) / 2;
906 dx = old_width - szHint.width; 951 dx = old_width - szHint.width;
907 dy = old_height - szHint.height; 952 dy = old_height - szHint.height;
908 953
909 /* Check position of the center of the window */ 954 /* Check position of the center of the window */
910 if (x < x1) /* left half */ 955 if (x < x1) /* left half */
911 dx = 0; 956 dx = 0;
912 else if (x == x1) /* exact center */ 957 else if (x == x1) /* exact center */
913 dx /= 2; 958 dx /= 2;
914 if (y < y1) /* top half */ 959 if (y < y1) /* top half */
915 dy = 0; 960 dy = 0;
916 else if (y == y1) /* exact center */ 961 else if (y == y1) /* exact center */
917 dy /= 2; 962 dy /= 2;
918 963
919 XMoveResizeWindow (Xdisplay, TermWin.parent[0], x + dx, y + dy, 964 XMoveResizeWindow (display->display, TermWin.parent[0], x + dx, y + dy,
920 szHint.width, szHint.height); 965 szHint.width, szHint.height);
921#else 966#else
922 XResizeWindow (Xdisplay, TermWin.parent[0], szHint.width, 967 XResizeWindow (display->display, TermWin.parent[0], szHint.width,
923 szHint.height); 968 szHint.height);
924#endif 969#endif
970
925 } 971 }
926 972
927 fix_screen = (TermWin.ncol != prev_ncol 973 fix_screen = (TermWin.ncol != prev_ncol
928 || TermWin.nrow != prev_nrow); 974 || TermWin.nrow != prev_nrow);
929 975
930 if (fix_screen || width != old_width || height != old_height) 976 if (fix_screen || width != old_width || height != old_height)
931 { 977 {
932 if (scrollbar_visible (this)) 978 if (scrollbar_visible ())
933 { 979 {
934 XMoveResizeWindow (Xdisplay, scrollBar.win, window_sb_x, 980 XMoveResizeWindow (display->display, scrollBar.win, window_sb_x,
935 0, scrollbar_TotalWidth (), szHint.height); 981 0, scrollbar_TotalWidth (), szHint.height);
936 resize_scrollbar (); 982 resize_scrollbar ();
937 } 983 }
938 984
939 if (menubar_visible (this)) 985 if (menubar_visible ())
940 XMoveResizeWindow (Xdisplay, menuBar.win, window_vt_x, 986 XMoveResizeWindow (display->display, menuBar.win, window_vt_x,
941 0, TermWin_TotalWidth (), menuBar_TotalHeight ()); 987 0, TermWin_TotalWidth (), menuBar_TotalHeight ());
942 988
943 XMoveResizeWindow (Xdisplay, TermWin.vt, window_vt_x, 989 XMoveResizeWindow (display->display, TermWin.vt, window_vt_x,
944 window_vt_y, TermWin_TotalWidth (), 990 window_vt_y, TermWin_TotalWidth (),
945 TermWin_TotalHeight ()); 991 TermWin_TotalHeight ());
946#ifdef RXVT_GRAPHICS 992#ifdef RXVT_GRAPHICS
947 if (old_height) 993 if (old_height)
948 rxvt_Gr_Resize (this, old_width - szHint.base_width, 994 Gr_Resize (old_width - szHint.base_width,
949 old_height - szHint.base_height); 995 old_height - szHint.base_height);
950#endif 996#endif
951 scr_clear (); 997 scr_clear ();
952#ifdef XPM_BACKGROUND 998#ifdef XPM_BACKGROUND
953 rxvt_resize_pixmap (this); 999 resize_pixmap ();
954#endif 1000#endif
1001
955 } 1002 }
956 1003
957 if (fix_screen || old_height == 0) 1004 if (fix_screen || old_height == 0)
958 { 1005 {
959 int curr_screen = -1; 1006 int curr_screen = -1;
960 uint16_t old_ncol = prev_ncol; 1007 int old_ncol = prev_ncol;
961 1008
962 /* scr_reset only works on the primary screen */ 1009 /* scr_reset only works on the primary screen */
963 if (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
964 curr_screen = rxvt_scr_change_screen (this, PRIMARY); 1014 curr_screen = scr_change_screen (PRIMARY);
1015 TermWin.ncol = ncol;
1016 }
965 1017
966 scr_reset(); 1018 scr_reset();
967 1019
968 if (curr_screen >= 0) /* this is not the first time through */ 1020 if (curr_screen >= 0) /* this is not the first time through */
969 { 1021 {
970 rxvt_scr_change_screen (this, curr_screen); 1022 scr_change_screen (curr_screen);
971 rxvt_selection_check (this, old_ncol != TermWin.ncol ? 4 : 0); 1023 selection_check (old_ncol != TermWin.ncol ? 4 : 0);
972 } 1024 }
973 } 1025 }
974 1026
975 old_width = szHint.width; 1027 old_width = szHint.width;
976 old_height = szHint.height; 1028 old_height = szHint.height;
977 1029
978#ifdef USE_XIM 1030#ifdef USE_XIM
979 rxvt_IMSetStatusPosition (this); 1031 IMSetStatusPosition ();
980#endif 1032#endif
981} 1033}
982 1034
983/* 1035/*
984 * Set the width/height of the vt window in characters. Units are pixels. 1036 * Set the width/height of the vt window in characters. Units are pixels.
985 * good for toggling 80/132 columns 1037 * good for toggling 80/132 columns
986 */ 1038 */
987/* EXTPROTO */
988void 1039void
989rxvt_set_widthheight(pR_ unsigned int width, unsigned int height) 1040rxvt_term::set_widthheight (unsigned int width, unsigned int height)
990{ 1041{
991 XWindowAttributes wattr; 1042 XWindowAttributes wattr;
992 1043
993 if (width == 0 || height == 0) { 1044 if (width == 0 || height == 0)
1045 {
994 XGetWindowAttributes(R->Xdisplay, Xroot, &wattr); 1046 XGetWindowAttributes(display->display, display->root, &wattr);
995 if (width == 0) 1047 if (width == 0)
996 width = wattr.width - R->szHint.base_width; 1048 width = wattr.width - szHint.base_width;
997 if (height == 0) 1049 if (height == 0)
998 height = wattr.height - R->szHint.base_height; 1050 height = wattr.height - szHint.base_height;
999 } 1051 }
1000 if (width != R->TermWin.width || height != R->TermWin.height) { 1052 if (width != TermWin.width || height != TermWin.height)
1053 {
1001 width += R->szHint.base_width; 1054 width += szHint.base_width;
1002 height += R->szHint.base_height; 1055 height += szHint.base_height;
1003 R->resize_all_windows (width, height, 0); 1056 resize_all_windows (width, height, 0);
1004 } 1057 }
1005} 1058}
1006 1059
1007/* -------------------------------------------------------------------- * 1060/* -------------------------------------------------------------------- *
1008 * - X INPUT METHOD ROUTINES - * 1061 * - X INPUT METHOD ROUTINES - *
1009 * -------------------------------------------------------------------- */ 1062 * -------------------------------------------------------------------- */
1010#ifdef USE_XIM 1063#ifdef USE_XIM
1064
1011void 1065void
1012rxvt_term::set_size (XRectangle *size) 1066rxvt_term::im_set_size (XRectangle *size)
1013{ 1067{
1014 size->x = TermWin.int_bwidth; 1068 size->x = TermWin.int_bwidth;
1015 size->y = TermWin.int_bwidth; 1069 size->y = TermWin.int_bwidth;
1016 size->width = Width2Pixel(TermWin.ncol); 1070 size->width = Width2Pixel(TermWin.ncol);
1017 size->height = Height2Pixel(TermWin.nrow); 1071 size->height = Height2Pixel(TermWin.nrow);
1018} 1072}
1019 1073
1020void 1074void
1021rxvt_term::set_color (unsigned long *fg, unsigned long *bg) 1075rxvt_term::im_set_color (unsigned long *fg, unsigned long *bg)
1022{ 1076{
1023 *fg = PixColors[Color_fg]; 1077 *fg = PixColors[Color_fg];
1024 *bg = PixColors[Color_bg]; 1078 *bg = PixColors[Color_bg];
1025} 1079}
1026 1080
1027/* Checking whether input method is running. */ 1081/* Checking whether input method is running. */
1028/* INTPROTO */
1029Bool 1082bool
1030rxvt_IMisRunning(pR) 1083rxvt_term::IMisRunning ()
1031{ 1084{
1032 char *p; 1085 char *p;
1033 Atom atom; 1086 Atom atom;
1034 Window win; 1087 Window win;
1035 char server[IMBUFSIZ]; 1088 char server[IMBUFSIZ];
1036 1089
1037/* get current locale modifier */ 1090 /* get current locale modifier */
1038 if ((p = XSetLocaleModifiers(NULL)) != NULL) { 1091 if ((p = XSetLocaleModifiers(NULL)) != NULL)
1092 {
1039 STRCPY(server, "@server="); 1093 STRCPY(server, "@server=");
1040 STRNCAT(server, &(p[4]), IMBUFSIZ - 9); /* skip "@im=" */ 1094 STRNCAT(server, &(p[4]), IMBUFSIZ - 9); /* skip "@im=" */
1041 if ((p = STRCHR(server + 1, '@')) != NULL) /* first one only */ 1095 if ((p = STRCHR(server + 1, '@')) != NULL) /* first one only */
1042 *p = '\0'; 1096 *p = '\0';
1043 1097
1044 atom = XInternAtom(R->Xdisplay, server, False); 1098 atom = XInternAtom(display->display, server, False);
1045 win = XGetSelectionOwner(R->Xdisplay, atom); 1099 win = XGetSelectionOwner(display->display, atom);
1046 if (win != None) 1100 if (win != None)
1047 return True; 1101 return True;
1048 } 1102 }
1049 return False; 1103 return False;
1050} 1104}
1051 1105
1052/* EXTPROTO */
1053void 1106void
1054rxvt_IMSendSpot(pR) 1107rxvt_term::IMSendSpot ()
1055{ 1108{
1056 XPoint spot; 1109 XPoint spot;
1057 XVaNestedList preedit_attr; 1110 XVaNestedList preedit_attr;
1058 1111
1059 if (R->Input_Context == NULL 1112 if (Input_Context == NULL
1060 || !R->TermWin.focus || !(R->input_style & XIMPreeditPosition) 1113 || !TermWin.focus || !(input_style & XIMPreeditPosition)
1061 || !(R->event_type == KeyPress 1114 || !(event_type == KeyPress
1062 || R->event_type == Expose 1115 || event_type == Expose
1063 || R->event_type == NoExpose 1116 || event_type == NoExpose
1064 || R->event_type == SelectionNotify 1117 || event_type == SelectionNotify
1065 || R->event_type == ButtonRelease || R->event_type == FocusIn) 1118 || event_type == ButtonRelease || event_type == FocusIn)
1066 || !rxvt_IMisRunning(aR)) 1119 || !IMisRunning ())
1067 return; 1120 return;
1068 1121
1069 R->set_position (&spot); 1122 im_set_position (&spot);
1070 1123
1071 preedit_attr = XVaCreateNestedList(0, XNSpotLocation, &spot, NULL); 1124 preedit_attr = XVaCreateNestedList(0, XNSpotLocation, &spot, NULL);
1072 XSetICValues(R->Input_Context, XNPreeditAttributes, preedit_attr, NULL); 1125 XSetICValues(Input_Context, XNPreeditAttributes, preedit_attr, NULL);
1073 XFree(preedit_attr); 1126 XFree(preedit_attr);
1074} 1127}
1075 1128
1076void 1129void
1077rxvt_term::set_preedit_area (XRectangle * preedit_rect, XRectangle * status_rect, 1130rxvt_term::im_set_preedit_area (XRectangle * preedit_rect, XRectangle * status_rect,
1078 XRectangle * needed_rect) 1131 XRectangle * needed_rect)
1079{ 1132{
1080 int mbh, vtx = 0; 1133 int mbh, vtx = 0;
1081 1134
1082 if (scrollbar_visible (this) && !(Options & Opt_scrollBar_right)) 1135 if (scrollbar_visible () && !(Options & Opt_scrollBar_right))
1083 vtx = scrollbar_TotalWidth(); 1136 vtx = scrollbar_TotalWidth();
1084 1137
1085 mbh = menubar_visible (this) ? menuBar_TotalHeight() : 0; 1138 mbh = menubar_visible () ? menuBar_TotalHeight() : 0;
1086 mbh -= TermWin.lineSpace; 1139 mbh -= TermWin.lineSpace;
1087 1140
1088 preedit_rect->x = needed_rect->width + vtx; 1141 preedit_rect->x = needed_rect->width + vtx;
1089 preedit_rect->y = Height2Pixel(TermWin.nrow - 1) + mbh; 1142 preedit_rect->y = Height2Pixel(TermWin.nrow - 1) + mbh;
1090 1143
… …
1096 1149
1097 status_rect->width = needed_rect->width ? needed_rect->width : Width2Pixel(TermWin.ncol + 1); 1150 status_rect->width = needed_rect->width ? needed_rect->width : Width2Pixel(TermWin.ncol + 1);
1098 status_rect->height = Height2Pixel(1); 1151 status_rect->height = Height2Pixel(1);
1099} 1152}
1100 1153
1101/* ARGSUSED */
1102/* INTPROTO */
1103void 1154void
1104rxvt_IMDestroyCallback(XIM xim __attribute__ ((unused)), XPointer client_data 1155rxvt_term::im_destroy ()
1105 __attribute__ ((unused)), XPointer call_data
1106 __attribute__ ((unused)))
1107{ 1156{
1108 dR; 1157 if (Input_Context)
1109 1158 {
1159 XDestroyIC (Input_Context);
1110 R->Input_Context = NULL; 1160 Input_Context = NULL;
1111/* To avoid Segmentation Fault in C locale: Solaris only? */ 1161 }
1112 if (STRCMP(R->locale, "C")) 1162
1113 XRegisterIMInstantiateCallback(R->Xdisplay, NULL, NULL, NULL, 1163 if (input_method)
1114 rxvt_IMInstantiateCallback, NULL); 1164 {
1165 display->put_xim (input_method);
1166 input_method = 0;
1167 }
1115} 1168}
1116 1169
1117/* 1170/*
1118 * 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
1119 * open a suitable preedit type 1172 * open a suitable preedit type
1120 */ 1173 */
1121static Bool 1174bool
1122rxvt_IM_get_IC (pR) 1175rxvt_term::IM_get_IC (const char *modifiers)
1123{ 1176{
1124 int i, j, found; 1177 int i, j, found;
1125 XIM xim; 1178 XIM xim;
1126 XPoint spot; 1179 XPoint spot;
1127 XRectangle rect, status_rect, needed_rect; 1180 XRectangle rect, status_rect, needed_rect;
1128 unsigned long fg, bg; 1181 unsigned long fg, bg;
1129 const char *p; 1182 const char *p;
1130 char **s; 1183 char **s;
1131 XIMStyles *xim_styles; 1184 XIMStyles *xim_styles;
1132 XVaNestedList preedit_attr, status_attr; 1185 XVaNestedList preedit_attr, status_attr;
1133 XIMCallback ximcallback;
1134 1186
1187 if (!((p = XSetLocaleModifiers (modifiers)) && *p))
1188 return false;
1189
1135 D_MAIN((stderr, "rxvt_IM_get_IC()")); 1190 D_MAIN((stderr, "rxvt_IM_get_IC()"));
1136 xim = XOpenIM (R->Xdisplay, NULL, NULL, NULL); 1191 input_method = display->get_xim (locale, modifiers);
1137 if (xim == NULL) 1192 if (input_method == NULL)
1138 return False; 1193 return false;
1139 1194
1195 xim = input_method->xim;
1196
1140 xim_styles = NULL; 1197 xim_styles = NULL;
1141 if (XGetIMValues (xim, XNQueryInputStyle, &xim_styles, NULL) 1198 if (XGetIMValues (xim, XNQueryInputStyle, &xim_styles, NULL)
1142 || !xim_styles || !xim_styles->count_styles) { 1199 || !xim_styles || !xim_styles->count_styles)
1143 XCloseIM(xim); 1200 {
1201 display->put_xim (input_method);
1144 return False; 1202 return false;
1145 } 1203 }
1146 1204
1147 p = R->rs[Rs_preeditType] ? R->rs[Rs_preeditType] 1205 p = rs[Rs_preeditType] ? rs[Rs_preeditType] : "OverTheSpot,OffTheSpot,Root";
1148 : "OverTheSpot,OffTheSpot,Root";
1149 s = rxvt_splitcommastring(p); 1206 s = rxvt_splitcommastring(p);
1150 for (i = found = 0; !found && s[i]; i++) { 1207 for (i = found = 0; !found && s[i]; i++)
1208 {
1151 if (!STRCMP(s[i], "OverTheSpot")) 1209 if (!STRCMP(s[i], "OverTheSpot"))
1152 R->input_style = (XIMPreeditPosition | XIMStatusNothing); 1210 input_style = (XIMPreeditPosition | XIMStatusNothing);
1153 else if (!STRCMP(s[i], "OffTheSpot")) 1211 else if (!STRCMP(s[i], "OffTheSpot"))
1154 R->input_style = (XIMPreeditArea | XIMStatusArea); 1212 input_style = (XIMPreeditArea | XIMStatusArea);
1155 else if (!STRCMP(s[i], "Root")) 1213 else if (!STRCMP(s[i], "Root"))
1156 R->input_style = (XIMPreeditNothing | XIMStatusNothing); 1214 input_style = (XIMPreeditNothing | XIMStatusNothing);
1157 1215
1158 for (j = 0; j < xim_styles->count_styles; j++) 1216 for (j = 0; j < xim_styles->count_styles; j++)
1159 if (R->input_style == xim_styles->supported_styles[j]) { 1217 if (input_style == xim_styles->supported_styles[j])
1218 {
1160 found = 1; 1219 found = 1;
1161 break; 1220 break;
1162 } 1221 }
1163 } 1222 }
1223
1164 for (i = 0; s[i]; i++) 1224 for (i = 0; s[i]; i++)
1165 free(s[i]); 1225 free (s[i]);
1226
1166 free(s); 1227 free (s);
1167 XFree(xim_styles); 1228 XFree (xim_styles);
1168 1229
1169 if (!found) { 1230 if (!found)
1170 XCloseIM(xim); 1231 {
1232 display->put_xim (input_method);
1171 return False; 1233 return false;
1172 } 1234 }
1173 1235
1174 ximcallback.callback = rxvt_IMDestroyCallback;
1175
1176 /* XXX: not sure why we need this (as well as IC one below) */
1177 XSetIMValues(xim, XNDestroyCallback, &ximcallback, NULL);
1178
1179 preedit_attr = status_attr = NULL; 1236 preedit_attr = status_attr = NULL;
1180 1237
1181 if (R->input_style & XIMPreeditPosition) { 1238 if (input_style & XIMPreeditPosition)
1239 {
1182 R->set_size (&rect); 1240 im_set_size (&rect);
1183 R->set_position (&spot); 1241 im_set_position (&spot);
1184 R->set_color (&fg, &bg); 1242 im_set_color (&fg, &bg);
1185 1243
1186 preedit_attr = XVaCreateNestedList(0, XNArea, &rect, 1244 preedit_attr = XVaCreateNestedList(0, XNArea, &rect,
1187 XNSpotLocation, &spot, 1245 XNSpotLocation, &spot,
1188 XNForeground, fg, XNBackground, bg,
1189 //XNFontSet, R->TermWin.fontset,
1190 NULL);
1191 } else if (R->input_style & XIMPreeditArea) {
1192 R->set_color (&fg, &bg);
1193
1194 /*
1195 * The necessary width of preedit area is unknown
1196 * until create input context.
1197 */
1198 needed_rect.width = 0;
1199
1200 R->set_preedit_area(&rect, &status_rect, &needed_rect);
1201
1202 preedit_attr = XVaCreateNestedList(0, XNArea, &rect,
1203 XNForeground, fg, XNBackground, bg,
1204 //XNFontSet, R->TermWin.fontset,
1205 NULL);
1206 status_attr = XVaCreateNestedList(0, XNArea, &status_rect,
1207 XNForeground, fg, XNBackground, bg, 1246 XNForeground, fg, XNBackground, bg,
1208 //XNFontSet, R->TermWin.fontset, 1247 //XNFontSet, TermWin.fontset,
1209 NULL); 1248 NULL);
1249 }
1250 else if (input_style & XIMPreeditArea)
1210 } 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
1211 R->Input_Context = XCreateIC(xim, XNInputStyle, R->input_style, 1272 Input_Context = XCreateIC(xim, XNInputStyle, input_style,
1212 XNClientWindow, R->TermWin.parent[0], 1273 XNClientWindow, TermWin.parent[0],
1213 XNFocusWindow, R->TermWin.parent[0], 1274 XNFocusWindow, TermWin.parent[0],
1214 XNDestroyCallback, &ximcallback,
1215 preedit_attr ? XNPreeditAttributes : NULL, 1275 preedit_attr ? XNPreeditAttributes : NULL,
1216 preedit_attr, 1276 preedit_attr,
1217 status_attr ? XNStatusAttributes : NULL, 1277 status_attr ? XNStatusAttributes : NULL,
1218 status_attr, NULL); 1278 status_attr, NULL);
1219 if (preedit_attr) 1279 if (preedit_attr) XFree(preedit_attr);
1220 XFree(preedit_attr); 1280 if (status_attr) XFree(status_attr);
1221 if (status_attr) 1281
1222 XFree(status_attr);
1223 if (R->Input_Context == NULL) { 1282 if (Input_Context == NULL)
1283 {
1224 rxvt_print_error("failed to create input context"); 1284 rxvt_print_error("failed to create input context");
1225 XCloseIM(xim); 1285 display->put_xim (input_method);
1226 return False; 1286 return false;
1227 } 1287 }
1288
1228 if (R->input_style & XIMPreeditArea) 1289 if (input_style & XIMPreeditArea)
1229 rxvt_IMSetStatusPosition(aR); 1290 IMSetStatusPosition ();
1291
1230 D_MAIN((stderr, "rxvt_IM_get_IC() - successful connection")); 1292 D_MAIN((stderr, "rxvt_IM_get_IC() - successful connection"));
1231 return True; 1293 return true;
1232} 1294}
1233 1295
1234/*
1235 * X manual pages and include files don't match on some systems:
1236 * some think this is an XIDProc and others an XIMProc so we can't
1237 * use the first argument - need to update this to be nice for
1238 * both types via some sort of configure detection
1239 */
1240/* ARGSUSED */
1241/* EXTPROTO */
1242void 1296void
1243rxvt_IMInstantiateCallback(Display * unused 1297rxvt_term::im_cb ()
1244 __attribute__ ((unused)), XPointer client_data
1245 __attribute__ ((unused)), XPointer call_data
1246 __attribute__ ((unused)))
1247{ 1298{
1248 dR;
1249 int i, found, had_im; 1299 int i, found, had_im;
1250 const char *p; 1300 const char *p;
1251 char **s; 1301 char **s;
1252 char buf[IMBUFSIZ]; 1302 char buf[IMBUFSIZ];
1253 1303
1304 im_destroy ();
1305
1254 D_MAIN((stderr, "rxvt_IMInstantiateCallback()")); 1306 D_MAIN((stderr, "rxvt_IMInstantiateCallback()"));
1255 if (R->Input_Context) 1307 if (Input_Context)
1256 return; 1308 return;
1257 1309
1258#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE) 1310#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1259 if (R->rs[Rs_imLocale]) 1311 if (rs[Rs_imLocale])
1260 setlocale (LC_CTYPE, R->rs[Rs_imLocale]); 1312 setlocale (LC_CTYPE, rs[Rs_imLocale]);
1261#endif 1313#endif
1262 1314
1263 p = R->rs[Rs_inputMethod]; 1315 p = rs[Rs_inputMethod];
1264 if (p && *p) 1316 if (p && *p)
1265 { 1317 {
1266 bool found = false; 1318 bool found = false;
1267 1319
1268 s = rxvt_splitcommastring (p); 1320 s = rxvt_splitcommastring (p);
… …
1270 { 1322 {
1271 if (*s[i]) 1323 if (*s[i])
1272 { 1324 {
1273 STRCPY (buf, "@im="); 1325 STRCPY (buf, "@im=");
1274 STRNCAT (buf, s[i], IMBUFSIZ - 5); 1326 STRNCAT (buf, s[i], IMBUFSIZ - 5);
1275 if ((p = XSetLocaleModifiers (buf)) && *p 1327 if (IM_get_IC (buf))
1276 && rxvt_IM_get_IC (aR))
1277 { 1328 {
1278 found = true; 1329 found = true;
1279 break; 1330 break;
1280 } 1331 }
1281 } 1332 }
1282 } 1333 }
1283 for (i = 0; s[i]; i++) 1334 for (i = 0; s[i]; i++)
1284 free(s[i]); 1335 free(s[i]);
1285 free(s); 1336 free(s);
1286 1337
1287 if (found) 1338 if (found)
1288 goto done; 1339 goto done;
1289 } 1340 }
1290 1341
1291/* try with XMODIFIERS env. var. */ 1342 /* try with XMODIFIERS env. var. */
1292 if ((p = XSetLocaleModifiers ("")) && *p 1343 if (IM_get_IC (""))
1293 && rxvt_IM_get_IC (aR))
1294 goto done; 1344 goto done;
1295 1345
1296/* 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 */
1297 if ((p = XSetLocaleModifiers ("@im=none")) && *p 1347 if (IM_get_IC ("@im=none"))
1298 && rxvt_IM_get_IC (aR) == True)
1299 goto done; 1348 goto done;
1300 1349
1301done: 1350done:
1302#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE) 1351#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1303 if (R->rs[Rs_imLocale]) 1352 if (rs[Rs_imLocale])
1304 setlocale (LC_CTYPE, R->locale); 1353 setlocale (LC_CTYPE, locale);
1305#endif 1354#endif
1306} 1355}
1307 1356
1308/* EXTPROTO */
1309void 1357void
1310rxvt_IMSetStatusPosition(pR) 1358rxvt_term::IMSetStatusPosition ()
1311{ 1359{
1312 XRectangle preedit_rect, status_rect, *needed_rect; 1360 XRectangle preedit_rect, status_rect, *needed_rect;
1313 XVaNestedList preedit_attr, status_attr; 1361 XVaNestedList preedit_attr, status_attr;
1314 1362
1315 if (R->Input_Context == NULL 1363 if (Input_Context == NULL
1316 || !R->TermWin.focus || !(R->input_style & XIMPreeditArea) 1364 || !TermWin.focus || !(input_style & XIMPreeditArea)
1317 || !rxvt_IMisRunning(aR)) 1365 || !IMisRunning ())
1318 return; 1366 return;
1319 1367
1320/* Getting the necessary width of preedit area */ 1368 /* Getting the necessary width of preedit area */
1321 status_attr = XVaCreateNestedList(0, XNAreaNeeded, &needed_rect, NULL); 1369 status_attr = XVaCreateNestedList(0, XNAreaNeeded, &needed_rect, NULL);
1322 XGetICValues(R->Input_Context, XNStatusAttributes, status_attr, NULL); 1370 XGetICValues(Input_Context, XNStatusAttributes, status_attr, NULL);
1323 XFree(status_attr); 1371 XFree(status_attr);
1324 1372
1325 R->set_preedit_area(&preedit_rect, &status_rect, needed_rect); 1373 im_set_preedit_area (&preedit_rect, &status_rect, needed_rect);
1326 1374
1327 preedit_attr = XVaCreateNestedList(0, XNArea, &preedit_rect, NULL); 1375 preedit_attr = XVaCreateNestedList(0, XNArea, &preedit_rect, NULL);
1328 status_attr = XVaCreateNestedList(0, XNArea, &status_rect, NULL); 1376 status_attr = XVaCreateNestedList(0, XNArea, &status_rect, NULL);
1329 1377
1330 XSetICValues(R->Input_Context, 1378 XSetICValues(Input_Context,
1331 XNPreeditAttributes, preedit_attr, 1379 XNPreeditAttributes, preedit_attr,
1332 XNStatusAttributes, status_attr, NULL); 1380 XNStatusAttributes, status_attr, NULL);
1333 1381
1334 XFree(preedit_attr); 1382 XFree(preedit_attr);
1335 XFree(status_attr); 1383 XFree(status_attr);
1336} 1384}
1337#endif /* USE_XIM */ 1385#endif /* USE_XIM */
1338 1386
1339/*----------------------------------------------------------------------*/ 1387/*----------------------------------------------------------------------*/
1340rxvt_t rxvt_current_term; 1388rxvt_t rxvt_current_term;

Diff Legend

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