[ViewVC] Diff of: cvs/rxvt-unicode/src/main.C

Comparing rxvt-unicode/src/main.C (file contents):
Revision 1.67 by pcg, Sun May 9 18:19:49 2004 UTC vs.
Revision 1.108 by root, Wed Aug 25 05:03:33 2004 UTC

…		…
51	static char curlocale[128];	51	static char curlocale[128];
52		52
53	bool	53	bool
54	rxvt_set_locale (const char *locale)	54	rxvt_set_locale (const char *locale)
55	{	55	{
56	if (!locale \|\| !STRNCMP (locale, curlocale, 128))	56	if (!locale \|\| !strncmp (locale, curlocale, 128))
57	return false;	57	return false;
58		58
59	STRNCPY (curlocale, locale, 128);	59	strncpy (curlocale, locale, 128);
60	setlocale (LC_CTYPE, curlocale);	60	setlocale (LC_CTYPE, curlocale);
61	return true;	61	return true;
62	}	62	}
63		63
64	#if ENABLE_COMBINING	64	#if ENABLE_COMBINING
…		…
123	return len;	123	return len;
124		124
125	}	125	}
126	#endif	126	#endif
127		127
128	void *
129	rxvt_term::operator new (size_t s)
130	{
131	void *p = malloc (s);
132
133	MEMSET (p, 0, s);
134	return p;
135	}
136
137	void
138	rxvt_term::operator delete (void *p, size_t s)
139	{
140	free (p);
141	}
142
143	rxvt_term::rxvt_term ()	128	rxvt_term::rxvt_term ()
144	:	129	:
		130	#if TRANSPARENT
145	rootwin_ev (this, &rxvt_term::rootwin_cb),	131	rootwin_ev (this, &rxvt_term::rootwin_cb),
		132	#endif
		133	#ifdef HAVE_SCROLLBARS
		134	scrollbar_ev (this, &rxvt_term::x_cb),
		135	#endif
		136	#ifdef MENUBAR
		137	menubar_ev (this, &rxvt_term::x_cb),
		138	#endif
		139	#ifdef CURSOR_BLINK
		140	cursor_blink_ev (this, &rxvt_term::cursor_blink_cb),
		141	#endif
		142	#ifdef TEXT_BLINK
		143	text_blink_ev (this, &rxvt_term::text_blink_cb),
		144	#endif
		145	#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
		146	cont_scroll_ev (this, &rxvt_term::cont_scroll_cb),
		147	#endif
		148	#ifdef SELECTION_SCROLLING
		149	sel_scroll_ev (this, &rxvt_term::sel_scroll_cb),
		150	#endif
		151	#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
		152	slip_wheel_ev (this, &rxvt_term::slip_wheel_cb),
		153	#endif
		154	#ifdef POINTER_BLANK
		155	pointer_ev (this, &rxvt_term::pointer_cb),
		156	#endif
		157	#ifdef USE_XIM
		158	im_ev (this, &rxvt_term::im_cb),
		159	#endif
146	termwin_ev (this, &rxvt_term::x_cb),	160	termwin_ev (this, &rxvt_term::x_cb),
147	vt_ev (this, &rxvt_term::x_cb),	161	vt_ev (this, &rxvt_term::x_cb),
148	#ifdef HAVE_SCROLLBARS
149	scrollbar_ev (this, &rxvt_term::x_cb),
150	#endif
151	#ifdef MENUBAR
152	menubar_ev (this, &rxvt_term::x_cb),
153	#endif
154	#ifdef CURSOR_BLINK
155	cursor_blink_ev (this, &rxvt_term::cursor_blink_cb),
156	#endif
157	#ifdef TEXT_BLINK
158	text_blink_ev (this, &rxvt_term::text_blink_cb),
159	#endif
160	#ifdef POINTER_BLANK
161	pointer_ev (this, &rxvt_term::pointer_cb),
162	#endif
163	#ifdef USE_XIM
164	im_ev (this, &rxvt_term::im_cb),
165	#endif
166	check_ev (this, &rxvt_term::check_cb),	162	check_ev (this, &rxvt_term::check_cb),
		163	flush_ev (this, &rxvt_term::flush_cb),
