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

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.316 by root, Thu Dec 7 20:59:59 2006 UTC vs.
Revision 1.357 by sasha, Tue Sep 18 22:01:36 2007 UTC

…		…
95	XK_Shift_L, 0x21e7,	95	XK_Shift_L, 0x21e7,
96	XK_Shift_R, 0x21e7,	96	XK_Shift_R, 0x21e7,
97		97
98	XK_Shift_Lock, 0x21eb,	98	XK_Shift_Lock, 0x21eb,
99	XK_ISO_Lock, 0x21eb,	99	XK_ISO_Lock, 0x21eb,
100	XK_ISO_Lock, 0x21eb,
101	XK_Caps_Lock, 0x21ec,	100	XK_Caps_Lock, 0x21ec,
102	XK_Num_Lock, 0x21ed,	101	XK_Num_Lock, 0x21ed,
103	XK_ISO_Level3_Shift, 0x21ee,	102	XK_ISO_Level3_Shift, 0x21ee,
104	XK_ISO_Level3_Lock, 0x21ef,	103	XK_ISO_Level3_Lock, 0x21ef,
105	XK_ISO_Group_Lock, 0x21f0,	104	XK_ISO_Group_Lock, 0x21f0,
…		…
500	# if ISO_14755	499	# if ISO_14755
501	iso14755_51 (0);	500	iso14755_51 (0);
502	# endif	501	# endif
503	return;	502	return;
504	}	503	}
		504	else if (keysym == XK_BackSpace)
		505	{
		506	iso14755buf = ((iso14755buf & ISO_14755_MASK) >> 4) \| ISO_14755_51;
		507	# if ISO_14755
		508	iso14755_51 (iso14755buf & ISO_14755_MASK);
		509	# endif
		510	return;
		511	}
