[ViewVC] Diff of: cvs/deliantra/Deliantra-Client/DC/UI.pm

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.270 by elmex, Fri Jun 2 09:02:49 2006 UTC vs.
Revision 1.287 by root, Mon Jun 5 05:31:13 2006 UTC

…		…
3	use utf8;	3	use utf8;
4	use strict;	4	use strict;
5		5
6	use Scalar::Util ();	6	use Scalar::Util ();
7	use List::Util ();	7	use List::Util ();
		8	use Event;
8		9
9	use CFClient;	10	use CFClient;
10	use CFClient::Texture;	11	use CFClient::Texture;
11		12
12	our ($FOCUS, $HOVER, $GRAB); # various widgets	13	our ($FOCUS, $HOVER, $GRAB); # various widgets
…		…
15	our $ROOT;	16	our $ROOT;
16	our $TOOLTIP;	17	our $TOOLTIP;
17	our $BUTTON_STATE;	18	our $BUTTON_STATE;
18		19
19	our %WIDGET; # all widgets, weak-referenced	20	our %WIDGET; # all widgets, weak-referenced
		21
		22	our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub {
		23	if (!$GRAB) {
		24	for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
		25	if (length $widget->{tooltip}) {
		26	if ($TOOLTIP->{owner} != $widget) {
		27	$TOOLTIP->hide;
		28
		29	$TOOLTIP->{owner} = $widget;
		30
		31	return if $ENV{CFPLUS_DEBUG} & 8;
		32
		33	my $tip = $widget->{tooltip};
		34
		35	$tip = $tip->($widget) if CODE:: eq ref $tip;
		36
		37	$TOOLTIP->set_tooltip_from ($widget);
		38	$TOOLTIP->show;
		39	}
		40
		41	return;
		42	}
		43	}
		44	}
		45
		46	$TOOLTIP->hide;
		47	delete $TOOLTIP->{owner};
		48	});
