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

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.276 by root, Sun Jun 4 00:16:01 2006 UTC vs.
Revision 1.303 by elmex, Tue Jun 13 10:28:38 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	}
…		…
271		272
272	return unless $self->{visible};	273	return unless $self->{visible};
273		274
274	$_->set_invisible for $self->children;	275	$_->set_invisible for $self->children;
275		276
		277	delete $self->{visible};
276	delete $self->{root};	278	delete $self->{root};
277	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);
…		…
314	}	315	}
315		316
316	sub move_abs {	317	sub move_abs {
317	my ($self, $x, $y, $z) = @_;	318	my ($self, $x, $y, $z) = @_;
318		319
319	$self->{x} = List::Util::max 0, int $x;	320	$self->{x} = List::Util::max 0, List::Util::min $self->{root}{w} - $self->{w}, int $x;
320	$self->{y} = List::Util::max 0, int $y;	321	$self->{y} = List::Util::max 0, List::Util::min $self->{root}{h} - $self->{h}, int $y;
321	$self->{z} = $z if defined $z;	322	$self->{z} = $z if defined $z;
322		323
323	$self->update;	324	$self->update;
324	}	325	}
325		326
…		…
381	}	382	}
382		383
383	sub set_max_size {	384	sub set_max_size {
384	my ($self, $w, $h) = @_;	385	my ($self, $w, $h) = @_;
385		386
386	delete $self->{max_w}; $self->{max_w} = $w if $w;	387	$self->{max_w} = int $w if defined $w;
387	delete $self->{max_h}; $self->{max_h} = $h if $h;	388	$self->{max_h} = int $h if defined $h;
		389
		390	$self->realloc;
388	}	391	}
389		392
390	sub set_tooltip {	393	sub set_tooltip {
391	my ($self, $tooltip) = @_;	394	my ($self, $tooltip) = @_;
392		395
…		…
397		400
398	$self->{tooltip} = $tooltip;	401	$self->{tooltip} = $tooltip;
399		402
400	if ($CFClient::UI::TOOLTIP->{owner} == $self) {	403	if ($CFClient::UI::TOOLTIP->{owner} == $self) {
401	delete $CFClient::UI::TOOLTIP->{owner};	404	delete $CFClient::UI::TOOLTIP->{owner};
402	CFClient::UI::check_tooltip;	405	$CFClient::UI::TOOLTIP_WATCHER->cb->();
403	}	406	}
404	}	407	}
405		408
406	# translate global coordinates to local coordinate system	409	# translate global coordinates to local coordinate system
407	sub coord2local {	410	sub coord2local {
…		…
548	return if ($draw_x + $self->{w} < 0) \|\| ($draw_x >= $draw_w)	551	return if ($draw_x + $self->{w} < 0) \|\| ($draw_x >= $draw_w)
549	\|\| ($draw_y + $self->{h} < 0) \|\| ($draw_y >= $draw_h);	552	\|\| ($draw_y + $self->{h} < 0) \|\| ($draw_y >= $draw_h);
550		553
551	glPushMatrix;	554	glPushMatrix;
552	glTranslate $self->{x}, $self->{y}, 0;	555	glTranslate $self->{x}, $self->{y}, 0;
553	$self->_draw;
554	glPopMatrix;
555		556
556	if ($self == $HOVER && $self->{can_hover}) {	557	if ($self == $HOVER && $self->{can_hover}) {
557	my ($x, $y) = @$self{qw(x y)};
558
559	glColor 1, 0.8, 0.5, 0.2;	558	glColor 10.2, 0.80.2, 0.5*0.2, 0.2;
560	glEnable GL_BLEND;	559	glEnable GL_BLEND;
561	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	560	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
562	glBegin GL_QUADS;	561	glBegin GL_QUADS;
563	glVertex $x , $y;	562	glVertex 0 , 0;
564	glVertex $x + $self->{w}, $y;	563	glVertex $self->{w}, 0;
565	glVertex $x + $self->{w}, $y + $self->{h};	564	glVertex $self->{w}, $self->{h};
566	glVertex $x , $y + $self->{h};	565	glVertex 0 , $self->{h};
567	glEnd;	566	glEnd;
568	glDisable GL_BLEND;	567	glDisable GL_BLEND;
569	}	568	}
570		569
571	if ($ENV{CFPLUS_DEBUG} & 1) {	570	if ($ENV{CFPLUS_DEBUG} & 1) {
572	glPushMatrix;	571	glPushMatrix;
573	glColor 1, 1, 0, 1;	572	glColor 1, 1, 0, 1;
574	glTranslate $self->{x} + 0.375, $self->{y} + 0.375;	573	glTranslate 0.375, 0.375;
575	glBegin GL_LINE_LOOP;	574	glBegin GL_LINE_LOOP;
576	glVertex 0 , 0;	575	glVertex 0 , 0;
577	glVertex $self->{w} - 1, 0;	576	glVertex $self->{w} - 1, 0;
578	glVertex $self->{w} - 1, $self->{h} - 1;	577	glVertex $self->{w} - 1, $self->{h} - 1;
579	glVertex 0 , $self->{h} - 1;	578	glVertex 0 , $self->{h} - 1;
580	glEnd;	579	glEnd;
581	glPopMatrix;	580	glPopMatrix;
582	#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;
583	}	582	}
		583
		584	$self->_draw;
		585	glPopMatrix;
584	}	586	}
585		587
586	sub _draw {	588	sub _draw {
587	my ($self) = @_;	589	my ($self) = @_;
588		590
…		…
591		593
592	sub DESTROY {	594	sub DESTROY {
593	my ($self) = @_;	595	my ($self) = @_;
594		596
595	delete $WIDGET{$self+0};	597	delete $WIDGET{$self+0};
596	#$self->deactivate;	598
		599	eval { $self->destroy };
		600	warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
597	}	601	}
598		602
599	#############################################################################	603	#############################################################################
600		604
601	package CFClient::UI::DrawBG;	605	package CFClient::UI::DrawBG;
…		…
626		630
627	if ($color && (@$color < 4 \|\| $color->[3])) {	631	if ($color && (@$color < 4 \|\| $color->[3])) {
628	my ($w, $h) = @$self{qw(w h)};	632	my ($w, $h) = @$self{qw(w h)};
629		633
630	glEnable GL_BLEND;	634	glEnable GL_BLEND;
631	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	635	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
632	glColor @$color;	636	glColor_premultiply @$color;
633		637
634	glBegin GL_QUADS;	638	glBegin GL_QUADS;
635	glVertex 0 , 0;	639	glVertex 0 , 0;
636	glVertex 0 , $h;	640	glVertex 0 , $h;
637	glVertex $w, $h;	641	glVertex $w, $h;
…		…
766	}	770	}
767		771
768	sub add {	772	sub add {
769	my ($self, $child) = @_;	773	my ($self, $child) = @_;
770		774
771	$self->{children} = [];	775	$self->SUPER::remove ($_) for @{ $self->{children} };
772
773	$self->SUPER::add ($child);	776	$self->SUPER::add ($child);
774	}	777	}
775		778
776	sub remove {	779	sub remove {
777	my ($self, $widget) = @_;	780	my ($self, $widget) = @_;
…		…
856	my $tex = $self->{texture}	859	my $tex = $self->{texture}
857	or return;	860	or return;
858		861
859	glEnable GL_TEXTURE_2D;	862	glEnable GL_TEXTURE_2D;
860	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	863	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
861	glColor 1, 1, 1, 1;	864	glColor 0, 0, 0, 1;
862		865
863	$tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);	866	$tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
864		867
865	glDisable GL_TEXTURE_2D;	868	glDisable GL_TEXTURE_2D;
866	}	869	}
…		…
1035		1038
1036	if ($self->{bg}) {	1039	if ($self->{bg}) {
1037	my ($w, $h) = @$self{qw(w h)};	1040	my ($w, $h) = @$self{qw(w h)};
1038		1041
1039	glEnable GL_BLEND;	1042	glEnable GL_BLEND;
1040	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	1043	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1041	glColor @{ $self->{bg} };	1044	glColor_premultiply @{ $self->{bg} };
1042		1045
1043	glBegin GL_QUADS;	1046	glBegin GL_QUADS;
1044	glVertex 0 , 0;	1047	glVertex 0 , 0;
1045	glVertex 0 , $h;	1048	glVertex 0 , $h;
1046	glVertex $w, $h;	1049	glVertex $w, $h;
…		…
1069	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	1072	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1070	qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);	1073	qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1071		1074
1072	sub new {	1075	sub new {
1073	my ($class, %arg) = @_;	1076	my ($class, %arg) = @_;
1074
1075	my $title = delete $arg{title};
1076		1077
1077	my $self = $class->SUPER::new (	1078	my $self = $class->SUPER::new (
1078	bg => [1, 1, 1, 1],	1079	bg => [1, 1, 1, 1],
1079	border_bg => [1, 1, 1, 1],	1080	border_bg => [1, 1, 1, 1],
1080	border => 0.6,	1081	border => 0.6,
…		…
1082	min_w => 16,	1083	min_w => 16,
1083	min_h => 16,	1084	min_h => 16,
1084	%arg,	1085	%arg,
1085	);	1086	);
1086		1087
1087	$self->{title} = new CFClient::UI::Label	1088	$self->{title_widget} = new CFClient::UI::Label
1088	align => 0,	1089	align => 0,
1089	valign => 1,	1090	valign => 1,
1090	text => $title,	1091	text => $self->{title},
1091	fontsize => $self->{border}	1092	fontsize => $self->{border},
1092	if defined $title;	1093	if exists $self->{title};
		1094
		1095	unless ($self->{no_close_button}) {
		1096	$self->{close_btn} =
		1097	new CFClient::UI::ImageButton
		1098	image => 'x1_close.png',
		1099	on_activate => sub { $self->hide };
		1100
		1101	$self->CFClient::UI::Container::add ($self->{close_btn});
		1102	}
1093		1103
1094	$self	1104	$self
1095	}	1105	}
1096		1106
1097	sub add {	1107	sub add {
1098	my ($self, @widgets) = @_;	1108	my ($self, @widgets) = @_;
1099		1109
1100	$self->SUPER::add (@widgets);	1110	$self->SUPER::add (@widgets);
		1111	$self->CFClient::UI::Container::add ($self->{close_btn}) if $self->{close_btn};
1101	$self->CFClient::UI::Container::add ($self->{title}) if $self->{title};	1112	$self->CFClient::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1102	}	1113	}
1103		1114
1104	sub border {	1115	sub border {
1105	int $_[0]{border} * $::FONTSIZE	1116	int $_[0]{border} * $::FONTSIZE
1106	}	1117	}
1107		1118
1108	sub size_request {	1119	sub size_request {
1109	my ($self) = @_;	1120	my ($self) = @_;
1110		1121
1111	$self->{title}->size_request	1122	$self->{title_widget}->size_request
1112	if $self->{title};	1123	if $self->{title_widget};
		1124
		1125	$self->{close_btn}->size_request
		1126	if $self->{close_btn};
1113		1127
1114	my ($w, $h) = $self->SUPER::size_request;	1128	my ($w, $h) = $self->SUPER::size_request;
1115		1129
1116	(	1130	(
1117	$w + $self->border * 2,	1131	$w + $self->border * 2,
…		…
1120	}	1134	}
1121		1135
1122	sub size_allocate {	1136	sub size_allocate {
1123	my ($self, $w, $h) = @_;	1137	my ($self, $w, $h) = @_;
1124		1138
1125	if ($self->{title}) {	1139	if ($self->{title_widget}) {
1126	$self->{title}{w} = $w;	1140	$self->{title_widget}{w} = $w;
1127	$self->{title}{h} = $h;	1141	$self->{title_widget}{h} = $h;
1128	$self->{title}->size_allocate ($w, $h);	1142	$self->{title_widget}->size_allocate ($w, $h);
1129	}	1143	}
1130		1144
1131	my $border = $self->border;	1145	my $border = $self->border;
1132		1146
1133	$h -= List::Util::max 0, $border * 2;	1147	$h -= List::Util::max 0, $border * 2;
1134	$w -= List::Util::max 0, $border * 2;	1148	$w -= List::Util::max 0, $border * 2;
1135		1149
1136	$self->child->configure ($border, $border, $w, $h);	1150	$self->child->configure ($border, $border, $w, $h);
		1151
		1152	$self->{close_btn}->configure ($self->{w} - (2 * $border), 0, $border, $border)
		1153	if $self->{close_btn};
1137	}	1154	}
1138		1155
1139	sub button_down {	1156	sub button_down {
1140	my ($self, $ev, $x, $y) = @_;	1157	my ($self, $ev, $x, $y) = @_;
1141		1158
…		…
1160	my $dy = $ev->{y} - $oy;	1177	my $dy = $ev->{y} - $oy;
1161		1178
1162	$self->{force_w} = $bw + $dx * ($mx ? -1 : 1);	1179	$self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
1163	$self->{force_h} = $bh + $dy * ($my ? -1 : 1);	1180	$self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1164		1181
		1182	$self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1165	$self->realloc;	1183	$self->realloc;
1166	$self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1167	};	1184	};
1168		1185
1169	} elsif ($lr ^ $td) {	1186	} elsif ($lr ^ $td) {
1170	my ($ox, $oy) = ($ev->{x}, $ev->{y});	1187	my ($ox, $oy) = ($ev->{x}, $ev->{y});
1171	my ($bx, $by) = ($self->{x}, $self->{y});	1188	my ($bx, $by) = ($self->{x}, $self->{y});
…		…
1174	my ($ev, $x, $y) = @_;	1191	my ($ev, $x, $y) = @_;
1175		1192
1176	($x, $y) = ($ev->{x}, $ev->{y});	1193	($x, $y) = ($ev->{x}, $ev->{y});
1177		1194
1178	$self->move_abs ($bx + $x - $ox, $by + $y - $oy);	1195	$self->move_abs ($bx + $x - $ox, $by + $y - $oy);
		1196	# HACK: the next line is required to enforce placement
		1197	$self->{parent}->size_allocate ($self->{parent}{w}, $self->{parent}{h});
1179	};	1198	};
1180	} else {	1199	} else {
1181	return 0;	1200	return 0;
1182	}	1201	}
1183		1202
1184	1	1203	1
1185	}	1204	}
1186		1205
1187	sub button_up {	1206	sub button_up {
1188	my ($self, $ev, $x, $y) = @_;	1207	my ($self, $ev, $x, $y) = @_;
		1208
		1209	$self->{close_btn}->button_up ($ev, $x, $y)
		1210	if $self->{close_btn};
1189		1211
1190	!!delete $self->{motion}	1212	!!delete $self->{motion}
1191	}	1213	}
1192		1214
1193	sub mouse_motion {	1215	sub mouse_motion {
…		…
1229		1251
1230	glDisable GL_TEXTURE_2D;	1252	glDisable GL_TEXTURE_2D;
1231		1253
1232	$child->draw;	1254	$child->draw;
1233		1255
1234	if ($self->{title}) {	1256	if ($self->{title_widget}) {
1235	glTranslate 0, $border - $self->{h};	1257	glTranslate 0, $border - $self->{h};
1236	$self->{title}->_draw;	1258	$self->{title_widget}->_draw;
		1259
		1260	glTranslate 0, - ($border - $self->{h});
1237	}	1261	}
		1262
		1263	$self->{close_btn}->draw
		1264	if $self->{close_btn};
1238	}	1265	}
1239		1266
1240	#############################################################################	1267	#############################################################################
1241		1268
1242	package CFClient::UI::Table;	1269	package CFClient::UI::Table;
…		…
1265		1292
1266	$child->set_parent ($self);	1293	$child->set_parent ($self);
1267	$self->{children}[$y][$x] = $child;	1294	$self->{children}[$y][$x] = $child;
1268		1295
1269	$self->realloc;	1296	$self->realloc;
		1297	}
		1298
		1299	sub remove {
		1300	my ($self, $child) = @_;
		1301
		1302	# TODO: not yet implemented
1270	}	1303	}
1271		1304
1272	# TODO: move to container class maybe? send children a signal on removal?	1305	# TODO: move to container class maybe? send children a signal on removal?
1273	sub clear {	1306	sub clear {
1274	my ($self) = @_;	1307	my ($self) = @_;
…		…
1535		1568
1536	delete $self->{texture};	1569	delete $self->{texture};
1537	$self->SUPER::update;	1570	$self->SUPER::update;
1538	}	1571	}
1539		1572
		1573	sub realloc {
		1574	my ($self) = @_;
		1575
		1576	delete $self->{ox};
		1577	$self->SUPER::realloc;
		1578	}
		1579