167	destroy_ev (this, &rxvt_term::destroy_cb),	164	destroy_ev (this, &rxvt_term::destroy_cb),
168	pty_ev (this, &rxvt_term::pty_cb),	165	pty_ev (this, &rxvt_term::pty_cb),
169	incr_ev (this, &rxvt_term::incr_cb)	166	incr_ev (this, &rxvt_term::incr_cb)
170	{	167	{
171	cmdbuf_ptr = cmdbuf_endp = cmdbuf_base;	168	cmdbuf_ptr = cmdbuf_endp = cmdbuf_base;
…		…
175		172
176	rxvt_term::~rxvt_term ()	173	rxvt_term::~rxvt_term ()
177	{	174	{
178	termlist.erase (find (termlist.begin (), termlist.end(), this));	175	termlist.erase (find (termlist.begin (), termlist.end(), this));
179		176
180	if (cmd_fd >= 0)	177	if (cmd_pid)
181	close (cmd_fd);	178	kill (-cmd_pid, SIGHUP);
182		179
183	#ifndef NO_SETOWNER_TTYDEV	180	pty.put ();
184	privileged_ttydev (RESTORE);	181
185	#endif
186	#ifdef UTMP_SUPPORT	182	#ifdef UTMP_SUPPORT
187	privileged_utmp (RESTORE);	183	privileged_utmp (RESTORE);
188	#endif	184	#endif
189		185
		186	#if ENABLE_STYLES
		187	for (int i = RS_styleCount; --i; )
		188	if (TermWin.fontset[i] != TermWin.fontset[0])
		189	delete TermWin.fontset[i];
		190	#endif
190	delete TermWin.fontset;	191	delete TermWin.fontset[0];
191		192
192	if (display)	193	if (display)
193	{	194	{
194	selection_clear ();	195	selection_clear ();
195		196
		197	#ifdef USE_XIM
		198	im_destroy ();
		199	#endif
196	#ifdef MENUBAR	200	#ifdef MENUBAR
197	if (menubarGC) XFreeGC (display->display, menubarGC);	201	if (menubarGC) XFreeGC (display->display, menubarGC);
198	#endif	202	#endif
199	#ifdef XTERM_SCROLLBAR	203	#ifdef XTERM_SCROLLBAR
200	if (xscrollbarGC) XFreeGC (display->display, xscrollbarGC);	204	if (xscrollbarGC) XFreeGC (display->display, xscrollbarGC);
201	if (ShadowGC) XFreeGC (display->display, ShadowGC);	205	if (ShadowGC) XFreeGC (display->display, ShadowGC);
202	#endif	206	#endif
…		…
233	XDestroyWindow (display->display, TermWin.parent[0]);	237	XDestroyWindow (display->display, TermWin.parent[0]);
234	}	238	}
235		239
236	// TODO: free pixcolours, colours should become part of rxvt_display	240	// TODO: free pixcolours, colours should become part of rxvt_display
237		241
238	delete PixColors;	242	delete pix_colors_focused;
		243	#ifdef OFF_FOCUS_FADING
		244	delete pix_colors_unfocused;
		245	#endif
239		246
240	displays.put (display);	247	displays.put (display);
241		248
242	scr_release ();	249	scr_release ();
243		250
…		…
261	}	268	}
262		269
263	void	270	void
264	rxvt_term::destroy ()	271	rxvt_term::destroy ()
265	{	272	{
		273	if (destroy_ev.active)
		274	return;
		275
		276	#if ENABLE_OVERLAY
		277	scr_overlay_off ();
		278	#endif
		279
266	if (display)	280	if (display)
267	{	281	{
		282	#if USE_XIM
		283	im_ev.stop (display);
		284	#endif
		285	#if HAVE_SCROLLBARS
		286	scrollbar_ev.stop (display);
		287	#endif
		288	#if MENUBAR
		289	menubar_ev.stop (display);
		290	#endif
		291	#if TRANSPARENT
268	rootwin_ev.stop (display);	292	rootwin_ev.stop (display);
		293	#endif
		294	incr_ev.stop ();
269	termwin_ev.stop (display);	295	termwin_ev.stop (display);
270	vt_ev.stop (display);	296	vt_ev.stop (display);
271	#ifdef USE_XIM
272	im_destroy ();
273	im_ev.stop (display);
274	#endif
275	#ifdef HAVE_SCROLLBARS
276	scrollbar_ev.stop (display);
277	#endif
278	#ifdef MENUBAR
279	menubar_ev.stop (display);
280	#endif
281	}	297	}
282		298
283	check_ev.stop ();	299	check_ev.stop ();
284	pty_ev.stop ();	300	pty_ev.stop ();
285	#ifdef CURSOR_BLINK	301	#ifdef CURSOR_BLINK
286	cursor_blink_ev.stop ();	302	cursor_blink_ev.stop ();
287	#endif	303	#endif
288	#ifdef TEXT_BLINK	304	#ifdef TEXT_BLINK
289	text_blink_ev.stop ();	305	text_blink_ev.stop ();
290	#endif	306	#endif
		307	#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
		308	cont_scroll_ev.stop ();
		309	#endif
		310	#ifdef SELECTION_SCROLLING
		311	sel_scroll_ev.stop ();
		312	#endif
291	#ifdef POINTER_BLANK	313	#ifdef POINTER_BLANK
292	pointer_ev.stop ();	314	pointer_ev.stop ();
293	#endif	315	#endif
294		316
295	destroy_ev.start (0);	317	destroy_ev.start (0);
…		…
311	SET_R (this);	333	SET_R (this);
312		334
313	if (!init_vars ())	335	if (!init_vars ())
314	return false;	336	return false;
315		337
		338	init_secondary ();
		339
		340	const char **cmd_argv = init_resources (argc, argv);
		341
		342	set_locale ("");
		343
		344	#if MENUBAR_MAX
		345	menubar_read (rs[Rs_menu]);
		346	#endif
		347	#ifdef HAVE_SCROLLBARS
		348	if (options & Opt_scrollBar)
		349	scrollBar.setIdle (); /* set existence for size calculations */
		350	#endif
		351
		352	create_windows (argc, argv);
		353
		354	init_xlocale ();
		355
		356	scr_reset (); /* initialize screen */
		357
		358	#if 0
		359	XSynchronize (display->display, True);
		360	#endif
		361
		362	#ifdef HAVE_SCROLLBARS
		363	if (options & Opt_scrollBar)
		364	resize_scrollbar (); /* create and map scrollbar */
		365	#endif
		366	#if (MENUBAR_MAX)
		367	if (menubar_visible ())
		368	XMapWindow (display->display, menuBar.win);
		369	#endif
		370	#ifdef TRANSPARENT
		371	if (options & Opt_transparent)
		372	{
		373	XSelectInput (display->display, display->root, PropertyChangeMask);
		374	check_our_parents ();
		375	rootwin_ev.start (display, display->root);
		376	}
		377	#endif
		378
		379	XMapWindow (display->display, TermWin.vt);
		380	XMapWindow (display->display, TermWin.parent[0]);
		381
		382	set_colorfgbg ();
		383
		384	init_command (cmd_argv);
		385
		386	pty_ev.start (pty.pty, EVENT_READ);
		387
		388	check_ev.start ();
		389
		390	return true;
		391	}
		392
		393	static int (old_xerror_handler) (Display dpy, XErrorEvent *event);
		394
		395	void
		396	rxvt_init ()
		397	{
		398	/* install exit handler for cleanup */
		399	#if 0
		400	#ifdef HAVE_ATEXIT
		401	atexit (rxvt_clean_exit);
		402	#else
		403	#endif
		404	#endif
316	/*	405	/*
317	* Save and then give up any super-user privileges	406	* Save and then give up any super-user privileges
318	* If we need privileges in any area then we must specifically request it.	407	* If we need privileges in any area then we must specifically request it.
319	* We should only need to be root in these cases:	408	* We should only need to be root in these cases:
320	* 1. write utmp entries on some systems	409	* 1. write utmp entries on some systems
321	* 2. chown tty on some systems	410	* 2. chown tty on some systems
322	*/	411	*/
323	privileges (SAVE);	412	rxvt_privileges (SAVE);
324	privileges (IGNORE);	413	rxvt_privileges (IGNORE);
325
326	init_secondary ();
327
328	const char **cmd_argv = init_resources (argc, argv);
329
330	set_locale ("");
331
332	#if MENUBAR_MAX
333	menubar_read (rs[Rs_menu]);
334	#endif
335	#ifdef HAVE_SCROLLBARS
336	if (Options & Opt_scrollBar)
337	scrollBar.setIdle (); /* set existence for size calculations */
338	#endif
339
340	create_windows (argc, argv);
341
342	init_xlocale ();
343
344	scr_reset (); /* initialize screen */
345
346	#if 0
347	XSynchronize (display->display, True);
348	#endif
349
350	#ifdef HAVE_SCROLLBARS
351	if (Options & Opt_scrollBar)
352	resize_scrollbar (); /* create and map scrollbar */
353	#endif
354	#if (MENUBAR_MAX)
355	if (menubar_visible ())
356	XMapWindow (display->display, menuBar.win);
357	#endif
358	#ifdef TRANSPARENT
359	if (Options & Opt_transparent)
360	{
361	XSelectInput (display->display, display->root, PropertyChangeMask);
362	check_our_parents ();
363	}
364	#endif
365
366	rootwin_ev.start (display, display->root);
367
368	XMapWindow (display->display, TermWin.vt);
369	XMapWindow (display->display, TermWin.parent[0]);
370
371	init_command (cmd_argv);
372
373	pty_ev.start (cmd_fd, EVENT_READ);
374
375	check_ev.start ();
376
377	return true;
378	}
379
380	static int (old_xerror_handler) (Display dpy, XErrorEvent *event);
381
382	void
383	rxvt_init_signals ()
384	{
385	/* install exit handler for cleanup */
386	#if 0
387	#ifdef HAVE_ATEXIT
388	atexit (rxvt_clean_exit);
389	#else
390	#endif
391	#endif
392		414
393	struct sigaction sa;	415	struct sigaction sa;
394		416
395	sigfillset (&sa.sa_mask);	417	sigfillset (&sa.sa_mask);
396	sa.sa_flags = SA_NOCLDSTOP \| SA_RESTART;	418	sa.sa_flags = SA_NOCLDSTOP \| SA_RESTART;
…		…
424	break;	446	break;
425	}	447	}
426	}	448	}
427		449
428	/* ARGSUSED */	450	/* ARGSUSED */
429	/* EXTPROTO */	451	/* INTPROTO */
430	RETSIGTYPE	452	RETSIGTYPE
431	rxvt_Child_signal (int sig __attribute__ ((unused)))	453	rxvt_Child_signal (int sig __attribute__ ((unused)))
432	{	454	{
433	int pid, save_errno = errno;	455	int pid, save_errno = errno;
434		456
…		…
439	}	461	}
440		462
441	/*	463	/*
442	* Catch a fatal signal and tidy up before quitting	464	* Catch a fatal signal and tidy up before quitting
443	*/	465	*/
444	/* EXTPROTO */	466	/* INTPROTO */
445	RETSIGTYPE	467	RETSIGTYPE
446	rxvt_Exit_signal (int sig)	468	rxvt_Exit_signal (int sig)
447	{	469	{
448	signal (sig, SIG_DFL);	470	signal (sig, SIG_DFL);
449	#ifdef DEBUG_CMD	471	#ifdef DEBUG_CMD
…		…
471	/----------------------------------------------------------------------/	493	/----------------------------------------------------------------------/
472	/*	494	/*
473	* Exit gracefully, clearing the utmp entry and restoring tty attributes	495	* Exit gracefully, clearing the utmp entry and restoring tty attributes
474	* TODO: if debugging, this should free up any known resources if we can	496	* TODO: if debugging, this should free up any known resources if we can
475	*/	497	*/
476	/* EXTPROTO */	498	/* INTPROTO */
477	void	499	void
478	rxvt_clean_exit ()	500	rxvt_clean_exit ()
479	{	501	{
480	// TODO: rxvtd should clean up all ressources	502	// TODO: rxvtd should clean up all ressources
481	if (GET_R)	503	if (GET_R)
…		…
483	}	505	}
484		506
485	/* ------------------------------------------------------------------------- *	507	/* ------------------------------------------------------------------------- *
486	* MEMORY ALLOCATION WRAPPERS *	508	* MEMORY ALLOCATION WRAPPERS *
487	* ------------------------------------------------------------------------- */	509	* ------------------------------------------------------------------------- */
488	/* EXTPROTO */	510	/* INTPROTO */
489	void *	511	void *
490	rxvt_malloc (size_t size)	512	rxvt_malloc (size_t size)
491	{	513	{
492	void *p;	514	void *p;
493		515
494	p = malloc (size);	516	p = malloc (size);
495	if (p)	517	if (p)
496	return p;	518	return p;
497		519
498	fprintf (stderr, RESNAME ": memory allocation failure. Aborting");	520	rxvt_fatal ("memory allocation failure. aborting.\n");
499	rxvt_clean_exit ();
500	exit (EXIT_FAILURE);
501	/* NOTREACHED */	521	/* NOTREACHED */
502	}	522	}
503		523
504	/* EXTPROTO */	524	/* INTPROTO */
505	void *	525	void *
506	rxvt_calloc (size_t number, size_t size)	526	rxvt_calloc (size_t number, size_t size)
507	{	527	{
508	void *p;	528	void *p;
509		529
510	p = calloc (number, size);	530	p = calloc (number, size);
511	if (p)	531	if (p)
512	return p;	532	return p;
513		533
514	fprintf (stderr, RESNAME ": memory allocation failure. Aborting");	534	rxvt_fatal ("memory allocation failure. aborting.\n");
515	rxvt_clean_exit ();
516	exit (EXIT_FAILURE);
517	/* NOTREACHED */	535	/* NOTREACHED */
518	}	536	}
519		537
520	/* EXTPROTO */	538	/* INTPROTO */
521	void *	539	void *
522	rxvt_realloc (void *ptr, size_t size)	540	rxvt_realloc (void *ptr, size_t size)
523	{	541	{
524	void *p;	542	void *p;
525		543
526	if (ptr)	544	if (ptr)
527	p = realloc (ptr, size);	545	p = realloc (ptr, size);
528	else	546	else
529	p = malloc (size);	547	p = malloc (size);
		548
530	if (p)	549	if (p)
531	return p;	550	return p;
532		551
533	fprintf (stderr, RESNAME ": memory allocation failure. Aborting");	552	rxvt_fatal ("memory allocation failure. aborting.\n");
534	rxvt_clean_exit ();
535	exit (EXIT_FAILURE);
536	/* NOTREACHED */	553	/* NOTREACHED */
537	}	554	}
538		555
539	/* ------------------------------------------------------------------------- *	556	/* ------------------------------------------------------------------------- *
540	* PRIVILEGED OPERATIONS *	557	* PRIVILEGED OPERATIONS *
541	* ------------------------------------------------------------------------- */	558	* ------------------------------------------------------------------------- */
542	/* take care of suid/sgid super-user (root) privileges */	559	/* take care of suid/sgid super-user (root) privileges */
543	void	560	void
544	rxvt_term::privileges (int mode)	561	rxvt_privileges (rxvt_privaction action)
545	{	562	{
		563	#if (defined(HAVE_SETEUID) \|\| defined(HAVE_SETREUID)) && !defined(__CYGWIN32__)
		564	static uid_t euid;
		565	static gid_t egid;
		566	#endif
		567
546	#if ! defined(__CYGWIN32__)	568	#if ! defined(__CYGWIN32__)
547	# if !defined(HAVE_SETEUID) && defined(HAVE_SETREUID)	569	# if !defined(HAVE_SETEUID) && defined(HAVE_SETREUID)
548	/* setreuid () is the poor man's setuid (), seteuid () */	570	/* setreuid () is the poor man's setuid (), seteuid () */
549	# define seteuid(a) setreuid(-1, (a))	571	# define seteuid(a) setreuid(-1, (a))
550	# define setegid(a) setregid(-1, (a))	572	# define setegid(a) setregid(-1, (a))
551	# define HAVE_SETEUID	573	# define HAVE_SETEUID
552	# endif	574	# endif
553	# ifdef HAVE_SETEUID	575	# ifdef HAVE_SETEUID
554	switch (mode)	576	switch (action)
555	{	577	{
556	case IGNORE:	578	case IGNORE:
557	/*	579	/*
558	* change effective uid/gid - not real uid/gid - so we can switch	580	* change effective uid/gid - not real uid/gid - so we can switch
559	* back to root later, as required	581	* back to root later, as required
…		…
569	seteuid (euid);	591	seteuid (euid);
570	setegid (egid);	592	setegid (egid);
571	break;	593	break;
572	}	594	}
573	# else	595	# else
574	switch (mode)	596	switch (action)
575	{	597	{
576	case IGNORE:	598	case IGNORE:
577	setuid (getuid ());	599	setuid (getuid ());
578	setgid (getgid ());	600	setgid (getgid ());
579	/* FALLTHROUGH */	601	/* FALLTHROUGH */
…		…
586	#endif	608	#endif
587	}	609	}
588		610
589	#ifdef UTMP_SUPPORT	611	#ifdef UTMP_SUPPORT
590	void	612	void
591	rxvt_term::privileged_utmp (char action)	613	rxvt_term::privileged_utmp (rxvt_privaction action)
592	{	614	{
593	D_MAIN ((stderr, "rxvt_privileged_utmp (%c); waiting for: %c (pid: %d)",
594	action, next_utmp_action, getpid ()));
595	if (next_utmp_action != action \|\| (action != SAVE && action != RESTORE)
596	\|\| (Options & Opt_utmpInhibit)	615	if ((options & Opt_utmpInhibit)
597	\|\| ttydev == NULL \|\| *ttydev == '\0')	616	\|\| !pty.name \|\| !*pty.name)
598	return;	617	return;
599		618
600	privileges (RESTORE);	619	rxvt_privileges (RESTORE);
		620
601	if (action == SAVE)	621	if (action == SAVE)
602	{
603	next_utmp_action = RESTORE;
604	makeutent (ttydev, rs[Rs_display_name]);	622	makeutent (pty.name, rs[Rs_display_name]);
605	}
606	else	623	else
607	{ /* action == RESTORE */
608	next_utmp_action = IGNORE;
609	cleanutent ();	624	cleanutent ();
610	}	625
611	privileges (IGNORE);	626	rxvt_privileges (IGNORE);
612	}
613	#endif
614
615	#ifndef NO_SETOWNER_TTYDEV
616	void
617	rxvt_term::privileged_ttydev (char action)
618	{
619	D_MAIN ((stderr,
620	"privileged_ttydev (%c); waiting for: %c (pid: %d)",
621	action, next_tty_action, getpid ()));
622	if (next_tty_action != action \|\| (action != SAVE && action != RESTORE)
623	\|\| ttydev == NULL \|\| *ttydev == '\0')
624	return;
625
626	privileges (RESTORE);
627
628	if (action == SAVE)
629	{
630	next_tty_action = RESTORE;
631	# ifndef RESET_TTY_TO_COMMON_DEFAULTS
632	/* store original tty status for restoration rxvt_clean_exit () -- rgg 04/12/95 */
633	if (lstat (ttydev, &ttyfd_stat) < 0) /* you lose out */
634	next_tty_action = IGNORE;
635	else
636	# endif
637
638	{
639	chown (ttydev, getuid (), ttygid); /* fail silently */
640	chmod (ttydev, ttymode);
641	# ifdef HAVE_REVOKE
642	revoke (ttydev);
643	# endif
644
645	}
646	}
647	else
648	{ /* action == RESTORE */
649	next_tty_action = IGNORE;
650	# ifndef RESET_TTY_TO_COMMON_DEFAULTS
651	chmod (ttydev, ttyfd_stat.st_mode);
652	chown (ttydev, ttyfd_stat.st_uid, ttyfd_stat.st_gid);
653	# else
654	chmod (ttydev,
655	(S_IRUSR \| S_IWUSR \| S_IRGRP \| S_IWGRP \| S_IROTH \| S_IWOTH));
656	chown (ttydev, 0, 0);
657	# endif
658
659	}
660
661	privileges (IGNORE);
662
663	# ifndef RESET_TTY_TO_COMMON_DEFAULTS
664	D_MAIN ((stderr, "%s \"%s\": mode %03o, uid %d, gid %d",
665	action == RESTORE ? "Restoring" : (action ==
666	SAVE ? "Saving" :
667	"UNKNOWN ERROR for"), ttydev,
668	ttyfd_stat.st_mode, ttyfd_stat.st_uid,
669	ttyfd_stat.st_gid));
670	# endif
671	}	627	}
672	#endif	628	#endif
673		629
674	/----------------------------------------------------------------------/	630	/----------------------------------------------------------------------/
675	/*	631	/*
…		…
740	max_height = MAX_ROWS * TermWin.fheight;	696	max_height = MAX_ROWS * TermWin.fheight;
741		697
742	szHint.base_width = szHint.base_height = 2 * TermWin.int_bwidth;	698	szHint.base_width = szHint.base_height = 2 * TermWin.int_bwidth;
743		699
744	sb_w = mb_h = 0;	700	sb_w = mb_h = 0;
745	window_vt_x = window_vt_y = 0;	701	window_vt_x = window_vt_y = TermWin.int_bwidth;
746		702
747	if (scrollbar_visible ())	703	if (scrollbar_visible ())
748	{	704	{
749	sb_w = scrollbar_TotalWidth ();	705	sb_w = scrollbar_TotalWidth ();
750	szHint.base_width += sb_w;	706	szHint.base_width += sb_w;
751	if (! (Options & Opt_scrollBar_right))	707	if (!(options & Opt_scrollBar_right))
752	window_vt_x = sb_w;	708	window_vt_x += sb_w;
753	}	709	}
754		710
755	if (menubar_visible ())	711	if (menubar_visible ())
756	{	712	{
757	mb_h = menuBar_TotalHeight ();	713	mb_h = menuBar_TotalHeight ();
758	szHint.base_height += mb_h;	714	szHint.base_height += mb_h;
759	window_vt_y = mb_h;	715	window_vt_y += mb_h;
760	}	716	}
761		717
762	szHint.width_inc = TermWin.fwidth;	718	szHint.width_inc = TermWin.fwidth;
763	szHint.height_inc = TermWin.fheight;	719	szHint.height_inc = TermWin.fheight;
764	szHint.min_width = szHint.base_width + szHint.width_inc;	720	szHint.min_width = szHint.base_width + szHint.width_inc;
…		…
784	{	740	{
785	MIN_IT (TermWin.height, max_height);	741	MIN_IT (TermWin.height, max_height);
786	szHint.height = szHint.base_height + TermWin.height;	742	szHint.height = szHint.base_height + TermWin.height;
787	}	743	}
788		744
789	if (scrollbar_visible () && (Options & Opt_scrollBar_right))	745	if (scrollbar_visible () && (options & Opt_scrollBar_right))
790	window_sb_x = szHint.width - sb_w;	746	window_sb_x = szHint.width - sb_w;
791		747
792	if (recalc_x)	748	if (recalc_x)
793	szHint.x += (DisplayWidth (display->display, DefaultScreen (display->display))	749	szHint.x += (DisplayWidth (display->display, DefaultScreen (display->display))
794	- szHint.width - 2 * TermWin.ext_bwidth);	750	- szHint.width - 2 * TermWin.ext_bwidth);
…		…
810	* Called after a window size change.	766	* Called after a window size change.
811	*/	767	*/
812	void	768	void
813	rxvt_term::tt_winch ()	769	rxvt_term::tt_winch ()
814	{	770	{
		771	if (pty.pty < 0)
		772	return;
		773
815	struct winsize ws;	774	struct winsize ws;
816
817	if (cmd_fd < 0)
818	return;
819		775
820	ws.ws_col = TermWin.ncol;	776	ws.ws_col = TermWin.ncol;
821	ws.ws_row = TermWin.nrow;	777	ws.ws_row = TermWin.nrow;
822	ws.ws_xpixel = ws.ws_ypixel = 0;	778	ws.ws_xpixel = TermWin.width;
823	#ifndef DEBUG_SIZE	779	ws.ws_ypixel = TermWin.height;
824	(void)ioctl (cmd_fd, TIOCSWINSZ, &ws);	780	(void)ioctl (pty.pty, TIOCSWINSZ, &ws);
825	#else	781
826	if (ioctl (cmd_fd, TIOCSWINSZ, &ws) < 0)	782	#if 0
827	D_SIZE ((stderr, "Failed to send TIOCSWINSZ to fd %d", fd));	783	// TIOCSWINSZ⎈ is supposed to do this automatically and correctly
828	# ifdef SIGWINCH
829	else if (cmd_pid) /* force through to the command */	784	if (cmd_pid) /* force through to the command */
830	kill (cmd_pid, SIGWINCH);	785	kill (cmd_pid, SIGWINCH);
831	# endif
832	#endif	786	#endif
833	}	787	}
834		788
835	/----------------------------------------------------------------------/	789	/----------------------------------------------------------------------/
836	/* rxvt_change_font () - Switch to a new font */	790	/* set_fonts () - load and set the various fonts
837	/*	791	/*
838	* init = 1 - initialize	792	* init = 1 - initialize
839	*	793	*
840	* fontname == FONT_UP - switch to bigger font	794	* fontname == FONT_UP - switch to bigger font
841	* fontname == FONT_DN - switch to smaller font	795	* fontname == FONT_DN - switch to smaller font
842	*/	796	*/
843	bool	797	bool
844	rxvt_term::change_font (const char *fontname)	798	rxvt_term::set_fonts ()
845	{	799	{
846	if (fontname == FONT_UP)
847	{
848	// TODO
849	}
850	else if (fontname == FONT_DN)
851	{
852	// TODO
853	}
854	else
855	{
856	rxvt_fontset *fs = new rxvt_fontset (this);	800	rxvt_fontset *fs = new rxvt_fontset (this);
		801	rxvt_fontprop prop;
857		802
858	if (fs && fs->populate (fontname ? fontname : "fixed"))	803	prop.width = prop.height = prop.weight = prop.slant
		804	= rxvt_fontprop::unset;
		805
		806	if (!fs
		807	\|\| !fs->populate (rs[Rs_font] ? rs[Rs_font] : "fixed", prop)
		808	\|\| !fs->realize_font (1))
		809	{
		810	delete fs;
		811	return false;
		812	}
		813
		814	#if ENABLE_STYLES
		815	for (int i = RS_styleCount; --i; )
		816	if (TermWin.fontset[i] != TermWin.fontset[0])
		817	delete TermWin.fontset[i];
		818	#endif
		819
		820	delete TermWin.fontset[0];
		821	TermWin.fontset[0] = fs;
		822
		823	fs->prop = prop = (*fs)[1]->properties ();
		824
		825	TermWin.fwidth = prop.width;
		826	TermWin.fheight = prop.height;
		827	TermWin.fweight = prop.weight;
		828	TermWin.fslant = prop.slant;
		829	TermWin.fbase = (*fs)[1]->ascent;
		830
		831	for (int style = 1; style < 4; style++)
		832	{
		833	#if ENABLE_STYLES
		834	const char *res = rs[Rs_font + style];
		835
		836	if (res && !*res)
		837	TermWin.fontset[style] = TermWin.fontset[0];
		838	else
859	{	839	{
860	delete TermWin.fontset;	840	TermWin.fontset[style] = fs = new rxvt_fontset (this);
861	TermWin.fontset = fs;	841	rxvt_fontprop prop2 = prop;
862	TermWin.fwidth = fs->base_font ()->width;
863	TermWin.fheight = fs->base_font ()->height;
864	TermWin.fbase = fs->base_font ()->ascent;
865		842
866	if (TermWin.parent[0])	843	if (res)
		844	prop2.weight = prop2.slant = rxvt_fontprop::unset;
		845	else
867	{	846	{
868	resize_all_windows (0, 0, 0);	847	res = TermWin.fontset[0]->fontdesc;
869	scr_remap_chars ();	848
870	scr_touch (true);	849	if (SET_STYLE (0, style) & RS_Bold) prop2.weight = rxvt_fontprop::bold;
		850	if (SET_STYLE (0, style) & RS_Italic) prop2.slant = rxvt_fontprop::italic;
871	}	851	}
872		852
873	return true;	853	fs->populate (res, prop2);
874	}	854	}
		855	#else
		856	TermWin.fontset[style] = TermWin.fontset[0];
		857	#endif
		858	}
		859
		860	if (TermWin.parent[0])
875	}	861	{
		862	resize_all_windows (0, 0, 0);
		863	scr_remap_chars ();
		864	scr_touch (true);
		865	}
876		866
877	return false;	867	return true;
878	}
879
880	bool
881	rxvt_term::font_up_down (int n, int direction)
882	{
883	return false;
884	}	868	}
885		869
886	/----------------------------------------------------------------------/	870	/----------------------------------------------------------------------/
887	/----------------------------------------------------------------------/	871	/----------------------------------------------------------------------/
888	/* xterm sequences - title, iconName, color (exptl) */	872	/* xterm sequences - title, iconName, color (exptl) */
…		…
893	char *name;	877	char *name;
894		878
895	if (!XFetchName (display->display, TermWin.parent[0], &name))	879	if (!XFetchName (display->display, TermWin.parent[0], &name))
896	name = NULL;	880	name = NULL;
897		881
898	if (name == NULL \|\| STRCMP (name, str))	882	if (name == NULL \|\| strcmp (name, str))
899	#endif	883	#endif
900	XStoreName (display->display, TermWin.parent[0], str);	884	XStoreName (display->display, TermWin.parent[0], str);
901		885
902	#ifdef SMART_WINDOW_TITLE	886	#ifdef SMART_WINDOW_TITLE
903	if (name)	887	if (name)
…		…
912	char *name;	896	char *name;
913		897
914	if (!XGetIconName (display->display, TermWin.parent[0], &name))	898	if (!XGetIconName (display->display, TermWin.parent[0], &name))
915	name = NULL;	899	name = NULL;
916		900
917	if (name == NULL \|\| STRCMP (name, str))	901	if (name == NULL \|\| strcmp (name, str))
918	#endif	902	#endif
919	XSetIconName (display->display, TermWin.parent[0], str);	903	XSetIconName (display->display, TermWin.parent[0], str);
920		904
921	#ifdef SMART_WINDOW_TITLE	905	#ifdef SMART_WINDOW_TITLE
922	if (name)	906	if (name)
…		…
940	i = atoi (color);	924	i = atoi (color);
941	if (i >= 8 && i <= 15)	925	if (i >= 8 && i <= 15)
942	{ /* bright colors */	926	{ /* bright colors */
943	i -= 8;	927	i -= 8;
944	# ifndef NO_BRIGHTCOLOR	928	# ifndef NO_BRIGHTCOLOR
945	PixColors[idx] = PixColors[minBrightCOLOR + i];	929	pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i];
946	SET_PIXCOLOR (idx);	930	SET_PIXCOLOR (idx);
947	goto Done;	931	goto Done;
948	# endif	932	# endif
949		933
950	}	934	}
951	if (i >= 0 && i <= 7)	935	if (i >= 0 && i <= 7)
952	{ /* normal colors */	936	{ /* normal colors */
953	PixColors[idx] = PixColors[minCOLOR + i];	937	pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];
954	SET_PIXCOLOR (idx);	938	SET_PIXCOLOR (idx);
955	goto Done;	939	goto Done;
956	}	940	}
957	}	941	}
958		942
959	if (!rXParseAllocColor (& xcol, color))	943	if (!rXParseAllocColor (& xcol, color))
960	return;	944	return;
961		945
962	/* XStoreColor (display->display, XCMAP, XColor); /	946	/* XStoreColor (display->display, display->cmap, XColor); /
963		947
964	/*	948	/*
965	* FIXME: should free colors here, but no idea how to do it so instead,	949	* FIXME: should free colors here, but no idea how to do it so instead,
966	* so just keep gobbling up the colormap	950	* so just keep gobbling up the colormap
967	*/	951	*/
968	# if 0	952	# if 0
969	for (i = Color_Black; i <= Color_White; i++)	953	for (i = Color_Black; i <= Color_White; i++)
970	if (PixColors[idx] == PixColors[i])	954	if (pix_colors[idx] == pix_colors[i])
971	break;	955	break;
972	if (i > Color_White)	956	if (i > Color_White)
973	{	957	{
974	/* fprintf (stderr, "XFreeColors: PixColors [%d] = %lu\n", idx, PixColors [idx]); */	958	/* fprintf (stderr, "XFreeColors: pix_colors [%d] = %lu\n", idx, pix_colors [idx]); */
975	XFreeColors (display->display, XCMAP, (PixColors + idx), 1,	959	XFreeColors (display->display, display->cmap, (pix_colors + idx), 1,
976	DisplayPlanes (display->display, display->screen));	960	DisplayPlanes (display->display, display->screen));
977	}	961	}
978	# endif	962	# endif
979		963
980	PixColors[idx] = xcol;	964	pix_colors_focused[idx] = xcol;
981	SET_PIXCOLOR (idx);	965	SET_PIXCOLOR (idx);
982		966
983	/* XSetWindowAttributes attr; */	967	/* XSetWindowAttributes attr; */
984	/* Cursor cursor; */	968	/* Cursor cursor; */
985	Done:	969	Done:
986	if (idx == Color_bg && ! (Options & Opt_transparent))	970	#ifdef OFF_FOCUS_FADING
987	XSetWindowBackground (display->display, TermWin.vt,	971	if (rs[Rs_fade])
988	PixColors[Color_bg]);	972	pix_colors_unfocused[idx] = pix_colors_focused[idx].fade (display, atoi (rs[Rs_fade]));
		973	#endif