20		49
21	sub get_layout {	50	sub get_layout {
22	my $layout;	51	my $layout;
23		52
24	for (grep { $_->{name} } values %WIDGET) {	53	for (grep { $_->{name} } values %WIDGET) {
…		…
39	my ($layout) = @_;	68	my ($layout) = @_;
40		69
41	$LAYOUT = $layout;	70	$LAYOUT = $layout;
42	}	71	}
43		72
44	sub check_tooltip {
45	return if $ENV{CFPLUS_DEBUG} & 8;
46
47	if (!$GRAB) {
48	for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
49	if (length $widget->{tooltip}) {
50	if ($TOOLTIP->{owner} != $widget) {
51	$TOOLTIP->hide;
52
53	$TOOLTIP->{owner} = $widget;
54
55	my $tip = $widget->{tooltip};
56
57	$tip = $tip->($widget) if CODE:: eq ref $tip;
58
59	$TOOLTIP->set_tooltip_from ($widget);
60	$TOOLTIP->show;
61	}
62
63	return;
64	}
65	}
66	}
67
68	$TOOLTIP->hide;
69	delete $TOOLTIP->{owner};
70	}
71
72	# class methods for events	73	# class methods for events
73	sub feed_sdl_key_down_event {	74	sub feed_sdl_key_down_event {
74	$FOCUS->emit (key_down => $_[0])	75	$FOCUS->emit (key_down => $_[0])
75	if $FOCUS;	76	if $FOCUS;
76	}	77	}
…		…
88	my $widget = $ROOT->find_widget ($x, $y);	89	my $widget = $ROOT->find_widget ($x, $y);
89		90
90	$GRAB = $widget;	91	$GRAB = $widget;
91	$GRAB->update if $GRAB;	92	$GRAB->update if $GRAB;
92		93
93	check_tooltip;	94	$TOOLTIP_WATCHER->cb->();
94	}	95	}
95		96
96	$BUTTON_STATE \|= 1 << ($ev->{button} - 1);	97	$BUTTON_STATE \|= 1 << ($ev->{button} - 1);
97		98
98	$GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))	99	$GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))
…		…
113	if (!$BUTTON_STATE) {	114	if (!$BUTTON_STATE) {
114	my $grab = $GRAB; undef $GRAB;	115	my $grab = $GRAB; undef $GRAB;
115	$grab->update if $grab;	116	$grab->update if $grab;
116	$GRAB->update if $GRAB;	117	$GRAB->update if $GRAB;
117		118
118	check_tooltip;	119	$TOOLTIP_WATCHER->cb->();
119	}	120	}
120	}	121	}
121		122
122	sub feed_sdl_motion_event {	123	sub feed_sdl_motion_event {
123	my ($ev) = @_;	124	my ($ev) = @_;
…		…
129	my $hover = $HOVER; $HOVER = $widget;	130	my $hover = $HOVER; $HOVER = $widget;
130		131
131	$hover->update if $hover && $hover->{can_hover};	132	$hover->update if $hover && $hover->{can_hover};
132	$HOVER->update if $HOVER && $HOVER->{can_hover};	133	$HOVER->update if $HOVER && $HOVER->{can_hover};
133		134
134	check_tooltip;	135	$TOOLTIP_WATCHER->start;
135	}	136	}
136		137
137	$HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))	138	$HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
138	if $HOVER;	139	if $HOVER;
139	}	140	}
…		…
277	delete $self->{visible};	278	delete $self->{visible};
278		279
279	undef $GRAB if $GRAB == $self;	280	undef $GRAB if $GRAB == $self;
280	undef $HOVER if $HOVER == $self;	281	undef $HOVER if $HOVER == $self;
281		282
282	CFClient::UI::check_tooltip	283	$CFClient::UI::TOOLTIP_WATCHER->cb->()
283	if $TOOLTIP->{owner} == $self;	284	if $TOOLTIP->{owner} == $self;
284		285
285	$self->focus_out;	286	$self->focus_out;
286		287
287	$self->emit (visibility_change => 0);	288	$self->emit (visibility_change => 0);
…		…
371	sub size_allocate {	372	sub size_allocate {
372	# nothing to be done	373	# nothing to be done
373	}	374	}
374		375
375	sub children {	376	sub children {
		377	# nop
		378	}
		379
		380	sub visible_children {
		381	$_[0]->children
376	}	382	}
377		383
378	sub set_max_size {	384	sub set_max_size {
379	my ($self, $w, $h) = @_;	385	my ($self, $w, $h) = @_;
380		386
381	delete $self->{max_w}; $self->{max_w} = $w if $w;	387	$self->{max_w} = int $w if defined $w;
382	delete $self->{max_h}; $self->{max_h} = $h if $h;	388	$self->{max_h} = int $h if defined $h;
		389
		390	$self->realloc;
383	}	391	}
384		392
385	sub set_tooltip {	393	sub set_tooltip {
386	my ($self, $tooltip) = @_;	394	my ($self, $tooltip) = @_;
387		395
…		…
392		400
393	$self->{tooltip} = $tooltip;	401	$self->{tooltip} = $tooltip;
394		402
395	if ($CFClient::UI::TOOLTIP->{owner} == $self) {	403	if ($CFClient::UI::TOOLTIP->{owner} == $self) {
396	delete $CFClient::UI::TOOLTIP->{owner};	404	delete $CFClient::UI::TOOLTIP->{owner};
397	CFClient::UI::check_tooltip;	405	$CFClient::UI::TOOLTIP_WATCHER->cb->();
398	}	406	}
399	}	407	}
400		408
401	# translate global coordinates to local coordinate system	409	# translate global coordinates to local coordinate system
402	sub coord2local {	410	sub coord2local {
…		…
439		447
440	$::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus	448	$::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus
441	unless $FOCUS;	449	unless $FOCUS;
442	}	450	}
443		451
444	sub mouse_motion { }	452	sub mouse_motion { 0 }
445	sub button_up { }	453	sub button_up { 0 }
446	sub key_down { }	454	sub key_down { 0 }
447	sub key_up { }	455	sub key_up { 0 }
448		456
449	sub button_down {	457	sub button_down {
450	my ($self, $ev, $x, $y) = @_;	458	my ($self, $ev, $x, $y) = @_;
451		459
452	$self->focus_in;	460	$self->focus_in;
		461
		462	0
453	}	463	}
454		464
455	sub find_widget {	465	sub find_widget {
456	my ($self, $x, $y) = @_;	466	my ($self, $x, $y) = @_;
457		467
…		…
541	return if ($draw_x + $self->{w} < 0) \|\| ($draw_x >= $draw_w)	551	return if ($draw_x + $self->{w} < 0) \|\| ($draw_x >= $draw_w)
542	\|\| ($draw_y + $self->{h} < 0) \|\| ($draw_y >= $draw_h);	552	\|\| ($draw_y + $self->{h} < 0) \|\| ($draw_y >= $draw_h);
543		553
544	glPushMatrix;	554	glPushMatrix;
545	glTranslate $self->{x}, $self->{y}, 0;	555	glTranslate $self->{x}, $self->{y}, 0;
546	$self->_draw;
547	glPopMatrix;
548		556
549	if ($self == $HOVER && $self->{can_hover}) {	557	if ($self == $HOVER && $self->{can_hover}) {
550	my ($x, $y) = @$self{qw(x y)};
551
552	glColor 1, 0.8, 0.5, 0.2;	558	glColor 10.2, 0.80.2, 0.5*0.2, 0.2;
553	glEnable GL_BLEND;	559	glEnable GL_BLEND;
554	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	560	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
555	glBegin GL_QUADS;	561	glBegin GL_QUADS;
556	glVertex $x , $y;	562	glVertex 0 , 0;
557	glVertex $x + $self->{w}, $y;	563	glVertex $self->{w}, 0;
558	glVertex $x + $self->{w}, $y + $self->{h};	564	glVertex $self->{w}, $self->{h};
559	glVertex $x , $y + $self->{h};	565	glVertex 0 , $self->{h};
560	glEnd;	566	glEnd;
561	glDisable GL_BLEND;	567	glDisable GL_BLEND;
562	}	568	}
563		569
564	if ($ENV{CFPLUS_DEBUG} & 1) {	570	if ($ENV{CFPLUS_DEBUG} & 1) {
565	glPushMatrix;	571	glPushMatrix;
566	glColor 1, 1, 0, 1;	572	glColor 1, 1, 0, 1;
567	glTranslate $self->{x} + 0.375, $self->{y} + 0.375;	573	glTranslate 0.375, 0.375;
568	glBegin GL_LINE_LOOP;	574	glBegin GL_LINE_LOOP;
569	glVertex 0 , 0;	575	glVertex 0 , 0;
570	glVertex $self->{w} - 1, 0;	576	glVertex $self->{w} - 1, 0;
571	glVertex $self->{w} - 1, $self->{h} - 1;	577	glVertex $self->{w} - 1, $self->{h} - 1;
572	glVertex 0 , $self->{h} - 1;	578	glVertex 0 , $self->{h} - 1;
573	glEnd;	579	glEnd;
574	glPopMatrix;	580	glPopMatrix;
575	#CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;	581	#CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
576	}	582	}
		583
		584	$self->_draw;
		585	glPopMatrix;
577	}	586	}
578		587
579	sub _draw {	588	sub _draw {
580	my ($self) = @_;	589	my ($self) = @_;
581		590
…		…
619		628
620	if ($color && (@$color < 4 \|\| $color->[3])) {	629	if ($color && (@$color < 4 \|\| $color->[3])) {
621	my ($w, $h) = @$self{qw(w h)};	630	my ($w, $h) = @$self{qw(w h)};
622		631
623	glEnable GL_BLEND;	632	glEnable GL_BLEND;
624	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	633	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
625	glColor @$color;	634	glColor_premultiply @$color;
626		635
627	glBegin GL_QUADS;	636	glBegin GL_QUADS;
628	glVertex 0 , 0;	637	glVertex 0 , 0;
629	glVertex 0 , $h;	638	glVertex 0 , $h;
630	glVertex $w, $h;	639	glVertex $w, $h;
…		…
661	our @ISA = CFClient::UI::Base::;	670	our @ISA = CFClient::UI::Base::;
662		671
663	sub new {	672	sub new {
664	my ($class, %arg) = @_;	673	my ($class, %arg) = @_;
665		674
666	my $children = delete $arg{children} \|\| [];	675	my $children = delete $arg{children};
667		676
668	my $self = $class->SUPER::new (	677	my $self = $class->SUPER::new (
669	children => [],	678	children => [],
670	can_events => 0,	679	can_events => 0,
671	%arg,	680	%arg,
672	);	681	);
		682
673	$self->add ($_) for @$children;	683	$self->add (@$children)
		684	if $children;
674		685
675	$self	686	$self
676	}	687	}
677		688
678	sub add {	689	sub add {
…		…
726	$x -= $self->{x};	737	$x -= $self->{x};
727	$y -= $self->{y};	738	$y -= $self->{y};
728		739
729	my $res;	740	my $res;
730		741
731	for (reverse @{ $self->{children} }) {	742	for (reverse $self->visible_children) {
732	$res = $_->find_widget ($x, $y)	743	$res = $_->find_widget ($x, $y)
733	and return $res;	744	and return $res;
734	}	745	}
735		746
736	$self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})	747	$self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
…		…
785	$self->{children}[0]->configure (0, 0, $w, $h);	796	$self->{children}[0]->configure (0, 0, $w, $h);
786	}	797	}
787		798
788	#############################################################################	799	#############################################################################
789		800
		801	# back-buffered drawing area
		802
790	package CFClient::UI::Window;	803	package CFClient::UI::Window;
791		804
792	our @ISA = CFClient::UI::Bin::;	805	our @ISA = CFClient::UI::Bin::;
793		806
794	use CFClient::OpenGL;	807	use CFClient::OpenGL;
…		…
845	my $tex = $self->{texture}	858	my $tex = $self->{texture}
846	or return;	859	or return;
847		860
848	glEnable GL_TEXTURE_2D;	861	glEnable GL_TEXTURE_2D;
849	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	862	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
850	glColor 1, 1, 1, 1;	863	glColor 0, 0, 0, 1;
851		864
852	$tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);	865	$tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
853		866
854	glDisable GL_TEXTURE_2D;	867	glDisable GL_TEXTURE_2D;
855	}	868	}
…		…
946	package CFClient::UI::ScrolledWindow;	959	package CFClient::UI::ScrolledWindow;
947		960
948	our @ISA = CFClient::UI::HBox::;	961	our @ISA = CFClient::UI::HBox::;
949		962
950	sub new {	963	sub new {
951	my $class = shift;	964	my ($class, %arg) = @_;
		965
		966	my $child = delete $arg{child};
952		967
953	my $self;	968	my $self;
954		969
955	my $slider = new CFClient::UI::Slider	970	my $slider = new CFClient::UI::Slider
956	vertical => 1,	971	vertical => 1,
…		…
961	;	976	;
962		977
963	$self = $class->SUPER::new (	978	$self = $class->SUPER::new (
964	vp => (new CFClient::UI::ViewPort expand => 1),	979	vp => (new CFClient::UI::ViewPort expand => 1),
965	slider => $slider,	980	slider => $slider,
966	@_,	981	%arg,
967	);	982	);
968		983
969	$self->{vp}->add ($self->{scrolled});
970	$self->add ($self->{vp});
971	$self->add ($self->{slider});	984	$self->SUPER::add ($self->{vp}, $self->{slider});
		985	$self->add ($child) if $child;
972		986
973	$self	987	$self
		988	}
		989
		990	sub add {
		991	my ($self, $widget) = @_;
		992
		993	$self->{vp}->add ($self->{child} = $widget);
974	}	994	}
975		995
976	sub update {	996	sub update {
977	my ($self) = @_;	997	my ($self) = @_;
978		998
…		…
1017		1037
1018	if ($self->{bg}) {	1038	if ($self->{bg}) {
1019	my ($w, $h) = @$self{qw(w h)};	1039	my ($w, $h) = @$self{qw(w h)};
1020		1040
1021	glEnable GL_BLEND;	1041	glEnable GL_BLEND;
1022	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	1042	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1023	glColor @{ $self->{bg} };	1043	glColor_premultiply @{ $self->{bg} };
1024		1044
1025	glBegin GL_QUADS;	1045	glBegin GL_QUADS;
1026	glVertex 0 , 0;	1046	glVertex 0 , 0;
1027	glVertex 0 , $h;	1047	glVertex 0 , $h;
1028	glVertex $w, $h;	1048	glVertex $w, $h;
…		…
1142	my $dy = $ev->{y} - $oy;	1162	my $dy = $ev->{y} - $oy;
1143		1163
1144	$self->{force_w} = $bw + $dx * ($mx ? -1 : 1);	1164	$self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
1145	$self->{force_h} = $bh + $dy * ($my ? -1 : 1);	1165	$self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1146		1166
		1167	$self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1147	$self->realloc;	1168	$self->realloc;
1148	$self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1149	};	1169	};
1150		1170
1151	} elsif ($lr ^ $td) {	1171	} elsif ($lr ^ $td) {
1152	my ($ox, $oy) = ($ev->{x}, $ev->{y});	1172	my ($ox, $oy) = ($ev->{x}, $ev->{y});
1153	my ($bx, $by) = ($self->{x}, $self->{y});	1173	my ($bx, $by) = ($self->{x}, $self->{y});
…		…
1156	my ($ev, $x, $y) = @_;	1176	my ($ev, $x, $y) = @_;
1157		1177
1158	($x, $y) = ($ev->{x}, $ev->{y});	1178	($x, $y) = ($ev->{x}, $ev->{y});
1159		1179
1160	$self->move_abs ($bx + $x - $ox, $by + $y - $oy);	1180	$self->move_abs ($bx + $x - $ox, $by + $y - $oy);
		1181	# HACK: the next line is required to enforce placement
		1182	$self->{parent}->size_allocate ($self->{parent}{w}, $self->{parent}{h});
1161	};	1183	};
		1184	} else {
		1185	return 0;
		1186	}
		1187