1540	sub set_text {	1580	sub set_text {
1541	my ($self, $text) = @_;	1581	my ($self, $text) = @_;
1542		1582
1543	return if $self->{text} eq "T$text";	1583	return if $self->{text} eq "T$text";
1544	$self->{text} = "T$text";	1584	$self->{text} = "T$text";
1545		1585
1546	$self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;	1586	$self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1547	$self->{layout}->set_text ($text);	1587	$self->{layout}->set_text ($text);
1548		1588
		1589	delete $self->{size_req};
1549	$self->realloc;	1590	$self->realloc;
1550	$self->update;	1591	$self->update;
1551	}	1592	}
1552		1593
1553	sub set_markup {	1594	sub set_markup {
…		…
1559	my $rgba = $markup =~ /span.*(?:foreground\|background)/;	1600	my $rgba = $markup =~ /span.*(?:foreground\|background)/;
1560		1601
1561	$self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;	1602	$self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1562	$self->{layout}->set_markup ($markup);	1603	$self->{layout}->set_markup ($markup);
1563		1604
		1605	delete $self->{size_req};
1564	$self->realloc;	1606	$self->realloc;
1565	$self->update;	1607	$self->update;
1566	}	1608	}
1567		1609
1568	sub size_request {	1610	sub size_request {
1569	my ($self) = @_;	1611	my ($self) = @_;
1570		1612
		1613	$self->{size_req} \|\|= do {
1571	$self->{layout}->set_font ($self->{font}) if $self->{font};	1614	$self->{layout}->set_font ($self->{font}) if $self->{font};
1572	$self->{layout}->set_width ($self->{max_w} \|\| -1);	1615	$self->{layout}->set_width ($self->{max_w} \|\| -1);
1573	$self->{layout}->set_ellipsise ($self->{ellipsise});	1616	$self->{layout}->set_ellipsise ($self->{ellipsise});
1574	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});	1617	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1575	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	1618	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1576		1619
1577	my ($w, $h) = $self->{layout}->size;	1620	my ($w, $h) = $self->{layout}->size;
1578		1621
1579	if (exists $self->{template}) {	1622	if (exists $self->{template}) {
1580	$self->{template}->set_font ($self->{font}) if $self->{font};	1623	$self->{template}->set_font ($self->{font}) if $self->{font};
1581	$self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);	1624	$self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1582		1625
1583	my ($w2, $h2) = $self->{template}->size;	1626	my ($w2, $h2) = $self->{template}->size;
1584		1627
1585	$w = List::Util::max $w, $w2;	1628	$w = List::Util::max $w, $w2;
1586	$h = List::Util::max $h, $h2;	1629	$h = List::Util::max $h, $h2;
		1630	}
		1631
		1632	[$w, $h]
1587	}	1633	};
1588		1634
1589	($w, $h)	1635	@{ $self->{size_req} }
1590	}	1636	}
1591		1637
1592	sub size_allocate {	1638	sub size_allocate {
1593	my ($self, $w, $h) = @_;	1639	my ($self, $w, $h) = @_;
1594		1640
…		…
1603		1649
1604	$self->{fontsize} = $fontsize;	1650	$self->{fontsize} = $fontsize;
1605	delete $self->{texture};	1651	delete $self->{texture};
1606		1652
1607	$self->realloc;	1653	$self->realloc;
		1654	}
		1655
		1656	sub reconfigure {
		1657	my ($self) = @_;
		1658
		1659	delete $self->{size_req};
		1660
		1661	$self->SUPER::reconfigure;
1608	}	1662	}
1609		1663
1610	sub _draw {	1664	sub _draw {
1611	my ($self) = @_;	1665	my ($self) = @_;
1612		1666
…		…
1632	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}	1686	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1633	: ($self->{h} - $tex->{h}) * 0.5);	1687	: ($self->{h} - $tex->{h}) * 0.5);
1634	};	1688	};
1635		1689
1636	glEnable GL_TEXTURE_2D;	1690	glEnable GL_TEXTURE_2D;
1637	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	1691
		1692	my $w = List::Util::min $self->{w} + 4, $tex->{w};
		1693	my $h = List::Util::min $self->{h} + 2, $tex->{h};
