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

Comparing rxvt-unicode/src/main.C (file contents):
Revision 1.237 by root, Tue Jun 26 00:40:18 2007 UTC vs.
Revision 1.309 by root, Wed Feb 27 01:02:33 2008 UTC

…		…
11	* Copyright (c) 1997 mj olesen <olesen@me.QueensU.CA>	11	* Copyright (c) 1997 mj olesen <olesen@me.QueensU.CA>
12	* - extensive modifications	12	* - extensive modifications
13	* Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de>	13	* Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de>
14	* Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com>	14	* Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com>
15	* - extensive modifications	15	* - extensive modifications
16	* Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com>	16	* Copyright (c) 2003-2008 Marc Lehmann <pcg@goof.com>
17	*	17	*
18	* This program is free software; you can redistribute it and/or modify	18	* This program is free software; you can redistribute it and/or modify
19	* it under the terms of the GNU General Public License as published by	19	* it under the terms of the GNU General Public License as published by
20	* the Free Software Foundation; either version 2 of the License, or	20	* the Free Software Foundation; either version 2 of the License, or
21	* (at your option) any later version.	21	* (at your option) any later version.
…		…
38	#include <limits>	38	#include <limits>
39		39
40	#include <csignal>	40	#include <csignal>
41	#include <cstring>	41	#include <cstring>
42		42
43	#ifdef TTY_GID_SUPPORT
44	# include <grp.h>
45	#endif
46
47	#ifdef HAVE_TERMIOS_H
48	# include <termios.h>	43	#include <termios.h>
		44
		45	#ifdef HAVE_XSETLOCALE
		46	# define X_LOCALE
		47	# include <X11/Xlocale.h>
		48	#else
		49	# ifdef HAVE_SETLOCALE
		50	# include <clocale>
		51	# endif
