ViewVC Help

View File | Revision Log | Show Annotations | Download File

/cvs/deliantra/Deliantra-Client/DC/UI.pm

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.292 by root, Tue Jun 6 03:02:15 2006 UTC vs.
Revision 1.310 by root, Fri Jun 23 20:28:20 2006 UTC

…		…
272		272
273	return unless $self->{visible};	273	return unless $self->{visible};
274		274
275	$_->set_invisible for $self->children;	275	$_->set_invisible for $self->children;
276		276
		277	delete $self->{visible};
277	delete $self->{root};	278	delete $self->{root};
278	delete $self->{visible};
279		279
280	undef $GRAB if $GRAB == $self;	280	undef $GRAB if $GRAB == $self;
281	undef $HOVER if $HOVER == $self;	281	undef $HOVER if $HOVER == $self;
282		282
283	$CFClient::UI::TOOLTIP_WATCHER->cb->()	283	$CFClient::UI::TOOLTIP_WATCHER->cb->()
284	if $TOOLTIP->{owner} == $self;	284	if $TOOLTIP->{owner} == $self;
285		285
286	$self->focus_out;	286	$self->emit ("focus_out");
287
288	$self->emit (visibility_change => 0);	287	$self->emit (visibility_change => 0);
289	}	288	}
290		289
291	sub set_visibility {	290	sub set_visibility {
292	my ($self, $visible) = @_;	291	my ($self, $visible) = @_;
…		…
315	}	314	}
316		315
317	sub move_abs {	316	sub move_abs {
318	my ($self, $x, $y, $z) = @_;	317	my ($self, $x, $y, $z) = @_;
319		318
320	$self->{x} = List::Util::max 0, int $x;	319	$self->{x} = List::Util::max 0, List::Util::min $self->{root}{w} - $self->{w}, int $x;
321	$self->{y} = List::Util::max 0, int $y;	320	$self->{y} = List::Util::max 0, List::Util::min $self->{root}{h} - $self->{h}, int $y;
322	$self->{z} = $z if defined $z;	321	$self->{z} = $z if defined $z;
323		322
324	$self->update;	323	$self->update;
325	}	324	}
326		325
…		…
367		366
368	$self->{root}{size_alloc}{$self+0} = $self;	367	$self->{root}{size_alloc}{$self+0} = $self;
369	}	368	}
370	}	369	}
371		370
372	sub size_allocate {
373	# nothing to be done
374	}
375
376	sub children {	371	sub children {
377	# nop	372	# nop
378	}	373	}
379		374
380	sub visible_children {	375	sub visible_children {
…		…
418	my ($self, $x, $y) = @_;	413	my ($self, $x, $y) = @_;
419		414
420	$self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})	415	$self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
421	}	416	}
422		417
423	sub focus_in {	418	sub invoke_focus_in {
424	my ($self) = @_;	419	my ($self) = @_;
425		420
426	return if $FOCUS == $self;	421	return if $FOCUS == $self;
427	return unless $self->{can_focus};	422	return unless $self->{can_focus};
428		423
429	my $focus = $FOCUS; $FOCUS = $self;	424	my $focus = $FOCUS; $FOCUS = $self;
430		425
431	$self->_emit (focus_in => $focus);
432
433	$focus->update if $focus;	426	$focus->update if $focus;
434	$FOCUS->update;	427	$FOCUS->update;
435	}
436		428
		429	0
		430	}
		431
437	sub focus_out {	432	sub invoke_focus_out {
438	my ($self) = @_;	433	my ($self) = @_;
439		434
440	return unless $FOCUS == $self;	435	return unless $FOCUS == $self;
441		436
442	my $focus = $FOCUS; undef $FOCUS;	437	my $focus = $FOCUS; undef $FOCUS;
443		438
444	$self->_emit (focus_out => $focus);
445
446	$focus->update if $focus; #?	439	$focus->update if $focus; #?
447		440
448	$::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus	441	$::MAPWIDGET->grab_focus #d# focus mapwidget if no other widget has focus
449	unless $FOCUS;	442	unless $FOCUS;
450	}
451		443
		444	0
		445	}
		446
		447	sub grab_focus {
		448	my ($self) = @_;
		449
		450	$self->emit ("focus_in");
		451	}
		452