1638		1694
1639	if ($tex->{format} == GL_ALPHA) {	1695	if ($tex->{format} == GL_ALPHA) {
		1696	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1640	glColor @{$self->{fg}};	1697	glColor @{$self->{fg}};
1641	$tex->draw_quad_alpha ($self->{ox}, $self->{oy});	1698	$tex->draw_quad_alpha ($self->{ox}, $self->{oy}, $w, $h);
1642	} else {	1699	} else {
		1700	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1643	$tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});	1701	$tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}, $w, $h);
1644	}	1702	}
1645		1703
1646	glDisable GL_TEXTURE_2D;	1704	glDisable GL_TEXTURE_2D;
1647	}	1705	}
1648		1706
…		…
1665	can_hover => 1,	1723	can_hover => 1,
1666	can_focus => 1,	1724	can_focus => 1,
1667	valign => 0,	1725	valign => 0,
1668	can_events => 1,	1726	can_events => 1,
1669	#text => ...	1727	#text => ...
		1728	#hidden => "*",
1670	@_	1729	@_
1671	)	1730	)
1672	}	1731	}
1673		1732
1674	sub _set_text {	1733	sub _set_text {
…		…
1681	$self->{last_activity} = $::NOW;	1740	$self->{last_activity} = $::NOW;
1682	$self->{text} = $text;	1741	$self->{text} = $text;
1683		1742
1684	$text =~ s/./*/g if $self->{hidden};	1743	$text =~ s/./*/g if $self->{hidden};
1685	$self->{layout}->set_text ("$text ");	1744	$self->{layout}->set_text ("$text ");
		1745	delete $self->{size_req};
1686		1746
1687	$self->_emit (changed => $self->{text});	1747	$self->_emit (changed => $self->{text});
		1748
		1749	$self->realloc;
1688	$self->update;	1750	$self->update;
1689	}	1751	}
1690		1752
1691	sub set_text {	1753	sub set_text {
1692	my ($self, $text) = @_;	1754	my ($self, $text) = @_;
1693		1755
1694	$self->{cursor} = length $text;	1756	$self->{cursor} = length $text;
1695	$self->_set_text ($text);	1757	$self->_set_text ($text);
1696
1697	$self->realloc;
1698	}	1758	}
1699		1759
1700	sub get_text {	1760	sub get_text {
1701	$_[0]{text}	1761	$_[0]{text}
1702	}	1762	}
…		…
1782	my ($self) = @_;	1842	my ($self) = @_;
1783		1843
1784	local $self->{fg} = $self->{fg};	1844	local $self->{fg} = $self->{fg};
1785		1845
1786	if ($FOCUS == $self) {	1846	if ($FOCUS == $self) {
1787	glColor @{$self->{active_bg}};	1847	glColor_premultiply @{$self->{active_bg}};
1788	$self->{fg} = $self->{active_fg};	1848	$self->{fg} = $self->{active_fg};
1789	} else {	1849	} else {
1790	glColor @{$self->{bg}};	1850	glColor_premultiply @{$self->{bg}};
1791	}	1851	}
1792		1852
1793	glEnable GL_BLEND;	1853	glEnable GL_BLEND;
1794	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	1854	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1795	glBegin GL_QUADS;	1855	glBegin GL_QUADS;
1796	glVertex 0 , 0;	1856	glVertex 0 , 0;
1797	glVertex 0 , $self->{h};	1857	glVertex 0 , $self->{h};
1798	glVertex $self->{w}, $self->{h};	1858	glVertex $self->{w}, $self->{h};
1799	glVertex $self->{w}, 0;	1859	glVertex $self->{w}, 0;
…		…
1909	}	1969	}
1910		1970
1911	sub _draw {	1971	sub _draw {
1912	my ($self) = @_;	1972	my ($self) = @_;
1913		1973
1914	local $self->{fg} = $self->{fg};	1974	local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1915
1916	if ($GRAB == $self) {
1917	$self->{fg} = $self->{active_fg};
1918	}
1919		1975
1920	glEnable GL_TEXTURE_2D;	1976	glEnable GL_TEXTURE_2D;
1921	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	1977	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1922	glColor 0, 0, 0, 1;	1978	glColor 0, 0, 0, 1;
1923		1979
1924	$tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});	1980	$tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1925		1981
1926	glDisable GL_TEXTURE_2D;	1982	glDisable GL_TEXTURE_2D;
1927		1983
1928	$self->SUPER::_draw;	1984	$self->SUPER::_draw;
		1985	}
		1986
		1987	#############################################################################
		1988
		1989	package CFClient::UI::ImageButton;
		1990
		1991	our @ISA = CFClient::UI::Image::;
		1992
		1993	use CFClient::OpenGL;
		1994
		1995	my %textures;
		1996
		1997	sub new {
		1998	my $class = shift;
		1999
		2000	my $self = $class->SUPER::new (
		2001	padding_x => 4,
		2002	padding_y => 4,
		2003	fg => [1, 1, 1],
		2004	active_fg => [0, 0, 1],
		2005	can_hover => 1,
		2006	align => 0,
		2007	valign => 0,
		2008	can_events => 1,
		2009	@_
		2010	);
		2011	}
		2012
		2013	sub activate { }
		2014
		2015	sub button_up {
		2016	my ($self, $ev, $x, $y) = @_;
		2017
		2018	$self->emit ("activate")
		2019	if $x >= 0 && $x < $self->{w}
		2020	&& $y >= 0 && $y < $self->{h};
		2021
		2022	1
1929	}	2023	}
1930		2024
1931	#############################################################################	2025	#############################################################################
1932		2026
1933	package CFClient::UI::CheckBox;	2027	package CFClient::UI::CheckBox;
…		…
2148		2242
2149	my $h1 = $self->{h} * (1 - $ycut1);	2243	my $h1 = $self->{h} * (1 - $ycut1);
2150	my $h2 = $self->{h} * (1 - $ycut2);	2244	my $h2 = $self->{h} * (1 - $ycut2);
2151		2245
2152	glEnable GL_BLEND;	2246	glEnable GL_BLEND;
2153	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	2247	glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
		2248	GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2154	glEnable GL_TEXTURE_2D;	2249	glEnable GL_TEXTURE_2D;