505	else if ((hv = hex_keyval (ev)) >= 0)	512	else if ((hv = hex_keyval (ev)) >= 0)
506	{	513	{
507	iso14755buf = ((iso14755buf << 4) & ISO_14755_MASK)	514	iso14755buf = ((iso14755buf << 4) & ISO_14755_MASK)
508	\| hv \| ISO_14755_51;	515	\| hv \| ISO_14755_51;
509	# if ISO_14755	516	# if ISO_14755
…		…
511	# endif	518	# endif
512	return;	519	return;
513	}	520	}
514	else	521	else
515	{	522	{
516	# if ENABLE_OVERLAY	523	# if ISO_14755
517	scr_overlay_off ();	524	scr_overlay_off ();
518	# endif	525	# endif
519	iso14755buf = 0;	526	iso14755buf = 0;
520	}	527	}
521	}	528	}
522	else if ((ctrl && (keysym == XK_Shift_L \|\| keysym == XK_Shift_R))	529	else if ((ctrl && (keysym == XK_Shift_L \|\| keysym == XK_Shift_R))
523	\|\| (shft && (keysym == XK_Control_L \|\| keysym == XK_Control_R)))	530	\|\| (shft && (keysym == XK_Control_L \|\| keysym == XK_Control_R)))
524	if (!(iso14755buf & ISO_14755_STARTED))	531	if (!(iso14755buf & ISO_14755_STARTED))
525	{	532	{
526	iso14755buf \|= ISO_14755_STARTED;	533	iso14755buf \|= ISO_14755_STARTED;
527	# if ENABLE_OVERLAY	534	# if ISO_14755
528	scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1);	535	scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1);
529	scr_overlay_set (0, 0, "ISO 14755 mode");	536	scr_overlay_set (0, 0, "ISO 14755 mode");
530	# endif	537	# endif
531	}	538	}
532	#endif	539	#endif
533		540
534	#ifdef PRINTPIPE	541	#ifdef PRINTPIPE
535	if (keysym == XK_Print)	542	if (keysym == XK_Print)
536	{	543	{
537	scr_printscreen (ctrl \| shft);	544	scr_printscreen (ctrl \| shft);
538	return;	545	return;
…		…
540	#endif	547	#endif
541		548
542	if (keysym >= 0xFF00 && keysym <= 0xFFFF)	549	if (keysym >= 0xFF00 && keysym <= 0xFFFF)
543	{	550	{
544	{	551	{
		552	bool kp = priv_modes & PrivMode_aplKP ? !shft : shft;
545	newlen = 1;	553	newlen = 1;
546	switch (keysym)	554	switch (keysym)
547	{	555	{
548	#ifndef NO_BACKSPACE_KEY	556	#ifndef NO_BACKSPACE_KEY
549	case XK_BackSpace:	557	case XK_BackSpace:
…		…
552	kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)	560	kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
553	^ !!ctrl) ? '\b' : '\177';	561	^ !!ctrl) ? '\b' : '\177';
554	kbuf[1] = '\0';	562	kbuf[1] = '\0';
555	}	563	}
556	else	564	else
557	strcpy (kbuf, key_backspace);	565	strcpy (kbuf, rs[Rs_backspace_key]);
558	break;	566	break;
559	#endif	567	#endif
560	#ifndef NO_DELETE_KEY	568	#ifndef NO_DELETE_KEY
561	# ifdef XK_KP_Prior	569	# ifdef XK_KP_Delete
562	case XK_KP_Delete:	570	case XK_KP_Delete:
563	/* allow shift to override */	571	/* allow shift to override */
564	if ((priv_modes & PrivMode_aplKP) ? !shft : shft)	572	if (kp)
565	{	573	{
566	strcpy (kbuf, "\033On");	574	strcpy (kbuf, "\033On");
567	break;	575	break;
568	}	576	}
569	/* FALLTHROUGH */	577	/* FALLTHROUGH */
570	# endif	578	# endif
571	case XK_Delete:	579	case XK_Delete:
572	strcpy (kbuf, key_delete);	580	strcpy (kbuf, rs[Rs_delete_key]);
573	break;	581	break;
574	#endif	582	#endif
575	case XK_Tab:	583	case XK_Tab:
576	if (shft)	584	if (shft)
577	strcpy (kbuf, "\033[Z");	585	strcpy (kbuf, "\033[Z");
…		…
592	#ifdef XK_KP_Left	600	#ifdef XK_KP_Left
593	case XK_KP_Up: /* \033Ox or standard */	601	case XK_KP_Up: /* \033Ox or standard */
594	case XK_KP_Down: /* \033Or or standard */	602	case XK_KP_Down: /* \033Or or standard */
595	case XK_KP_Right: /* \033Ov or standard */	603	case XK_KP_Right: /* \033Ov or standard */
596	case XK_KP_Left: /* \033Ot or standard */	604	case XK_KP_Left: /* \033Ot or standard */
597	if ((priv_modes & PrivMode_aplKP) ? !shft : shft)	605	if (kp)
598	{	606	{
599	strcpy (kbuf, "\033OZ");	607	strcpy (kbuf, "\033OZ");
600	kbuf[2] = "txvr"[keysym - XK_KP_Left];	608	kbuf[2] = "txvr"[keysym - XK_KP_Left];
601	break;	609	break;
602	}	610	}
…		…
625		633
626	#ifndef UNSHIFTED_SCROLLKEYS	634	#ifndef UNSHIFTED_SCROLLKEYS
627	# ifdef XK_KP_Prior	635	# ifdef XK_KP_Prior
628	case XK_KP_Prior:	636	case XK_KP_Prior:
629	/* allow shift to override */	637	/* allow shift to override */
630	if ((priv_modes & PrivMode_aplKP) ? !shft : shft)	638	if (kp)
631	{	639	{
632	strcpy (kbuf, "\033Oy");	640	strcpy (kbuf, "\033Oy");
633	break;	641	break;
634	}	642	}
635	/* FALLTHROUGH */	643	/* FALLTHROUGH */
…		…
638	strcpy (kbuf, "\033[5~");	646	strcpy (kbuf, "\033[5~");
639	break;	647	break;
640	# ifdef XK_KP_Next	648	# ifdef XK_KP_Next
641	case XK_KP_Next:	649	case XK_KP_Next:
642	/* allow shift to override */	650	/* allow shift to override */
643	if ((priv_modes & PrivMode_aplKP) ? !shft : shft)	651	if (kp)
644	{	652	{
645	strcpy (kbuf, "\033Os");	653	strcpy (kbuf, "\033Os");
646	break;	654	break;
647	}	655	}
648	/* FALLTHROUGH */	656	/* FALLTHROUGH */
…		…
651	strcpy (kbuf, "\033[6~");	659	strcpy (kbuf, "\033[6~");
652	break;	660	break;
653	#endif	661	#endif
654	case XK_KP_Enter:	662	case XK_KP_Enter:
655	/* allow shift to override */	663	/* allow shift to override */
656	if ((priv_modes & PrivMode_aplKP) ? !shft : shft)	664	if (kp)
657	{	665	{
658	strcpy (kbuf, "\033OM");	666	strcpy (kbuf, "\033OM");
659	break;	667	break;
660	}	668	}
661		669
…		…
704	case XK_KP_6: /* "\033Ov" : "6" */	712	case XK_KP_6: /* "\033Ov" : "6" */
705	case XK_KP_7: /* "\033Ow" : "7" */	713	case XK_KP_7: /* "\033Ow" : "7" */
706	case XK_KP_8: /* "\033Ox" : "8" */	714	case XK_KP_8: /* "\033Ox" : "8" */
707	case XK_KP_9: /* "\033Oy" : "9" */	715	case XK_KP_9: /* "\033Oy" : "9" */
708	/* allow shift to override */	716	/* allow shift to override */
709	if ((priv_modes & PrivMode_aplKP) ? !shft : shft)	717	if (kp)
710	{	718	{
711	strcpy (kbuf, "\033Oj");	719	strcpy (kbuf, "\033Oj");
712	kbuf[2] += (keysym - XK_KP_Multiply);	720	kbuf[2] += (keysym - XK_KP_Multiply);
713	}	721	}
714	else	722	else
…		…
720		728
721	case XK_Find:	729	case XK_Find:
722	strcpy (kbuf, "\033[1~");	730	strcpy (kbuf, "\033[1~");
723	break;	731	break;
724		732
725	#ifdef XK_KP_End	733	#ifdef XK_KP_Insert
726	case XK_KP_Insert:	734	case XK_KP_Insert:
727	/* allow shift to override */	735	/* allow shift to override */
728	if ((priv_modes & PrivMode_aplKP) ? !shft : shft)	736	if (kp)
729	{	737	{
730	strcpy (kbuf, "\033Op");	738	strcpy (kbuf, "\033Op");
731	break;	739	break;
732	}	740	}
733	/* FALLTHROUGH */	741	/* FALLTHROUGH */
…		…
746	strcpy (kbuf, "\033[4~");	754	strcpy (kbuf, "\033[4~");
747	break;	755	break;
748	#ifdef XK_KP_End	756	#ifdef XK_KP_End
749	case XK_KP_End:	757	case XK_KP_End:
750	/* allow shift to override */	758	/* allow shift to override */
751	if ((priv_modes & PrivMode_aplKP) ? !shft : shft)	759	if (kp)
752	{	760	{
753	strcpy (kbuf, "\033Oq");	761	strcpy (kbuf, "\033Oq");
754	break;	762	break;
755	}	763	}
756	/* FALLTHROUGH */	764	/* FALLTHROUGH */
…		…
759	strcpy (kbuf, KS_END);	767	strcpy (kbuf, KS_END);
760	break;	768	break;
761	#ifdef XK_KP_Home	769	#ifdef XK_KP_Home
762	case XK_KP_Home:	770	case XK_KP_Home:
763	/* allow shift to override */	771	/* allow shift to override */
764	if ((priv_modes & PrivMode_aplKP) ? !shft : shft)	772	if (kp)
765	{	773	{
766	strcpy (kbuf, "\033Ow");	774	strcpy (kbuf, "\033Ow");
767	break;	775	break;
768	}	776	}
769	/* FALLTHROUGH */	777	/* FALLTHROUGH */
…		…
877	return;	885	return;
878		886
879	if (len <= 0)	887	if (len <= 0)
880	return; /* not mapped */	888	return; /* not mapped */
881		889
882	if (OPTION (Opt_scrollTtyKeypress))	890	if (option (Opt_scrollTtyKeypress))
883	if (view_start)	891	if (view_start)
884	{	892	{
885	view_start = 0;	893	view_start = 0;
886	want_refresh = 1;	894	want_refresh = 1;
887	}	895	}
…		…
926	#if ENABLE_FRILLS \|\| ISO_14755	934	#if ENABLE_FRILLS \|\| ISO_14755
927	// ISO 14755 support	935	// ISO 14755 support
928	if (iso14755buf)	936	if (iso14755buf)
929	if (iso14755buf & ISO_14755_52)	937	if (iso14755buf & ISO_14755_52)
930	{	938	{
931	# if ENABLE_OVERLAY	939	# if ISO_14755
932	scr_overlay_off ();	940	scr_overlay_off ();
933	# endif	941	# endif
934	# if ISO_14755	942	# if ISO_14755
935	// iso14755 part 5.2 handling: release time	943	// iso14755 part 5.2 handling: release time
936	// first: controls	944	// first: controls
…		…
959		967
960	return;	968	return;
961	}	969	}
962	else if ((ev.state & (ShiftMask \| ControlMask)) != (ShiftMask \| ControlMask))	970	else if ((ev.state & (ShiftMask \| ControlMask)) != (ShiftMask \| ControlMask))
963	{	971	{
964	# if ENABLE_OVERLAY	972	# if ISO_14755
965	scr_overlay_off ();	973	scr_overlay_off ();
966	# endif	974	# endif
967	if (iso14755buf & ISO_14755_51)	975	if (iso14755buf & ISO_14755_51)
968	commit_iso14755 ();	976	commit_iso14755 ();
969	#if ISO_14755	977	#if ISO_14755
970	else if (iso14755buf & ISO_14755_STARTED)	978	else if (option (Opt_iso14755_52) && iso14755buf & ISO_14755_STARTED)
971	{	979	{
972	iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair	980	iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
973		981
974	scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);	982	scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
975	scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");	983	scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
…		…
1026		1034
1027	void	1035	void
1028	rxvt_term::flush ()	1036	rxvt_term::flush ()
1029	{	1037	{
1030	flush_ev.stop ();	1038	flush_ev.stop ();
1031		1039
1032	#ifdef TRANSPARENT	1040	#ifdef HAVE_BG_PIXMAP
1033	if (want_full_refresh)	1041	if (bgPixmap.check_clearChanged ())
1034	{	1042	{
1035	want_full_refresh = 0;
1036	scr_clear ();	1043	scr_clear (true);
1037	scr_touch (false);	1044	scr_touch (false);
1038	}	1045	}
1039	#endif	1046	#endif
1040		1047
1041	if (want_refresh)	1048	if (want_refresh)
…		…
1102	void	1109	void
1103	rxvt_term::flush_cb (time_watcher &w)	1110	rxvt_term::flush_cb (time_watcher &w)
1104	{	1111	{
1105	make_current ();	1112	make_current ();
1106		1113
1107	refresh_limit = 1;
1108	refresh_count = 0;	1114	refresh_count = 0;
1109	flush ();	1115	flush ();
1110	}	1116	}
1111		1117
1112	#ifdef CURSOR_BLINK	1118	#ifdef CURSOR_BLINK
…		…
1178		1184
1179	#if LINUX_YIELD_HACK	1185	#if LINUX_YIELD_HACK
1180	static struct event_handler	1186	static struct event_handler
1181	{	1187	{
1182	check_watcher yield_ev;	1188	check_watcher yield_ev;
1183		1189
1184	void yield_cb (check_watcher &w)	1190	void yield_cb (check_watcher &w)
1185	{	1191	{
1186	// this should really be sched_yield(), but the linux guys thought	1192	// this should really be sched_yield(), but the linux guys thought
1187	// that giving a process calling sched_yield () less cpu time than	1193	// that giving a process calling sched_yield () less cpu time than
1188	// ones with high nice levels is a useful thing to do. It surely is is	1194	// ones with high nice levels is a useful thing to do. It surely is is
…		…
1232	}	1238	}
1233	else	1239	else
1234	{	1240	{
1235	pty_ev.stop ();	1241	pty_ev.stop ();
1236		1242
1237	if (!OPTION (Opt_hold))	1243	if (!option (Opt_hold))
1238	destroy ();	1244	destroy ();
1239	}	1245	}
1240		1246
1241	return false;	1247	return false;
1242	}	1248	}
1243		1249
1244	void	1250	void
1245	rxvt_term::pty_cb (io_watcher &w, short revents)	1251	rxvt_term::pty_cb (io_watcher &w, short revents)
…		…
1263	recolour_cursor ();	1269	recolour_cursor ();
1264		1270
1265	#ifdef POINTER_BLANK	1271	#ifdef POINTER_BLANK
1266	hidden_pointer = 0;	1272	hidden_pointer = 0;
1267		1273
1268	if (OPTION (Opt_pointerBlank))	1274	if (option (Opt_pointerBlank))
1269	pointer_ev.start (NOW + pointerBlankDelay);	1275	pointer_ev.start (NOW + pointerBlankDelay);
1270	#endif	1276	#endif
1271	}	1277	}
1272		1278
1273	#ifdef POINTER_BLANK	1279	#ifdef POINTER_BLANK
1274	void	1280	void
1275	rxvt_term::pointer_blank ()	1281	rxvt_term::pointer_blank ()
1276	{	1282	{
1277	if (!OPTION (Opt_pointerBlank))	1283	if (!option (Opt_pointerBlank))
1278	return;	1284	return;
1279		1285
1280	XDefineCursor (dpy, vt, display->blank_cursor);	1286	XDefineCursor (dpy, vt, display->blank_cursor);
1281	XFlush (dpy);	1287	XFlush (dpy);
1282		1288
…		…
1426	else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)	1432	else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1427	focus_out ();	1433	focus_out ();
1428	}	1434	}
1429	#endif	1435	#endif
1430	}	1436	}
1431	break;
1432
1433	case MappingNotify:
1434	XRefreshKeyboardMapping (&ev.xmapping);
1435	break;	1437	break;
1436		1438
1437	/*	1439	/*
1438	* XXX: this is not the _current_ arrangement	1440	* XXX: this is not the _current_ arrangement
1439	* Here's my conclusion:	1441	* Here's my conclusion:
…		…
1458	break;	1460	break;
1459	}	1461	}
1460	break;	1462	break;
1461		1463
1462	case FocusIn:	1464	case FocusIn:
1463	if (ev.xfocus.detail != NotifyInferior && ev.xfocus.detail != NotifyPointer)	1465	if (ev.xfocus.detail != NotifyInferior
		1466	&& ev.xfocus.detail != NotifyPointer
		1467	&& ev.xfocus.mode != NotifyGrab)
1464	focus_in ();	1468	focus_in ();
1465	break;	1469	break;
1466		1470
1467	case FocusOut:	1471	case FocusOut:
1468	if (ev.xfocus.detail != NotifyInferior && ev.xfocus.detail != NotifyPointer)	1472	if (ev.xfocus.detail != NotifyInferior
		1473	&& ev.xfocus.detail != NotifyPointer
		1474	&& ev.xfocus.mode != NotifyGrab)
1469	focus_out ();	1475	focus_out ();
1470	break;	1476	break;
1471		1477
1472	case ConfigureNotify:	1478	case ConfigureNotify:
		1479	/* fprintf (stderr, "ConfigureNotify for %X, parent is %X, geom is %dx%d%+d%+d, old geom was %dx%d\n",
		1480	ev.xconfigure.window, parent[0], ev.xconfigure.width, ev.xconfigure.height, ev.xconfigure.x, ev.xconfigure.y,
		1481	szHint.width, szHint.height); */
1473	if (ev.xconfigure.window == parent[0])	1482	if (ev.xconfigure.window == parent[0])
1474	{	1483	{
1475	while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))	1484	while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1476	;	1485	;
1477		1486
1478	if (szHint.width != ev.xconfigure.width \|\| szHint.height != ev.xconfigure.height)	1487	if (szHint.width != ev.xconfigure.width \|\| szHint.height != ev.xconfigure.height)
1479	{	1488	{
1480	seen_resize = 1;	1489	seen_resize = 1;
1481	resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);	1490	resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1482	}	1491	}
1483		1492	else
		1493	{
		1494	#ifdef HAVE_BG_PIXMAP
		1495	if (bgPixmap.window_position_sensitive ())
		1496	update_background ();
		1497	#endif
		1498	}
1484	HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));	1499	HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1485
1486	#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1487	if (OPTION (Opt_transparent))
1488	check_our_parents ();
1489	#endif
1490	}	1500	}
1491	break;	1501	break;
1492		1502
1493	case PropertyNotify:	1503	case PropertyNotify:
1494	if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END)))	1504	if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END)))
…		…
1525	text_blink_ev.stop ();	1535	text_blink_ev.stop ();
1526	#endif	1536	#endif
1527	HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));	1537	HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1528	break;	1538	break;
1529		1539
1530	#ifdef TRANSPARENT
1531	case ReparentNotify:
1532	rootwin_cb (ev);
1533	break;
1534	#endif /* TRANSPARENT */
1535
1536	case GraphicsExpose:	1540	case GraphicsExpose:
1537	case Expose:	1541	case Expose:
1538	if (ev.xany.window == vt)	1542	if (ev.xany.window == vt)
1539	{	1543	{
1540	do	1544	do
		1545	{
1541	scr_expose (ev.xexpose.x, ev.xexpose.y,	1546	scr_expose (ev.xexpose.x, ev.xexpose.y,
1542	ev.xexpose.width, ev.xexpose.height, False);	1547	ev.xexpose.width, ev.xexpose.height, False);
		1548	}
1543	while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));	1549	while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1544		1550
1545	ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;	1551	ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1546		1552
1547	while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))	1553	while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
		1554	{
1548	scr_expose (ev.xexpose.x, ev.xexpose.y,	1555	scr_expose (ev.xexpose.x, ev.xexpose.y,
1549	ev.xexpose.width, ev.xexpose.height, False);	1556	ev.xexpose.width, ev.xexpose.height, False);
1550		1557	}
1551	want_refresh = 1;	1558	want_refresh = 1;
1552	}	1559	}
1553	else	1560	else
1554	{	1561	{
1555	XEvent unused_event;	1562	XEvent unused_event;
…		…
1562	if (isScrollbarWindow (ev.xany.window))	1569	if (isScrollbarWindow (ev.xany.window))
1563	{	1570	{
1564	scrollBar.setIdle ();	1571	scrollBar.setIdle ();
1565	scrollbar_show (0);	1572	scrollbar_show (0);
1566	}	1573	}
1567
1568	#ifdef TRANSPARENT
1569	if (am_transparent && ev.xany.window == parent[0])
1570	XClearWindow (dpy, ev.xany.window);
1571	#endif
1572	}	1574	}
1573	break;	1575	break;
1574		1576
1575	case MotionNotify:	1577	case MotionNotify:
1576	#ifdef POINTER_BLANK	1578	#ifdef POINTER_BLANK
…		…
1674	&ev.xbutton.x, &ev.xbutton.y,	1676	&ev.xbutton.x, &ev.xbutton.y,
1675	&unused_mask);	1677	&unused_mask);
1676	scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,	1678	scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1677	scrollbar_size ());	1679	scrollbar_size ());
1678	want_refresh = 1;	1680	want_refresh = 1;
1679	refresh_limit = 0;
1680	scrollbar_show (1);	1681	scrollbar_show (1);
1681	}	1682	}
1682	break;	1683	break;
1683	}	1684	}
1684		1685
1685	#if defined(CURSOR_BLINK)	1686	#if defined(CURSOR_BLINK)
1686	if (OPTION (Opt_cursorBlink) && ev.type == KeyPress)	1687	if (option (Opt_cursorBlink) && ev.type == KeyPress)
1687	{	1688	{
1688	if (hidden_cursor)	1689	if (hidden_cursor)
1689	{	1690	{
1690	hidden_cursor = 0;	1691	hidden_cursor = 0;
1691	want_refresh = 1;	1692	want_refresh = 1;
…		…
1694	cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);	1695	cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1695	}	1696	}
1696	#endif	1697	#endif
1697		1698
1698	#if defined(POINTER_BLANK)	1699	#if defined(POINTER_BLANK)
1699	if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0)	1700	if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1700	{	1701	{
1701	if (ev.type == MotionNotify	1702	if (ev.type == MotionNotify
1702	\|\| ev.type == ButtonPress	1703	\|\| ev.type == ButtonPress
1703	\|\| ev.type == ButtonRelease)	1704	\|\| ev.type == ButtonRelease)
1704	if (hidden_pointer)	1705	if (hidden_pointer)
…		…
1726	IMSetPosition ();	1727	IMSetPosition ();
1727	XSetICFocus (Input_Context);	1728	XSetICFocus (Input_Context);
1728	}	1729	}
1729	#endif	1730	#endif
1730	#if CURSOR_BLINK	1731	#if CURSOR_BLINK
1731	if (OPTION (Opt_cursorBlink))	1732	if (option (Opt_cursorBlink))
1732	cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);	1733	cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1733	#endif	1734	#endif
1734	#if OFF_FOCUS_FADING	1735	#if OFF_FOCUS_FADING
1735	if (rs[Rs_fade])	1736	if (rs[Rs_fade])
1736	{	1737	{
1737	pix_colors = pix_colors_focused;	1738	pix_colors = pix_colors_focused;
1738	scr_recolour ();	1739	scr_recolour ();
1739	}	1740	}
1740	#endif	1741	#endif
		1742	#if ENABLE_FRILLS
		1743	if (option (Opt_urgentOnBell))
		1744	{
		1745	if (XWMHints *h = XGetWMHints(dpy, parent[0]))
		1746	{
		1747	h->flags &= ~XUrgencyHint;
		1748	XSetWMHints (dpy, parent[0], h);
		1749	}
		1750	}
		1751	#endif