1162	}	1188	1
1163	}	1189	}
1164		1190
1165	sub button_up {	1191	sub button_up {
1166	my ($self, $ev, $x, $y) = @_;	1192	my ($self, $ev, $x, $y) = @_;
1167		1193
1168	delete $self->{motion};	1194	!!delete $self->{motion}
1169	}	1195	}
1170		1196
1171	sub mouse_motion {	1197	sub mouse_motion {
1172	my ($self, $ev, $x, $y) = @_;	1198	my ($self, $ev, $x, $y) = @_;
1173		1199
1174	$self->{motion}->($ev, $x, $y) if $self->{motion};	1200	$self->{motion}->($ev, $x, $y) if $self->{motion};
		1201
		1202	!!$self->{motion}
1175	}	1203	}
1176		1204
1177	sub _draw {	1205	sub _draw {
1178	my ($self) = @_;	1206	my ($self) = @_;
1179		1207
…		…
1511		1539
1512	delete $self->{texture};	1540	delete $self->{texture};
1513	$self->SUPER::update;	1541	$self->SUPER::update;
1514	}	1542	}
1515		1543
		1544	sub realloc {
		1545	my ($self) = @_;
		1546
		1547	delete $self->{ox};
		1548	$self->SUPER::realloc;
		1549	}
		1550