2155	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2250	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2156		2251
2157	glBindTexture GL_TEXTURE_2D, $t1->{name};	2252	glBindTexture GL_TEXTURE_2D, $t1->{name};
2158	glBegin GL_QUADS;	2253	glBegin GL_QUADS;
…		…
2279	sub set_range {	2374	sub set_range {
2280	my ($self, $range) = @_;	2375	my ($self, $range) = @_;
2281		2376
2282	($range, $self->{range}) = ($self->{range}, $range);	2377	($range, $self->{range}) = ($self->{range}, $range);
2283		2378
2284	$self->update
2285	if "@$range" ne "@{$self->{range}}";	2379	if ("@$range" ne "@{$self->{range}}") {
		2380	$self->update;
		2381	$self->set_value ($self->{range}[0]);
		2382	}
2286	}	2383	}
2287		2384
2288	sub set_value {	2385	sub set_value {
2289	my ($self, $value) = @_;	2386	my ($self, $value) = @_;
2290		2387
…		…
2437	sub set_range { shift->{slider}->set_range (@_) }	2534	sub set_range { shift->{slider}->set_range (@_) }
2438	sub set_value { shift->{slider}->set_value (@_) }	2535	sub set_value { shift->{slider}->set_value (@_) }
2439		2536
2440	#############################################################################	2537	#############################################################################
2441		2538
2442	package CFClient::UI::TextView;	2539	package CFClient::UI::TextScroller;
2443		2540
2444	our @ISA = CFClient::UI::HBox::;	2541	our @ISA = CFClient::UI::HBox::;
2445		2542
2446	use CFClient::OpenGL;	2543	use CFClient::OpenGL;
2447		2544
…		…
2449	my $class = shift;	2546	my $class = shift;
2450		2547
2451	my $self = $class->SUPER::new (	2548	my $self = $class->SUPER::new (
2452	fontsize => 1,	2549	fontsize => 1,
2453	can_events => 0,	2550	can_events => 0,
		2551	indent => 0,
2454	#font => default_font	2552	#font => default_font
2455	@_,	2553	@_,
2456		2554
2457	layout => (new CFClient::Layout 1),	2555	layout => (new CFClient::Layout 1),
2458	par => [],	2556	par => [],
…		…
2481	$self->SUPER::size_allocate ($w, $h);	2579	$self->SUPER::size_allocate ($w, $h);
2482		2580
2483	$self->{layout}->set_font ($self->{font}) if $self->{font};	2581	$self->{layout}->set_font ($self->{font}) if $self->{font};
2484	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	2582	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2485	$self->{layout}->set_width ($self->{children}[0]{w});	2583	$self->{layout}->set_width ($self->{children}[0]{w});
		2584	$self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2486		2585
2487	$self->reflow;	2586	$self->reflow;
2488	}	2587	}
2489		2588
2490	sub text_size {	2589	sub text_size {
…		…
2492		2591
2493	my $layout = $self->{layout};	2592	my $layout = $self->{layout};
2494		2593
2495	$layout->set_height ($self->{fontsize} * $::FONTSIZE);	2594	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
2496	$layout->set_width ($self->{children}[0]{w} - $indent);	2595	$layout->set_width ($self->{children}[0]{w} - $indent);
		2596	$layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2497	$layout->set_markup ($text);	2597	$layout->set_markup ($text);
2498		2598
2499	$layout->size	2599	$layout->size
2500	}	2600	}
2501		2601
…		…
2540		2640
2541	return unless $self->{h} > 0;	2641	return unless $self->{h} > 0;
2542		2642
2543	delete $self->{texture};	2643	delete $self->{texture};
2544		2644
2545	$ROOT->on_post_alloc ($self, sub {	2645	$ROOT->on_post_alloc ($self => sub {
2546	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};	2646	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2547		2647
2548	if (delete $self->{need_reflow}) {	2648	if (delete $self->{need_reflow}) {
2549	my $height = 0;	2649	my $height = 0;
2550		2650
…		…
2553	$layout->set_height ($self->{fontsize} * $::FONTSIZE);	2653	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
2554		2654
2555	for (@{$self->{par}}) {	2655	for (@{$self->{par}}) {
2556	if (1 \|\| $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support	2656	if (1 \|\| $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2557	$layout->set_width ($W - $_->[3]);	2657	$layout->set_width ($W - $_->[3]);
		2658	$layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2558	$layout->set_markup ($_->[4]);	2659	$layout->set_markup ($_->[4]);
2559	my ($w, $h) = $layout->size;	2660	my ($w, $h) = $layout->size;
2560	$_->[0] = $w + $_->[3];	2661	$_->[0] = $w + $_->[3];
2561	$_->[1] = $h;	2662	$_->[1] = $h;
2562	}	2663	}
…		…
2565	}	2666	}
2566		2667
2567	$self->{height} = $height;	2668	$self->{height} = $height;
2568		2669
2569	$self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);	2670	$self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2570		2671
2571	delete $self->{texture};	2672	delete $self->{texture};
2572	}	2673	}
2573		2674
2574	$self->{texture} \|\|= new_from_opengl CFClient::Texture $W, $H, sub {	2675	$self->{texture} \|\|= new_from_opengl CFClient::Texture $W, $H, sub {
2575	glClearColor 0.5, 0.5, 0.5, 0;	2676	glClearColor 0, 0, 0, 0;
2576	glClear GL_COLOR_BUFFER_BIT;	2677	glClear GL_COLOR_BUFFER_BIT;
2577		2678
2578	my $top = int $self->{children}[1]{range}[0];	2679	my $top = int $self->{children}[1]{range}[0];
2579		2680
2580	my $y0 = $top;	2681	my $y0 = $top;
…		…
2594	my $h = $par->[1];	2695	my $h = $par->[1];
2595		2696
2596	if ($y0 < $y + $h && $y < $y1) {	2697	if ($y0 < $y + $h && $y < $y1) {
2597	$layout->set_foreground (@{ $par->[2] });	2698	$layout->set_foreground (@{ $par->[2] });
2598	$layout->set_width ($W - $par->[3]);	2699	$layout->set_width ($W - $par->[3]);
		2700	$layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2599	$layout->set_markup ($par->[4]);	2701	$layout->set_markup ($par->[4]);
2600		2702
2601	my ($w, $h, $data, $format, $internalformat) = $layout->render;	2703	my ($w, $h, $data, $format, $internalformat) = $layout->render;
2602		2704
2603	glRasterPos $par->[3], $y - $y0;	2705	glRasterPos $par->[3], $y - $y0;
…		…
2615	sub _draw {	2717	sub _draw {
2616	my ($self) = @_;	2718	my ($self) = @_;
2617		2719
2618	glEnable GL_TEXTURE_2D;	2720	glEnable GL_TEXTURE_2D;
2619	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2721	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2620	glColor 1, 1, 1, 1;	2722	glColor 0, 0, 0, 1;
2621	$self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});	2723	$self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2622	glDisable GL_TEXTURE_2D;	2724	glDisable GL_TEXTURE_2D;
2623		2725
2624	$self->{children}[1]->draw;	2726	$self->{children}[1]->draw;
2625		2727
2626	}	2728	}
…		…
2717	$tooltip .= "\n\n" . (ref $widget) . "\n"	2819	$tooltip .= "\n\n" . (ref $widget) . "\n"
2718	. "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"	2820	. "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2719	. "req $widget->{req_w} $widget->{req_h}\n"	2821	. "req $widget->{req_w} $widget->{req_h}\n"
2720	. "visible $widget->{visible}";	2822	. "visible $widget->{visible}";
2721	}	2823	}
		2824
		2825	$tooltip =~ s/^\n+//;
		2826	$tooltip =~ s/\n+$//;
2722		2827
2723	$self->add (new CFClient::UI::Label	2828	$self->add (new CFClient::UI::Label
2724	markup => $tooltip,	2829	markup => $tooltip,
2725	max_w => ($widget->{tooltip_width} \|\| 0.25) * $::WIDTH,	2830	max_w => ($widget->{tooltip_width} \|\| 0.25) * $::WIDTH,
2726	fontsize => 0.8,	2831	fontsize => 0.8,
…		…
2754	or return;	2859	or return;
2755		2860
2756	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);	2861	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2757		2862
2758	($x, $y) = $widget->coord2global (-$self->{w}, 0)	2863	($x, $y) = $widget->coord2global (-$self->{w}, 0)
2759	if $x + $self->{w} > $::WIDTH;	2864	if $x + $self->{w} > $self->{root}{w};
2760		2865
2761	$self->move_abs ($x, $y);	2866	$self->move_abs ($x, $y);
2762	});	2867	});
2763	}	2868	}
2764		2869
…		…
2853	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face \|\| $self->{face}]];	2958	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face \|\| $self->{face}]];
2854		2959
2855	if ($tex) {	2960	if ($tex) {
2856	glEnable GL_TEXTURE_2D;	2961	glEnable GL_TEXTURE_2D;
2857	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2962	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2858	glColor 1, 1, 1, 1;	2963	glColor 0, 0, 0, 1;
2859	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});	2964	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2860	glDisable GL_TEXTURE_2D;	2965	glDisable GL_TEXTURE_2D;
2861	}	2966	}
2862	}	2967	}
2863		2968
2864	sub DESTROY {	2969	sub destroy {
2865	my ($self) = @_;	2970	my ($self) = @_;
2866		2971
2867	$self->{timer}->cancel	2972	$self->{timer}->cancel
2868	if $self->{timer};	2973	if $self->{timer};
2869		2974
2870	$self->SUPER::DESTROY;	2975	$self->SUPER::destroy;
2871	}	2976	}
2872		2977
2873	#############################################################################	2978	#############################################################################
2874		2979
2875	package CFClient::UI::Buttonbar;	2980	package CFClient::UI::Buttonbar;
…		…
2896	);	3001	);
2897		3002
2898	$self->add ($self->{vbox} = new CFClient::UI::VBox);	3003	$self->add ($self->{vbox} = new CFClient::UI::VBox);
2899		3004
2900	for my $item (@{ $self->{items} }) {	3005	for my $item (@{ $self->{items} }) {
2901	my ($widget, $cb) = @$item;	3006	my ($widget, $cb, $tooltip) = @$item;
2902		3007
2903	# handle various types of items, only text for now	3008	# handle various types of items, only text for now
2904	if (!ref $widget) {	3009	if (!ref $widget) {
2905	$widget = new CFClient::UI::Label	3010	$widget = new CFClient::UI::Label
2906	can_hover => 1,	3011	can_hover => 1,
2907	can_events => 1,	3012	can_events => 1,
2908	text => $widget;	3013	markup => $widget,
		3014	tooltip => $tooltip
2909	}	3015	}
2910		3016
2911	$self->{item}{$widget} = $item;	3017	$self->{item}{$widget} = $item;
2912		3018
2913	$self->{vbox}->add ($widget);	3019	$self->{vbox}->add ($widget);
…		…
3064	$self->_emit (page_changed => $self->{multiplexer}{current});	3170	$self->_emit (page_changed => $self->{multiplexer}{current});
3065	}	3171	}
3066		3172
3067	#############################################################################	3173	#############################################################################
3068		3174
3069	package CFClient::UI::Statusbox;	3175	package CFClient::UI::Combobox;
3070		3176
		3177	use utf8;
		3178