1741	}	1752	}
1742	}	1753	}
1743		1754
1744	void	1755	void
1745	rxvt_term::focus_out ()	1756	rxvt_term::focus_out ()
…		…
1753		1764
1754	#if ENABLE_FRILLS \|\| ISO_14755	1765	#if ENABLE_FRILLS \|\| ISO_14755
1755	if (iso14755buf)	1766	if (iso14755buf)
1756	{	1767	{
1757	iso14755buf = 0;	1768	iso14755buf = 0;
1758	# if ENABLE_OVERLAY	1769	# if ISO_14755
1759	scr_overlay_off ();	1770	scr_overlay_off ();
1760	# endif	1771	# endif
1761	}	1772	}
1762	#endif	1773	#endif
1763	#if USE_XIM	1774	#if USE_XIM
1764	if (Input_Context != NULL)	1775	if (Input_Context != NULL)
1765	XUnsetICFocus (Input_Context);	1776	XUnsetICFocus (Input_Context);
1766	#endif	1777	#endif
1767	#if CURSOR_BLINK	1778	#if CURSOR_BLINK
1768	if (OPTION (Opt_cursorBlink))	1779	if (option (Opt_cursorBlink))
1769	cursor_blink_ev.stop ();	1780	cursor_blink_ev.stop ();
1770	hidden_cursor = 0;	1781	hidden_cursor = 0;
1771	#endif	1782	#endif
1772	#if OFF_FOCUS_FADING	1783	#if OFF_FOCUS_FADING
1773	if (rs[Rs_fade])	1784	if (rs[Rs_fade])
…		…
1790	pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);	1801	pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
1791	}	1802	}
1792	#endif	1803	#endif
1793	}	1804	}
1794		1805
1795	#if TRANSPARENT \|\| ENABLE_PERL	1806	#if ENABLE_TRANSPARENCY \|\| ENABLE_PERL
1796	void	1807	void
1797	rxvt_term::rootwin_cb (XEvent &ev)	1808	rxvt_term::rootwin_cb (XEvent &ev)
1798	{	1809	{
1799	make_current ();	1810	make_current ();
1800		1811
1801	if (SHOULD_INVOKE (HOOK_ROOT_EVENT)	1812	if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
1802	&& HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))	1813	&& HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
1803	return;	1814	return;
1804		1815
1805	# if TRANSPARENT	1816	# if ENABLE_TRANSPARENCY
1806	switch (ev.type)	1817	switch (ev.type)
1807	{	1818	{
1808	case PropertyNotify:	1819	case PropertyNotify:
1809	/*	1820	/*
1810	* if user used some Esetroot compatible prog to set the root bg,	1821	* if user used some Esetroot compatible prog to set the root bg,
1811	* use the property to determine the pixmap. We use it later on.	1822	* use the property to determine the pixmap. We use it later on.
1812	*/	1823	*/
1813	if (ev.xproperty.atom != xa[XA_XROOTPMAP_ID]	1824	if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1814	&& ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID])	1825	\|\| ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1815	return;	1826	{
1816		1827	bgPixmap.set_root_pixmap ();
1817	/* FALLTHROUGH */	1828	update_background ();
1818	case ReparentNotify:	1829	}
1819	if (OPTION (Opt_transparent) && check_our_parents () && am_transparent)
1820	want_refresh = want_full_refresh = 1;
1821	break;	1830	break;
1822	}	1831	}
1823	# endif	1832	# endif
1824	}	1833	}
1825	#endif	1834	#endif
…		…
2156	selection_make (ev.time);	2165	selection_make (ev.time);
2157	break;	2166	break;
2158		2167
2159	case Button2:	2168	case Button2:
2160	if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?	2169	if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
2161	selection_request (ev.time, ev.state & ModMetaMask ? Sel_Primary : Sel_Primary);	2170	selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2162	break;	2171	break;
2163		2172
2164	#ifdef MOUSE_WHEEL	2173	#ifdef MOUSE_WHEEL
2165	case Button4:	2174	case Button4:
2166	case Button5:	2175	case Button5:
…		…
2170		2179
2171	v = ev.button == Button4 ? UP : DN;	2180	v = ev.button == Button4 ? UP : DN;
2172		2181
2173	if (ev.state & ShiftMask)	2182	if (ev.state & ShiftMask)
2174	i = 1;	2183	i = 1;
2175	else if (OPTION (Opt_mouseWheelScrollPage))	2184	else if (option (Opt_mouseWheelScrollPage))
2176	i = nrow - 1;	2185	i = nrow - 1;
2177	else	2186	else
2178	i = 5;	2187	i = 5;
2179		2188
2180	# ifdef MOUSE_SLIP_WHEELING	2189	# ifdef MOUSE_SLIP_WHEELING
…		…
2201	break;	2210	break;
2202	#endif	2211	#endif
2203	}	2212	}
2204	}	2213	}
2205	}	2214	}
2206
2207	#ifdef TRANSPARENT
2208	#if TINTING
2209	/* taken from aterm-0.4.2 */
2210
2211	typedef uint32_t RUINT32T;
2212
2213	void ShadeXImage(rxvt_term term, XImage srcImage, int shade, int rm, int gm, int bm)
2214	{
2215	int sh_r, sh_g, sh_b;
2216	RUINT32T mask_r, mask_g, mask_b;
2217	RUINT32T lookup, lookup_r, lookup_g, lookup_b;
2218	unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2219	unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2220	int i;
2221
2222	Visual *visual = term->visual;
2223
2224	if( visual->c_class != TrueColor \|\| srcImage->format != ZPixmap ) return ;
2225
2226	/* for convenience */
2227	mask_r = visual->red_mask;
2228	mask_g = visual->green_mask;
2229	mask_b = visual->blue_mask;
2230
2231	/* boring lookup table pre-initialization */
2232	switch (srcImage->bits_per_pixel) {
2233	case 15:
2234	if ((mask_r != 0x7c00) \|\|
2235	(mask_g != 0x03e0) \|\|
2236	(mask_b != 0x001f))
2237	return;
2238	lookup = (RUINT32T ) malloc (sizeof (RUINT32T)(32+32+32));
2239	lookup_r = lookup;
2240	lookup_g = lookup+32;
2241	lookup_b = lookup+32+32;
2242	sh_r = 10;
2243	sh_g = 5;
2244	sh_b = 0;
2245	break;
2246	case 16:
2247	if ((mask_r != 0xf800) \|\|
2248	(mask_g != 0x07e0) \|\|
2249	(mask_b != 0x001f))
2250	return;
2251	lookup = (RUINT32T ) malloc (sizeof (RUINT32T)(32+64+32));
2252	lookup_r = lookup;
2253	lookup_g = lookup+32;
2254	lookup_b = lookup+32+64;
2255	sh_r = 11;
2256	sh_g = 5;
2257	sh_b = 0;
2258	break;
2259	case 24:
2260	if ((mask_r != 0xff0000) \|\|
2261	(mask_g != 0x00ff00) \|\|
2262	(mask_b != 0x0000ff))
2263	return;
2264	lookup = (RUINT32T ) malloc (sizeof (RUINT32T)(256+256+256));
2265	lookup_r = lookup;
2266	lookup_g = lookup+256;
2267	lookup_b = lookup+256+256;
2268	sh_r = 16;
2269	sh_g = 8;
2270	sh_b = 0;
2271	break;
2272	case 32:
2273	if ((mask_r != 0xff0000) \|\|
2274	(mask_g != 0x00ff00) \|\|
2275	(mask_b != 0x0000ff))
2276	return;
2277	lookup = (RUINT32T ) malloc (sizeof (RUINT32T)(256+256+256));
2278	lookup_r = lookup;
2279	lookup_g = lookup+256;
2280	lookup_b = lookup+256+256;
2281	sh_r = 16;
2282	sh_g = 8;
2283	sh_b = 0;
2284	break;
2285	default:
2286	return; /* we do not support this color depth */
2287	}
2288
2289	/* prepare limits for color transformation (each channel is handled separately) */
2290	if (shade < 0) {
2291	shade = -shade;
2292	if (shade < 0) shade = 0;
2293	if (shade > 100) shade = 100;
2294
2295	lower_lim_r = 65535-rm;
2296	lower_lim_g = 65535-gm;
2297	lower_lim_b = 65535-bm;
2298
2299	lower_lim_r = 65535-(unsigned int)(((RUINT32T)lower_lim_r)*((RUINT32T)shade)/100);
2300	lower_lim_g = 65535-(unsigned int)(((RUINT32T)lower_lim_g)*((RUINT32T)shade)/100);
2301	lower_lim_b = 65535-(unsigned int)(((RUINT32T)lower_lim_b)*((RUINT32T)shade)/100);
2302
2303	upper_lim_r = upper_lim_g = upper_lim_b = 65535;
2304	} else {
2305	if (shade < 0) shade = 0;
2306	if (shade > 100) shade = 100;
2307
2308	lower_lim_r = lower_lim_g = lower_lim_b = 0;
2309
2310	upper_lim_r = (unsigned int)((((RUINT32T)rm)*((RUINT32T)shade))/100);
2311	upper_lim_g = (unsigned int)((((RUINT32T)gm)*((RUINT32T)shade))/100);
2312	upper_lim_b = (unsigned int)((((RUINT32T)bm)*((RUINT32T)shade))/100);
2313	}
2314
2315	/* switch red and blue bytes if necessary, we need it for some weird XServers like XFree86 3.3.3.1 */
2316	if ((srcImage->bits_per_pixel == 24) && (mask_r >= 0xFF0000 ))
2317	{
2318	unsigned int tmp;
2319
2320	tmp = lower_lim_r;
2321	lower_lim_r = lower_lim_b;
2322	lower_lim_b = tmp;
2323
2324	tmp = upper_lim_r;
2325	upper_lim_r = upper_lim_b;
2326	upper_lim_b = tmp;
2327	}
2328
2329	/* fill our lookup tables */
2330	for (i = 0; i <= mask_r>>sh_r; i++)
2331	{
2332	RUINT32T tmp;
2333	tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_r-lower_lim_r));
2334	tmp += ((RUINT32T)(mask_r>>sh_r))*((RUINT32T)lower_lim_r);
2335	lookup_r[i] = (tmp/65535)<<sh_r;
2336	}
2337	for (i = 0; i <= mask_g>>sh_g; i++)
2338	{
2339	RUINT32T tmp;
2340	tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_g-lower_lim_g));
2341	tmp += ((RUINT32T)(mask_g>>sh_g))*((RUINT32T)lower_lim_g);
2342	lookup_g[i] = (tmp/65535)<<sh_g;
2343	}
2344	for (i = 0; i <= mask_b>>sh_b; i++)
2345	{
2346	RUINT32T tmp;
2347	tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_b-lower_lim_b));
2348	tmp += ((RUINT32T)(mask_b>>sh_b))*((RUINT32T)lower_lim_b);
2349	lookup_b[i] = (tmp/65535)<<sh_b;
2350	}
2351
2352	/* apply table to input image (replacing colors by newly calculated ones) */
2353	switch (srcImage->bits_per_pixel)
2354	{
2355	case 15:
2356	{
2357	unsigned short p1, pf, p, pl;
2358	p1 = (unsigned short *) srcImage->data;
2359	pf = (unsigned short ) (srcImage->data + srcImage->height srcImage->bytes_per_line);
2360	while (p1 < pf)
2361	{
2362	p = p1;
2363	pl = p1 + srcImage->width;
2364	for (; p < pl; p++)
2365	{
2366	p = lookup_r[(p & 0x7c00)>>10] \|
2367	lookup_g[(*p & 0x03e0)>> 5] \|
2368	lookup_b[(*p & 0x001f)];
2369	}
2370	p1 = (unsigned short ) ((char ) p1 + srcImage->bytes_per_line);
2371	}
2372	break;
2373	}
2374	case 16:
2375	{
2376	unsigned short p1, pf, p, pl;
2377	p1 = (unsigned short *) srcImage->data;
2378	pf = (unsigned short ) (srcImage->data + srcImage->height srcImage->bytes_per_line);
2379	while (p1 < pf)
2380	{
2381	p = p1;
2382	pl = p1 + srcImage->width;
2383	for (; p < pl; p++)
2384	{
2385	p = lookup_r[(p & 0xf800)>>11] \|
2386	lookup_g[(*p & 0x07e0)>> 5] \|
2387	lookup_b[(*p & 0x001f)];
2388	}
2389	p1 = (unsigned short ) ((char ) p1 + srcImage->bytes_per_line);
2390	}
2391	break;
2392	}
2393	case 24:
2394	{
2395	unsigned char p1, pf, p, pl;
2396	p1 = (unsigned char *) srcImage->data;
2397	pf = (unsigned char ) (srcImage->data + srcImage->height srcImage->bytes_per_line);
2398	while (p1 < pf)
2399	{
2400	p = p1;
2401	pl = p1 + srcImage->width * 3;
2402	for (; p < pl; p += 3)
2403	{
2404	p[0] = lookup_r[(p[0] & 0xff0000)>>16];
2405	p[1] = lookup_r[(p[1] & 0x00ff00)>> 8];
2406	p[2] = lookup_r[(p[2] & 0x0000ff)];
2407	}
2408	p1 = (unsigned char ) ((char ) p1 + srcImage->bytes_per_line);
2409	}
2410	break;
2411	}
2412	case 32:
2413	{
2414	RUINT32T p1, pf, p, pl;
2415	p1 = (RUINT32T *) srcImage->data;
2416	pf = (RUINT32T ) (srcImage->data + srcImage->height srcImage->bytes_per_line);
2417
2418	while (p1 < pf)
2419	{
2420	p = p1;
2421	pl = p1 + srcImage->width;
2422	for (; p < pl; p++)
2423	{
2424	p = lookup_r[(p & 0xff0000)>>16] \|
2425	lookup_g[(*p & 0x00ff00)>> 8] \|
2426	lookup_b[(*p & 0x0000ff)] \|
2427	(*p & ~0xffffff);
2428	}
2429	p1 = (RUINT32T ) ((char ) p1 + srcImage->bytes_per_line);
2430	}
2431	break;
2432	}
2433	}
2434
2435	free (lookup);
2436	}
2437	#endif
2438
2439	/*
2440	* Check our parents are still who we think they are.
2441	* Do transparency updates if required
2442	*/
2443	int
2444	rxvt_term::check_our_parents ()
2445	{
2446	int i, pchanged, aformat, have_pixmap, rootdepth;
2447	unsigned long nitems, bytes_after;
2448	Atom atype;
2449	unsigned char *prop = NULL;
2450	Window root, oldp, *list;
2451	Pixmap rootpixmap = None;
2452	XWindowAttributes wattr, wrootattr;
2453
2454	pchanged = 0;
2455
2456	if (!OPTION (Opt_transparent))
2457	return pchanged; /* Don't try any more */
2458
2459	XGetWindowAttributes (dpy, display->root, &wrootattr);
2460	rootdepth = wrootattr.depth;
2461
2462	XGetWindowAttributes (dpy, parent[0], &wattr);
2463
2464	if (rootdepth != wattr.depth)
2465	{
2466	if (am_transparent)
2467	{
2468	pchanged = 1;
2469	XSetWindowBackground (dpy, vt, pix_colors_focused[Color_bg]);
2470	am_transparent = am_pixmap_trans = 0;
2471	}
2472
2473	return pchanged; /* Don't try any more */
2474	}
2475
2476	/* Get all X ops out of the queue so that our information is up-to-date. */
2477	XSync (dpy, False);
2478
2479	/*
2480	* Make the frame window set by the window manager have
2481	* the root background. Some window managers put multiple nested frame
2482	* windows for each client, so we have to take care about that.
2483	*/
2484	i = (xa[XA_XROOTPMAP_ID]
2485	&& XGetWindowProperty (dpy, display->root, xa[XA_XROOTPMAP_ID],
2486	0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2487	&nitems, &bytes_after, &prop) == Success);
2488
2489	if (!i \|\| prop == NULL)
2490	i = (xa[XA_ESETROOT_PMAP_ID]
2491	&& XGetWindowProperty (dpy, display->root, xa[XA_ESETROOT_PMAP_ID],
2492	0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2493	&nitems, &bytes_after, &prop) == Success);
2494
2495	if (!i \|\| prop == NULL
2496	#if TINTING
2497	\|\| !ISSET_PIXCOLOR (Color_tint)
2498	#endif
2499	)
2500	have_pixmap = 0;
2501	else
2502	{
2503	have_pixmap = 1;
2504	rootpixmap = (Pixmap )prop;
2505	XFree (prop);
2506	}
2507
2508	if (have_pixmap)
2509	{
2510	/*
2511	* Copy display->root pixmap transparency
2512	*/
2513	int sx, sy, nx, ny;
2514	unsigned int nw, nh;
2515	Window cr;
2516	XImage *image;
2517	GC gc;
2518	XGCValues gcvalue;
2519
2520	XTranslateCoordinates (dpy, parent[0], display->root,
2521	0, 0, &sx, &sy, &cr);
2522	nw = (unsigned int)szHint.width;
2523	nh = (unsigned int)szHint.height;
2524	nx = ny = 0;
2525
2526	if (sx < 0)
2527	{
2528	nw += sx;
2529	nx = -sx;
2530	sx = 0;
2531	}
2532
2533	if (sy < 0)
2534	{
2535	nh += sy;
2536	ny = -sy;
2537	sy = 0;
2538	}
2539
2540	min_it (nw, (unsigned int) (wrootattr.width - sx));
2541	min_it (nh, (unsigned int) (wrootattr.height - sy));
2542
2543	XSync (dpy, False);
2544	allowedxerror = -1;
2545	image = XGetImage (dpy, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2546
2547	/* XXX: handle BadMatch - usually because we're outside the pixmap */
2548	/* XXX: may need a delay here? */
2549	allowedxerror = 0;
2550
2551	if (image == NULL)
2552	{
2553	if (am_transparent && am_pixmap_trans)
2554	{
2555	pchanged = 1;
2556	if (pixmap != None)
2557	{
2558	XFreePixmap (dpy, pixmap);
2559	pixmap = None;
2560	}
2561	}
2562
2563	am_pixmap_trans = 0;
2564	}
2565	else
2566	{
2567	if (pixmap != None)
2568	XFreePixmap (dpy, pixmap);
2569
2570	#if TINTING
2571	if (ISSET_PIXCOLOR (Color_tint))
2572	{
2573	int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2574
2575	rgba c;
2576	pix_colors_focused [Color_tint].get (c);
2577
2578	ShadeXImage (this, image, shade, c.r, c.g, c.b);
2579	}
2580	#endif
2581
2582	pixmap = XCreatePixmap (dpy, vt, szHint.width, szHint.height, image->depth);
2583	gc = XCreateGC (dpy, vt, 0UL, &gcvalue);
2584	XPutImage (dpy, pixmap, gc, image, 0, 0,
2585	nx, ny, image->width, image->height);
2586	XFreeGC (dpy, gc);
2587	XDestroyImage (image);
2588	XSetWindowBackgroundPixmap (dpy, parent[0], pixmap);
2589	XClearWindow (dpy, parent[0]);
2590
2591	if (!am_transparent \|\| !am_pixmap_trans)
2592	pchanged = 1;
2593
2594	am_transparent = am_pixmap_trans = 1;
2595	}
2596	}
2597
2598	if (am_pixmap_trans)
2599	XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2600	else
2601	{
2602	unsigned int n;
2603	/*
2604	* InheritPixmap transparency
2605	*/
2606	for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2607	{
2608	oldp = parent[i];
2609	XQueryTree (dpy, parent[i - 1], &root, &parent[i], &list, &n);
2610	XFree (list);
2611
2612	if (parent[i] == display->root)
2613	{
2614	if (oldp != None)
2615	pchanged = 1;
2616
2617	break;
2618	}
2619
2620	if (oldp != parent[i])
2621	pchanged = 1;
2622	}
2623
2624	n = 0;
2625
2626	if (pchanged)
2627	for (; n < (unsigned int)i; n++)
2628	{
2629	XGetWindowAttributes (dpy, parent[n], &wattr);
2630
2631	if (wattr.depth != rootdepth \|\| wattr.c_class == InputOnly)
2632	{
2633	n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2634	break;
2635	}
2636	}
2637
2638	if (n > (sizeof (parent) / sizeof (parent[0])))
2639	{
2640	XSetWindowBackground (dpy, parent[0], pix_colors_focused[Color_border]);
2641	XSetWindowBackground (dpy, vt, pix_colors_focused[Color_bg]);
2642	am_transparent = 0;
2643	/* XXX: also turn off Opt_transparent? */
2644	}
2645	else
2646	{
2647	for (n = 0; n < (unsigned int)i; n++)
2648	{
2649	XSetWindowBackgroundPixmap (dpy, parent[n], ParentRelative);
2650	XClearWindow (dpy, parent[n]);
2651	}
2652
2653	XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2654	am_transparent = 1;
2655	}
2656
2657	for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2658	parent[i] = None;
2659	}
2660
2661	if (scrollBar.win)
2662	{
2663	XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
2664	scrollBar.setIdle ();
2665	scrollbar_show (0);
2666	}
2667
2668	if (am_transparent)
2669	{
2670	want_refresh = want_full_refresh = 1;
2671	if (am_pixmap_trans)
2672	flush ();
2673	}
2674
2675	return pchanged;
2676	}
2677	#endif
2678		2215
2679	/}}} /	2216	/}}} /
2680		2217
2681	bool	2218	bool
2682	rxvt_term::cmd_parse ()	2219	rxvt_term::cmd_parse ()
…		…
2731	if (ch == C0_LF)	2268	if (ch == C0_LF)
2732	nlines++;	2269	nlines++;
2733		2270
2734	refresh_count++;	2271	refresh_count++;
2735		2272
2736	if (!OPTION (Opt_jumpScroll)	2273	if (!option (Opt_jumpScroll) \|\| refresh_count >= nrow - 1)
2737	\|\| (refresh_count >= refresh_limit * (nrow - 1)))
2738	{	2274	{
2739	refreshnow = true;
2740	refresh_count = 0;	2275	refresh_count = 0;
		2276
		2277	if (!option (Opt_skipScroll) \|\| io_manager::now () > NOW + 1. / 60.)
		2278	{
		2279	refreshnow = true;
2741	ch = NOCHAR;	2280	ch = NOCHAR;
2742	break;	2281	break;
		2282	}
2743	}	2283	}
2744		2284
2745	// scr_add_lines only works for nlines <= nrow - 1.	2285	// scr_add_lines only works for nlines <= nrow - 1.
2746	if (nlines >= nrow - 1)	2286	if (nlines >= nrow - 1)
2747	{	2287	{
…		…
2775	&& HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))	2315	&& HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2776	scr_add_lines (buf, str - buf, nlines);	2316	scr_add_lines (buf, str - buf, nlines);
2777		2317
2778	/*	2318	/*
2779	* If there have been a lot of new lines, then update the screen	2319	* If there have been a lot of new lines, then update the screen
2780	* What the heck I'll cheat and only refresh less than every page-full.	2320	* What the heck we'll cheat and only refresh less than every page-full.
2781	* the number of pages between refreshes is refresh_limit, which	2321	* if skipScroll is enabled.
2782	* is incremented here because we must be doing flat-out scrolling.
2783	*/	2322	*/
2784	if (refreshnow)	2323	if (refreshnow)
2785	{	2324	{
2786	if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2787	refresh_limit++;
2788	else
2789	{
2790	flag = true;	2325	flag = true;
2791	//TODO: due to popular request, implement "skipscroll" option here
2792	scr_refresh ();	2326	scr_refresh ();
2793	want_refresh = 1;	2327	want_refresh = 1;
2794	}
2795	}	2328	}
2796		2329
2797	}	2330	}
2798	else	2331	else
2799	{	2332	{
…		…
2948	{	2481	{
2949	if ((buf[len++] = cmd_getc ()) == 'i')	2482	if ((buf[len++] = cmd_getc ()) == 'i')
2950	break; /* done = 1 */	2483	break; /* done = 1 */
2951	}	2484	}
2952	}	2485	}
2953		2486
2954	for (i = 0; i < len; i++)	2487	for (i = 0; i < len; i++)
2955	if (putc (buf[i], fd) == EOF)	2488	if (putc (buf[i], fd) == EOF)
2956	{	2489	{
2957	done = 1;	2490	done = 1;
2958	break;	2491	break;
…		…
3020	process_dcs_seq ();	2553	process_dcs_seq ();
3021	break;	2554	break;
3022	case 0x9b: /* CSI */	2555	case 0x9b: /* CSI */
3023	process_csi_seq ();	2556	process_csi_seq ();
3024	break;	2557	break;
3025	case 0x9d: /* CSI */	2558	case 0x9d: /* OSC */
3026	process_osc_seq ();	2559	process_osc_seq ();
3027	break;	2560	break;
3028	#endif	2561	#endif
3029	}	2562	}
3030	}	2563	}
…		…
3256	rxvt_term::process_csi_seq ()	2789	rxvt_term::process_csi_seq ()
3257	{	2790	{
3258	unicode_t ch, priv, i;	2791	unicode_t ch, priv, i;
3259	unsigned int nargs, p;	2792	unsigned int nargs, p;
3260	int n, ndef;	2793	int n, ndef;
3261	int arg[ESC_ARGS];	2794	int arg[ESC_ARGS] = { };
3262		2795
3263	for (nargs = ESC_ARGS; nargs > 0;)	2796	nargs = 0;
3264	arg[--nargs] = 0;
3265		2797
3266	priv = 0;	2798	priv = 0;
3267	ch = cmd_getc ();	2799	ch = cmd_getc ();
3268	if (ch >= '<' && ch <= '?')	2800	if (ch >= '<' && ch <= '?')
3269	{ /* '<' '=' '>' '?' */	2801	{ /* '<' '=' '>' '?' */
…		…
3313	switch (priv)	2845	switch (priv)
3314	{	2846	{
3315	case '>':	2847	case '>':
3316	if (ch == CSI_DA) /* secondary device attributes */	2848	if (ch == CSI_DA) /* secondary device attributes */
3317	{	2849	{
3318	// first parameter is normally 0 for vt100, 1 for some newer vtxxx, 'R' for rxvt,	2850	// first parameter is normally 0 for vt100, 1 for vt220, 'R' for rxvt,
3319	// 'U' for rxvt-unicode != 7.[34] (where it was broken).	2851	// 'U' for rxvt-unicode != 7.[34] (where it was broken).
3320	//	2852	//
3321	// second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt	2853	// second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
3322	// and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, and 94 for later versions, to signify	2854	// and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, and 94 for later versions, to signify
3323	// that we do not support xterm mouse reporting (should be 95 when we do).	2855	// that we do not support xterm mouse reporting (should be 95 when we do).
…		…
3457	break;	2989	break;
3458	case 6: /* CPR requested */	2990	case 6: /* CPR requested */
3459	scr_report_position ();	2991	scr_report_position ();
3460	break;	2992	break;
3461	case 7: /* unofficial extension */	2993	case 7: /* unofficial extension */
3462	if (OPTION (Opt_insecure))	2994	if (option (Opt_insecure))
3463	tt_printf ("%-.250s\012", rs[Rs_display_name]);	2995	tt_printf ("%-.250s\012", rs[Rs_display_name]);
3464	break;	2996	break;
3465	case 8: /* unofficial extension */	2997	case 8: /* unofficial extension */
3466	process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);	2998	process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3467	break;	2999	break;
…		…
3631	break;	3163	break;
3632	case 20: /* report icon label */	3164	case 20: /* report icon label */
3633	{	3165	{
3634	char *s;	3166	char *s;
3635	XGetIconName (dpy, parent[0], &s);	3167	XGetIconName (dpy, parent[0], &s);
3636	tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */	3168	tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3637	XFree (s);	3169	XFree (s);
3638	}	3170	}
3639	break;	3171	break;
3640	case 21: /* report window title */	3172	case 21: /* report window title */
3641	{	3173	{
3642	char *s;	3174	char *s;
3643	XFetchName (dpy, parent[0], &s);	3175	XFetchName (dpy, parent[0], &s);
3644	tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */	3176	tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3645	XFree (s);	3177	XFree (s);
3646	}	3178	}
3647	break;	3179	break;
3648	}	3180	}
3649	}	3181	}
…		…
3776	int saveop = op;	3308	int saveop = op;
3777		3309
3778	dLocal (Display *, dpy);	3310	dLocal (Display *, dpy);
3779		3311
3780	assert (str != NULL);	3312	assert (str != NULL);
3781		3313
3782	if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_INT, op, DT_STR, str, DT_END)))	3314	if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_INT, op, DT_STR, str, DT_END)))
3783	return;	3315	return;
3784		3316
3785	switch (op)	3317	switch (op)
3786	{	3318	{
…		…
3881	break;	3413	break;
3882	case URxvt_Color_IT:	3414	case URxvt_Color_IT:
3883	process_color_seq (op, Color_IT, str, resp);	3415	process_color_seq (op, Color_IT, str, resp);
3884	break;	3416	break;
3885	#endif	3417	#endif
3886	#if TRANSPARENT && TINTING	3418	#if ENABLE_TRANSPARENCY
3887	case URxvt_Color_tint:	3419	case URxvt_Color_tint:
3888	process_color_seq (op, Color_tint, str, resp);	3420	process_color_seq (op, Color_tint, str, resp);
		3421	{
		3422	bool changed = false;
		3423	if (ISSET_PIXCOLOR (Color_tint))
		3424	changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]);
		3425	else
		3426	changed = bgPixmap.unset_tint ();
		3427	if (changed)
		3428	update_background ();
		3429	}