1516	sub set_text {	1551	sub set_text {
1517	my ($self, $text) = @_;	1552	my ($self, $text) = @_;
1518		1553
1519	return if $self->{text} eq "T$text";	1554	return if $self->{text} eq "T$text";
1520	$self->{text} = "T$text";	1555	$self->{text} = "T$text";
1521		1556
1522	$self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;	1557	$self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1523	$self->{layout}->set_text ($text);	1558	$self->{layout}->set_text ($text);
		1559	delete $self->{req_h};
1524		1560
1525	$self->realloc;	1561	$self->realloc;
1526	$self->update;	1562	$self->update;
1527	}	1563	}
1528		1564
…		…
1534		1570
1535	my $rgba = $markup =~ /span.*(?:foreground\|background)/;	1571	my $rgba = $markup =~ /span.*(?:foreground\|background)/;
1536		1572
1537	$self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;	1573	$self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1538	$self->{layout}->set_markup ($markup);	1574	$self->{layout}->set_markup ($markup);
		1575	delete $self->{req_h};
1539		1576
1540	$self->realloc;	1577	$self->realloc;
1541	$self->update;	1578	$self->update;
1542	}	1579	}
1543		1580
1544	sub size_request {	1581	sub size_request {
1545	my ($self) = @_;	1582	my ($self) = @_;
1546		1583
		1584	if (exists $self->{req_h}) {
		1585	@$self{qw(req_w req_h)}
		1586	} else {
1547	$self->{layout}->set_font ($self->{font}) if $self->{font};	1587	$self->{layout}->set_font ($self->{font}) if $self->{font};
1548	$self->{layout}->set_width ($self->{max_w} \|\| -1);	1588	$self->{layout}->set_width ($self->{max_w} \|\| -1);
1549	$self->{layout}->set_ellipsise ($self->{ellipsise});	1589	$self->{layout}->set_ellipsise ($self->{ellipsise});
1550	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});	1590	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1551	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	1591	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1552		1592
1553	my ($w, $h) = $self->{layout}->size;	1593	my ($w, $h) = $self->{layout}->size;
1554		1594
1555	if (exists $self->{template}) {	1595	if (exists $self->{template}) {
1556	$self->{template}->set_font ($self->{font}) if $self->{font};	1596	$self->{template}->set_font ($self->{font}) if $self->{font};
1557	$self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);	1597	$self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1558		1598
1559	my ($w2, $h2) = $self->{template}->size;	1599	my ($w2, $h2) = $self->{template}->size;
1560		1600
1561	$w = List::Util::max $w, $w2;	1601	$w = List::Util::max $w, $w2;
1562	$h = List::Util::max $h, $h2;	1602	$h = List::Util::max $h, $h2;
1563	}	1603	}
1564		1604
1565	($w, $h)	1605	($w, $h)
		1606	}
1566	}	1607	}
1567		1608
1568	sub size_allocate {	1609	sub size_allocate {
1569	my ($self, $w, $h) = @_;	1610	my ($self, $w, $h) = @_;
1570		1611
…		…
1608	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}	1649	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1609	: ($self->{h} - $tex->{h}) * 0.5);	1650	: ($self->{h} - $tex->{h}) * 0.5);
1610	};	1651	};
1611		1652
1612	glEnable GL_TEXTURE_2D;	1653	glEnable GL_TEXTURE_2D;
1613	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1614		1654
1615	if ($tex->{format} == GL_ALPHA) {	1655	if ($tex->{format} == GL_ALPHA) {
		1656	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1616	glColor @{$self->{fg}};	1657	glColor @{$self->{fg}};
1617	$tex->draw_quad_alpha ($self->{ox}, $self->{oy});	1658	$tex->draw_quad_alpha ($self->{ox}, $self->{oy});
1618	} else {	1659	} else {
		1660	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1619	$tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});	1661	$tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1620	}	1662	}
1621		1663
1622	glDisable GL_TEXTURE_2D;	1664	glDisable GL_TEXTURE_2D;
1623	}	1665	}
…		…
1652		1694
1653	delete $self->{cur_h};	1695	delete $self->{cur_h};
1654		1696
1655	return if $self->{text} eq $text;	1697	return if $self->{text} eq $text;
1656		1698
1657	delete $self->{texture};
1658
1659	$self->{last_activity} = $::NOW;	1699	$self->{last_activity} = $::NOW;
1660	$self->{text} = $text;	1700	$self->{text} = $text;
1661		1701
1662	$text =~ s/./*/g if $self->{hidden};	1702	$text =~ s/./*/g if $self->{hidden};
1663	$self->{layout}->set_text ("$text ");	1703	$self->{layout}->set_text ("$text ");
		1704	delete $self->{req_h};
1664		1705
1665	$self->_emit (changed => $self->{text});	1706	$self->_emit (changed => $self->{text});
		1707
		1708	$self->realloc;
		1709	$self->update;
1666	}	1710	}
1667		1711
1668	sub set_text {	1712	sub set_text {
1669	my ($self, $text) = @_;	1713	my ($self, $text) = @_;
1670		1714
1671	$self->{cursor} = length $text;	1715	$self->{cursor} = length $text;
1672	$self->_set_text ($text);	1716	$self->_set_text ($text);
1673
1674	$self->realloc;
1675	}	1717	}
1676		1718
1677	sub get_text {	1719	sub get_text {
1678	$_[0]{text}	1720	$_[0]{text}
1679	}	1721	}
…		…
1709	$self->{cursor} = length $text;	1751	$self->{cursor} = length $text;
1710	} elsif ($uni == 27) {	1752	} elsif ($uni == 27) {
1711	$self->_emit ('escape');	1753	$self->_emit ('escape');
1712	} elsif ($uni) {	1754	} elsif ($uni) {
1713	substr $text, $self->{cursor}++, 0, chr $uni;	1755	substr $text, $self->{cursor}++, 0, chr $uni;
		1756	} else {
		1757	return 0;
1714	}	1758	}
1715		1759
1716	$self->_set_text ($text);	1760	$self->_set_text ($text);
1717		1761
1718	$self->realloc;	1762	$self->realloc;
		1763
		1764	1