989		974
990	/* handle Color_BD, scrollbar background, etc. */	975	/TODO: handle Color_BD, scrollbar background, etc. /
991		976
992	set_colorfgbg ();
993	recolour_cursor ();	977	recolour_cursor ();
994	scr_touch (true);	978	scr_recolour ();
995	}	979	}
996		980
997	#else	981	#else
998	# define set_window_color (idx,color) ((void)0)	982	# define set_window_color (idx,color) ((void)0)
999	#endif /* XTERM_COLOR_CHANGE */	983	#endif /* XTERM_COLOR_CHANGE */
…		…
1001	void	985	void
1002	rxvt_term::recolour_cursor ()	986	rxvt_term::recolour_cursor ()
1003	{	987	{
1004	XColor xcol[2];	988	XColor xcol[2];
1005		989
1006	xcol[0].pixel = ISSET_PIXCOLOR (Color_pointer_fg) ? PixColors[Color_pointer_fg] : PixColors[Color_fg];	990	xcol[0].pixel = ISSET_PIXCOLOR (Color_pointer_fg)
1007	xcol[1].pixel = ISSET_PIXCOLOR (Color_pointer_bg) ? PixColors[Color_pointer_bg] : PixColors[Color_bg];	991	? pix_colors_focused[Color_pointer_fg]
		992	: pix_colors_focused[Color_fg];
		993	xcol[1].pixel = ISSET_PIXCOLOR (Color_pointer_bg)
		994	? pix_colors_focused[Color_pointer_bg]
		995	: pix_colors_focused[Color_bg];
		996
1008	XQueryColors (display->display, XCMAP, xcol, 2);	997	XQueryColors (display->display, display->cmap, xcol, 2);
1009	XRecolorCursor (display->display, TermWin_cursor, xcol + 0, xcol + 1);	998	XRecolorCursor (display->display, TermWin_cursor, xcol + 0, xcol + 1);
1010	}	999	}
1011		1000
1012	/----------------------------------------------------------------------/	1001	/----------------------------------------------------------------------/
1013	/*	1002	/*
1014	* find if fg/bg matches any of the normal (low-intensity) colors	1003	* find if fg/bg matches any of the normal (low-intensity) colors
1015	*/	1004	*/
1016	void	1005	void
1017	rxvt_term::set_colorfgbg ()	1006	rxvt_term::set_colorfgbg ()
1018	{	1007	{
1019	unsigned int i;	1008	unsigned int i;
1020	const char *xpmb = "\0";	1009	const char *xpmb = "\0";
1021	char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1];	1010	char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1];
1022		1011
1023	env_colorfgbg =
1024	(char *)rxvt_malloc (sizeof ("COLORFGBG=default;default;bg") + 1);	1012	env_colorfgbg = (char *)rxvt_malloc (sizeof ("COLORFGBG=default;default;bg") + 1);
1025	STRCPY (fstr, "default");	1013	strcpy (fstr, "default");
1026	STRCPY (bstr, "default");	1014	strcpy (bstr, "default");
1027	for (i = Color_Black; i <= Color_White; i++)	1015	for (i = Color_Black; i <= Color_White; i++)
1028	if (PixColors[Color_fg] == PixColors[i])	1016	if (pix_colors[Color_fg] == pix_colors[i])
1029	{	1017	{
1030	sprintf (fstr, "%d", (i - Color_Black));	1018	sprintf (fstr, "%d", (i - Color_Black));
1031	break;	1019	break;
1032	}	1020	}
		1021