3889		3430
3890	check_our_parents ();
3891
3892	if (am_transparent)
3893	want_full_refresh = want_refresh = 1;
3894
3895	break;	3431	break;
3896	#endif	3432	#endif
3897		3433
		3434	#if BG_IMAGE_FROM_FILE
3898	case Rxvt_Pixmap:	3435	case Rxvt_Pixmap:
3899	{	3436	if (!strcmp (str, "?"))
3900	if (*str != ';')
3901	{	3437	{
3902	#if XPM_BACKGROUND	3438	char str[256];
3903	scale_pixmap (""); /* reset to default scaling */	3439
3904	set_bgPixmap (str); /* change pixmap */	3440	sprintf (str, "[%dx%d+%d+%d]", /* can't presume snprintf () ! */
3905	scr_touch (true);	3441	min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767),
3906	#endif	3442	min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767));
		3443	process_xterm_seq (XTerm_title, str, CHAR_ST);
3907	}	3444	}
3908		3445	else
		3446	{
3909	int changed = 0;	3447	int changed = 0;
3910		3448
3911	while ((str = strchr (str, ';')) != NULL)	3449	if (*str != ';')
3912	{	3450	{
		3451	/* reset to default scaling :*/
		3452	bgPixmap.unset_geometry ();
		3453	if (bgPixmap.set_file (str)) /* change pixmap */
		3454	changed++;
		3455	str = strchr (str, ';');
		3456	if (str == NULL)
		3457	bgPixmap.set_defaultGeometry ();
		3458	}
		3459	while (str)
		3460	{
3913	str++;	3461	str++;
3914	#if XPM_BACKGROUND	3462	if (bgPixmap.set_geometry (str))
3915	changed += scale_pixmap (str);	3463	changed++;
3916	#endif	3464	str = strchr (str, ';');
3917	}	3465	}
3918
3919	if (changed)	3466	if (changed)
3920	{	3467	update_background ();
3921	#ifdef XPM_BACKGROUND
3922	resize_pixmap ();
3923	scr_touch (true);
3924	#endif
3925	}	3468	}
3926	}
3927	break;	3469	break;
		3470	#endif