1719	}	1765	}
1720		1766
1721	sub focus_in {	1767	sub focus_in {
1722	my ($self) = @_;	1768	my ($self) = @_;
1723		1769
…		…
1738	utf8::encode $text;	1784	utf8::encode $text;
1739	$self->{cursor} = length substr $text, 0, $idx;	1785	$self->{cursor} = length substr $text, 0, $idx;
1740		1786
1741	$self->_set_text ($self->{text});	1787	$self->_set_text ($self->{text});
1742	$self->update;	1788	$self->update;
		1789
		1790	1
1743	}	1791	}
1744		1792
1745	sub mouse_motion {	1793	sub mouse_motion {
1746	my ($self, $ev, $x, $y) = @_;	1794	my ($self, $ev, $x, $y) = @_;
1747	# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#	1795	# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
		1796
		1797	0
1748	}	1798	}
1749		1799
1750	sub _draw {	1800	sub _draw {
1751	my ($self) = @_;	1801	my ($self) = @_;
1752		1802
1753	local $self->{fg} = $self->{fg};	1803	local $self->{fg} = $self->{fg};
1754		1804
1755	if ($FOCUS == $self) {	1805	if ($FOCUS == $self) {
1756	glColor @{$self->{active_bg}};	1806	glColor_premultiply @{$self->{active_bg}};
1757	$self->{fg} = $self->{active_fg};	1807	$self->{fg} = $self->{active_fg};
1758	} else {	1808	} else {
1759	glColor @{$self->{bg}};	1809	glColor_premultiply @{$self->{bg}};
1760	}	1810	}
1761		1811
1762	glEnable GL_BLEND;	1812	glEnable GL_BLEND;
1763	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	1813	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1764	glBegin GL_QUADS;	1814	glBegin GL_QUADS;
1765	glVertex 0 , 0;	1815	glVertex 0 , 0;
1766	glVertex 0 , $self->{h};	1816	glVertex 0 , $self->{h};
1767	glVertex $self->{w}, $self->{h};	1817	glVertex $self->{w}, $self->{h};
1768	glVertex $self->{w}, 0;	1818	glVertex $self->{w}, 0;
…		…
1829	} else {	1879	} else {
1830	$self->set_text ($self->{history_saveback});	1880	$self->set_text ($self->{history_saveback});
1831	}	1881	}
1832		1882
1833	} else {	1883	} else {
1834	$self->SUPER::key_down ($ev);	1884	return $self->SUPER::key_down ($ev)
		1885	}
		1886
1835	}	1887	1
1836
1837	}	1888	}
1838		1889
1839	#############################################################################	1890	#############################################################################
1840		1891
1841	package CFClient::UI::Button;	1892	package CFClient::UI::Button;
…		…
1870	my ($self, $ev, $x, $y) = @_;	1921	my ($self, $ev, $x, $y) = @_;
1871		1922
1872	$self->emit ("activate")	1923	$self->emit ("activate")
1873	if $x >= 0 && $x < $self->{w}	1924	if $x >= 0 && $x < $self->{w}
1874	&& $y >= 0 && $y < $self->{h};	1925	&& $y >= 0 && $y < $self->{h};
		1926
		1927	1
1875	}	1928	}
1876		1929
1877	sub _draw {	1930	sub _draw {
1878	my ($self) = @_;	1931	my ($self) = @_;
1879		1932
1880	local $self->{fg} = $self->{fg};	1933	local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1881
1882	if ($GRAB == $self) {
1883	$self->{fg} = $self->{active_fg};
1884	}
1885		1934
1886	glEnable GL_TEXTURE_2D;	1935	glEnable GL_TEXTURE_2D;
1887	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	1936	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1888	glColor 0, 0, 0, 1;	1937	glColor 0, 0, 0, 1;
1889		1938
…		…
1933		1982
1934	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}	1983	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1935	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {	1984	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1936	$self->{state} = !$self->{state};	1985	$self->{state} = !$self->{state};
1937	$self->_emit (changed => $self->{state});	1986	$self->_emit (changed => $self->{state});
		1987	} else {
		1988	return 0
		1989	}
		1990
1938	}	1991	1
1939	}	1992	}
1940		1993
1941	sub _draw {	1994	sub _draw {
1942	my ($self) = @_;	1995	my ($self) = @_;
1943		1996
…		…
2110		2163
2111	my $h1 = $self->{h} * (1 - $ycut1);	2164	my $h1 = $self->{h} * (1 - $ycut1);
2112	my $h2 = $self->{h} * (1 - $ycut2);	2165	my $h2 = $self->{h} * (1 - $ycut2);
2113		2166
2114	glEnable GL_BLEND;	2167	glEnable GL_BLEND;
2115	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	2168	glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
		2169	GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2116	glEnable GL_TEXTURE_2D;	2170	glEnable GL_TEXTURE_2D;
2117	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2171	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2118		2172
2119	glBindTexture GL_TEXTURE_2D, $t1->{name};	2173	glBindTexture GL_TEXTURE_2D, $t1->{name};
2120	glBegin GL_QUADS;	2174	glBegin GL_QUADS;
…		…
2281		2335
2282	$self->SUPER::button_down ($ev, $x, $y);	2336	$self->SUPER::button_down ($ev, $x, $y);
2283		2337
2284	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];	2338	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2285		2339
2286	$self->mouse_motion ($ev, $x, $y);	2340	$self->mouse_motion ($ev, $x, $y)
2287	}	2341	}
2288		2342
2289	sub mouse_motion {	2343	sub mouse_motion {
2290	my ($self, $ev, $x, $y) = @_;	2344	my ($self, $ev, $x, $y) = @_;
2291		2345
…		…
2295	my (undef, $lo, $hi, $page) = @{$self->{range}};	2349	my (undef, $lo, $hi, $page) = @{$self->{range}};
2296		2350
2297	$x = ($x - $self->{click}[1]) / ($w * $self->{scale});	2351	$x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2298		2352
2299	$self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));	2353	$self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
		2354	} else {
		2355	return 0;
		2356	}
		2357