1033	for (i = Color_Black; i <= Color_White; i++)	1022	for (i = Color_Black; i <= Color_White; i++)
1034	if (PixColors[Color_bg] == PixColors[i])	1023	if (pix_colors[Color_bg] == pix_colors[i])
1035	{	1024	{
1036	sprintf (bstr, "%d", (i - Color_Black));	1025	sprintf (bstr, "%d", (i - Color_Black));
1037	#ifdef XPM_BACKGROUND	1026	#ifdef XPM_BACKGROUND
1038	xpmb = "default;";	1027	xpmb = "default;";
1039	#endif	1028	#endif
1040	break;	1029	break;
1041	}	1030	}
1042		1031
1043	sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr);	1032	sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr);
1044
1045	#ifndef NO_BRIGHTCOLOR
1046	colorfgbg = DEFAULT_RSTYLE;
1047	for (i = minCOLOR; i <= maxCOLOR; i++)
1048	{
1049	if (PixColors[Color_fg] == PixColors[i])
1050	colorfgbg = SET_FGCOLOR (colorfgbg, i);
1051	if (PixColors[Color_bg] == PixColors[i])
1052	colorfgbg = SET_BGCOLOR (colorfgbg, i);
1053	}
1054	#endif
1055	}	1033	}
1056		1034
1057	/----------------------------------------------------------------------/	1035	/----------------------------------------------------------------------/
1058	/*	1036	/*
1059	* Colour determination for low colour displays, routine from	1037	* Colour determination for low colour displays, routine from
…		…
1207	if (width == 0)	1185	if (width == 0)
1208	width = wattr.width - szHint.base_width;	1186	width = wattr.width - szHint.base_width;
1209	if (height == 0)	1187	if (height == 0)
1210	height = wattr.height - szHint.base_height;	1188	height = wattr.height - szHint.base_height;
1211	}	1189	}
		1190
1212	if (width != TermWin.width \|\| height != TermWin.height)	1191	if (width != TermWin.width \|\| height != TermWin.height)
1213	{	1192	{
1214	width += szHint.base_width;	1193	width += szHint.base_width;
1215	height += szHint.base_height;	1194	height += szHint.base_height;
1216	resize_all_windows (width, height, 0);	1195	resize_all_windows (width, height, 0);
…		…
1221	* - X INPUT METHOD ROUTINES - *	1200	* - X INPUT METHOD ROUTINES - *
1222	* -------------------------------------------------------------------- */	1201	* -------------------------------------------------------------------- */
1223	#ifdef USE_XIM	1202	#ifdef USE_XIM
1224		1203
1225	void	1204	void
		1205	rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg)
		1206	{
		1207	fg = pix_colors[Color_fg];
		1208	bg = pix_colors[Color_bg];
		1209	}
		1210
		1211	void