3071	our @ISA = CFClient::UI::VBox::;	3179	our @ISA = CFClient::UI::Button::;
3072		3180
3073	sub new {	3181	sub new {
3074	my $class = shift;	3182	my $class = shift;
3075		3183
3076	$class->SUPER::new (	3184	my $self = $class->SUPER::new (
		3185	options => [], # [value, title, longdesc], ...
		3186	value => undef,
		3187	@_,
		3188	);
		3189
		3190	$self->_set_value ($self->{value});
		3191
		3192	$self
		3193	}
		3194
		3195	sub button_down {
		3196	my ($self, $ev) = @_;
		3197
		3198	my @menu_items;
		3199
		3200	for (@{ $self->{options} }) {
		3201	my ($value, $title, $tooltip) = @$_;
		3202
		3203	push @menu_items, [$tooltip \|\| $title, sub { $self->set_value ($value) }];
		3204	}
		3205
		3206	CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
		3207	}
		3208
		3209	sub _set_value {
		3210	my ($self, $value) = @_;
		3211
		3212	my ($item) = grep $_->[0] eq $value, @{ $self->{options} }
		3213	or return;
		3214
		3215	$self->{value} = $item->[0];
		3216	$self->set_markup ("$item->[1] ⇓");
		3217	$self->set_tooltip ($item->[2]);
		3218	}
		3219
		3220	sub set_value {
		3221	my ($self, $value) = @_;
		3222
		3223	return unless $self->{value} ne $value;
		3224
		3225	$self->_set_value ($value);
		3226	$self->_emit (changed => $value);
		3227	}
		3228
		3229	#############################################################################
		3230
		3231	package CFClient::UI::Statusbox;
		3232
		3233	our @ISA = CFClient::UI::VBox::;
		3234
		3235	sub new {
		3236	my $class = shift;
		3237
		3238	my $self = $class->SUPER::new (
3077	fontsize => 0.8,	3239	fontsize => 0.8,
3078	@_,	3240	@_,
3079	)	3241	);
		3242
		3243	Scalar::Util::weaken (my $this = $self);
		3244
		3245	$self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
		3246
		3247	$self
3080	}	3248	}
3081		3249
3082	sub reorder {	3250	sub reorder {
3083	my ($self) = @_;	3251	my ($self) = @_;
3084	my $NOW = time;	3252	my $NOW = Time::HiRes::time;
		3253
		3254	# freeze display when hovering over any label
		3255	return if $CFClient::UI::TOOLTIP->{owner}
		3256	&& grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},
		3257	values %{ $self->{item} };
3085		3258
3086	while (my ($k, $v) = each %{ $self->{item} }) {	3259	while (my ($k, $v) = each %{ $self->{item} }) {
3087	delete $self->{item}{$k} if $v->{timeout} < $NOW;	3260	delete $self->{item}{$k} if $v->{timeout} < $NOW;
3088	}	3261	}
3089		3262
…		…
3092	my @items = sort {	3265	my @items = sort {
3093	$a->{pri} <=> $b->{pri}	3266	$a->{pri} <=> $b->{pri}
3094	or $b->{id} <=> $a->{id}	3267	or $b->{id} <=> $a->{id}
3095	} values %{ $self->{item} };	3268	} values %{ $self->{item} };
3096		3269
		3270	$self->{timer}->interval (1);
		3271
3097	my $count = 10 + 1;	3272	my $count = 10 + 1;
3098	for my $item (@items) {	3273	for my $item (@items) {
3099	last unless --$count;	3274	last unless --$count;
3100		3275
3101	push @widgets, $item->{label} \|\|= do {	3276	my $label = $item->{label} \|\|= do {
3102	# TODO: doesn't handle markup well (read as: at all)	3277	# TODO: doesn't handle markup well (read as: at all)
3103	my $short = $item->{count} > 1	3278	my $short = $item->{count} > 1
3104	? "<b>$item->{count} ×</b> $item->{text}"	3279	? "<b>$item->{count} ×</b> $item->{text}"
3105	: $item->{text};	3280	: $item->{text};
3106		3281
…		…
3114	tooltip => $item->{tooltip},	3289	tooltip => $item->{tooltip},
3115	tooltip_font => $::FONT_PROP,	3290	tooltip_font => $::FONT_PROP,
3116	tooltip_width => 0.67,	3291	tooltip_width => 0.67,
3117	fontsize => $item->{fontsize} \|\| $self->{fontsize},	3292	fontsize => $item->{fontsize} \|\| $self->{fontsize},
3118	max_w => $::WIDTH * 0.44,	3293	max_w => $::WIDTH * 0.44,
3119	fg => $item->{fg},	3294	fg => [@{ $item->{fg} }],
3120	can_events => 1,	3295	can_events => 1,
3121	can_hover => 1	3296	can_hover => 1
3122	};	3297	};
		3298
		3299	if ((my $diff = $item->{timeout} - $NOW) < 2) {
		3300	$label->{fg}[3] = ($item->{fg}[3] \|\| 1) * $diff / 2;
		3301	$label->update;
		3302	$label->set_max_size (undef, $label->{req_h} * $diff)
		3303	if $diff < 1;
		3304	$self->{timer}->interval (1/30);
		3305	} else {
		3306	$label->{fg}[3] = $item->{fg}[3] \|\| 1;
		3307	}
		3308
		3309	push @widgets, $label;
3123	}	3310	}
3124		3311
3125	$self->clear;	3312	$self->clear;
3126	$self->SUPER::add (reverse @widgets);	3313	$self->SUPER::add (reverse @widgets);
3127	}	3314	}
…		…
3132	$text =~ s/^\s+//;	3319	$text =~ s/^\s+//;
3133	$text =~ s/\s+$//;	3320	$text =~ s/\s+$//;
3134		3321
3135	return unless $text;	3322	return unless $text;
3136		3323
3137	my $timeout = time + ((delete $arg{timeout}) \|\| 60);	3324	my $timeout = (int time) + ((delete $arg{timeout}) \|\| 60);
3138		3325
3139	my $group = exists $arg{group} ? $arg{group} : ++$self->{id};	3326	my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
3140		3327
3141	if (my $item = $self->{item}{$group}) {	3328	if (my $item = $self->{item}{$group}) {
3142	if ($item->{text} eq $text) {	3329	if ($item->{text} eq $text) {
3143	$item->{count}++;	3330	$item->{count}++;
3144	} else {	3331	} else {
3145	$item->{count} = 1;	3332	$item->{count} = 1;
3146	$item->{text} = $item->{tooltip} = $text;	3333	$item->{text} = $item->{tooltip} = $text;
3147	}	3334	}
3148	$item->{id} = ++$self->{id};	3335	$item->{id} += 0.2;#d#
3149	$item->{timeout} = $timeout;	3336	$item->{timeout} = $timeout;
3150	delete $item->{label};	3337	delete $item->{label};
3151	} else {	3338	} else {
3152	$self->{item}{$group} = {	3339	$self->{item}{$group} = {
3153	id => ++$self->{id},	3340	id => ++$self->{id},
…		…
3172		3359
3173	$self->reorder;	3360	$self->reorder;
3174	$self->SUPER::reconfigure;	3361	$self->SUPER::reconfigure;
3175	}	3362	}
3176		3363
		3364	sub destroy {
		3365	my ($self) = @_;
		3366
		3367	$self->{timer}->cancel;
		3368
		3369	$self->SUPER::destroy;
		3370	}
		3371
3177	#############################################################################	3372	#############################################################################
3178		3373
3179	package CFClient::UI::Inventory;	3374	package CFClient::UI::Inventory;
3180		3375
3181	our @ISA = CFClient::UI::ScrolledWindow::;	3376	our @ISA = CFClient::UI::ScrolledWindow::;
…		…
3427	commands => [],	3622	commands => [],
3428	@_,	3623	@_,
3429	)	3624	)
3430	}	3625	}
3431		3626
3432	# XXX: Do sorting? Argl...	3627	my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
		3628
		3629	my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
		3630	"<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
		3631	my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
		3632	"<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
		3633	my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
		3634	"<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
		3635	my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
		3636	"<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
		3637	my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
		3638	"<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
		3639
		3640	sub rebuild_spell_list {
		3641	my ($self) = @_;
		3642
		3643	$CFClient::UI::ROOT->on_refresh ($self => sub {
		3644	$self->clear;
		3645
		3646	return unless $::CONN;
		3647
		3648	$self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);
		3649	$self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL);
		3650	$self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
		3651	$self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
		3652	$self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
		3653
		3654	my $row = 0;
		3655
		3656	for (sort { $a cmp $b } keys %{ $self->{spell} }) {
		3657	my $spell = $self->{spell}{$_};
		3658
		3659	$row++;
		3660
		3661	my $spell_cb = sub {
		3662	my ($widget, $ev) = @_;
		3663
		3664	if ($ev->{button} == 1) {
		3665	$::CONN->user_send ("cast $spell->{name}");
		3666	} elsif ($ev->{button} == 2) {
		3667	$::CONN->user_send ("invoke $spell->{name}");
		3668	} elsif ($ev->{button} == 3) {
		3669	(new CFClient::UI::Menu
		3670	items => [
		3671	["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
		3672	["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
		3673	],
		3674	)->popup ($ev);
		3675	} else {
		3676	return 0;
		3677	}
		3678
		3679	1
		3680	};
		3681
		3682	my $tooltip = "$spell->{message}$TOOLTIP_ALL";
		3683
		3684	#TODO: add path info to tooltip
		3685	#$self->add (6, $row, new CFClient::UI::Label text => $spell->{path});
		3686
		3687	$self->add (0, $row, new CFClient::UI::Face
		3688	face => $spell->{face},
		3689	can_hover => 1,
		3690	can_events => 1,
		3691	tooltip => $tooltip,
		3692	on_button_down => $spell_cb,
		3693	);
		3694
		3695	$self->add (1, $row, new CFClient::UI::Label
		3696	expand => 1,
		3697	text => $spell->{name},
		3698	can_hover => 1,
		3699	can_events => 1,
		3700	tooltip => $tooltip,
		3701	on_button_down => $spell_cb,
		3702	);
		3703
		3704	$self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
		3705	$self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
		3706	$self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} \|\| $spell->{grace}, @TOOLTIP_SP);
		3707	$self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
		3708	}
		3709	});
		3710	}
		3711