452	sub mouse_motion { 0 }	453	sub invoke_mouse_motion { 1 }
453	sub button_up { 0 }	454	sub invoke_button_up { 1 }
454	sub key_down { 0 }	455	sub invoke_key_down { 1 }
455	sub key_up { 0 }	456	sub invoke_key_up { 1 }
456		457
457	sub button_down {	458	sub invoke_button_down {
458	my ($self, $ev, $x, $y) = @_;	459	my ($self, $ev, $x, $y) = @_;
459		460
460	$self->focus_in;	461	$self->grab_focus;
461		462
462	0	463	1
		464	}
		465
		466	sub connect {
		467	my ($self, $signal, $cb) = @_;
		468
		469	push @{ $self->{signal_cb}{$signal} }, $cb;
		470	}
		471
		472	sub emit {
		473	my ($self, $signal, @args) = @_;
		474
		475	#d##TODO# stop propagating at first true, do not use sum
		476	(List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}) # before
		477	|| ($self->can ("invoke_$signal") || sub { 1 })->($self, @args) # closure
		478	|| ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent
463	}	479	}
464		480
465	sub find_widget {	481	sub find_widget {
466	my ($self, $x, $y) = @_;	482	my ($self, $x, $y) = @_;
467		483
…		…
477	sub set_parent {	493	sub set_parent {
478	my ($self, $parent) = @_;	494	my ($self, $parent) = @_;
479		495
480	Scalar::Util::weaken ($self->{parent} = $parent);	496	Scalar::Util::weaken ($self->{parent} = $parent);
481	$self->set_visible if $parent->{visible};	497	$self->set_visible if $parent->{visible};
482	}
483
484	sub connect {
485	my ($self, $signal, $cb) = @_;
486
487	push @{ $self->{signal_cb}{$signal} }, $cb;
488	}
489
490	sub _emit {
491	my ($self, $signal, @args) = @_;
492
493	List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
494	}
495
496	sub emit {
497	my ($self, $signal, @args) = @_;
498
499	$self->_emit ($signal, @args)
500	|| $self->$signal (@args);
501	}
502
503	sub visibility_change {
504	#my ($self, $visible) = @_;
505	}	498	}
506		499
507	sub realloc {	500	sub realloc {
508	my ($self) = @_;	501	my ($self) = @_;
509		502
…		…
593		586
594	sub DESTROY {	587	sub DESTROY {
595	my ($self) = @_;	588	my ($self) = @_;
596		589
597	delete $WIDGET{$self+0};	590	delete $WIDGET{$self+0};
598	#$self->deactivate;	591
		592	eval { $self->destroy };
		593	warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
599	}	594	}
600		595
601	#############################################################################	596	#############################################################################
602		597
603	package CFClient::UI::DrawBG;	598	package CFClient::UI::DrawBG;
…		…
768	}	763	}
769		764
770	sub add {	765	sub add {
771	my ($self, $child) = @_;	766	my ($self, $child) = @_;
772		767
773	$self->{children} = [];	768	$self->SUPER::remove ($_) for @{ $self->{children} };
774
775	$self->SUPER::add ($child);	769	$self->SUPER::add ($child);
776	}	770	}
777		771
778	sub remove {	772	sub remove {
779	my ($self, $widget) = @_;	773	my ($self, $widget) = @_;
…		…
788		782
789	sub size_request {	783	sub size_request {
790	$_[0]{children}[0]->size_request	784	$_[0]{children}[0]->size_request
791	}	785	}
792		786
793	sub size_allocate {	787	sub invoke_size_allocate {
794	my ($self, $w, $h) = @_;	788	my ($self, $w, $h) = @_;
795		789
796	$self->{children}[0]->configure (0, 0, $w, $h);	790	$self->{children}[0]->configure (0, 0, $w, $h);
		791
		792	1
797	}	793	}
798		794
799	#############################################################################	795	#############################################################################
800		796
801	# back-buffered drawing area	797	# back-buffered drawing area
…		…
817		813
818	$ROOT->on_post_alloc ($self => sub { $self->render_child });	814	$ROOT->on_post_alloc ($self => sub { $self->render_child });
819	$self->SUPER::update;	815	$self->SUPER::update;
820	}	816	}
821		817
822	sub size_allocate {	818	sub invoke_size_allocate {
823	my ($self, $w, $h) = @_;	819	my ($self, $w, $h) = @_;
824		820
825	$self->SUPER::size_allocate ($w, $h);
826	$self->update;	821	$self->update;
		822
		823	$self->SUPER::invoke_size_allocate ($w, $h)
827	}	824	}
828		825
829	sub _render {	826	sub _render {
830	my ($self) = @_;	827	my ($self) = @_;
831		828
…		…
892	$h = 10 if $self->{scroll_y};	889	$h = 10 if $self->{scroll_y};
893		890
894	($w, $h)	891	($w, $h)
895	}	892	}
896		893
897	sub size_allocate {	894	sub invoke_size_allocate {
898	my ($self, $w, $h) = @_;	895	my ($self, $w, $h) = @_;
899		896
900	my $child = $self->child;	897	my $child = $self->child;
901		898
902	$w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};	899	$w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
903	$h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};	900	$h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
904		901
905	$self->child->configure (0, 0, $w, $h);	902	$self->child->configure (0, 0, $w, $h);
906	$self->update;	903	$self->update;
		904
		905	1
907	}	906	}
908		907
909	sub set_offset {	908	sub set_offset {
910	my ($self, $x, $y) = @_;	909	my ($self, $x, $y) = @_;
911		910
…		…
1001	# todo: overwrite size_allocate of child	1000	# todo: overwrite size_allocate of child
1002	my $child = $self->{vp}->child;	1001	my $child = $self->{vp}->child;
1003	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);	1002	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
1004	}	1003	}
1005		1004
1006	sub size_allocate {	1005	sub invoke_size_allocate {
1007	my ($self, $w, $h) = @_;	1006	my ($self, $w, $h) = @_;
1008
1009	$self->SUPER::size_allocate ($w, $h);
1010		1007
1011	my $child = $self->{vp}->child;	1008	my $child = $self->{vp}->child;
1012	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);	1009	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
		1010
		1011	$self->SUPER::invoke_size_allocate ($w, $h)
1013	}	1012	}
1014		1013
1015	#TODO# update range on size_allocate depending on child	1014	#TODO# update range on size_allocate depending on child
1016	# update viewport offset on scroll	1015	# update viewport offset on scroll
1017		1016
…		…
1071	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	1070	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1072	qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);	1071	qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1073		1072
1074	sub new {	1073	sub new {
1075	my ($class, %arg) = @_;	1074	my ($class, %arg) = @_;
1076
1077	my $title = delete $arg{title};
1078		1075
1079	my $self = $class->SUPER::new (	1076	my $self = $class->SUPER::new (
1080	bg => [1, 1, 1, 1],	1077	bg => [1, 1, 1, 1],
1081	border_bg => [1, 1, 1, 1],	1078	border_bg => [1, 1, 1, 1],
1082	border => 0.6,	1079	border => 0.6,
…		…
1084	min_w => 16,	1081	min_w => 16,
1085	min_h => 16,	1082	min_h => 16,
1086	%arg,	1083	%arg,
1087	);	1084	);
1088		1085
1089	$self->{title} = new CFClient::UI::Label	1086	$self->{title_widget} = new CFClient::UI::Label
1090	align => 0,	1087	align => 0,
1091	valign => 1,	1088	valign => 1,
1092	text => $title,	1089	text => $self->{title},
1093	fontsize => $self->{border}	1090	fontsize => $self->{border},
1094	if defined $title;	1091	if exists $self->{title};
		1092
		1093	if ($self->{has_close_button}) {
		1094	$self->{close_button} =
		1095	new CFClient::UI::ImageButton
		1096	path => 'x1_close.png',
		1097	on_activate => sub { $self->hide };
		1098
		1099	$self->CFClient::UI::Container::add ($self->{close_button});
		1100	}
1095		1101
1096	$self	1102	$self
1097	}	1103	}
1098		1104
1099	sub add {	1105	sub add {
1100	my ($self, @widgets) = @_;	1106	my ($self, @widgets) = @_;
1101		1107
1102	$self->SUPER::add (@widgets);	1108	$self->SUPER::add (@widgets);
		1109	$self->CFClient::UI::Container::add ($self->{close_button}) if $self->{close_button};
1103	$self->CFClient::UI::Container::add ($self->{title}) if $self->{title};	1110	$self->CFClient::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1104	}	1111	}
1105		1112
1106	sub border {	1113	sub border {
1107	int $_[0]{border} * $::FONTSIZE	1114	int $_[0]{border} * $::FONTSIZE
1108	}	1115	}
1109		1116
1110	sub size_request {	1117	sub size_request {
1111	my ($self) = @_;	1118	my ($self) = @_;
1112		1119
1113	$self->{title}->size_request	1120	$self->{title_widget}->size_request
1114	if $self->{title};	1121	if $self->{title_widget};
		1122
		1123	$self->{close_button}->size_request
		1124	if $self->{close_button};
1115		1125
1116	my ($w, $h) = $self->SUPER::size_request;	1126	my ($w, $h) = $self->SUPER::size_request;
1117		1127
1118	(	1128	(
1119	$w + $self->border * 2,	1129	$w + $self->border * 2,
1120	$h + $self->border * 2,	1130	$h + $self->border * 2,
1121	)	1131	)
1122	}	1132	}
1123		1133
1124	sub size_allocate {	1134	sub invoke_size_allocate {
1125	my ($self, $w, $h) = @_;	1135	my ($self, $w, $h) = @_;
1126		1136
1127	if ($self->{title}) {	1137	if ($self->{title_widget}) {
1128	$self->{title}{w} = $w;	1138	$self->{title_widget}{w} = $w;
1129	$self->{title}{h} = $h;	1139	$self->{title_widget}{h} = $h;
1130	$self->{title}->size_allocate ($w, $h);	1140	$self->{title_widget}->invoke_size_allocate ($w, $h);
1131	}	1141	}
1132		1142
1133	my $border = $self->border;	1143	my $border = $self->border;
1134		1144
1135	$h -= List::Util::max 0, $border * 2;	1145	$h -= List::Util::max 0, $border * 2;
1136	$w -= List::Util::max 0, $border * 2;	1146	$w -= List::Util::max 0, $border * 2;
1137		1147
1138	$self->child->configure ($border, $border, $w, $h);	1148	$self->child->configure ($border, $border, $w, $h);
1139	}
1140		1149
		1150	$self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
		1151	if $self->{close_button};
		1152
		1153	1
		1154	}
		1155
1141	sub button_down {	1156	sub invoke_button_down {
1142	my ($self, $ev, $x, $y) = @_;	1157	my ($self, $ev, $x, $y) = @_;
1143		1158
1144	my ($w, $h) = @$self{qw(w h)};	1159	my ($w, $h) = @$self{qw(w h)};
1145	my $border = $self->border;	1160	my $border = $self->border;
1146		1161
…		…
1177		1192
1178	($x, $y) = ($ev->{x}, $ev->{y});	1193	($x, $y) = ($ev->{x}, $ev->{y});
1179		1194
1180	$self->move_abs ($bx + $x - $ox, $by + $y - $oy);	1195	$self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1181	# HACK: the next line is required to enforce placement	1196	# HACK: the next line is required to enforce placement
1182	$self->{parent}->size_allocate ($self->{parent}{w}, $self->{parent}{h});	1197	$self->{parent}->invoke_size_allocate ($self->{parent}{w}, $self->{parent}{h});
1183	};	1198	};
1184	} else {	1199	} else {
1185	return 0;	1200	return 0;
1186	}	1201	}
1187		1202
1188	1	1203	1
1189	}	1204	}
1190		1205
1191	sub button_up {	1206	sub invoke_button_up {
1192	my ($self, $ev, $x, $y) = @_;	1207	my ($self, $ev, $x, $y) = @_;
1193		1208
1194	!!delete $self->{motion}	1209	! ! delete $self->{motion}
1195	}	1210	}
1196		1211
1197	sub mouse_motion {	1212	sub invoke_mouse_motion {
1198	my ($self, $ev, $x, $y) = @_;	1213	my ($self, $ev, $x, $y) = @_;
1199		1214
1200	$self->{motion}->($ev, $x, $y) if $self->{motion};	1215	$self->{motion}->($ev, $x, $y) if $self->{motion};
1201		1216
1202	!!$self->{motion}	1217	! ! $self->{motion}
1203	}	1218	}
1204		1219
1205	sub _draw {	1220	sub _draw {
1206	my ($self) = @_;	1221	my ($self) = @_;
1207		1222
…		…
1233		1248
1234	glDisable GL_TEXTURE_2D;	1249	glDisable GL_TEXTURE_2D;
1235		1250
1236	$child->draw;	1251	$child->draw;
1237		1252
1238	if ($self->{title}) {	1253	if ($self->{title_widget}) {
1239	glTranslate 0, $border - $self->{h};	1254	glTranslate 0, $border - $self->{h};
1240	$self->{title}->_draw;	1255	$self->{title_widget}->_draw;
		1256
		1257	glTranslate 0, - ($border - $self->{h});
1241	}	1258	}
		1259
		1260	$self->{close_button}->draw
		1261	if $self->{close_button};
1242	}	1262	}
1243		1263
1244	#############################################################################	1264	#############################################################################
1245		1265
1246	package CFClient::UI::Table;	1266	package CFClient::UI::Table;
…		…
1269		1289
1270	$child->set_parent ($self);	1290	$child->set_parent ($self);
1271	$self->{children}[$y][$x] = $child;	1291	$self->{children}[$y][$x] = $child;
1272		1292
1273	$self->realloc;	1293	$self->realloc;
		1294	}
		1295
		1296	sub remove {
		1297	my ($self, $child) = @_;
		1298
		1299	# TODO: not yet implemented
1274	}	1300	}
1275		1301
1276	# TODO: move to container class maybe? send children a signal on removal?	1302	# TODO: move to container class maybe? send children a signal on removal?
1277	sub clear {	1303	sub clear {
1278	my ($self) = @_;	1304	my ($self) = @_;
…		…
1319	(sum @$ws),	1345	(sum @$ws),
1320	(sum @$hs),	1346	(sum @$hs),
1321	)	1347	)
1322	}	1348	}
1323		1349
1324	sub size_allocate {	1350	sub invoke_size_allocate {
1325	my ($self, $w, $h) = @_;	1351	my ($self, $w, $h) = @_;
1326		1352
1327	my ($ws, $hs) = $self->get_wh;	1353	my ($ws, $hs) = $self->get_wh;
1328		1354
1329	my $req_w = (sum @$ws) || 1;	1355	my $req_w = (sum @$ws) || 1;
…		…
1361	}	1387	}
1362		1388
1363	$y += $row_h;	1389	$y += $row_h;
1364	}	1390	}
1365		1391
		1392	1