49	#endif	52	#endif
50		53
51	vector<rxvt_term *> rxvt_term::termlist;	54	vector<rxvt_term *> rxvt_term::termlist;
52		55
53	// used to tell global functions which terminal instance is "active"	56	// used to tell global functions which terminal instance is "active"
…		…
88	class rxvt_composite_vec rxvt_composite;	91	class rxvt_composite_vec rxvt_composite;
89		92
90	text_t rxvt_composite_vec::compose (unicode_t c1, unicode_t c2)	93	text_t rxvt_composite_vec::compose (unicode_t c1, unicode_t c2)
91	{	94	{
92	compose_char *cc;	95	compose_char *cc;
93		96
94	// break compose chains, as stupid readline really likes to duplicate	97	// break compose chains, as stupid readline really likes to duplicate
95	// composing characters for some reason near the end of a line.	98	// composing characters for some reason near the end of a line.
96	cc = (*this)[c1];	99	cc = (*this)[c1];
97	while (cc)	100	while (cc)
98	{	101	{
…		…
147		150
148	}	151	}
149	#endif	152	#endif
150		153
151	rxvt_term::rxvt_term ()	154	rxvt_term::rxvt_term ()
152	:	155	{
		156	#if HAVE_BG_PIXMAP
		157	update_background_ev.set<rxvt_term, &rxvt_term::update_background_cb> (this);
		158	#endif
		159	#ifdef CURSOR_BLINK
		160	cursor_blink_ev.set <rxvt_term, &rxvt_term::cursor_blink_cb> (this); cursor_blink_ev.set (0., CURSOR_BLINK_INTERVAL);
		161	#endif
		162	#ifdef TEXT_BLINK
		163	text_blink_ev.set <rxvt_term, &rxvt_term::text_blink_cb> (this); text_blink_ev.set (0., TEXT_BLINK_INTERVAL);
		164	#endif
		165	#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
		166	cont_scroll_ev.set <rxvt_term, &rxvt_term::cont_scroll_cb> (this);
		167	#endif
		168	#ifdef SELECTION_SCROLLING
		169	sel_scroll_ev.set <rxvt_term, &rxvt_term::sel_scroll_cb> (this);
		170	#endif
		171	#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
		172	slip_wheel_ev.set <rxvt_term, &rxvt_term::slip_wheel_cb> (this);
		173	#endif
153	#if ENABLE_TRANSPARENCY \|\| ENABLE_PERL	174	#if ENABLE_TRANSPARENCY \|\| ENABLE_PERL
154	rootwin_ev (this, &rxvt_term::rootwin_cb),	175	rootwin_ev.set <rxvt_term, &rxvt_term::rootwin_cb> (this),
155	#endif	176	#endif
156	#if ENABLE_TRANSPARENCY	177	scrollbar_ev.set <rxvt_term, &rxvt_term::x_cb> (this),
157	check_our_parents_ev(this, &rxvt_term::check_our_parents_cb),	178	#ifdef USE_XIM
158	#endif	179	im_ev.set <rxvt_term, &rxvt_term::im_cb> (this),
159	#ifdef HAVE_SCROLLBARS
160	scrollbar_ev (this, &rxvt_term::x_cb),
161	#endif
162	#ifdef CURSOR_BLINK
163	cursor_blink_ev (this, &rxvt_term::cursor_blink_cb),
164	#endif
165	#ifdef TEXT_BLINK
166	text_blink_ev (this, &rxvt_term::text_blink_cb),
167	#endif
168	#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
169	cont_scroll_ev (this, &rxvt_term::cont_scroll_cb),
170	#endif
171	#ifdef SELECTION_SCROLLING
172	sel_scroll_ev (this, &rxvt_term::sel_scroll_cb),
173	#endif
174	#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
175	slip_wheel_ev (this, &rxvt_term::slip_wheel_cb),
176	#endif	180	#endif
177	#ifdef POINTER_BLANK	181	#ifdef POINTER_BLANK
178	pointer_ev (this, &rxvt_term::pointer_cb),	182	pointer_ev.set <rxvt_term, &rxvt_term::pointer_cb> (this);
179	#endif	183	#endif
180	#ifdef USE_XIM
181	im_ev (this, &rxvt_term::im_cb),
182	#endif
183	#ifndef NO_BELL	184	#ifndef NO_BELL
184	bell_ev (this, &rxvt_term::bell_cb),	185	bell_ev.set <rxvt_term, &rxvt_term::bell_cb> (this);
185	#endif	186	#endif
186	termwin_ev (this, &rxvt_term::x_cb),	187	child_ev.set <rxvt_term, &rxvt_term::child_cb> (this);
187	vt_ev (this, &rxvt_term::x_cb),	188	flush_ev.set <rxvt_term, &rxvt_term::flush_cb> (this);
188	child_ev (this, &rxvt_term::child_cb),	189	destroy_ev.set <rxvt_term, &rxvt_term::destroy_cb> (this);
189	check_ev (this, &rxvt_term::check_cb),	190	pty_ev.set <rxvt_term, &rxvt_term::pty_cb> (this);
190	flush_ev (this, &rxvt_term::flush_cb),	191	incr_ev.set <rxvt_term, &rxvt_term::incr_cb> (this);
191	destroy_ev (this, &rxvt_term::destroy_cb),	192	termwin_ev.set <rxvt_term, &rxvt_term::x_cb> (this);
192	pty_ev (this, &rxvt_term::pty_cb),	193	vt_ev.set <rxvt_term, &rxvt_term::x_cb> (this);
193	incr_ev (this, &rxvt_term::incr_cb)	194
194	{
195	cmdbuf_ptr = cmdbuf_endp = cmdbuf_base;	195	cmdbuf_ptr = cmdbuf_endp = cmdbuf_base;
196		196
197	termlist.push_back (this);	197	termlist.push_back (this);
198		198
199	#ifdef KEYSYM_RESOURCE	199	#ifdef KEYSYM_RESOURCE
…		…
201	#endif	201	#endif
202	}	202	}
203		203
204	// clean up the most important stuff, do not call x or free mem etc.	204	// clean up the most important stuff, do not call x or free mem etc.
205	// for use before an emergency exit	205	// for use before an emergency exit
		206	void
206	void rxvt_term::emergency_cleanup ()	207	rxvt_term::emergency_cleanup ()
207	{	208	{
208	if (cmd_pid)	209	if (cmd_pid)
209	kill (-cmd_pid, SIGHUP);	210	kill (-cmd_pid, SIGHUP);
210		211
211	pty_ev.stop ();	212	pty_ev.stop ();
…		…
223	if (fontset[i] != fontset[0])	224	if (fontset[i] != fontset[0])
224	delete fontset[i];	225	delete fontset[i];
225	#endif	226	#endif
226	delete fontset[0];	227	delete fontset[0];
227		228
		229	#ifdef HAVE_BG_PIXMAP
		230	bgPixmap.destroy ();
		231	#endif
		232
228	if (display)	233	if (display)
229	{	234	{
230	selection_clear ();	235	selection_clear ();
231		236
232	#ifdef USE_XIM	237	#ifdef USE_XIM
233	im_destroy ();	238	im_destroy ();
234	#endif	239	#endif
235	#ifdef XTERM_SCROLLBAR	240	scrollBar.destroy ();
236	if (xscrollbarGC) XFreeGC (dpy, xscrollbarGC);
237	if (ShadowGC) XFreeGC (dpy, ShadowGC);
238	#endif
239	#ifdef PLAIN_SCROLLBAR
240	if (pscrollbarGC) XFreeGC (dpy, pscrollbarGC);
241	#endif
242	#ifdef NEXT_SCROLLBAR
243	if (blackGC) XFreeGC (dpy, blackGC);
244	if (whiteGC) XFreeGC (dpy, whiteGC);
245	if (grayGC) XFreeGC (dpy, grayGC);
246	if (darkGC) XFreeGC (dpy, darkGC);
247	if (stippleGC) XFreeGC (dpy, stippleGC);
248	if (dimple) XFreePixmap (dpy, dimple);
249	if (upArrow) XFreePixmap (dpy, upArrow);
250	if (downArrow) XFreePixmap (dpy, downArrow);
251	if (upArrowHi) XFreePixmap (dpy, upArrowHi);
252	if (downArrowHi) XFreePixmap (dpy, downArrowHi);
253	#endif
254	#ifdef RXVT_SCROLLBAR
255	if (topShadowGC) XFreeGC (dpy, topShadowGC);
256	if (botShadowGC) XFreeGC (dpy, botShadowGC);
257	if (scrollbarGC) XFreeGC (dpy, scrollbarGC);
258	#endif
259	if (gc) XFreeGC (dpy, gc);	241	if (gc) XFreeGC (dpy, gc);
260		242
261	delete drawable;	243	delete drawable;
262	// destroy all windows	244	// destroy all windows
263	if (parent[0])	245	if (parent[0])
…		…
271	pix_colors_unfocused [i].free (this);	253	pix_colors_unfocused [i].free (this);
272	#endif	254	#endif
273	}	255	}
274		256
275	clear ();	257	clear ();
276	}
277		258
278	delete [] pix_colors_focused;	259	display->flush (); /* ideally .put should do this */
279	#if OFF_FOCUS_FADING
280	delete [] pix_colors_unfocused;
281	#endif
282
283	displays.put (display);	260	displays.put (display);
		261	}
284		262
285	scr_release ();	263	scr_release ();
286		264
287	/* clear all resources */	265	/* clear all resources */
288	for (int i = 0; i < allocated.size (); i++)	266	for (int i = 0; i < allocated.size (); i++)
…		…
300	delete argv;	278	delete argv;
301		279
302	#ifdef KEYSYM_RESOURCE	280	#ifdef KEYSYM_RESOURCE
303	delete keyboard;	281	delete keyboard;
304	#endif	282	#endif
		283	#ifndef NO_RESOURCES
		284	XrmDestroyDatabase (option_db);
		285	#endif
305	}	286	}
306		287
307	// child has exited, usually destroys	288	// child has exited, usually destroys
308	void	289	void
309	rxvt_term::child_cb (child_watcher &w, int status)	290	rxvt_term::child_cb (ev::child &w, int status)
310	{	291	{
311	HOOK_INVOKE ((this, HOOK_CHILD_EXIT, DT_INT, status, DT_END));	292	HOOK_INVOKE ((this, HOOK_CHILD_EXIT, DT_INT, status, DT_END));
312		293
313	cmd_pid = 0;	294	cmd_pid = 0;
314		295
…		…
317	}	298	}
318		299
319	void	300	void
320	rxvt_term::destroy ()	301	rxvt_term::destroy ()
321	{	302	{
322	if (destroy_ev.active)	303	if (destroy_ev.is_active ())
323	return;	304	return;
324		305
325	HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));	306	HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));
326		307
327	#if ENABLE_OVERLAY	308	#if ENABLE_OVERLAY
…		…
331	if (display)	312	if (display)
332	{	313	{
333	#if USE_XIM	314	#if USE_XIM
334	im_ev.stop (display);	315	im_ev.stop (display);
335	#endif	316	#endif
336	#if HAVE_SCROLLBARS
337	scrollbar_ev.stop (display);	317	scrollbar_ev.stop (display);
338	#endif
339	#if ENABLE_TRANSPARENCY \|\| ENABLE_PERL	318	#if ENABLE_TRANSPARENCY \|\| ENABLE_PERL
340	rootwin_ev.stop (display);	319	rootwin_ev.stop (display);
341	#endif	320	#endif
342	incr_ev.stop ();	321	incr_ev.stop ();
343	termwin_ev.stop (display);	322	termwin_ev.stop (display);
344	vt_ev.stop (display);	323	vt_ev.stop (display);
345	}	324	}
346		325
347	check_ev.stop ();	326	flush_ev.stop ();
348	pty_ev.stop ();	327	pty_ev.stop ();
349	#ifdef CURSOR_BLINK	328	#ifdef CURSOR_BLINK
350	cursor_blink_ev.stop ();	329	cursor_blink_ev.stop ();
351	#endif	330	#endif
352	#ifdef TEXT_BLINK	331	#ifdef TEXT_BLINK
…		…
360	#endif	339	#endif
361	#ifdef POINTER_BLANK	340	#ifdef POINTER_BLANK
362	pointer_ev.stop ();	341	pointer_ev.stop ();
363	#endif	342	#endif
364		343
365	destroy_ev.start (0);	344	destroy_ev.start ();
366	}	345	}
367		346
368	void	347	void
369	rxvt_term::destroy_cb (time_watcher &w)	348	rxvt_term::destroy_cb (ev::idle &w, int revents)
370	{	349	{
371	make_current ();	350	make_current ();
372		351
373	delete this;	352	delete this;
374	}	353	}
…		…
428	else	407	else
429	XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x",	408	XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x",
430	mesg, BUFSIZ);	409	mesg, BUFSIZ);
431	rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid);	410	rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid);
432	}	411	}
433	XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d",	412	XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d",
434	mesg, BUFSIZ);	413	mesg, BUFSIZ);
435	rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial);	414	rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial);
436	}	415	}
437	#endif	416	#endif
438		417
…		…
462	DisplayString (display));	441	DisplayString (display));
463	rxvt_emergency_cleanup ();	442	rxvt_emergency_cleanup ();
464	_exit (EXIT_FAILURE);	443	_exit (EXIT_FAILURE);
465	}	444	}
466		445
467	/----------------------------------------------------------------------/
468	bool
469	rxvt_term::init (int argc, const char const argv, stringvec *envv)
470	{
471	this->envv = envv;
472
473	SET_R (this);
474	set_locale ("");
475	set_environ (envv); // few things in X do not call setlocale :(
476
477	if (!init_vars ())
478	return false;
479
480	init_secondary ();
481
482	const char **cmd_argv = init_resources (argc, argv);
483
484	#ifdef KEYSYM_RESOURCE
485	keyboard->register_done ();
486	#endif
487
488	#ifdef HAVE_SCROLLBARS
489	if (option (Opt_scrollBar))
490	scrollBar.setIdle (); /* set existence for size calculations */
491	#endif
492
493	pty = ptytty::create ();
494
495	create_windows (argc, argv);
496
497	init_xlocale ();
498
499	scr_reset (); // initialize screen
500
501	#if 0
502	XSynchronize (dpy, True);
503	#endif
504
505	#ifdef HAVE_SCROLLBARS
506	if (option (Opt_scrollBar))
507	resize_scrollbar (); /* create and map scrollbar */
508	#endif
509	#ifdef ENABLE_TRANSPARENCY
510	if (option (Opt_transparent))
511	{
512	XSelectInput (dpy, display->root, PropertyChangeMask);
513	check_our_parents ();
514	rootwin_ev.start (display, display->root);
515	}
516	#endif
517	#if ENABLE_PERL
518	rootwin_ev.start (display, display->root);
519	#endif
520
521	set_colorfgbg ();
522
523	init_command (cmd_argv);
524
525	free (cmd_argv);
526
527	if (pty->pty >= 0)
528	pty_ev.start (pty->pty, EVENT_READ);
529
530	check_ev.start ();
531
532	HOOK_INVOKE ((this, HOOK_START, DT_END));
533
534	#if ENABLE_XEMBED
535	if (rs[Rs_embed])
536	{
537	long info[2] = { 0, XEMBED_MAPPED };
538
539	XChangeProperty (dpy, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
540	32, PropModeReplace, (unsigned char *)&info, 2);
541	}
542	#endif
543
544	XMapWindow (dpy, vt);
545	XMapWindow (dpy, parent[0]);
546
547	return true;
548	}
549
550	static struct sig_handlers	446	static struct sig_handlers
551	{	447	{
552	sig_watcher sw_term, sw_int;	448	ev::sig sw_term, sw_int;
553		449
554	/*	450	/*
555	* Catch a fatal signal and tidy up before quitting	451	* Catch a fatal signal and tidy up before quitting
556	*/	452	*/
557	void	453	void sig_term (ev::sig &w, int revents);
558	sig_term (sig_watcher &w)	454
		455	sig_handlers ()
559	{	456	{
560	rxvt_emergency_cleanup ();	457	sw_term.set<sig_handlers, &sig_handlers::sig_term> (this);
561	signal (w.signum, SIG_DFL);
562	kill (getpid (), w.signum);
563	}
564
565	sig_handlers ()
566	: sw_term (this, &sig_handlers::sig_term),
567	sw_int (this, &sig_handlers::sig_term)	458	sw_int .set<sig_handlers, &sig_handlers::sig_term> (this);
568	{
569	}	459	}
570	} sig_handlers;	460	} sig_handlers;
571		461
		462	void
		463	sig_handlers::sig_term (ev::sig &w, int revents)
		464	{
		465	rxvt_emergency_cleanup ();
		466	w.stop ();
		467	kill (getpid (), w.signum);
		468	}
		469