3433	sub add_spell {	3712	sub add_spell {
3434	my ($self, $spell) = @_;	3713	my ($self, $spell) = @_;
		3714
3435	$self->{spells}->{$spell->{name}} = $spell;	3715	$self->{spell}->{$spell->{name}} = $spell;
3436		3716	$self->rebuild_spell_list;
3437	$self->add (0, $self->{tbl_idx}, new CFClient::UI::Face
3438	face => $spell->{face},
3439	can_hover => 1,
3440	can_events => 1,
3441	tooltip => $spell->{message});
3442
3443	$self->add (1, $self->{tbl_idx}, new CFClient::UI::Label
3444	text => $spell->{name},
3445	can_hover => 1,
3446	can_events => 1,
3447	tooltip => $spell->{message},
3448	expand => 1);
3449
3450	$self->add (2, $self->{tbl_idx}, new CFClient::UI::Label
3451	text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
3452	$spell->{level}, ($spell->{mana} \|\| $spell->{grace}), $spell->{damage}),
3453	expand => 1);
3454
3455	$self->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
3456	text => "bind to key",
3457	on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
3458	}
3459
3460	sub rebuild_spell_list {
3461	my ($self) = @_;
3462	$self->{tbl_idx} = 0;
3463	$self->add_spell ($_) for values %{$self->{spells}};
3464	}	3717	}
3465		3718
3466	sub remove_spell {	3719	sub remove_spell {
3467	my ($self, $spell) = @_;	3720	my ($self, $spell) = @_;
		3721
3468	delete $self->{spells}->{$spell->{name}};	3722	delete $self->{spell}->{$spell->{name}};
3469	$self->rebuild_spell_list;	3723	$self->rebuild_spell_list;
3470	}	3724	}
3471		3725
		3726	sub clear_spells {
		3727	my ($self) = @_;
		3728
		3729	$self->{spell} = {};
		3730	$self->rebuild_spell_list;
		3731	}
		3732