1366	}	1393	}
1367		1394
1368	sub find_widget {	1395	sub find_widget {
1369	my ($self, $x, $y) = @_;	1396	my ($self, $x, $y) = @_;
1370		1397
…		…
1407	(List::Util::sum map $_->{req_w}, @{$self->{children}}),	1434	(List::Util::sum map $_->{req_w}, @{$self->{children}}),
1408	(List::Util::max map $_->{req_h}, @{$self->{children}}),	1435	(List::Util::max map $_->{req_h}, @{$self->{children}}),
1409	)	1436	)
1410	}	1437	}
1411		1438
1412	sub size_allocate {	1439	sub invoke_size_allocate {
1413	my ($self, $w, $h) = @_;	1440	my ($self, $w, $h) = @_;
1414		1441
1415	my $space = $self->{vertical} ? $h : $w;	1442	my $space = $self->{vertical} ? $h : $w;
1416	my $children = $self->{children};	1443	my @children = $self->visible_children;
1417		1444
1418	my @req;	1445	my @req;
1419		1446
1420	if ($self->{homogeneous}) {	1447	if ($self->{homogeneous}) {
1421	@req = ($space / (@$children || 1)) x @$children;	1448	@req = ($space / (@children || 1)) x @children;
1422	} else {	1449	} else {
1423	@req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children;	1450	@req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @children;
1424	my $req = List::Util::sum @req;	1451	my $req = List::Util::sum @req;
1425		1452
1426	if ($req > $space) {	1453	if ($req > $space) {
1427	# ah well, not enough space	1454	# ah well, not enough space
1428	$_ *= $space / $req for @req;	1455	$_ *= $space / $req for @req;
1429	} else {	1456	} else {
1430	my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;	1457	my $expand = (List::Util::sum map $_->{expand}, @children) || 1;
1431		1458
1432	$space = ($space - $req) / $expand; # remaining space to give away	1459	$space = ($space - $req) / $expand; # remaining space to give away
1433		1460
1434	$req[$_] += $space * $children->[$_]{expand}	1461	$req[$_] += $space * $children[$_]{expand}
1435	for 0 .. $#$children;	1462	for 0 .. $#children;
1436	}	1463	}
1437	}	1464	}
1438		1465
1439	CFClient::UI::harmonize \@req;	1466	CFClient::UI::harmonize \@req;
1440		1467
1441	my $pos = 0;	1468	my $pos = 0;
1442	for (0 .. $#$children) {	1469	for (0 .. $#children) {
1443	my $alloc = $req[$_];	1470	my $alloc = $req[$_];
1444	$children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));	1471	$children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1445		1472
1446	$pos += $alloc;	1473	$pos += $alloc;
1447	}	1474	}
1448		1475
1449	1	1476	1
…		…
1604	};	1631	};
1605		1632
1606	@{ $self->{size_req} }	1633	@{ $self->{size_req} }
1607	}	1634	}
1608		1635
1609	sub size_allocate {	1636	sub invoke_size_allocate {
1610	my ($self, $w, $h) = @_;	1637	my ($self, $w, $h) = @_;
1611		1638
1612	delete $self->{ox};	1639	delete $self->{ox};
1613		1640
1614	delete $self->{texture}	1641	delete $self->{texture}
1615	unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};	1642	unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
		1643
		1644	1
1616	}	1645	}
1617		1646
1618	sub set_fontsize {	1647	sub set_fontsize {
1619	my ($self, $fontsize) = @_;	1648	my ($self, $fontsize) = @_;
1620		1649
…		…
1658	: ($self->{h} - $tex->{h}) * 0.5);	1687	: ($self->{h} - $tex->{h}) * 0.5);
1659	};	1688	};
1660		1689
1661	glEnable GL_TEXTURE_2D;	1690	glEnable GL_TEXTURE_2D;
1662		1691
		1692	my $w = List::Util::min $self->{w} + 4, $tex->{w};
		1693	my $h = List::Util::min $self->{h} + 2, $tex->{h};
		1694