572	char **rxvt_environ; // startup environment	470	char **rxvt_environ; // startup environment
573		471
574	void	472	void
575	rxvt_init ()	473	rxvt_init ()
576	{	474	{
577	ptytty::init ();	475	ptytty::init ();
		476
		477	if (!ev_default_loop (0))
		478	rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n");
578		479
579	rxvt_environ = environ;	480	rxvt_environ = environ;
580		481
581	signal (SIGHUP, SIG_IGN);	482	signal (SIGHUP, SIG_IGN);
582	signal (SIGPIPE, SIG_IGN);	483	signal (SIGPIPE, SIG_IGN);
583		484
584	sig_handlers.sw_term.start (SIGTERM);	485	sig_handlers.sw_term.start (SIGTERM); ev_unref ();
585	sig_handlers.sw_int.start (SIGINT);	486	sig_handlers.sw_int.start (SIGINT); ev_unref ();
586		487
587	/* need to trap SIGURG for SVR4 (Unixware) rlogin */	488	/* need to trap SIGURG for SVR4 (Unixware) rlogin */
588	/* signal (SIGURG, SIG_DFL); */	489	/* signal (SIGURG, SIG_DFL); */
589		490
590	old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);	491	old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
591	// TODO: handle this with exceptions and tolerate the memory loss	492	// TODO: handle this with exceptions and tolerate the memory loss
592	XSetIOErrorHandler (rxvt_xioerror_handler);	493	XSetIOErrorHandler (rxvt_xioerror_handler);
593		494
594	XrmInitialize ();	495	XrmInitialize ();
595	}
596
597	/* ------------------------------------------------------------------------- *
598	* MEMORY ALLOCATION WRAPPERS *
599	* ------------------------------------------------------------------------- */
600	void *
601	rxvt_malloc (size_t size)
602	{
603	void *p = malloc (size);
604
605	if (!p)
606	rxvt_fatal ("memory allocation failure. aborting.\n");
607
608	return p;
609	}
610
611	void *
612	rxvt_calloc (size_t number, size_t size)
613	{
614	void *p = calloc (number, size);
615
616	if (!p)
617	rxvt_fatal ("memory allocation failure. aborting.\n");
618
619	return p;
620	}
621
622	void *
623	rxvt_realloc (void *ptr, size_t size)
624	{
625	void *p = realloc (ptr, size);
626
627	if (!p)
628	rxvt_fatal ("memory allocation failure. aborting.\n");
629
630	return p;
631	}	496	}
632		497
633	/----------------------------------------------------------------------/	498	/----------------------------------------------------------------------/
634	/*	499	/*
635	* window size/position calculations for XSizeHint and other storage.	500	* window size/position calculations for XSizeHint and other storage.
…		…
637	*/	502	*/
638	void	503	void
639	rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)	504	rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
640	{	505	{
641	short recalc_x, recalc_y;	506	short recalc_x, recalc_y;
642	int x, y, sb_w, flags;	507	int x, y, flags;
643	unsigned int w, h;	508	unsigned int w, h;
644	unsigned int max_width, max_height;	509	unsigned int max_width, max_height;
645		510
646	szHint.flags = PMinSize \| PResizeInc \| PBaseSize \| PWinGravity;	511	szHint.flags = PMinSize \| PResizeInc \| PBaseSize \| PWinGravity;
647	szHint.win_gravity = NorthWestGravity;	512	szHint.win_gravity = NorthWestGravity;
…		…
694	szHint.win_gravity = SouthEastGravity;	559	szHint.win_gravity = SouthEastGravity;
695	else	560	else
696	szHint.win_gravity = SouthWestGravity;	561	szHint.win_gravity = SouthWestGravity;
697	}	562	}
698	}	563	}
		564
		565	if (!szHint.width \|\| !szHint.height)
		566	rxvt_fatal ("window width or height must not be zero, aborting.\n");
