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.19 by pcg, Wed Dec 24 09:22:29 2003 UTC vs.
Revision 1.31 by pcg, Fri Feb 13 12:11:05 2004 UTC

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

Diff Legend

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