1663	if ($tex->{format} == GL_ALPHA) {	1695	if ($tex->{format} == GL_ALPHA) {
1664	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	1696	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1665	glColor @{$self->{fg}};	1697	glColor @{$self->{fg}};
1666	$tex->draw_quad_alpha ($self->{ox}, $self->{oy});	1698	$tex->draw_quad_alpha ($self->{ox}, $self->{oy}, $w, $h);
1667	} else {	1699	} else {
1668	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	1700	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1669	$tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});	1701	$tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}, $w, $h);
1670	}	1702	}
1671		1703
1672	glDisable GL_TEXTURE_2D;	1704	glDisable GL_TEXTURE_2D;
1673	}	1705	}
1674		1706
…		…
1710		1742
1711	$text =~ s/./*/g if $self->{hidden};	1743	$text =~ s/./*/g if $self->{hidden};
1712	$self->{layout}->set_text ("$text ");	1744	$self->{layout}->set_text ("$text ");
1713	delete $self->{size_req};	1745	delete $self->{size_req};
1714		1746
1715	$self->_emit (changed => $self->{text});	1747	$self->emit (changed => $self->{text});
1716		1748
1717	$self->realloc;	1749	$self->realloc;
1718	$self->update;	1750	$self->update;
1719	}	1751	}
1720		1752
…		…
1735	my ($w, $h) = $self->SUPER::size_request;	1767	my ($w, $h) = $self->SUPER::size_request;
1736		1768
1737	($w + 1, $h) # add 1 for cursor	1769	($w + 1, $h) # add 1 for cursor
1738	}	1770	}
1739		1771
1740	sub key_down {	1772	sub invoke_key_down {
1741	my ($self, $ev) = @_;	1773	my ($self, $ev) = @_;
1742		1774
1743	my $mod = $ev->{mod};	1775	my $mod = $ev->{mod};
1744	my $sym = $ev->{sym};	1776	my $sym = $ev->{sym};
1745	my $uni = $ev->{unicode};	1777	my $uni = $ev->{unicode};
…		…
1757	} elsif ($sym == CFClient::SDLK_HOME) {	1789	} elsif ($sym == CFClient::SDLK_HOME) {
1758	$self->{cursor} = 0;	1790	$self->{cursor} = 0;
1759	} elsif ($sym == CFClient::SDLK_END) {	1791	} elsif ($sym == CFClient::SDLK_END) {
1760	$self->{cursor} = length $text;	1792	$self->{cursor} = length $text;
1761	} elsif ($uni == 27) {	1793	} elsif ($uni == 27) {
1762	$self->_emit ('escape');	1794	$self->emit ('escape');
1763	} elsif ($uni) {	1795	} elsif ($uni) {
1764	substr $text, $self->{cursor}++, 0, chr $uni;	1796	substr $text, $self->{cursor}++, 0, chr $uni;
1765	} else {	1797	} else {
1766	return 0;	1798	return 0;
1767	}	1799	}
…		…
1771	$self->realloc;	1803	$self->realloc;
1772		1804
1773	1	1805	1
1774	}	1806	}
1775		1807
1776	sub focus_in {	1808	sub invoke_focus_in {
1777	my ($self) = @_;	1809	my ($self) = @_;
1778		1810
1779	$self->{last_activity} = $::NOW;	1811	$self->{last_activity} = $::NOW;
1780		1812
1781	$self->SUPER::focus_in;	1813	$self->SUPER::invoke_focus_in
1782	}	1814	}
1783		1815
1784	sub button_down {	1816	sub invoke_button_down {
1785	my ($self, $ev, $x, $y) = @_;	1817	my ($self, $ev, $x, $y) = @_;
1786		1818
1787	$self->SUPER::button_down ($ev, $x, $y);	1819	$self->SUPER::invoke_button_down ($ev, $x, $y);
1788		1820
1789	my $idx = $self->{layout}->xy_to_index ($x, $y);	1821	my $idx = $self->{layout}->xy_to_index ($x, $y);
1790		1822
1791	# byte-index to char-index	1823	# byte-index to char-index
1792	my $text = $self->{text};	1824	my $text = $self->{text};
…		…
1797	$self->update;	1829	$self->update;
1798		1830
1799	1	1831	1
1800	}	1832	}
1801		1833
1802	sub mouse_motion {	1834	sub invoke_mouse_motion {
1803	my ($self, $ev, $x, $y) = @_;	1835	my ($self, $ev, $x, $y) = @_;
1804	# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#	1836	# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1805		1837
1806	0	1838	1
1807	}	1839	}
1808		1840
1809	sub _draw {	1841	sub _draw {
1810	my ($self) = @_;	1842	my ($self) = @_;
1811		1843
…		…
1852		1884
1853	our @ISA = CFClient::UI::EntryBase::;	1885	our @ISA = CFClient::UI::EntryBase::;
1854		1886
1855	use CFClient::OpenGL;	1887	use CFClient::OpenGL;
1856		1888
1857	sub key_down {	1889	sub invoke_key_down {
1858	my ($self, $ev) = @_;	1890	my ($self, $ev) = @_;
1859		1891
1860	my $sym = $ev->{sym};	1892	my $sym = $ev->{sym};
1861		1893
1862	if ($sym == 13) {	1894	if ($sym == 13) {
1863	unshift @{$self->{history}},	1895	unshift @{$self->{history}},
1864	my $txt = $self->get_text;	1896	my $txt = $self->get_text;
		1897
1865	$self->{history_pointer} = -1;	1898	$self->{history_pointer} = -1;
1866	$self->{history_saveback} = '';	1899	$self->{history_saveback} = '';
1867	$self->_emit (activate => $txt);	1900	$self->emit (activate => $txt);
1868	$self->update;	1901	$self->update;
1869		1902
1870	} elsif ($sym == CFClient::SDLK_UP) {	1903	} elsif ($sym == CFClient::SDLK_UP) {
1871	if ($self->{history_pointer} < 0) {	1904	if ($self->{history_pointer} < 0) {
1872	$self->{history_saveback} = $self->get_text;	1905	$self->{history_saveback} = $self->get_text;
…		…
1888	} else {	1921	} else {
1889	$self->set_text ($self->{history_saveback});	1922	$self->set_text ($self->{history_saveback});
1890	}	1923	}
1891		1924
1892	} else {	1925	} else {
1893	return $self->SUPER::key_down ($ev)	1926	return $self->SUPER::invoke_key_down ($ev)
1894	}	1927	}
1895		1928
1896	1	1929	1
1897	}	1930	}
1898		1931
…		…
1922	can_events => 1,	1955	can_events => 1,
1923	@_	1956	@_
1924	)	1957	)
1925	}	1958	}
1926		1959
1927	sub activate { }
1928
1929	sub button_up {	1960	sub invoke_button_up {
1930	my ($self, $ev, $x, $y) = @_;	1961	my ($self, $ev, $x, $y) = @_;
1931		1962
1932	$self->emit ("activate")	1963	$self->emit ("activate")
1933	if $x >= 0 && $x < $self->{w}	1964	if $x >= 0 && $x < $self->{w}
1934	&& $y >= 0 && $y < $self->{h};	1965	&& $y >= 0 && $y < $self->{h};
…		…
1948	$tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});	1979	$tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1949		1980
1950	glDisable GL_TEXTURE_2D;	1981	glDisable GL_TEXTURE_2D;
1951		1982
1952	$self->SUPER::_draw;	1983	$self->SUPER::_draw;
		1984	}
		1985
		1986	#############################################################################
		1987
		1988	package CFClient::UI::ImageButton;
		1989
		1990	our @ISA = CFClient::UI::Image::;
		1991
		1992	use CFClient::OpenGL;
		1993
		1994	my %textures;
		1995
		1996	sub new {
		1997	my $class = shift;
		1998
		1999	my $self = $class->SUPER::new (
		2000	padding_x => 4,
		2001	padding_y => 4,
		2002	fg => [1, 1, 1],
		2003	active_fg => [0, 0, 1],
		2004	can_hover => 1,
		2005	align => 0,
		2006	valign => 0,
		2007	can_events => 1,
		2008	@_
		2009	);
		2010	}
		2011
		2012	sub invoke_button_up {
		2013	my ($self, $ev, $x, $y) = @_;
		2014
		2015	$self->emit ("activate")
		2016	if $x >= 0 && $x < $self->{w}
		2017	&& $y >= 0 && $y < $self->{h};
		2018
		2019	1
1953	}	2020	}
1954		2021
1955	#############################################################################	2022	#############################################################################
1956		2023
1957	package CFClient::UI::CheckBox;	2024	package CFClient::UI::CheckBox;
…		…
1984	my ($self) = @_;	2051	my ($self) = @_;
1985		2052
1986	(6) x 2	2053	(6) x 2
1987	}	2054	}
1988		2055
1989	sub button_down {	2056	sub invoke_button_down {
1990	my ($self, $ev, $x, $y) = @_;	2057	my ($self, $ev, $x, $y) = @_;
1991		2058
1992	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}	2059	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1993	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {	2060	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1994	$self->{state} = !$self->{state};	2061	$self->{state} = !$self->{state};
1995	$self->_emit (changed => $self->{state});	2062	$self->emit (changed => $self->{state});
1996	} else {	2063	} else {
1997	return 0	2064	return 0
1998	}	2065	}
1999		2066
2000	1	2067	1
…		…
2025	package CFClient::UI::Image;	2092	package CFClient::UI::Image;
2026		2093
2027	our @ISA = CFClient::UI::Base::;	2094	our @ISA = CFClient::UI::Base::;
2028		2095
2029	use CFClient::OpenGL;	2096	use CFClient::OpenGL;
2030	use Carp qw/confess/;
2031		2097
2032	our %loaded_images;	2098	our %texture_cache;
2033		2099
2034	sub new {	2100	sub new {
2035	my $class = shift;	2101	my $class = shift;
2036		2102
2037	my $self = $class->SUPER::new (can_events => 0, @_);	2103	my $self = $class->SUPER::new (
		2104	can_events => 0,
		2105	@_,
		2106	);
2038		2107
2039	$self->{image} or confess "Image has 'image' not set. This is a fatal error!";	2108	$self->{path}
		2109	or Carp::croak "required attribute 'path' not set";
2040		2110
2041	$loaded_images{$self->{image}} ||=	2111	$self->{tex} = $texture_cache{$self->{path}} ||=
2042	new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1;	2112	new_from_file CFClient::Texture CFClient::find_rcfile $self->{path}, mipmap => 1;
2043		2113
2044	my $tex = $self->{tex} = $loaded_images{$self->{image}};	2114	Scalar::Util::weaken $texture_cache{$self->{path}};
2045		2115
2046	Scalar::Util::weaken $loaded_images{$self->{image}};	2116	$self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2047
2048	$self->{aspect} = $tex->{w} / $tex->{h};
2049		2117
2050	$self	2118	$self
2051	}	2119	}
2052		2120
2053	sub size_request {	2121	sub size_request {
2054	my ($self) = @_;	2122	my ($self) = @_;
2055		2123
2056	($self->{tex}->{w}, $self->{tex}->{h})	2124	($self->{tex}{w}, $self->{tex}{h})
2057	}	2125	}
2058		2126
2059	sub _draw {	2127	sub _draw {
2060	my ($self) = @_;	2128	my ($self) = @_;
2061		2129
…		…
2297	$self->update;	2365	$self->update;
2298		2366
2299	$self	2367	$self
2300	}	2368	}
2301		2369
2302	sub changed { }
2303
2304	sub set_range {	2370	sub set_range {
2305	my ($self, $range) = @_;	2371	my ($self, $range) = @_;
2306		2372
2307	($range, $self->{range}) = ($self->{range}, $range);	2373	($range, $self->{range}) = ($self->{range}, $range);
2308		2374
2309	$self->update
2310	if "@$range" ne "@{$self->{range}}";	2375	if ("@$range" ne "@{$self->{range}}") {
		2376	$self->update;
		2377	$self->set_value ($self->{range}[0]);
		2378	}
2311	}	2379	}
2312		2380
2313	sub set_value {	2381	sub set_value {
2314	my ($self, $value) = @_;	2382	my ($self, $value) = @_;
2315		2383
…		…
2326	if $unit;	2394	if $unit;
2327		2395
2328	@{$self->{range}} = ($value, $lo, $hi, $page, $unit);	2396	@{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2329		2397
2330	if ($value != $old_value) {	2398	if ($value != $old_value) {
2331	$self->_emit (changed => $value);	2399	$self->emit (changed => $value);
2332	$self->update;	2400	$self->update;
2333	}	2401	}
2334	}	2402	}
2335		2403
2336	sub size_request {	2404	sub size_request {
2337	my ($self) = @_;	2405	my ($self) = @_;
2338		2406
2339	($self->{req_w}, $self->{req_h})	2407	($self->{req_w}, $self->{req_h})
2340	}	2408	}
2341		2409
2342	sub button_down {	2410	sub invoke_button_down {
2343	my ($self, $ev, $x, $y) = @_;	2411	my ($self, $ev, $x, $y) = @_;
2344		2412
2345	$self->SUPER::button_down ($ev, $x, $y);	2413	$self->SUPER::invoke_button_down ($ev, $x, $y);
2346		2414
2347	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];	2415	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2348		2416
2349	$self->mouse_motion ($ev, $x, $y)	2417	$self->invoke_mouse_motion ($ev, $x, $y)
2350	}	2418	}
2351		2419
2352	sub mouse_motion {	2420	sub invoke_mouse_motion {
2353	my ($self, $ev, $x, $y) = @_;	2421	my ($self, $ev, $x, $y) = @_;
2354		2422
2355	if ($GRAB == $self) {	2423	if ($GRAB == $self) {
2356	my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});	2424	my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2357		2425
…		…
2462	sub set_range { shift->{slider}->set_range (@_) }	2530	sub set_range { shift->{slider}->set_range (@_) }
2463	sub set_value { shift->{slider}->set_value (@_) }	2531	sub set_value { shift->{slider}->set_value (@_) }
2464		2532
2465	#############################################################################	2533	#############################################################################
2466		2534
2467	package CFClient::UI::TextView;	2535	package CFClient::UI::TextScroller;
2468		2536
2469	our @ISA = CFClient::UI::HBox::;	2537	our @ISA = CFClient::UI::HBox::;
2470		2538
2471	use CFClient::OpenGL;	2539	use CFClient::OpenGL;
2472		2540
…		…
2474	my $class = shift;	2542	my $class = shift;
2475		2543
2476	my $self = $class->SUPER::new (	2544	my $self = $class->SUPER::new (
2477	fontsize => 1,	2545	fontsize => 1,
2478	can_events => 0,	2546	can_events => 0,
		2547	indent => 0,
2479	#font => default_font	2548	#font => default_font
2480	@_,	2549	@_,
2481		2550
2482	layout => (new CFClient::Layout 1),	2551	layout => (new CFClient::Layout 1),
2483	par => [],	2552	par => [],
…		…
2498		2567
2499	$self->{fontsize} = $fontsize;	2568	$self->{fontsize} = $fontsize;
2500	$self->reflow;	2569	$self->reflow;
2501	}	2570	}
2502		2571
		2572	sub visible_children {
		2573	my ($self) = @_;
		2574
		2575	@{$self->{children}}[0,1]
		2576	}
		2577
2503	sub size_allocate {	2578	sub invoke_size_allocate {
2504	my ($self, $w, $h) = @_;	2579	my ($self, $w, $h) = @_;
2505		2580
2506	$self->SUPER::size_allocate ($w, $h);	2581	my (undef, undef, @other) = @{ $self->{children} };
		2582	$_->configure (@$_{qw(x y req_w req_h)}) for @other;
2507		2583
2508	$self->{layout}->set_font ($self->{font}) if $self->{font};	2584	$self->{layout}->set_font ($self->{font}) if $self->{font};
2509	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	2585	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2510	$self->{layout}->set_width ($self->{children}[0]{w});	2586	$self->{layout}->set_width ($self->{children}[0]{w});
2511	$self->{layout}->set_indent (-$self->{fontsize} * $::FONTSIZE * 4);	2587	$self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2512		2588
2513	$self->reflow;	2589	$self->reflow;
2514	}
2515		2590
2516	sub text_size {	2591	$self->SUPER::invoke_size_allocate ($w, $h)
2517	my ($self, $text, $indent) = @_;	2592	}
		2593
		2594	sub get_layout {
		2595	my ($self, $para) = @_;
2518		2596
2519	my $layout = $self->{layout};	2597	my $layout = $self->{layout};
2520		2598
		2599	$layout->set_font ($self->{font}) if $self->{font};
2521	$layout->set_height ($self->{fontsize} * $::FONTSIZE);	2600	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
2522	$layout->set_width ($self->{children}[0]{w} - $indent);	2601	$layout->set_width ($self->{children}[0]{w} - $para->{indent});
2523	$layout->set_indent (-$self->{fontsize} * $::FONTSIZE * 4);	2602	$layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2524	$layout->set_markup ($text);	2603	$layout->set_markup ($para->{markup});
2525		2604	$layout->set_shapes (map +($_->{req_w}, $_->{req_h}), @{$para->{widget}});
		2605
2526	$layout->size	2606	$layout
2527	}	2607	}
2528		2608
2529	sub reflow {	2609	sub reflow {
2530	my ($self) = @_;	2610	my ($self) = @_;
2531		2611
…		…
2540	$self->{children}[1]->set_value ($offset);	2620	$self->{children}[1]->set_value ($offset);
2541	}	2621	}
2542		2622
2543	sub clear {	2623	sub clear {
2544	my ($self) = @_;	2624	my ($self) = @_;
		2625
		2626	my (undef, undef, @other) = @{ $self->{children} };
		2627	$self->remove ($_) for @other;
2545		2628
2546	$self->{par} = [];	2629	$self->{par} = [];
2547	$self->{height} = 0;	2630	$self->{height} = 0;
2548	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);	2631	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2549	}	2632	}
2550		2633
2551	sub add_paragraph {	2634	sub add_paragraph {
2552	my ($self, $color, $text, $indent) = @_;	2635	my ($self, $color, $para, $indent) = @_;
2553		2636
2554	for my $line (split /\n/, $text) {	2637	my ($text, @w) = ref $para ? @$para : $para;
2555	my ($w, $h) = $self->text_size ($line);	2638
2556	$self->{height} += $h;	2639	$para = {
2557	push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];	2640	w => 1e10,
		2641	wrapped => 1,
		2642	fg => $color,
		2643	indent => $indent,
		2644	markup => $text,
		2645	widget => \@w,
2558	}	2646	};
2559		2647
2560	$self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]);	2648	$self->add (@w) if @w;
		2649	push @{$self->{par}}, $para;
		2650
		2651	$self->{need_reflow}++;
		2652	$self->update;
		2653	}
		2654
		2655	sub scroll_to_bottom {
		2656	my ($self) = @_;
		2657
		2658	$self->{scroll_to_bottom} = 1;
		2659	$self->update;
2561	}	2660	}
2562		2661
2563	sub update {	2662	sub update {
2564	my ($self) = @_;	2663	my ($self) = @_;
2565		2664
…		…
2567		2666
2568	return unless $self->{h} > 0;	2667	return unless $self->{h} > 0;
2569		2668
2570	delete $self->{texture};	2669	delete $self->{texture};
2571		2670
2572	$ROOT->on_post_alloc ($self, sub {	2671	$ROOT->on_post_alloc ($self => sub {
2573	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};	2672	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2574		2673
2575	if (delete $self->{need_reflow}) {	2674	if (delete $self->{need_reflow}) {
2576	my $height = 0;	2675	my $height = 0;
2577		2676
2578	my $layout = $self->{layout};
2579
2580	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
2581
2582	for (@{$self->{par}}) {	2677	for my $para (@{$self->{par}}) {
2583	if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support	2678	if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2584	$layout->set_width ($W - $_->[3]);	2679	my $layout = $self->get_layout ($para);
2585	$layout->set_indent (-$self->{fontsize} * $::FONTSIZE * 4);
2586	$layout->set_markup ($_->[4]);
2587	my ($w, $h) = $layout->size;	2680	my ($w, $h) = $layout->size;
2588	$_->[0] = $w + $_->[3];	2681
		2682	$para->{w} = $w + $para->{indent};
2589	$_->[1] = $h;	2683	$para->{h} = $h;
		2684	$para->{wrapped} = $layout->has_wrapped;
2590	}	2685	}
2591		2686
2592	$height += $_->[1];	2687	$height += $para->{h};
2593	}	2688	}
2594		2689
2595	$self->{height} = $height;	2690	$self->{height} = $height;
2596		2691
2597	$self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);	2692	$self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2598		2693
2599	delete $self->{texture};	2694	delete $self->{texture};
		2695	}
		2696
		2697	if (delete $self->{scroll_to_bottom}) {
		2698	$self->{children}[1]->set_value (1e10);
2600	}	2699	}
2601		2700
2602	$self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {	2701	$self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2603	glClearColor 0, 0, 0, 0;	2702	glClearColor 0, 0, 0, 0;
2604	glClear GL_COLOR_BUFFER_BIT;	2703	glClear GL_COLOR_BUFFER_BIT;
…		…
2608	my $y0 = $top;	2707	my $y0 = $top;
2609	my $y1 = $top + $H;	2708	my $y1 = $top + $H;
2610		2709
2611	my $y = 0;	2710	my $y = 0;
2612		2711
2613	my $layout = $self->{layout};
2614
2615	$layout->set_font ($self->{font}) if $self->{font};
2616
2617	glEnable GL_BLEND;	2712	glEnable GL_BLEND;
2618	#TODO# not correct in windows where rgba is forced off	2713	#TODO# not correct in windows where rgba is forced off
2619	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;	2714	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2620		2715
2621	for my $par (@{$self->{par}}) {	2716	for my $para (@{$self->{par}}) {
2622	my $h = $par->[1];	2717	my $h = $para->{h};
2623		2718
2624	if ($y0 < $y + $h && $y < $y1) {	2719	if ($y0 < $y + $h && $y < $y1) {
2625	$layout->set_foreground (@{ $par->[2] });	2720
2626	$layout->set_width ($W - $par->[3]);	2721	my $layout = $self->get_layout ($para);
2627	$layout->set_indent (-$self->{fontsize} * $::FONTSIZE * 4);
2628	$layout->set_markup ($par->[4]);
2629		2722
2630	my ($w, $h, $data, $format, $internalformat) = $layout->render;	2723	my ($w, $h, $data, $format, $internalformat) = $layout->render;
2631		2724
2632	glRasterPos $par->[3], $y - $y0;	2725	glRasterPos $para->{indent}, $y - $y0;
2633	glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;	2726	glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
		2727
		2728	if (my @w = @{ $para->{widget} }) {
		2729	my @s = $layout->get_shapes;
		2730
		2731	for (@w) {
		2732	my ($dx, $dy) = splice @s, 0, 2, ();
		2733
		2734	$_->{x} = $dx + $para->{indent};
		2735	$_->{y} = $dy + $y - $y0;
		2736
		2737	$_->draw;
		2738	}
		2739	}
2634	}	2740	}
2635		2741
2636	$y += $h;	2742	$y += $h;
2637	}	2743	}
2638		2744
2639	glDisable GL_BLEND;	2745	glDisable GL_BLEND;
2640	};	2746	};
2641	});	2747	});
		2748	}
		2749
		2750	sub reconfigure {
		2751	my ($self) = @_;
		2752
		2753	$self->SUPER::reconfigure;
		2754
		2755	$_->{w} = 1e10 for @{ $self->{par} };
		2756	$self->reflow;
2642	}	2757	}
2643		2758
2644	sub _draw {	2759	sub _draw {
2645	my ($self) = @_;	2760	my ($self) = @_;
2646		2761
…		…
2649	glColor 0, 0, 0, 1;	2764	glColor 0, 0, 0, 1;
2650	$self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});	2765	$self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2651	glDisable GL_TEXTURE_2D;	2766	glDisable GL_TEXTURE_2D;
2652		2767
2653	$self->{children}[1]->draw;	2768	$self->{children}[1]->draw;
2654
2655	}	2769	}
2656		2770
2657	#############################################################################	2771	#############################################################################
2658		2772
2659	package CFClient::UI::Animator;	2773	package CFClient::UI::Animator;
…		…
2746	$tooltip .= "\n\n" . (ref $widget) . "\n"	2860	$tooltip .= "\n\n" . (ref $widget) . "\n"
2747	. "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"	2861	. "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2748	. "req $widget->{req_w} $widget->{req_h}\n"	2862	. "req $widget->{req_w} $widget->{req_h}\n"
2749	. "visible $widget->{visible}";	2863	. "visible $widget->{visible}";
2750	}	2864	}
		2865
		2866	$tooltip =~ s/^\n+//;
		2867	$tooltip =~ s/\n+$//;