699	}	567	}
700		568
701	/* TODO: BOUNDS */	569	/* TODO: BOUNDS */
702	width = ncol * fwidth;	570	width = ncol * fwidth;
703	height = nrow * fheight;	571	height = nrow * fheight;
704	max_width = MAX_COLS * fwidth;	572	max_width = MAX_COLS * fwidth;
705	max_height = MAX_ROWS * fheight;	573	max_height = MAX_ROWS * fheight;
706		574
707	szHint.base_width = szHint.base_height = 2 * int_bwidth;	575	szHint.base_width = szHint.base_height = 2 * int_bwidth;
708		576
709	sb_w = 0;
710	window_vt_x = window_vt_y = int_bwidth;	577	window_vt_x = window_vt_y = int_bwidth;
711		578
712	if (scrollBar.state)	579	if (scrollBar.state)
713	{	580	{
714	sb_w = scrollbar_TotalWidth ();	581	int sb_w = scrollBar.total_width ();
715	szHint.base_width += sb_w;	582	szHint.base_width += sb_w;
716		583
717	if (!option (Opt_scrollBar_right))	584	if (!option (Opt_scrollBar_right))
718	window_vt_x += sb_w;	585	window_vt_x += sb_w;
719	}	586	}
…		…
742	else	609	else
743	{	610	{
744	min_it (height, max_height);	611	min_it (height, max_height);
745	szHint.height = szHint.base_height + height;	612	szHint.height = szHint.base_height + height;
746	}	613	}
747
748	if (scrollBar.state && option (Opt_scrollBar_right))
749	window_sb_x = szHint.width - sb_w;
750		614
751	if (recalc_x)	615	if (recalc_x)
752	szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth;	616	szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth;
753		617
754	if (recalc_y)	618	if (recalc_y)
…		…
776	ws.ws_xpixel = width;	640	ws.ws_xpixel = width;
777	ws.ws_ypixel = height;	641	ws.ws_ypixel = height;
778	(void)ioctl (pty->pty, TIOCSWINSZ, &ws);	642	(void)ioctl (pty->pty, TIOCSWINSZ, &ws);
779		643
780	#if 0	644	#if 0
781	// TIOCSWINSZ⎈ is supposed to do this automatically and correctly	645	// TIOCSWINSZ is supposed to do this automatically and correctly
782	if (cmd_pid) /* force through to the command */	646	if (cmd_pid) /* force through to the command */
783	kill (-cmd_pid, SIGWINCH);	647	kill (-cmd_pid, SIGWINCH);
784	#endif	648	#endif
785	}	649	}
786		650
…		…
860	if (parent[0])	724	if (parent[0])
861	{	725	{
862	resize_all_windows (0, 0, 0);	726	resize_all_windows (0, 0, 0);
863	scr_remap_chars ();	727	scr_remap_chars ();
864	scr_touch (true);	728	scr_touch (true);
865	}	729	}
866		730
867	return true;	731	return true;
868	}	732	}
869		733
		734	void