3928		3471
3929	case Rxvt_restoreFG:	3472	case Rxvt_restoreFG:
3930	set_window_color (Color_fg, str);	3473	set_window_color (Color_fg, str);
3931	break;	3474	break;
3932	case Rxvt_restoreBG:	3475	case Rxvt_restoreBG:
…		…
3957	case URxvt_italicFont:	3500	case URxvt_italicFont:
3958	case URxvt_boldItalicFont:	3501	case URxvt_boldItalicFont:
3959	#endif	3502	#endif
3960	if (query)	3503	if (query)
3961	tt_printf ("\33]%d;%-.250s%c", saveop,	3504	tt_printf ("\33]%d;%-.250s%c", saveop,
3962	OPTION (Opt_insecure) && fontset[op - URxvt_font]->fontdesc	3505	option (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3963	? fontset[op - URxvt_font]->fontdesc : "",	3506	? fontset[op - URxvt_font]->fontdesc : "",
3964	resp);	3507	resp);
3965	else	3508	else
3966	{	3509	{
3967	const char *&res = rs[Rs_font + (op - URxvt_font)];	3510	const char *&res = rs[Rs_font + (op - URxvt_font)];
…		…
3981	break;	3524	break;
3982		3525
3983	#if !ENABLE_MINIMAL	3526	#if !ENABLE_MINIMAL
3984	case URxvt_locale:	3527	case URxvt_locale:
3985	if (query)	3528	if (query)
3986	tt_printf ("\33]%d;%-.250s%c", op, OPTION (Opt_insecure) ? locale : "", resp);	3529	tt_printf ("\33]%d;%-.250s%c", op, option (Opt_insecure) ? locale : "", resp);
3987	else	3530	else
3988	{	3531	{
3989	set_locale (str);	3532	set_locale (str);
3990	pty->set_utf8_mode (enc_utf8);	3533	pty->set_utf8_mode (enc_utf8);
3991	init_xlocale ();	3534	init_xlocale ();
…		…
4054	{	3597	{
4055	unsigned int i, j;	3598	unsigned int i, j;
4056	int state;	3599	int state;
4057		3600
4058	static const struct	3601	static const struct
4059	{	3602	{
4060	const int argval;	3603	const int argval;
4061	const unsigned long bit;	3604	const unsigned long bit;
4062	}
4063
4064	argtopriv[] = {	3605	} argtopriv[] = {
4065	{ 1, PrivMode_aplCUR },	3606	{ 1, PrivMode_aplCUR },
4066	{ 2, PrivMode_vt52 },	3607	{ 2, PrivMode_vt52 },
4067	{ 3, PrivMode_132 },	3608	{ 3, PrivMode_132 },
4068	{ 4, PrivMode_smoothScroll },	3609	{ 4, PrivMode_smoothScroll },
4069	{ 5, PrivMode_rVideo },	3610	{ 5, PrivMode_rVideo },
…		…
4132	scr_touch (true);	3673	scr_touch (true);
4133	break;	3674	break;
4134	#endif	3675	#endif
4135	case 1048: /* alternative cursor save */	3676	case 1048: /* alternative cursor save */
4136	case 1049:	3677	case 1049:
4137	if (OPTION (Opt_secondaryScreen))	3678	if (option (Opt_secondaryScreen))
4138	if (mode == 0)	3679	if (mode == 0)
4139	scr_cursor (RESTORE);	3680	scr_cursor (RESTORE);
4140	else if (mode == 1)	3681	else if (mode == 1)
4141	scr_cursor (SAVE);	3682	scr_cursor (SAVE);
4142	break;	3683	break;
…		…
4207	break;	3748	break;
4208	case 1011: /* scroll to bottom on key press */	3749	case 1011: /* scroll to bottom on key press */
4209	set_option (Opt_scrollTtyKeypress, state);	3750	set_option (Opt_scrollTtyKeypress, state);
4210	break;	3751	break;
4211	case 1047: /* secondary screen w/ clearing last */	3752	case 1047: /* secondary screen w/ clearing last */
4212	if (OPTION (Opt_secondaryScreen))	3753	if (option (Opt_secondaryScreen))
4213	if (current_screen != PRIMARY)	3754	if (current_screen != PRIMARY)
4214	scr_erase_screen (2);	3755	scr_erase_screen (2);
4215	scr_change_screen (state);	3756	scr_change_screen (state);
4216	break;	3757	break;
4217	case 1049: /* secondary screen w/ clearing first */	3758	case 1049: /* secondary screen w/ clearing first */
4218	scr_change_screen (state);	3759	scr_change_screen (state);
4219	if (OPTION (Opt_secondaryScreen))	3760	if (option (Opt_secondaryScreen))
4220	if (current_screen != PRIMARY)	3761	if (current_screen != PRIMARY)
4221	scr_erase_screen (2);	3762	scr_erase_screen (2);
4222	break;	3763	break;
4223	default:	3764	default:
4224	break;	3765	break;
…		…
4461		4002
4462	if (v_buflen == 0)	4003	if (v_buflen == 0)
4463	{	4004	{
4464	free (v_buffer);	4005	free (v_buffer);
4465	v_buffer = 0;	4006	v_buffer = 0;
4466	v_buflen = 0;
4467		4007
4468	pty_ev.set (EVENT_READ);	4008	pty_ev.set (EVENT_READ);
4469	return;	4009	return;
4470	}	4010	}
4471		4011

Diff Legend

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

Comparing rxvt-unicode/src/command.C (file contents): Revision 1.316 by root, Thu Dec 7 20:59:59 2006 UTC vs. Revision 1.357 by sasha, Tue Sep 18 22:01:36 2007 UTC

Diff Legend

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.316 by root, Thu Dec 7 20:59:59 2006 UTC vs.
Revision 1.357 by sasha, Tue Sep 18 22:01:36 2007 UTC