2751		2868
2752	$self->add (new CFClient::UI::Label	2869	$self->add (new CFClient::UI::Label
2753	markup => $tooltip,	2870	markup => $tooltip,
2754	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,	2871	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2755	fontsize => 0.8,	2872	fontsize => 0.8,
…		…
2765	my ($w, $h) = @{$self->child}{qw(req_w req_h)};	2882	my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2766		2883
2767	($w + 4, $h + 4)	2884	($w + 4, $h + 4)
2768	}	2885	}
2769		2886
2770	sub size_allocate {	2887	sub invoke_size_allocate {
2771	my ($self, $w, $h) = @_;	2888	my ($self, $w, $h) = @_;
2772		2889
2773	$self->SUPER::size_allocate ($w - 4, $h - 4);	2890	$self->SUPER::invoke_size_allocate ($w - 4, $h - 4)
2774	}	2891	}
2775		2892
2776	sub visibility_change {	2893	sub invoke_visibility_change {
2777	my ($self, $visible) = @_;	2894	my ($self, $visible) = @_;
2778		2895
2779	return unless $visible;	2896	return unless $visible;
2780		2897
2781	$self->{root}->on_post_alloc ("move_$self" => sub {	2898	$self->{root}->on_post_alloc ("move_$self" => sub {
…		…
2783	or return;	2900	or return;
2784		2901
2785	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);	2902	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2786		2903
2787	($x, $y) = $widget->coord2global (-$self->{w}, 0)	2904	($x, $y) = $widget->coord2global (-$self->{w}, 0)
2788	if $x + $self->{w} > $::WIDTH;	2905	if $x + $self->{w} > $self->{root}{w};
2789		2906
2790	$self->move_abs ($x, $y);	2907	$self->move_abs ($x, $y);
2791	});	2908	});
2792	}	2909	}
2793		2910
…		…
2888	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});	3005	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2889	glDisable GL_TEXTURE_2D;	3006	glDisable GL_TEXTURE_2D;
2890	}	3007	}
2891	}	3008	}
2892		3009
2893	sub DESTROY {	3010	sub destroy {
2894	my ($self) = @_;	3011	my ($self) = @_;
2895		3012
2896	$self->{timer}->cancel	3013	$self->{timer}->cancel
2897	if $self->{timer};	3014	if $self->{timer};
2898		3015
2899	$self->SUPER::DESTROY;	3016	$self->SUPER::destroy;
2900	}	3017	}
2901		3018
2902	#############################################################################	3019	#############################################################################
2903		3020
2904	package CFClient::UI::Buttonbar;	3021	package CFClient::UI::Buttonbar;
…		…
2932	# handle various types of items, only text for now	3049	# handle various types of items, only text for now
2933	if (!ref $widget) {	3050	if (!ref $widget) {
2934	$widget = new CFClient::UI::Label	3051	$widget = new CFClient::UI::Label
2935	can_hover => 1,	3052	can_hover => 1,
2936	can_events => 1,	3053	can_events => 1,
2937	text => $widget,	3054	markup => $widget,
2938	tooltip => $tooltip	3055	tooltip => $tooltip
2939	}	3056	}
2940		3057
2941	$self->{item}{$widget} = $item;	3058	$self->{item}{$widget} = $item;
2942		3059
…		…
2948		3065
2949	# popup given the event (must be a mouse button down event currently)	3066	# popup given the event (must be a mouse button down event currently)
2950	sub popup {	3067	sub popup {
2951	my ($self, $ev) = @_;	3068	my ($self, $ev) = @_;
2952		3069
2953	$self->_emit ("popdown");	3070	$self->emit ("popdown");
2954		3071
2955	# maybe save $GRAB? must be careful about events...	3072	# maybe save $GRAB? must be careful about events...
2956	$GRAB = $self;	3073	$GRAB = $self;
2957	$self->{button} = $ev->{button};	3074	$self->{button} = $ev->{button};
2958		3075
2959	$self->show;	3076	$self->show;
2960	$self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);	3077	$self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2961	}	3078	}
2962		3079
2963	sub mouse_motion {	3080	sub invoke_mouse_motion {
2964	my ($self, $ev, $x, $y) = @_;	3081	my ($self, $ev, $x, $y) = @_;
2965		3082
2966	# TODO: should use vbox->find_widget or so	3083	# TODO: should use vbox->find_widget or so
2967	$HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});	3084	$HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2968	$self->{hover} = $self->{item}{$HOVER};	3085	$self->{hover} = $self->{item}{$HOVER};
2969		3086
2970	0	3087	0
2971	}	3088	}
2972		3089
2973	sub button_up {	3090	sub invoke_button_up {
2974	my ($self, $ev, $x, $y) = @_;	3091	my ($self, $ev, $x, $y) = @_;
2975		3092
2976	if ($ev->{button} == $self->{button}) {	3093	if ($ev->{button} == $self->{button}) {
2977	undef $GRAB;	3094	undef $GRAB;
2978	$self->hide;	3095	$self->hide;
2979		3096
2980	$self->_emit ("popdown");	3097	$self->emit ("popdown");
2981	$self->{hover}[1]->() if $self->{hover};	3098	$self->{hover}[1]->() if $self->{hover};
2982	} else {	3099	} else {
2983	return 0	3100	return 0
2984	}	3101	}
2985		3102
…		…
3022	: $self->{children}[$page_or_widget];	3139	: $self->{children}[$page_or_widget];
3023		3140
3024	$self->{current} = $widget;	3141	$self->{current} = $widget;
3025	$self->{current}->configure (0, 0, $self->{w}, $self->{h});	3142	$self->{current}->configure (0, 0, $self->{w}, $self->{h});
3026		3143
3027	$self->_emit (page_changed => $self->{current});	3144	$self->emit (page_changed => $self->{current});
3028		3145
3029	$self->realloc;	3146	$self->realloc;
3030	}	3147	}
3031		3148
3032	sub visible_children {	3149	sub visible_children {
…		…
3037	my ($self) = @_;	3154	my ($self) = @_;
3038		3155
3039	$self->{current}->size_request	3156	$self->{current}->size_request
3040	}	3157	}
3041		3158
3042	sub size_allocate {	3159	sub invoke_size_allocate {
3043	my ($self, $w, $h) = @_;	3160	my ($self, $w, $h) = @_;
3044		3161
3045	$self->{current}->configure (0, 0, $w, $h);	3162	$self->{current}->configure (0, 0, $w, $h);
		3163
		3164	1
3046	}	3165	}
3047		3166
3048	sub _draw {	3167	sub _draw {
3049	my ($self) = @_;	3168	my ($self) = @_;
3050		3169
…		…
3089		3208
3090	sub set_current_page {	3209	sub set_current_page {
3091	my ($self, $page) = @_;	3210	my ($self, $page) = @_;
3092		3211
3093	$self->{multiplexer}->set_current_page ($page);	3212	$self->{multiplexer}->set_current_page ($page);
3094	$self->_emit (page_changed => $self->{multiplexer}{current});	3213	$self->emit (page_changed => $self->{multiplexer}{current});
3095	}	3214	}
3096		3215
3097	#############################################################################	3216	#############################################################################
3098		3217
3099	package CFClient::UI::Combobox;	3218	package CFClient::UI::Combobox;
…		…
3104		3223
3105	sub new {	3224	sub new {
3106	my $class = shift;	3225	my $class = shift;
3107		3226
3108	my $self = $class->SUPER::new (	3227	my $self = $class->SUPER::new (
3109	options => [], # [title, value, tooltip], ...	3228	options => [], # [value, title, longdesc], ...
3110	value => undef,	3229	value => undef,
3111	@_,	3230	@_,
3112	);	3231	);
3113		3232
3114	$self->_set_value ($self->{value});	3233	$self->_set_value ($self->{value});
3115		3234
3116	$self	3235	$self
3117	}	3236	}
3118		3237
3119	sub button_down {	3238	sub invoke_button_down {
3120	my ($self, $ev) = @_;	3239	my ($self, $ev) = @_;
3121		3240
3122	my @menu_items;	3241	my @menu_items;
3123		3242
3124	for (@{ $self->{options} }) {	3243	for (@{ $self->{options} }) {
3125	my ($title, $value, $tooltip) = @$_;	3244	my ($value, $title, $tooltip) = @$_;
3126		3245
3127	push @menu_items, [$tooltip, sub { $self->set_value ($value) }];	3246	push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3128	}	3247	}
3129		3248
3130	CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);	3249	CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
3131	}	3250	}
3132		3251
3133	sub _set_value {	3252	sub _set_value {
3134	my ($self, $value) = @_;	3253	my ($self, $value) = @_;
3135		3254
3136	my ($item) = grep $_->[1] eq $value, @{ $self->{options} }	3255	my ($item) = grep $_->[0] eq $value, @{ $self->{options} }
3137	or return;	3256	or return;
3138		3257
3139	$self->{value} = $item->[1];	3258	$self->{value} = $item->[0];
3140	$self->set_markup ("$item->[0] ⇓");	3259	$self->set_markup ("$item->[1] ⇓");
3141	$self->set_tooltip ($item->[2]);	3260	$self->set_tooltip ($item->[2]);
3142	}	3261	}
3143		3262
3144	sub set_value {	3263	sub set_value {
3145	my ($self, $value) = @_;	3264	my ($self, $value) = @_;
3146		3265
3147	return unless $self->{value} ne $value;	3266	return unless $self->{value} ne $value;
3148		3267
3149	$self->_set_value ($value);	3268	$self->_set_value ($value);
3150	$self->_emit (changed => $value);	3269	$self->emit (changed => $value);
3151	}	3270	}
3152		3271
3153	#############################################################################	3272	#############################################################################
3154		3273
3155	package CFClient::UI::Statusbox;	3274	package CFClient::UI::Statusbox;
…		…
3254	$item->{count}++;	3373	$item->{count}++;
3255	} else {	3374	} else {
3256	$item->{count} = 1;	3375	$item->{count} = 1;
3257	$item->{text} = $item->{tooltip} = $text;	3376	$item->{text} = $item->{tooltip} = $text;
3258	}	3377	}
3259	$item->{id} = ++$self->{id};	3378	$item->{id} += 0.2;#d#
3260	$item->{timeout} = $timeout;	3379	$item->{timeout} = $timeout;
3261	delete $item->{label};	3380	delete $item->{label};
3262	} else {	3381	} else {
3263	$self->{item}{$group} = {	3382	$self->{item}{$group} = {
3264	id => ++$self->{id},	3383	id => ++$self->{id},
…		…
3283		3402
3284	$self->reorder;	3403	$self->reorder;
3285	$self->SUPER::reconfigure;	3404	$self->SUPER::reconfigure;
3286	}	3405	}
3287		3406
3288	sub DESTROY {	3407	sub destroy {
3289	my ($self) = @_;	3408	my ($self) = @_;
3290		3409
3291	$self->{timer}->cancel;	3410	$self->{timer}->cancel;
3292		3411
3293	$self->SUPER::DESTROY;	3412	$self->SUPER::destroy;
3294	}	3413	}
3295		3414
3296	#############################################################################	3415	#############################################################################
3297		3416
3298	package CFClient::UI::Inventory;	3417	package CFClient::UI::Inventory;
…		…
3399	$self->update_binding_widgets;	3518	$self->update_binding_widgets;
3400		3519
3401	$self	3520	$self
3402	}	3521	}
3403		3522
		3523	sub cfg_bind {
		3524	my ($self, $mod, $sym, $cmds) = @_;
		3525	$::CFG->{profile}{default}{bindings}{$mod}{$sym} = $cmds;
		3526	::update_bindings ();
		3527	}
		3528
		3529	sub cfg_unbind {
		3530	my ($self, $mod, $sym, $cmds) = @_;
		3531	delete $::CFG->{profile}{default}{bindings}{$mod}{$sym};
		3532	::update_bindings ();
		3533	}
		3534