2300	}	2358	1
2301	}	2359	}
2302		2360
2303	sub update {	2361	sub update {
2304	my ($self) = @_;	2362	my ($self) = @_;
2305		2363
2306	$CFClient::UI::ROOT->on_post_alloc ($self => sub {	2364	delete $self->{knob_w};
		2365	$self->SUPER::update;
		2366	}
		2367
		2368	sub _draw {
		2369	my ($self) = @_;
		2370
		2371	unless ($self->{knob_w}) {
2307	$self->set_value ($self->{range}[0]);	2372	$self->set_value ($self->{range}[0]);
2308		2373
2309	my ($value, $lo, $hi, $page) = @{$self->{range}};	2374	my ($value, $lo, $hi, $page) = @{$self->{range}};
2310	my $range = ($hi - $page - $lo) \|\| 1e-100;	2375	my $range = ($hi - $page - $lo) \|\| 1e-100;
2311		2376
…		…
2317	$value = ($value - $lo) / $range;	2382	$value = ($value - $lo) / $range;
2318	$value = $value * $self->{scale} + $self->{offset};	2383	$value = $value * $self->{scale} + $self->{offset};
2319		2384
2320	$self->{knob_x} = $value - $knob_w * 0.5;	2385	$self->{knob_x} = $value - $knob_w * 0.5;
2321	$self->{knob_w} = $knob_w;	2386	$self->{knob_w} = $knob_w;
2322	});	2387	}
2323
2324	$self->SUPER::update;
2325	}
2326
2327	sub _draw {
2328	my ($self) = @_;
2329		2388
2330	$self->SUPER::_draw ();	2389	$self->SUPER::_draw ();
2331		2390
2332	glScale $self->{w}, $self->{h};	2391	glScale $self->{w}, $self->{h};
2333		2392
…		…
2527		2586
2528	delete $self->{texture};	2587	delete $self->{texture};
2529	}	2588	}
2530		2589
2531	$self->{texture} \|\|= new_from_opengl CFClient::Texture $W, $H, sub {	2590	$self->{texture} \|\|= new_from_opengl CFClient::Texture $W, $H, sub {
2532	glClearColor 0.5, 0.5, 0.5, 0;	2591	glClearColor 0, 0, 0, 0;
2533	glClear GL_COLOR_BUFFER_BIT;	2592	glClear GL_COLOR_BUFFER_BIT;
2534		2593
2535	my $top = int $self->{children}[1]{range}[0];	2594	my $top = int $self->{children}[1]{range}[0];
2536		2595
2537	my $y0 = $top;	2596	my $y0 = $top;
…		…
2572	sub _draw {	2631	sub _draw {
2573	my ($self) = @_;	2632	my ($self) = @_;
2574		2633
2575	glEnable GL_TEXTURE_2D;	2634	glEnable GL_TEXTURE_2D;
2576	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2635	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2577	glColor 1, 1, 1, 1;	2636	glColor 0, 0, 0, 1;
2578	$self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});	2637	$self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2579	glDisable GL_TEXTURE_2D;	2638	glDisable GL_TEXTURE_2D;
2580		2639
2581	$self->{children}[1]->draw;	2640	$self->{children}[1]->draw;
2582		2641
2583	}	2642	}
…		…
2810	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face \|\| $self->{face}]];	2869	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face \|\| $self->{face}]];
2811		2870
2812	if ($tex) {	2871	if ($tex) {
2813	glEnable GL_TEXTURE_2D;	2872	glEnable GL_TEXTURE_2D;
2814	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2873	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2815	glColor 1, 1, 1, 1;	2874	glColor 0, 0, 0, 1;
2816	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});	2875	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2817	glDisable GL_TEXTURE_2D;	2876	glDisable GL_TEXTURE_2D;
2818	}	2877	}
2819	}	2878	}
2820		2879
…		…
2824	$self->{timer}->cancel	2883	$self->{timer}->cancel
2825	if $self->{timer};	2884	if $self->{timer};
2826		2885
2827	$self->SUPER::DESTROY;	2886	$self->SUPER::DESTROY;
2828	}	2887	}
		2888
		2889	#############################################################################
		2890
		2891	package CFClient::UI::Buttonbar;
		2892
		2893	our @ISA = CFClient::UI::HBox::;
		2894
		2895	# TODO: should actualyl wrap buttons and other goodies.
2829		2896
2830	#############################################################################	2897	#############################################################################
2831		2898
2832	package CFClient::UI::Menu;	2899	package CFClient::UI::Menu;
2833		2900
…		…
2883	my ($self, $ev, $x, $y) = @_;	2950	my ($self, $ev, $x, $y) = @_;
2884		2951
2885	# TODO: should use vbox->find_widget or so	2952	# TODO: should use vbox->find_widget or so
2886	$HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});	2953	$HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2887	$self->{hover} = $self->{item}{$HOVER};	2954	$self->{hover} = $self->{item}{$HOVER};
		2955
		2956	0