870	void rxvt_term::set_string_property (Atom prop, const char *str, int len)	735	rxvt_term::set_string_property (Atom prop, const char *str, int len)
871	{	736	{
872	XChangeProperty (dpy, parent[0],	737	XChangeProperty (dpy, parent[0],
873	prop, XA_STRING, 8, PropModeReplace,	738	prop, XA_STRING, 8, PropModeReplace,
874	(const unsigned char *)str, len >= 0 ? len : strlen (str));	739	(const unsigned char *)str, len >= 0 ? len : strlen (str));
875	}	740	}
876		741
		742	void
877	void rxvt_term::set_utf8_property (Atom prop, const char *str, int len)	743	rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
878	{	744	{
879	wchar_t *ws = rxvt_mbstowcs (str, len);	745	wchar_t *ws = rxvt_mbstowcs (str, len);
880	char *s = rxvt_wcstoutf8 (ws);	746	char *s = rxvt_wcstoutf8 (ws);
881		747
882	XChangeProperty (dpy, parent[0],	748	XChangeProperty (dpy, parent[0],
…		…
906	#if ENABLE_EWMH	772	#if ENABLE_EWMH
907	set_utf8_property (xa[XA_NET_WM_ICON_NAME], str);	773	set_utf8_property (xa[XA_NET_WM_ICON_NAME], str);
908	#endif	774	#endif
909	}	775	}
910		776
		777	void
		778	rxvt_term::set_window_color (int idx, const char *color)
		779	{
911	#ifdef XTERM_COLOR_CHANGE	780	#ifdef XTERM_COLOR_CHANGE
912	void
913	rxvt_term::set_window_color (int idx, const char *color)
914	{
915	rxvt_color xcol;	781	rxvt_color xcol;
916	int i;	782
917
918	if (color == NULL \|\| *color == '\0')	783	if (color == NULL \|\| *color == '\0')
919	return;	784	return;
920		785
921	color = strdup (color);	786	color = strdup (color);
922	allocated.push_back ((void *)color);	787	allocated.push_back ((void *)color);
923	rs[Rs_color + idx] = color;	788	rs[Rs_color + idx] = color;
924		789
925	/* handle color aliases */	790	/* handle color aliases */
926	if (isdigit (*color))	791	if (isdigit (*color))
927	{	792	{
928	i = atoi (color);	793	int i = atoi (color);
929		794
930	if (i >= 8 && i <= 15)	795	if (i >= 8 && i <= 15)
		796	{
931	{ /* bright colors */	797	/* bright colors */
932	i -= 8;
933	pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i];	798	pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i - 8];
934	goto done;	799	goto done;
935	}	800	}
936		801
937	if (i >= 0 && i <= 7)	802	if (i >= 0 && i <= 7)
		803	{
938	{ /* normal colors */	804	/* normal colors */
939	pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];	805	pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];
940	goto done;	806	goto done;
941	}	807	}
942	}	808	}
943		809
…		…
948	* so just keep gobbling up the colormap	814	* so just keep gobbling up the colormap
949	*/	815	*/
950		816
951	pix_colors_focused[idx] = xcol;	817	pix_colors_focused[idx] = xcol;
952		818
953	/* XSetWindowAttributes attr; */
954	/* Cursor cursor; */
955	done:	819	done:
956	/TODO: handle Color_BD, scrollbar background, etc. /	820	/TODO: handle Color_BD, scrollbar background, etc. /
957		821
958	update_fade_color (idx);	822	update_fade_color (idx);
959	recolour_cursor ();	823	recolour_cursor ();
960	scr_recolour ();	824	scr_recolour ();
		825	#endif /* XTERM_COLOR_CHANGE */