3404	sub commit {	3535	sub commit {
3405	my ($self) = @_;	3536	my ($self) = @_;
3406	my ($mod, $sym, $cmds) = $self->get_binding;	3537	my ($mod, $sym, $cmds) = $self->get_binding;
3407	if ($sym != 0 && @$cmds > 0) {	3538	if ($sym != 0 && @$cmds > 0) {
3408	$::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)	3539	$::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
…		…
3442	my ($self) = @_;	3573	my ($self) = @_;
3443	$self->ask_for_bind (1);	3574	$self->ask_for_bind (1);
3444	}	3575	}
3445		3576
3446	sub ask_for_bind {	3577	sub ask_for_bind {
3447	my ($self, $commit) = @_;	3578	my ($self, $commit, $end_cb) = @_;
3448		3579
3449	CFClient::Binder::open_binding_dialog (sub {	3580	CFClient::Binder::open_binding_dialog (sub {
3450	my ($mod, $sym) = @_;	3581	my ($mod, $sym) = @_;
3451	$self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?	3582	$self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3452	$self->update_binding_widgets;	3583	$self->update_binding_widgets;
3453	$self->commit if $commit;	3584	$self->commit if $commit;
		3585	$end_cb->() if $end_cb;
3454	});	3586	});
3455	}	3587	}
3456		3588
3457	# $mod and $sym are the modifiers and key symbol	3589	# $mod and $sym are the modifiers and key symbol
3458	# $cmds is a array ref of strings (the commands)	3590	# $cmds is a array ref of strings (the commands)
…		…
3476	}	3608	}
3477		3609
3478	# this is a shortcut method that asks for a binding	3610	# this is a shortcut method that asks for a binding
3479	# and then just binds it.	3611	# and then just binds it.
3480	sub do_quick_binding {	3612	sub do_quick_binding {
3481	my ($self, $cmds) = @_;	3613	my ($self, $cmds, $end_cb) = @_;
3482	$self->set_binding (undef, undef, $cmds, sub {	3614	$self->set_binding (undef, undef, $cmds, sub { $self->cfg_bind (@_) });
3483	$::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3484	});
3485	$self->ask_for_bind (1);	3615	$self->ask_for_bind (1, $end_cb);
3486	}	3616	}
3487		3617
3488	sub update_binding_widgets {	3618	sub update_binding_widgets {
3489	my ($self) = @_;	3619	my ($self) = @_;
3490	my ($mod, $sym, $cmds) = $self->get_binding;	3620	my ($mod, $sym, $cmds) = $self->get_binding;
…		…
3546	commands => [],	3676	commands => [],
3547	@_,	3677	@_,
3548	)	3678	)
3549	}	3679	}
3550		3680
		3681	my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
		3682
		3683	my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
		3684	"<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
		3685	my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
		3686	"<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3551	my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>	3687	my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3552	"<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.");	3688	"<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3553	my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>	3689	my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3554	"<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.");	3690	"<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3555	my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>	3691	my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3556	"<b>Damage</b>. The amount of damage the spell deals when it hits.");	3692	"<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3557		3693