3472	#############################################################################	3733	#############################################################################
3473		3734
3474	package CFClient::UI::Root;	3735	package CFClient::UI::Root;
3475		3736
3476	our @ISA = CFClient::UI::Container::;	3737	our @ISA = CFClient::UI::Container::;
		3738
		3739	use List::Util qw(min max);
3477		3740
3478	use CFClient::OpenGL;	3741	use CFClient::OpenGL;
3479		3742
3480	sub new {	3743	sub new {
3481	my $class = shift;	3744	my $class = shift;
…		…
3616		3879
3617	delete $queue{$widget+0};	3880	delete $queue{$widget+0};
3618		3881
3619	my ($w, $h) = $widget->size_request;	3882	my ($w, $h) = $widget->size_request;
3620		3883
3621	$w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2;	3884	$w = max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3622	$h = List::Util::max $widget->{min_h}, $h + $widget->{padding_y} * 2;	3885	$h = max $widget->{min_h}, $h + $widget->{padding_y} * 2;
		3886
		3887	$w = min $widget->{max_w}, $w if exists $widget->{max_w};
		3888	$h = min $widget->{max_h}, $h if exists $widget->{max_h};
3623		3889
3624	$w = $widget->{force_w} if exists $widget->{force_w};	3890	$w = $widget->{force_w} if exists $widget->{force_w};
3625	$h = $widget->{force_h} if exists $widget->{force_h};	3891	$h = $widget->{force_h} if exists $widget->{force_h};
3626		3892
3627	if ($widget->{req_w} != $w \|\| $widget->{req_h} != $h	3893	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.276 by root, Sun Jun 4 00:16:01 2006 UTC vs. Revision 1.303 by elmex, Tue Jun 13 10:28:38 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.276 by root, Sun Jun 4 00:16:01 2006 UTC vs.
Revision 1.303 by elmex, Tue Jun 13 10:28:38 2006 UTC