2888	}	2957	}
2889		2958
2890	sub button_up {	2959	sub button_up {
2891	my ($self, $ev, $x, $y) = @_;	2960	my ($self, $ev, $x, $y) = @_;
2892		2961
…		…
2894	undef $GRAB;	2963	undef $GRAB;
2895	$self->hide;	2964	$self->hide;
2896		2965
2897	$self->_emit ("popdown");	2966	$self->_emit ("popdown");
2898	$self->{hover}[1]->() if $self->{hover};	2967	$self->{hover}[1]->() if $self->{hover};
		2968	} else {
		2969	return 0
		2970	}
		2971
2899	}	2972	1
2900	}	2973	}
2901		2974
2902	#############################################################################	2975	#############################################################################
2903		2976
2904	package CFClient::UI::Statusbox;	2977	package CFClient::UI::Multiplexer;
2905		2978
2906	our @ISA = CFClient::UI::VBox::;	2979	our @ISA = CFClient::UI::Container::;
2907		2980
2908	sub new {	2981	sub new {
2909	my $class = shift;	2982	my $class = shift;
2910		2983
2911	$class->SUPER::new (	2984	my $self = $class->SUPER::new (
		2985	@_,
		2986	);
		2987
		2988	$self->{current} = $self->{children}[0]
		2989	if @{ $self->{children} };
		2990
		2991	$self
		2992	}
		2993
		2994	sub add {
		2995	my ($self, @widgets) = @_;
		2996
		2997	$self->SUPER::add (@widgets);
		2998
		2999	$self->{current} = $self->{children}[0]
		3000	if @{ $self->{children} };
		3001	}
		3002
		3003	sub set_current_page {
		3004	my ($self, $page_or_widget) = @_;
		3005
		3006	my $widget = ref $page_or_widget
		3007	? $page_or_widget
		3008	: $self->{children}[$page_or_widget];
		3009
		3010	$self->{current} = $widget;
		3011	$self->{current}->configure (0, 0, $self->{w}, $self->{h});
		3012
		3013	$self->_emit (page_changed => $self->{current});
		3014
		3015	$self->realloc;
		3016	}
		3017
		3018	sub visible_children {
		3019	$_[0]{current}
		3020	}
		3021
		3022	sub size_request {
		3023	my ($self) = @_;
		3024
		3025	$self->{current}->size_request
		3026	}
		3027
		3028	sub size_allocate {
		3029	my ($self, $w, $h) = @_;
		3030
		3031	$self->{current}->configure (0, 0, $w, $h);
		3032	}
		3033
		3034	sub _draw {
		3035	my ($self) = @_;
		3036
		3037	$self->{current}->draw;
		3038	}
		3039
		3040	#############################################################################
		3041
		3042	package CFClient::UI::Notebook;
		3043
		3044	our @ISA = CFClient::UI::VBox::;
		3045
		3046	sub new {
		3047	my $class = shift;
		3048
		3049	my $self = $class->SUPER::new (
		3050	buttonbar => (new CFClient::UI::Buttonbar),
		3051	multiplexer => (new CFClient::UI::Multiplexer expand => 1),
		3052	# filter => # will be put between multiplexer and $self
		3053	@_,
		3054	);
		3055
		3056	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};
		3057	$self->SUPER::add ($self->{buttonbar}, $self->{filter} \|\| $self->{multiplexer});
		3058
		3059	$self
		3060	}
		3061
		3062	sub add {
		3063	my ($self, $title, $widget, $tooltip) = @_;
		3064
		3065	Scalar::Util::weaken $self;
		3066
		3067	$self->{buttonbar}->add (new CFClient::UI::Button
		3068	markup => $title,
		3069	tooltip => $tooltip,
		3070	on_activate => sub { $self->set_current_page ($widget) },
		3071	);
		3072
		3073	$self->{multiplexer}->add ($widget);
		3074	}
		3075
		3076	sub set_current_page {
		3077	my ($self, $page) = @_;
		3078
		3079	$self->{multiplexer}->set_current_page ($page);
		3080	$self->_emit (page_changed => $self->{multiplexer}{current});
		3081	}
		3082
		3083	#############################################################################
		3084
		3085	package CFClient::UI::Statusbox;
		3086
		3087	our @ISA = CFClient::UI::VBox::;
		3088
		3089	sub new {
		3090	my $class = shift;
		3091
		3092	my $self = $class->SUPER::new (
2912	fontsize => 0.8,	3093	fontsize => 0.8,
2913	@_,	3094	@_,
2914	)	3095	);
		3096
		3097	Scalar::Util::weaken (my $this = $self);
		3098
		3099	$self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
		3100
		3101	$self
2915	}	3102	}
2916		3103
2917	sub reorder {	3104	sub reorder {
2918	my ($self) = @_;	3105	my ($self) = @_;
2919	my $NOW = time;	3106	my $NOW = Time::HiRes::time;
		3107
		3108	# freeze display when hovering over any label
		3109	return if $CFClient::UI::TOOLTIP->{owner}
		3110	&& grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},
		3111	values %{ $self->{item} };
2920		3112
2921	while (my ($k, $v) = each %{ $self->{item} }) {	3113	while (my ($k, $v) = each %{ $self->{item} }) {
2922	delete $self->{item}{$k} if $v->{timeout} < $NOW;	3114	delete $self->{item}{$k} if $v->{timeout} < $NOW;
2923	}	3115	}
2924		3116
…		…
2927	my @items = sort {	3119	my @items = sort {
2928	$a->{pri} <=> $b->{pri}	3120	$a->{pri} <=> $b->{pri}
2929	or $b->{id} <=> $a->{id}	3121	or $b->{id} <=> $a->{id}
2930	} values %{ $self->{item} };	3122	} values %{ $self->{item} };
2931		3123
		3124	$self->{timer}->interval (1);
		3125
2932	my $count = 10 + 1;	3126	my $count = 10 + 1;
2933	for my $item (@items) {	3127	for my $item (@items) {
2934	last unless --$count;	3128	last unless --$count;
2935		3129
2936	push @widgets, $item->{label} \|\|= do {	3130	my $label = $item->{label} \|\|= do {
2937	# TODO: doesn't handle markup well (read as: at all)	3131	# TODO: doesn't handle markup well (read as: at all)
2938	my $short = $item->{count} > 1	3132	my $short = $item->{count} > 1
2939	? "<b>$item->{count} ×</b> $item->{text}"	3133	? "<b>$item->{count} ×</b> $item->{text}"
2940	: $item->{text};	3134	: $item->{text};
2941		3135
…		…
2949	tooltip => $item->{tooltip},	3143	tooltip => $item->{tooltip},
2950	tooltip_font => $::FONT_PROP,	3144	tooltip_font => $::FONT_PROP,
2951	tooltip_width => 0.67,	3145	tooltip_width => 0.67,
2952	fontsize => $item->{fontsize} \|\| $self->{fontsize},	3146	fontsize => $item->{fontsize} \|\| $self->{fontsize},
2953	max_w => $::WIDTH * 0.44,	3147	max_w => $::WIDTH * 0.44,
2954	fg => $item->{fg},	3148	fg => [@{ $item->{fg} }],
2955	can_events => 1,	3149	can_events => 1,
2956	can_hover => 1	3150	can_hover => 1
2957	};	3151	};
		3152
		3153	if ((my $diff = $item->{timeout} - $NOW) < 2) {
		3154	$label->{fg}[3] = ($item->{fg}[3] \|\| 1) * $diff / 2;
		3155	$label->update;
		3156	$label->set_max_size (undef, $label->{req_h} * $diff)
		3157	if $diff < 1;
		3158	$self->{timer}->interval (1/30);
		3159	} else {
		3160	$label->{fg}[3] = $item->{fg}[3] \|\| 1;
		3161	}
		3162
		3163	push @widgets, $label;
2958	}	3164	}
2959		3165
2960	$self->clear;	3166	$self->clear;
2961	$self->SUPER::add (reverse @widgets);	3167	$self->SUPER::add (reverse @widgets);
2962	}	3168	}
…		…
2967	$text =~ s/^\s+//;	3173	$text =~ s/^\s+//;
2968	$text =~ s/\s+$//;	3174	$text =~ s/\s+$//;
2969		3175
2970	return unless $text;	3176	return unless $text;
2971		3177
2972	my $timeout = time + ((delete $arg{timeout}) \|\| 60);	3178	my $timeout = (int time) + ((delete $arg{timeout}) \|\| 60);
2973		3179
2974	my $group = exists $arg{group} ? $arg{group} : ++$self->{id};	3180	my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2975		3181
2976	if (my $item = $self->{item}{$group}) {	3182	if (my $item = $self->{item}{$group}) {
2977	if ($item->{text} eq $text) {	3183	if ($item->{text} eq $text) {
…		…
3007		3213
3008	$self->reorder;	3214	$self->reorder;
3009	$self->SUPER::reconfigure;	3215	$self->SUPER::reconfigure;
3010	}	3216	}
3011		3217
		3218	sub DESTROY {
		3219	my ($self) = @_;
		3220
		3221	$self->{timer}->cancel;
		3222
		3223	$self->SUPER::DESTROY;
		3224	}
		3225
3012	#############################################################################	3226	#############################################################################
3013		3227
3014	package CFClient::UI::Inventory;	3228	package CFClient::UI::Inventory;
3015		3229
3016	our @ISA = CFClient::UI::ScrolledWindow::;	3230	our @ISA = CFClient::UI::ScrolledWindow::;
3017		3231
3018	sub new {	3232	sub new {
3019	my $class = shift;	3233	my $class = shift;
3020		3234
3021	my $self = $class->SUPER::new (	3235	my $self = $class->SUPER::new (
3022	scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),	3236	child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
3023	@_,	3237	@_,
3024	);	3238	);
3025		3239
3026	$self	3240	$self
3027	}	3241	}
3028		3242
3029	sub set_items {	3243	sub set_items {
3030	my ($self, $items) = @_;	3244	my ($self, $items) = @_;
3031		3245
3032	$self->{scrolled}->clear;	3246	$self->{child}->clear;
3033	return unless $items;	3247	return unless $items;
3034		3248
3035	my @items = sort {	3249	my @items = sort {
3036	($a->{type} <=> $b->{type})	3250	($a->{type} <=> $b->{type})
3037	or ($a->{name} cmp $b->{name})	3251	or ($a->{name} cmp $b->{name})
…		…
3041		3255
3042	my $row = 0;	3256	my $row = 0;
3043	for my $item (@items) {	3257	for my $item (@items) {
3044	CFClient::Item::update_widgets $item;	3258	CFClient::Item::update_widgets $item;
3045		3259
3046	$self->{scrolled}->add (0, $row, $item->{face_widget});	3260	$self->{child}->add (0, $row, $item->{face_widget});
3047	$self->{scrolled}->add (1, $row, $item->{desc_widget});	3261	$self->{child}->add (1, $row, $item->{desc_widget});
3048	$self->{scrolled}->add (2, $row, $item->{weight_widget});	3262	$self->{child}->add (2, $row, $item->{weight_widget});
3049		3263
3050	$row++;	3264	$row++;
3051	}	3265	}
3052	}	3266	}
3053		3267
…		…
3250		3464
3251	#############################################################################	3465	#############################################################################
3252		3466
3253	package CFClient::UI::SpellList;	3467	package CFClient::UI::SpellList;
3254		3468
3255	our @ISA = CFClient::UI::FancyFrame::;	3469	our @ISA = CFClient::UI::Table::;
3256		3470
3257	sub new {	3471	sub new {
3258	my $class = shift;	3472	my $class = shift;
3259		3473
3260	my $self = $class->SUPER::new (binding => [], commands => [], @_);	3474	my $self = $class->SUPER::new (
3261		3475	binding => [],
3262	$self->add (new CFClient::UI::ScrolledWindow	3476	commands => [],
3263	scrolled => $self->{spellbox} = new CFClient::UI::Table);	3477	@_,
3264		3478	)
3265	$self;
3266	}	3479	}
3267		3480
3268	# XXX: Do sorting? Argl...	3481	# XXX: Do sorting? Argl...
3269	sub add_spell {	3482	sub add_spell {
3270	my ($self, $spell) = @_;	3483	my ($self, $spell) = @_;
3271	$self->{spells}->{$spell->{name}} = $spell;	3484	$self->{spells}->{$spell->{name}} = $spell;
3272		3485
3273	$self->{spellbox}->add (0, $self->{tbl_idx}, new CFClient::UI::Face	3486	$self->add (0, $self->{tbl_idx}, new CFClient::UI::Face
3274	face => $spell->{face},	3487	face => $spell->{face},
3275	can_hover => 1,	3488	can_hover => 1,
3276	can_events => 1,	3489	can_events => 1,
3277	tooltip => $spell->{message});	3490	tooltip => $spell->{message});
3278		3491
3279	$self->{spellbox}->add (1, $self->{tbl_idx}, new CFClient::UI::Label	3492	$self->add (1, $self->{tbl_idx}, new CFClient::UI::Label
3280	text => $spell->{name},	3493	text => $spell->{name},
3281	can_hover => 1,	3494	can_hover => 1,
3282	can_events => 1,	3495	can_events => 1,
3283	tooltip => $spell->{message},	3496	tooltip => $spell->{message},
3284	expand => 1);	3497	expand => 1);
3285		3498
3286	$self->{spellbox}->add (2, $self->{tbl_idx}, new CFClient::UI::Label	3499	$self->add (2, $self->{tbl_idx}, new CFClient::UI::Label
3287	text => (sprintf "lvl: %2d sp: %2d dmg: %2d",	3500	text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
3288	$spell->{level}, ($spell->{mana} \|\| $spell->{grace}), $spell->{damage}),	3501	$spell->{level}, ($spell->{mana} \|\| $spell->{grace}), $spell->{damage}),
3289	expand => 1);	3502	expand => 1);
3290		3503
3291	$self->{spellbox}->add (3, $self->{tbl_idx}++, new CFClient::UI::Button	3504	$self->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
3292	text => "bind to key",	3505	text => "bind to key",
3293	on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });	3506	on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
3294	}	3507	}
3295		3508
3296	sub rebuild_spell_list {	3509	sub rebuild_spell_list {
…		…
3308	#############################################################################	3521	#############################################################################
3309		3522
3310	package CFClient::UI::Root;	3523	package CFClient::UI::Root;
3311		3524
3312	our @ISA = CFClient::UI::Container::;	3525	our @ISA = CFClient::UI::Container::;
		3526
		3527	use List::Util qw(min max);
3313		3528
3314	use CFClient::OpenGL;	3529	use CFClient::OpenGL;
3315		3530
3316	sub new {	3531	sub new {
3317	my $class = shift;	3532	my $class = shift;
…		…
3452		3667
3453	delete $queue{$widget+0};	3668	delete $queue{$widget+0};
3454		3669
3455	my ($w, $h) = $widget->size_request;	3670	my ($w, $h) = $widget->size_request;
3456		3671
3457	$w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2;	3672	$w = max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3458	$h = List::Util::max $widget->{min_h}, $h + $widget->{padding_y} * 2;	3673	$h = max $widget->{min_h}, $h + $widget->{padding_y} * 2;
		3674
		3675	$w = min $widget->{max_w}, $w if exists $widget->{max_w};
		3676	$h = min $widget->{max_h}, $h if exists $widget->{max_h};
3459		3677
3460	$w = $widget->{force_w} if exists $widget->{force_w};	3678	$w = $widget->{force_w} if exists $widget->{force_w};
3461	$h = $widget->{force_h} if exists $widget->{force_h};	3679	$h = $widget->{force_h} if exists $widget->{force_h};
3462		3680
3463	if ($widget->{req_w} != $w \|\| $widget->{req_h} != $h	3681	if ($widget->{req_w} != $w \|\| $widget->{req_h} != $h

Diff Legend

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

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents): Revision 1.270 by elmex, Fri Jun 2 09:02:49 2006 UTC vs. Revision 1.287 by root, Mon Jun 5 05:31:13 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.270 by elmex, Fri Jun 2 09:02:49 2006 UTC vs.
Revision 1.287 by root, Mon Jun 5 05:31:13 2006 UTC