1226	rxvt_term::im_set_size (XRectangle *size)	1212	rxvt_term::im_set_size (XRectangle &size)
1227	{	1213	{
		1214	// the int_bwidth terms make no sense to me
1228	size->x = TermWin.int_bwidth;	1215	size.x = TermWin.int_bwidth;
1229	size->y = TermWin.int_bwidth;	1216	size.y = TermWin.int_bwidth;
1230	size->width = Width2Pixel (TermWin.ncol);	1217	size.width = Width2Pixel (TermWin.ncol) + TermWin.int_bwidth;
1231	size->height = Height2Pixel (TermWin.nrow);	1218	size.height = Height2Pixel (TermWin.nrow) + TermWin.int_bwidth;
1232	}	1219	}
1233		1220
1234	void	1221	void
1235	rxvt_term::im_set_color (unsigned long fg, unsigned long bg)	1222	rxvt_term::im_set_preedit_area (XRectangle &preedit_rect,
		1223	XRectangle &status_rect,
		1224	const XRectangle &needed_rect)
1236	{	1225	{
1237	*fg = PixColors[Color_fg];	1226	preedit_rect.x = needed_rect.width;
1238	*bg = PixColors[Color_bg];	1227	preedit_rect.y = 0;
		1228	preedit_rect.width = Width2Pixel (TermWin.ncol) - needed_rect.width + 1;
		1229	preedit_rect.height = TermWin.fheight;
		1230
		1231	status_rect.x = 0;
		1232	status_rect.y = 0;
		1233	status_rect.width = needed_rect.width ? needed_rect.width : Width2Pixel (TermWin.ncol) + 1;
		1234	status_rect.height = TermWin.fheight;
1239	}	1235	}
1240		1236
1241	/* Checking whether input method is running. */	1237	/* Checking whether input method is running. */
1242	bool	1238	bool
1243	rxvt_term::IMisRunning ()	1239	rxvt_term::IMisRunning ()
1244	{	1240	{
1245	char *p;	1241	char *p;
1246	Atom atom;	1242	Atom atom;
1247	Window win;	1243	Window win;
1248	char server[IMBUFSIZ];	1244	char server[IMBUFSIZ];
1249		1245
1250	/* get current locale modifier */	1246	/* get current locale modifier */
1251	if ((p = XSetLocaleModifiers (NULL)) != NULL)	1247	if ((p = XSetLocaleModifiers (NULL)) != NULL)
1252	{	1248	{
1253	STRCPY (server, "@server=");	1249	strcpy (server, "@server=");
1254	STRNCAT (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */	1250	strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */
		1251
1255	if ((p = STRCHR (server + 1, '@')) != NULL) /* first one only */	1252	if ((p = strchr (server + 1, '@')) != NULL) /* first one only */
1256	*p = '\0';	1253	*p = '\0';
1257		1254
1258	atom = XInternAtom (display->display, server, False);	1255	atom = XInternAtom (display->display, server, False);
1259	win = XGetSelectionOwner (display->display, atom);	1256	win = XGetSelectionOwner (display->display, atom);
		1257
1260	if (win != None)	1258	if (win != None)
1261	return True;	1259	return True;
1262	}	1260	}
		1261
1263	return False;	1262	return False;
1264	}	1263	}
1265		1264
1266	void	1265	void
1267	rxvt_term::IMSendSpot ()	1266	rxvt_term::IMSendSpot ()
1268	{	1267	{
1269	XPoint spot;	1268	XPoint spot;
1270	XVaNestedList preedit_attr;	1269	XVaNestedList preedit_attr;
1271		1270
1272	if (Input_Context == NULL	1271	if (!Input_Context
		1272	\|\| !TermWin.focus
1273	\|\| !TermWin.focus \|\| ! (input_style & XIMPreeditPosition)	1273	\|\| !(input_style & XIMPreeditPosition)
		1274	#if 0
1274	\|\| ! (event_type == KeyPress	1275	\|\| !(event_type == KeyPress
1275	\|\| event_type == Expose	1276	\|\| event_type == Expose
1276	\|\| event_type == NoExpose	1277	\|\| event_type == NoExpose
1277	\|\| event_type == SelectionNotify	1278	\|\| event_type == SelectionNotify
1278	\|\| event_type == ButtonRelease \|\| event_type == FocusIn)	1279	\|\| event_type == ButtonRelease \|\| event_type == FocusIn)
		1280	#endif
1279	\|\| !IMisRunning ())	1281	\|\| !IMisRunning ())
1280	return;	1282	return;
1281		1283
1282	im_set_position (&spot);	1284	im_set_position (spot);
1283		1285
1284	preedit_attr = XVaCreateNestedList (0, XNSpotLocation, &spot, NULL);	1286	preedit_attr = XVaCreateNestedList (0, XNSpotLocation, &spot, NULL);
1285	XSetICValues (Input_Context, XNPreeditAttributes, preedit_attr, NULL);	1287	XSetICValues (Input_Context, XNPreeditAttributes, preedit_attr, NULL);
1286	XFree (preedit_attr);	1288	XFree (preedit_attr);
1287	}	1289	}
1288		1290
1289	void	1291	void
1290	rxvt_term::im_set_preedit_area (XRectangle * preedit_rect, XRectangle * status_rect,
1291	XRectangle * needed_rect)
1292	{
1293	int mbh, vtx = 0;
1294
1295	if (scrollbar_visible () && ! (Options & Opt_scrollBar_right))
1296	vtx = scrollbar_TotalWidth ();
1297
1298	mbh = menubar_visible () ? menuBar_TotalHeight () : 0;
1299	mbh -= TermWin.lineSpace;
1300
1301	preedit_rect->x = needed_rect->width + vtx;
1302	preedit_rect->y = Height2Pixel (TermWin.nrow - 1) + mbh;
1303
1304	preedit_rect->width = Width2Pixel (TermWin.ncol + 1) - needed_rect->width + vtx;
1305	preedit_rect->height = Height2Pixel (1);
1306
1307	status_rect->x = vtx;
1308	status_rect->y = Height2Pixel (TermWin.nrow - 1) + mbh;
1309
1310	status_rect->width = needed_rect->width ? needed_rect->width : Width2Pixel (TermWin.ncol + 1);
1311	status_rect->height = Height2Pixel (1);
1312	}
1313
1314	void
1315	rxvt_term::im_destroy ()	1292	rxvt_term::im_destroy ()
1316	{	1293	{
1317	if (Input_Context)	1294	if (Input_Context)
1318	{	1295	{
1319	XDestroyIC (Input_Context);	1296	XDestroyIC (Input_Context);
1320	Input_Context = NULL;	1297	Input_Context = 0;
1321	}	1298	}
1322		1299
1323	if (input_method)	1300	if (input_method)
1324	{	1301	{
1325	display->put_xim (input_method);	1302	display->put_xim (input_method);
…		…
1332	* open a suitable preedit type	1309	* open a suitable preedit type
1333	*/	1310	*/
1334	bool	1311	bool
1335	rxvt_term::IM_get_IC (const char *modifiers)	1312	rxvt_term::IM_get_IC (const char *modifiers)
1336	{	1313	{
1337	int i, j, found;	1314	int i, j, found;
1338	XIM xim;	1315	XIM xim;
1339	XPoint spot;	1316	XPoint spot;
1340	XRectangle rect, status_rect, needed_rect;	1317	XRectangle rect, status_rect, needed_rect;
1341	unsigned long fg, bg;	1318	unsigned long fg, bg;
1342	const char *p;	1319	const char *p;
1343	char **s;	1320	char **s;
1344	XIMStyles *xim_styles;	1321	XIMStyles *xim_styles;
1345	XVaNestedList preedit_attr, status_attr;
1346		1322
1347	if (! ((p = XSetLocaleModifiers (modifiers)) && *p))	1323	if (! ((p = XSetLocaleModifiers (modifiers)) && *p))
1348	return false;	1324	return false;
1349		1325
1350	D_MAIN ((stderr, "rxvt_IM_get_IC ()"));	1326	D_MAIN ((stderr, "rxvt_IM_get_IC ()"));
…		…
1356		1332
1357	xim_styles = NULL;	1333	xim_styles = NULL;
1358	if (XGetIMValues (xim, XNQueryInputStyle, &xim_styles, NULL)	1334	if (XGetIMValues (xim, XNQueryInputStyle, &xim_styles, NULL)
1359	\|\| !xim_styles \|\| !xim_styles->count_styles)	1335	\|\| !xim_styles \|\| !xim_styles->count_styles)
1360	{	1336	{
1361	display->put_xim (input_method);	1337	im_destroy ();
1362	return false;	1338	return false;
1363	}	1339	}
1364		1340
1365	p = rs[Rs_preeditType] ? rs[Rs_preeditType] : "OverTheSpot,OffTheSpot,Root";	1341	p = rs[Rs_preeditType] ? rs[Rs_preeditType] : "OverTheSpot,OffTheSpot,Root";
1366	s = rxvt_splitcommastring (p);	1342	s = rxvt_splitcommastring (p);
		1343
1367	for (i = found = 0; !found && s[i]; i++)	1344	for (i = found = 0; !found && s[i]; i++)
1368	{	1345	{
1369	if (!STRCMP (s[i], "OverTheSpot"))	1346	if (!strcmp (s[i], "OverTheSpot"))
1370	input_style = (XIMPreeditPosition \| XIMStatusNothing);	1347	input_style = (XIMPreeditPosition \| XIMStatusNothing);
1371	else if (!STRCMP (s[i], "OffTheSpot"))	1348	else if (!strcmp (s[i], "OffTheSpot"))
1372	input_style = (XIMPreeditArea \| XIMStatusArea);	1349	input_style = (XIMPreeditArea \| XIMStatusArea);
1373	else if (!STRCMP (s[i], "Root"))	1350	else if (!strcmp (s[i], "Root"))
1374	input_style = (XIMPreeditNothing \| XIMStatusNothing);	1351	input_style = (XIMPreeditNothing \| XIMStatusNothing);
1375		1352
1376	for (j = 0; j < xim_styles->count_styles; j++)	1353	for (j = 0; j < xim_styles->count_styles; j++)
1377	if (input_style == xim_styles->supported_styles[j])	1354	if (input_style == xim_styles->supported_styles[j])
1378	{	1355	{
…		…
1387	free (s);	1364	free (s);
1388	XFree (xim_styles);	1365	XFree (xim_styles);
1389		1366
1390	if (!found)	1367	if (!found)
1391	{	1368	{
1392	display->put_xim (input_method);	1369	im_destroy ();
1393	return false;	1370	return false;
1394	}	1371	}
1395		1372
1396	preedit_attr = status_attr = NULL;	1373	XFontSet fs = 0;
		1374	XVaNestedList preedit_attr = 0, status_attr = 0;
		1375
		1376	if (input_style & (XIMPreeditPosition \| XIMPreeditArea))
		1377	{
		1378	// fake us a font-set, please
		1379	char **missing_charset_list;
		1380	int missing_charset_count;
		1381	char *def_string;
		1382	char pat[512];
		1383
		1384	sprintf (pat,
		1385	"----R---%d------*,"
		1386	"----R---%d------*,"
		1387	"----R---%d------*,"
		1388	"----R---%d------*,"
		1389	"----R---%d------*,"
		1390	"*",
		1391	TermWin.fheight,
		1392	TermWin.fheight + 1, TermWin.fheight - 1,
		1393	TermWin.fheight - 2, TermWin.fheight + 2);
		1394
		1395	fs = XCreateFontSet (display->display, pat,
		1396	&missing_charset_list, &missing_charset_count, &def_string);
		1397
		1398	if (missing_charset_list)
		1399	XFreeStringList (missing_charset_list);
		1400
		1401	if (!fs)
		1402	{
		1403	input_style &= ~(XIMPreeditPosition \| XIMPreeditArea);
		1404	rxvt_warn ("unable to create fontset for input method, try \"-pt Root\". Continuing.\n");
		1405	}
		1406	}
1397		1407
1398	if (input_style & XIMPreeditPosition)	1408	if (input_style & XIMPreeditPosition)
1399	{	1409	{
1400	im_set_size (&rect);	1410	im_set_size (rect);
1401	im_set_position (&spot);	1411	im_set_position (spot);
1402	im_set_color (&fg, &bg);	1412	im_set_color (fg, bg);
1403		1413
1404	preedit_attr = XVaCreateNestedList (0, XNArea, &rect,	1414	preedit_attr = XVaCreateNestedList (0,
		1415	XNForeground, fg,
		1416	XNBackground, bg,
		1417	XNArea, &rect,
1405	XNSpotLocation, &spot,	1418	XNSpotLocation, &spot,
1406	XNForeground, fg, XNBackground, bg,
1407	//XNFontSet, TermWin.fontset,	1419	XNFontSet, fs,
1408	NULL);	1420	NULL);
1409	}	1421	}
1410	else if (input_style & XIMPreeditArea)	1422	else if (input_style & XIMPreeditArea)
1411	{	1423	{
1412	im_set_color (&fg, &bg);	1424	im_set_color (fg, bg);
1413		1425
1414	/*	1426	/*
1415	* The necessary width of preedit area is unknown	1427	* The necessary width of preedit area is unknown
1416	* until create input context.	1428	* until create input context.
1417	*/	1429	*/
1418	needed_rect.width = 0;	1430	needed_rect.width = 0;
1419
1420	im_set_preedit_area (&rect, &status_rect, &needed_rect);	1431	im_set_preedit_area (rect, status_rect, needed_rect);
1421		1432
1422	preedit_attr = XVaCreateNestedList (0, XNArea, &rect,	1433	preedit_attr = XVaCreateNestedList (0,
		1434	XNForeground, fg,
1423	XNForeground, fg, XNBackground, bg,	1435	XNBackground, bg,
		1436	XNArea, &rect,
		1437	XNFontSet, fs,
		1438	NULL);
		1439	status_attr = XVaCreateNestedList (0,
		1440	XNForeground, fg,
		1441	XNBackground, bg,
		1442	XNArea, &status_rect,
1424	//XNFontSet, TermWin.fontset,	1443	XNFontSet, fs,
1425	NULL);	1444	NULL);
1426	status_attr = XVaCreateNestedList (0, XNArea, &status_rect,
1427	XNForeground, fg, XNBackground, bg,
1428	//XNFontSet, TermWin.fontset,
1429	NULL);
1430	}	1445	}
1431		1446
1432	Input_Context = XCreateIC (xim, XNInputStyle, input_style,	1447	Input_Context = XCreateIC (xim,
		1448	XNInputStyle, input_style,
1433	XNClientWindow, TermWin.parent[0],	1449	XNClientWindow, TermWin.vt,
1434	XNFocusWindow, TermWin.parent[0],	1450	XNFocusWindow, TermWin.parent[0],
1435	preedit_attr ? XNPreeditAttributes : NULL,	1451	preedit_attr ? XNPreeditAttributes : NULL,
1436	preedit_attr,	1452	preedit_attr,
1437	status_attr ? XNStatusAttributes : NULL,	1453	status_attr ? XNStatusAttributes : NULL,
1438	status_attr, NULL);	1454	status_attr, NULL);
		1455
1439	if (preedit_attr) XFree (preedit_attr);	1456	if (preedit_attr) XFree (preedit_attr);
1440	if (status_attr) XFree (status_attr);	1457	if (status_attr) XFree (status_attr);
		1458	if (fs) XFreeFontSet (display->display, fs);
1441		1459
1442	if (Input_Context == NULL)	1460	if (Input_Context == NULL)
1443	{	1461	{
1444	rxvt_warn ("failed to create input context, continuing without XIM.\n");	1462	rxvt_warn ("failed to create input context, continuing without XIM.\n");
1445	display->put_xim (input_method);	1463	im_destroy ();
1446	return false;	1464	return false;
1447	}	1465	}
1448		1466
1449	if (input_style & XIMPreeditArea)	1467	if (input_style & XIMPreeditArea)
1450	IMSetStatusPosition ();	1468	IMSetStatusPosition ();
…		…
1480	s = rxvt_splitcommastring (p);	1498	s = rxvt_splitcommastring (p);
1481	for (i = 0; s[i]; i++)	1499	for (i = 0; s[i]; i++)
1482	{	1500	{
1483	if (*s[i])	1501	if (*s[i])
1484	{	1502	{
1485	STRCPY (buf, "@im=");	1503	strcpy (buf, "@im=");
1486	STRNCAT (buf, s[i], IMBUFSIZ - 5);	1504	strncat (buf, s[i], IMBUFSIZ - 5);
1487	if (IM_get_IC (buf))	1505	if (IM_get_IC (buf))
1488	{	1506	{
1489	found = true;	1507	found = true;
1490	break;	1508	break;
1491	}	1509	}
…		…
1515	}	1533	}
1516		1534
1517	void	1535	void
1518	rxvt_term::IMSetStatusPosition ()	1536	rxvt_term::IMSetStatusPosition ()
1519	{	1537	{
1520	XRectangle preedit_rect, status_rect, *needed_rect;	1538	XRectangle preedit_rect, status_rect, *needed_rect;
1521	XVaNestedList preedit_attr, status_attr;	1539	XVaNestedList preedit_attr, status_attr;
1522		1540
1523	if (Input_Context == NULL	1541	if (!Input_Context
		1542	\|\| !TermWin.focus
1524	\|\| !TermWin.focus \|\| ! (input_style & XIMPreeditArea)	1543	\|\| !(input_style & XIMPreeditArea)
1525	\|\| !IMisRunning ())	1544	\|\| !IMisRunning ())
1526	return;	1545	return;
1527		1546
1528	/* Getting the necessary width of preedit area */	1547	/* Getting the necessary width of preedit area */
1529	status_attr = XVaCreateNestedList (0, XNAreaNeeded, &needed_rect, NULL);	1548	status_attr = XVaCreateNestedList (0, XNAreaNeeded, &needed_rect, NULL);
1530	XGetICValues (Input_Context, XNStatusAttributes, status_attr, NULL);	1549	XGetICValues (Input_Context, XNStatusAttributes, status_attr, NULL);
1531	XFree (status_attr);	1550	XFree (status_attr);
1532		1551
1533	im_set_preedit_area (&preedit_rect, &status_rect, needed_rect);	1552	im_set_preedit_area (preedit_rect, status_rect, *needed_rect);
		1553	XFree (needed_rect);
1534		1554
1535	preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);	1555	preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);
1536	status_attr = XVaCreateNestedList (0, XNArea, &status_rect, NULL);	1556	status_attr = XVaCreateNestedList (0, XNArea, &status_rect, NULL);
1537		1557
1538	XSetICValues (Input_Context,	1558	XSetICValues (Input_Context,
1539	XNPreeditAttributes, preedit_attr,	1559	XNPreeditAttributes, preedit_attr,
1540	XNStatusAttributes, status_attr, NULL);	1560	XNStatusAttributes, status_attr, NULL);
1541		1561
1542	XFree (preedit_attr);	1562	XFree (preedit_attr);
1543	XFree (status_attr);	1563	XFree (status_attr);
1544	}	1564	}
1545	#endif /* USE_XIM */	1565	#endif /* USE_XIM */

Diff Legend

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

Comparing rxvt-unicode/src/main.C (file contents): Revision 1.67 by pcg, Sun May 9 18:19:49 2004 UTC vs. Revision 1.108 by root, Wed Aug 25 05:03:33 2004 UTC

Diff Legend

Comparing rxvt-unicode/src/main.C (file contents):
Revision 1.67 by pcg, Sun May 9 18:19:49 2004 UTC vs.
Revision 1.108 by root, Wed Aug 25 05:03:33 2004 UTC