3558	sub rebuild_spell_list {	3694	sub rebuild_spell_list {
3559	my ($self) = @_;	3695	my ($self) = @_;
3560		3696
3561	$CFClient::UI::ROOT->on_refresh ($self => sub {	3697	$CFClient::UI::ROOT->on_refresh ($self => sub {
3562	$self->clear;	3698	$self->clear;
3563		3699
		3700	return unless $::CONN;
		3701
3564	$self->add (1, 0, new CFClient::UI::Label text => "Spell Name");	3702	$self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);
		3703	$self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL);
3565	$self->add (2, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);	3704	$self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3566	$self->add (3, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);	3705	$self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3567	$self->add (4, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);	3706	$self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3568		3707
3569	my $row = 0;	3708	my $row = 0;
3570		3709
3571	for (sort { $a cmp $b } keys %{ $self->{spell} }) {	3710	for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3572	my $spell = $self->{spell}{$_};	3711	my $spell = $self->{spell}{$_};
3573		3712
3574	$row++;	3713	$row++;
		3714
		3715	my $spell_cb = sub {
		3716	my ($widget, $ev) = @_;
		3717
		3718	if ($ev->{button} == 1) {
		3719	$::CONN->user_send ("cast $spell->{name}");
		3720	} elsif ($ev->{button} == 2) {
		3721	$::CONN->user_send ("invoke $spell->{name}");
		3722	} elsif ($ev->{button} == 3) {
		3723	(new CFClient::UI::Menu
		3724	items => [
		3725	["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
		3726	["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
		3727	],
		3728	)->popup ($ev);
		3729	} else {
		3730	return 0;
		3731	}
		3732
		3733	1
		3734	};
		3735
		3736	my $tooltip = "$spell->{message}$TOOLTIP_ALL";
		3737
		3738	#TODO: add path info to tooltip
		3739	#$self->add (6, $row, new CFClient::UI::Label text => $spell->{path});
3575		3740
3576	$self->add (0, $row, new CFClient::UI::Face	3741	$self->add (0, $row, new CFClient::UI::Face
3577	face => $spell->{face},	3742	face => $spell->{face},
3578	can_hover => 1,	3743	can_hover => 1,
3579	can_events => 1,	3744	can_events => 1,
3580	tooltip => $spell->{message},	3745	tooltip => $tooltip,
		3746	on_button_down => $spell_cb,
3581	);	3747	);
3582		3748
3583	$self->add (1, $row, new CFClient::UI::Label	3749	$self->add (1, $row, new CFClient::UI::Label
3584	expand => 1,	3750	expand => 1,
3585	text => $spell->{name},	3751	text => $spell->{name},
3586	can_hover => 1,	3752	can_hover => 1,
3587	can_events => 1,	3753	can_events => 1,
3588	tooltip => $spell->{message},	3754	tooltip => $tooltip,
		3755	on_button_down => $spell_cb,
3589	);	3756	);
3590		3757
		3758	$self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3591	$self->add (2, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);	3759	$self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3592	$self->add (3, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);	3760	$self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3593	$self->add (4, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);	3761	$self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3594
3595	# TODO: should be done via popup
3596	$self->add (5, $row, new CFClient::UI::Button
3597	text => "bind",
3598	tooltip => "bind spell readying (cast command) to key",
3599	on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) },
3600	);
3601	}	3762	}
3602	});	3763	});
3603	}	3764	}
3604		3765
3605	sub add_spell {	3766	sub add_spell {
…		…
3611		3772
3612	sub remove_spell {	3773	sub remove_spell {
3613	my ($self, $spell) = @_;	3774	my ($self, $spell) = @_;
3614		3775
3615	delete $self->{spell}->{$spell->{name}};	3776	delete $self->{spell}->{$spell->{name}};
		3777	$self->rebuild_spell_list;
		3778	}
		3779
		3780	sub clear_spells {
		3781	my ($self) = @_;
		3782
		3783	$self->{spell} = {};
3616	$self->rebuild_spell_list;	3784	$self->rebuild_spell_list;
3617	}	3785	}
3618		3786
3619	#############################################################################	3787	#############################################################################
3620		3788
…		…
3657	$coord = $max - $size if $coord > $max - $size;	3825	$coord = $max - $size if $coord > $max - $size;
3658		3826
3659	int $coord + 0.5	3827	int $coord + 0.5
3660	}	3828	}
3661		3829
3662	sub size_allocate {	3830	sub invoke_size_allocate {
3663	my ($self, $w, $h) = @_;	3831	my ($self, $w, $h) = @_;
3664		3832
3665	for my $child ($self->children) {	3833	for my $child ($self->children) {
3666	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};	3834	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3667		3835
…		…
3671	$X = _to_pixel $X, $W, $self->{w};	3839	$X = _to_pixel $X, $W, $self->{w};
3672	$Y = _to_pixel $Y, $H, $self->{h};	3840	$Y = _to_pixel $Y, $H, $self->{h};
3673		3841
3674	$child->configure ($X, $Y, $W, $H);	3842	$child->configure ($X, $Y, $W, $H);
3675	}	3843	}
		3844
		3845	1
3676	}	3846	}
3677		3847
3678	sub coord2local {	3848	sub coord2local {
3679	my ($self, $x, $y) = @_;	3849	my ($self, $x, $y) = @_;
3680		3850

Diff Legend

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