961	}	826	}
962
963	#else
964	# define set_window_color (idx,color) ((void)0)
965	#endif /* XTERM_COLOR_CHANGE */
966		827
967	void	828	void
968	rxvt_term::recolour_cursor ()	829	rxvt_term::recolour_cursor ()
969	{	830	{
970	XColor fg, bg;	831	XColor fg, bg;
…		…
986	*/	847	*/
987	void	848	void
988	rxvt_term::set_colorfgbg ()	849	rxvt_term::set_colorfgbg ()
989	{	850	{
990	unsigned int i;	851	unsigned int i;
991	const char *xpmb = "\0";	852	const char *xpmb = "";
992	char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1];	853	char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1];
993		854
994	strcpy (fstr, "default");	855	strcpy (fstr, "default");
995	strcpy (bstr, "default");	856	strcpy (bstr, "default");
996	for (i = Color_Black; i <= Color_White; i++)	857	for (i = Color_Black; i <= Color_White; i++)
…		…
1002		863
1003	for (i = Color_Black; i <= Color_White; i++)	864	for (i = Color_Black; i <= Color_White; i++)
1004	if (pix_colors[Color_bg] == pix_colors[i])	865	if (pix_colors[Color_bg] == pix_colors[i])
1005	{	866	{
1006	sprintf (bstr, "%d", (i - Color_Black));	867	sprintf (bstr, "%d", (i - Color_Black));
1007	#ifdef XPM_BACKGROUND	868	#ifdef BG_IMAGE_FROM_FILE
1008	xpmb = "default;";	869	xpmb = "default;";
1009	#endif	870	#endif
1010	break;	871	break;
1011	}	872	}
1012		873
…		…
1097	fix_screen = ncol != prev_ncol \|\| nrow != prev_nrow;	958	fix_screen = ncol != prev_ncol \|\| nrow != prev_nrow;
1098		959
1099	if (fix_screen \|\| newwidth != old_width \|\| newheight != old_height)	960	if (fix_screen \|\| newwidth != old_width \|\| newheight != old_height)
1100	{	961	{
1101	if (scrollBar.state)	962	if (scrollBar.state)
1102	{	963	scrollBar.resize ();
1103	XMoveResizeWindow (dpy, scrollBar.win,
1104	window_sb_x, 0,
1105	scrollbar_TotalWidth (), szHint.height);
1106	resize_scrollbar ();
1107	}
1108		964
1109	XMoveResizeWindow (dpy, vt,	965	XMoveResizeWindow (dpy, vt,
1110	window_vt_x, window_vt_y,	966	window_vt_x, window_vt_y,
1111	width, height);	967	width, height);
1112		968
		969	#ifdef HAVE_BG_PIXMAP
		970	if (bgPixmap.window_size_sensitive ())
		971	update_background ();
		972	#endif
		973
1113	scr_clear ();	974	scr_clear ();
1114	#ifdef XPM_BACKGROUND
1115	resize_pixmap ();
1116	#endif
1117	}	975	}
1118		976
1119	if (fix_screen \|\| old_height == 0)	977	if (fix_screen \|\| old_height == 0)
1120	scr_reset ();	978	scr_reset ();
1121		979
1122	// TODO, with nvidia-8178, resizes kill the alpha channel, report if not fixed in newer version	980	// TODO, with nvidia-8178, resizes kill the alpha channel, report if not fixed in newer version
1123	//scr_touch (false);	981	//scr_touch (false);
1124		982
1125	#ifdef XPM_BACKGROUND	983	#ifdef HAVE_BG_PIXMAP
1126	if (pixmap)	984	// TODO: this don't seem to have any effect - do we still need it ? If so - in which case exactly ?
		985	// if (bgPixmap.pixmap)
1127	scr_touch (false);	986	// scr_touch (false);
1128	#endif	987	#endif
1129		988
1130	#ifdef USE_XIM	989	#ifdef USE_XIM
1131	IMSetPosition ();	990	IMSetPosition ();
1132	#endif	991	#endif
…		…
1303	if (term->rs[Rs_imLocale])	1162	if (term->rs[Rs_imLocale])
1304	SET_LOCALE (term->locale);	1163	SET_LOCALE (term->locale);
1305	}	1164	}
1306	else	1165	else
1307	str = (void *)text->string.wide_char;	1166	str = (void *)text->string.wide_char;
1308		1167
1309	HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,	1168	HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
1310	DT_INT, call_data->caret,	1169	DT_INT, call_data->caret,
1311	DT_INT, call_data->chg_first,	1170	DT_INT, call_data->chg_first,
1312	DT_INT, call_data->chg_length,	1171	DT_INT, call_data->chg_length,
1313	DT_LCS_LEN, (void *)text->feedback, text->feedback ? (int)text->length : 0,	1172	DT_LCS_LEN, (void *)text->feedback, text->feedback ? (int)text->length : 0,
…		…
1632		1491
1633	if (input_style & XIMPreeditPosition)	1492	if (input_style & XIMPreeditPosition)
1634	{	1493	{
1635	im_set_size (preedit_rect);	1494	im_set_size (preedit_rect);
1636	preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);	1495	preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);
1637		1496
1638	XSetICValues (Input_Context,	1497	XSetICValues (Input_Context,
1639	XNPreeditAttributes, preedit_attr, NULL);	1498	XNPreeditAttributes, preedit_attr, NULL);
1640	}	1499	}
1641	else	1500	else
1642	{	1501	{
…		…
1659	XFree (status_attr);	1518	XFree (status_attr);
1660	}	1519	}
1661		1520
1662	XFree (preedit_attr);	1521	XFree (preedit_attr);
1663	}	1522	}
1664	#endif /* USE_XIM */	1523	#endif /* USE_XIM */
		1524
		1525	void
		1526	rxvt_term::get_window_origin (int &x, int &y)
		1527	{
		1528	Window cr;
		1529	XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr);
		1530	/* fprintf (stderr, "origin is %+d%+d\n", x, y);*/
		1531	}
		1532
		1533	Pixmap
		1534	rxvt_term::get_pixmap_property (int prop_id)
		1535	{
		1536	if (prop_id > 0 && prop_id < NUM_XA)
		1537	if (xa[prop_id])
		1538	{
		1539	int aformat;
		1540	unsigned long nitems, bytes_after;
		1541	Atom atype;
		1542	unsigned char *prop = NULL;
		1543	int result = XGetWindowProperty (dpy, display->root, xa[prop_id],
		1544	0L, 1L, False, XA_PIXMAP, &atype, &aformat,
		1545	&nitems, &bytes_after, &prop);
		1546	if (result == Success && prop && atype == XA_PIXMAP)
		1547	return (Pixmap )prop;
		1548	}
		1549
		1550	return None;
		1551	}
		1552
		1553	#ifdef HAVE_BG_PIXMAP
		1554	# if TRACE_PIXMAPS
		1555	# undef update_background
		1556	void
		1557	rxvt_term::trace_update_background (const char *file, int line)
		1558	{
		1559	fprintf (stderr, "%s:%d:update_background()\n", file, line);
		1560	update_background ();
		1561	}
		1562	# endif
		1563
		1564	void
		1565	rxvt_term::update_background ()
		1566	{
		1567	if (update_background_ev.is_active ())
		1568	return;
		1569
		1570	bgPixmap.invalidate ();
		1571
		1572	ev_tstamp to_wait = 0.5 - (ev::now () - bgPixmap.valid_since);
		1573
		1574	if (to_wait <= 0.)
		1575	bgPixmap.render ();
		1576	else
		1577	update_background_ev.start (to_wait);
		1578	}
		1579
		1580	void
		1581	rxvt_term::update_background_cb (ev::timer &w, int revents)
		1582	{
		1583	make_current ();
		1584
		1585	update_background_ev.stop ();
		1586	bgPixmap.render ();
		1587	refresh_check ();
		1588	}
		1589
		1590	#endif /* HAVE_BG_PIXMAP */
1665		1591
1666	/----------------------- end-of-file (C source) -----------------------/	1592	/----------------------- end-of-file (C source) -----------------------/

Diff Legend

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

Comparing rxvt-unicode/src/main.C (file contents): Revision 1.237 by root, Tue Jun 26 00:40:18 2007 UTC vs. Revision 1.309 by root, Wed Feb 27 01:02:33 2008 UTC

Diff Legend

Comparing rxvt-unicode/src/main.C (file contents):
Revision 1.237 by root, Tue Jun 26 00:40:18 2007 UTC vs.
Revision 1.309 by root, Wed Feb 27 01:02:33 2008 UTC