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.286 by root, Mon Jun 5 03:48:49 2006 UTC vs.
Revision 1.311 by root, Fri Jun 23 22:35:16 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
…		…
334	}	333	}
335		334
336	sub size_request {	335	sub size_request {
337	require Carp;	336	require Carp;
338	Carp::confess "size_request is abstract";	337	Carp::confess "size_request is abstract";
		338	}
		339
		340	sub baseline_shift {
		341	0
339	}	342	}
340		343
341	sub configure {	344	sub configure {
342	my ($self, $x, $y, $w, $h) = @_;	345	my ($self, $x, $y, $w, $h) = @_;
343		346
…		…
367		370
368	$self->{root}{size_alloc}{$self+0} = $self;	371	$self->{root}{size_alloc}{$self+0} = $self;
369	}	372	}
370	}	373	}
371		374
372	sub size_allocate {
373	# nothing to be done
374	}
375
376	sub children {	375	sub children {
377	# nop	376	# nop
378	}	377	}
379		378
380	sub visible_children {	379	sub visible_children {
…		…
418	my ($self, $x, $y) = @_;	417	my ($self, $x, $y) = @_;
419		418
420	$self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})	419	$self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
421	}	420	}
422		421
423	sub focus_in {	422	sub invoke_focus_in {
424	my ($self) = @_;	423	my ($self) = @_;
425		424
426	return if $FOCUS == $self;	425	return if $FOCUS == $self;
427	return unless $self->{can_focus};	426	return unless $self->{can_focus};
428		427
429	my $focus = $FOCUS; $FOCUS = $self;	428	my $focus = $FOCUS; $FOCUS = $self;
430		429
431	$self->_emit (focus_in => $focus);
432
433	$focus->update if $focus;	430	$focus->update if $focus;
434	$FOCUS->update;	431	$FOCUS->update;
435	}
436		432
		433	0
		434	}
		435
437	sub focus_out {	436	sub invoke_focus_out {
438	my ($self) = @_;	437	my ($self) = @_;
439		438
440	return unless $FOCUS == $self;	439	return unless $FOCUS == $self;
441		440
442	my $focus = $FOCUS; undef $FOCUS;	441	my $focus = $FOCUS; undef $FOCUS;
443		442
444	$self->_emit (focus_out => $focus);
445
446	$focus->update if $focus; #?	443	$focus->update if $focus; #?
447		444
448	$::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus	445	$::MAPWIDGET->grab_focus #d# focus mapwidget if no other widget has focus
449	unless $FOCUS;	446	unless $FOCUS;
450	}
451		447
		448	0
		449	}
		450
		451	sub grab_focus {
		452	my ($self) = @_;
		453
		454	$self->emit ("focus_in");
		455	}
		456
452	sub mouse_motion { 0 }	457	sub invoke_mouse_motion { 1 }
453	sub button_up { 0 }	458	sub invoke_button_up { 1 }
454	sub key_down { 0 }	459	sub invoke_key_down { 1 }
455	sub key_up { 0 }	460	sub invoke_key_up { 1 }
456		461
457	sub button_down {	462	sub invoke_button_down {
458	my ($self, $ev, $x, $y) = @_;	463	my ($self, $ev, $x, $y) = @_;
459		464
460	$self->focus_in;	465	$self->grab_focus;
461		466
462	0	467	1
		468	}
		469
		470	sub connect {
		471	my ($self, $signal, $cb) = @_;
		472
		473	push @{ $self->{signal_cb}{$signal} }, $cb;
		474	}
		475
		476	sub emit {
		477	my ($self, $signal, @args) = @_;
		478
		479	#d##TODO# stop propagating at first true, do not use sum
		480	(List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}) # before
		481	|| ($self->can ("invoke_$signal") || sub { 1 })->($self, @args) # closure
		482	|| ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent
463	}	483	}
464		484
465	sub find_widget {	485	sub find_widget {
466	my ($self, $x, $y) = @_;	486	my ($self, $x, $y) = @_;
467		487
…		…
477	sub set_parent {	497	sub set_parent {
478	my ($self, $parent) = @_;	498	my ($self, $parent) = @_;
479		499
480	Scalar::Util::weaken ($self->{parent} = $parent);	500	Scalar::Util::weaken ($self->{parent} = $parent);
481	$self->set_visible if $parent->{visible};	501	$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	}	502	}
506		503
507	sub realloc {	504	sub realloc {
508	my ($self) = @_;	505	my ($self) = @_;
509		506
…		…
593		590
594	sub DESTROY {	591	sub DESTROY {
595	my ($self) = @_;	592	my ($self) = @_;
596		593
597	delete $WIDGET{$self+0};	594	delete $WIDGET{$self+0};
598	#$self->deactivate;	595
		596	eval { $self->destroy };
		597	warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
599	}	598	}
600		599
601	#############################################################################	600	#############################################################################
602		601
603	package CFClient::UI::DrawBG;	602	package CFClient::UI::DrawBG;
…		…
768	}	767	}
769		768
770	sub add {	769	sub add {
771	my ($self, $child) = @_;	770	my ($self, $child) = @_;
772		771
773	$self->{children} = [];	772	$self->SUPER::remove ($_) for @{ $self->{children} };
774
775	$self->SUPER::add ($child);	773	$self->SUPER::add ($child);
776	}	774	}
777		775
778	sub remove {	776	sub remove {
779	my ($self, $widget) = @_;	777	my ($self, $widget) = @_;
…		…
788		786
789	sub size_request {	787	sub size_request {
790	$_[0]{children}[0]->size_request	788	$_[0]{children}[0]->size_request
791	}	789	}
792		790
793	sub size_allocate {	791	sub invoke_size_allocate {
794	my ($self, $w, $h) = @_;	792	my ($self, $w, $h) = @_;
795		793
796	$self->{children}[0]->configure (0, 0, $w, $h);	794	$self->{children}[0]->configure (0, 0, $w, $h);
		795
		796	1
797	}	797	}
798		798
799	#############################################################################	799	#############################################################################
800		800
801	# back-buffered drawing area	801	# back-buffered drawing area
…		…
817		817
818	$ROOT->on_post_alloc ($self => sub { $self->render_child });	818	$ROOT->on_post_alloc ($self => sub { $self->render_child });
819	$self->SUPER::update;	819	$self->SUPER::update;
820	}	820	}
821		821
822	sub size_allocate {	822	sub invoke_size_allocate {
823	my ($self, $w, $h) = @_;	823	my ($self, $w, $h) = @_;
824		824
825	$self->SUPER::size_allocate ($w, $h);
826	$self->update;	825	$self->update;
		826
		827	$self->SUPER::invoke_size_allocate ($w, $h)
827	}	828	}
828		829
829	sub _render {	830	sub _render {
830	my ($self) = @_;	831	my ($self) = @_;
831		832
…		…
892	$h = 10 if $self->{scroll_y};	893	$h = 10 if $self->{scroll_y};
893		894
894	($w, $h)	895	($w, $h)
895	}	896	}
896		897
897	sub size_allocate {	898	sub invoke_size_allocate {
898	my ($self, $w, $h) = @_;	899	my ($self, $w, $h) = @_;
899		900
900	my $child = $self->child;	901	my $child = $self->child;
901		902
902	$w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};	903	$w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
903	$h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};	904	$h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
904		905
905	$self->child->configure (0, 0, $w, $h);	906	$self->child->configure (0, 0, $w, $h);
906	$self->update;	907	$self->update;
		908
		909	1
907	}	910	}
908		911
909	sub set_offset {	912	sub set_offset {
910	my ($self, $x, $y) = @_;	913	my ($self, $x, $y) = @_;
911		914
…		…
1001	# todo: overwrite size_allocate of child	1004	# todo: overwrite size_allocate of child
1002	my $child = $self->{vp}->child;	1005	my $child = $self->{vp}->child;
1003	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);	1006	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
1004	}	1007	}
1005		1008
1006	sub size_allocate {	1009	sub invoke_size_allocate {
1007	my ($self, $w, $h) = @_;	1010	my ($self, $w, $h) = @_;
1008
1009	$self->SUPER::size_allocate ($w, $h);
1010		1011
1011	my $child = $self->{vp}->child;	1012	my $child = $self->{vp}->child;
1012	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);	1013	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
		1014
		1015	$self->SUPER::invoke_size_allocate ($w, $h)
1013	}	1016	}
1014		1017
1015	#TODO# update range on size_allocate depending on child	1018	#TODO# update range on size_allocate depending on child
1016	# update viewport offset on scroll	1019	# update viewport offset on scroll
1017		1020
…		…
1071	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	1074	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);	1075	qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1073		1076
1074	sub new {	1077	sub new {
1075	my ($class, %arg) = @_;	1078	my ($class, %arg) = @_;
1076
1077	my $title = delete $arg{title};
1078		1079
1079	my $self = $class->SUPER::new (	1080	my $self = $class->SUPER::new (
1080	bg => [1, 1, 1, 1],	1081	bg => [1, 1, 1, 1],
1081	border_bg => [1, 1, 1, 1],	1082	border_bg => [1, 1, 1, 1],
1082	border => 0.6,	1083	border => 0.6,
…		…
1084	min_w => 16,	1085	min_w => 16,
1085	min_h => 16,	1086	min_h => 16,
1086	%arg,	1087	%arg,
1087	);	1088	);
1088		1089
1089	$self->{title} = new CFClient::UI::Label	1090	$self->{title_widget} = new CFClient::UI::Label
1090	align => 0,	1091	align => 0,
1091	valign => 1,	1092	valign => 1,
1092	text => $title,	1093	text => $self->{title},
1093	fontsize => $self->{border}	1094	fontsize => $self->{border},
1094	if defined $title;	1095	if exists $self->{title};
		1096
		1097	if ($self->{has_close_button}) {
		1098	$self->{close_button} =
		1099	new CFClient::UI::ImageButton
		1100	path => 'x1_close.png',
		1101	on_activate => sub { $self->hide };
		1102
		1103	$self->CFClient::UI::Container::add ($self->{close_button});
		1104	}
1095		1105
1096	$self	1106	$self
1097	}	1107	}
1098		1108
1099	sub add {	1109	sub add {
1100	my ($self, @widgets) = @_;	1110	my ($self, @widgets) = @_;
1101		1111
1102	$self->SUPER::add (@widgets);	1112	$self->SUPER::add (@widgets);
		1113	$self->CFClient::UI::Container::add ($self->{close_button}) if $self->{close_button};
1103	$self->CFClient::UI::Container::add ($self->{title}) if $self->{title};	1114	$self->CFClient::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1104	}	1115	}
1105		1116
1106	sub border {	1117	sub border {
1107	int $_[0]{border} * $::FONTSIZE	1118	int $_[0]{border} * $::FONTSIZE
1108	}	1119	}
1109		1120
1110	sub size_request {	1121	sub size_request {
1111	my ($self) = @_;	1122	my ($self) = @_;
1112		1123
1113	$self->{title}->size_request	1124	$self->{title_widget}->size_request
1114	if $self->{title};	1125	if $self->{title_widget};
		1126
		1127	$self->{close_button}->size_request
		1128	if $self->{close_button};
1115		1129
1116	my ($w, $h) = $self->SUPER::size_request;	1130	my ($w, $h) = $self->SUPER::size_request;
1117		1131
1118	(	1132	(
1119	$w + $self->border * 2,	1133	$w + $self->border * 2,
1120	$h + $self->border * 2,	1134	$h + $self->border * 2,
1121	)	1135	)
1122	}	1136	}
1123		1137
1124	sub size_allocate {	1138	sub invoke_size_allocate {
1125	my ($self, $w, $h) = @_;	1139	my ($self, $w, $h) = @_;
1126		1140
1127	if ($self->{title}) {	1141	if ($self->{title_widget}) {
1128	$self->{title}{w} = $w;	1142	$self->{title_widget}{w} = $w;
1129	$self->{title}{h} = $h;	1143	$self->{title_widget}{h} = $h;
1130	$self->{title}->size_allocate ($w, $h);	1144	$self->{title_widget}->invoke_size_allocate ($w, $h);
1131	}	1145	}
1132		1146
1133	my $border = $self->border;	1147	my $border = $self->border;
1134		1148
1135	$h -= List::Util::max 0, $border * 2;	1149	$h -= List::Util::max 0, $border * 2;
1136	$w -= List::Util::max 0, $border * 2;	1150	$w -= List::Util::max 0, $border * 2;
1137		1151
1138	$self->child->configure ($border, $border, $w, $h);	1152	$self->child->configure ($border, $border, $w, $h);
1139	}
1140		1153
		1154	$self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
		1155	if $self->{close_button};
		1156
		1157	1
		1158	}
		1159
1141	sub button_down {	1160	sub invoke_button_down {
1142	my ($self, $ev, $x, $y) = @_;	1161	my ($self, $ev, $x, $y) = @_;
1143		1162
1144	my ($w, $h) = @$self{qw(w h)};	1163	my ($w, $h) = @$self{qw(w h)};
1145	my $border = $self->border;	1164	my $border = $self->border;
1146		1165
…		…
1177		1196
1178	($x, $y) = ($ev->{x}, $ev->{y});	1197	($x, $y) = ($ev->{x}, $ev->{y});
1179		1198
1180	$self->move_abs ($bx + $x - $ox, $by + $y - $oy);	1199	$self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1181	# HACK: the next line is required to enforce placement	1200	# HACK: the next line is required to enforce placement
1182	$self->{parent}->size_allocate ($self->{parent}{w}, $self->{parent}{h});	1201	$self->{parent}->invoke_size_allocate ($self->{parent}{w}, $self->{parent}{h});
1183	};	1202	};
1184	} else {	1203	} else {
1185	return 0;	1204	return 0;
1186	}	1205	}
1187		1206
1188	1	1207	1
1189	}	1208	}
1190		1209
1191	sub button_up {	1210	sub invoke_button_up {
1192	my ($self, $ev, $x, $y) = @_;	1211	my ($self, $ev, $x, $y) = @_;
1193		1212
1194	!!delete $self->{motion}	1213	! ! delete $self->{motion}
1195	}	1214	}
1196		1215
1197	sub mouse_motion {	1216	sub invoke_mouse_motion {
1198	my ($self, $ev, $x, $y) = @_;	1217	my ($self, $ev, $x, $y) = @_;
1199		1218
1200	$self->{motion}->($ev, $x, $y) if $self->{motion};	1219	$self->{motion}->($ev, $x, $y) if $self->{motion};
1201		1220
1202	!!$self->{motion}	1221	! ! $self->{motion}
1203	}	1222	}
1204		1223
1205	sub _draw {	1224	sub _draw {
1206	my ($self) = @_;	1225	my ($self) = @_;
1207		1226
…		…
1233		1252
1234	glDisable GL_TEXTURE_2D;	1253	glDisable GL_TEXTURE_2D;
1235		1254
1236	$child->draw;	1255	$child->draw;
1237		1256
1238	if ($self->{title}) {	1257	if ($self->{title_widget}) {
1239	glTranslate 0, $border - $self->{h};	1258	glTranslate 0, $border - $self->{h};
1240	$self->{title}->_draw;	1259	$self->{title_widget}->_draw;
		1260
		1261	glTranslate 0, - ($border - $self->{h});
1241	}	1262	}
		1263
		1264	$self->{close_button}->draw
		1265	if $self->{close_button};
1242	}	1266	}
1243		1267
1244	#############################################################################	1268	#############################################################################
1245		1269
1246	package CFClient::UI::Table;	1270	package CFClient::UI::Table;
…		…
1269		1293
1270	$child->set_parent ($self);	1294	$child->set_parent ($self);
1271	$self->{children}[$y][$x] = $child;	1295	$self->{children}[$y][$x] = $child;
1272		1296
1273	$self->realloc;	1297	$self->realloc;
		1298	}
		1299
		1300	sub remove {
		1301	my ($self, $child) = @_;
		1302
		1303	# TODO: not yet implemented
1274	}	1304	}
1275		1305
1276	# TODO: move to container class maybe? send children a signal on removal?	1306	# TODO: move to container class maybe? send children a signal on removal?
1277	sub clear {	1307	sub clear {
1278	my ($self) = @_;	1308	my ($self) = @_;
…		…
1319	(sum @$ws),	1349	(sum @$ws),
1320	(sum @$hs),	1350	(sum @$hs),
1321	)	1351	)
1322	}	1352	}
1323		1353
1324	sub size_allocate {	1354	sub invoke_size_allocate {
1325	my ($self, $w, $h) = @_;	1355	my ($self, $w, $h) = @_;
1326		1356
1327	my ($ws, $hs) = $self->get_wh;	1357	my ($ws, $hs) = $self->get_wh;
1328		1358
1329	my $req_w = (sum @$ws) || 1;	1359	my $req_w = (sum @$ws) || 1;
…		…
1361	}	1391	}
1362		1392
1363	$y += $row_h;	1393	$y += $row_h;
1364	}	1394	}
1365		1395
		1396	1
1366	}	1397	}
1367		1398
1368	sub find_widget {	1399	sub find_widget {
1369	my ($self, $x, $y) = @_;	1400	my ($self, $x, $y) = @_;
1370		1401
…		…
1407	(List::Util::sum map $_->{req_w}, @{$self->{children}}),	1438	(List::Util::sum map $_->{req_w}, @{$self->{children}}),
1408	(List::Util::max map $_->{req_h}, @{$self->{children}}),	1439	(List::Util::max map $_->{req_h}, @{$self->{children}}),
1409	)	1440	)
1410	}	1441	}
1411		1442
1412	sub size_allocate {	1443	sub invoke_size_allocate {
1413	my ($self, $w, $h) = @_;	1444	my ($self, $w, $h) = @_;
1414		1445
1415	my $space = $self->{vertical} ? $h : $w;	1446	my $space = $self->{vertical} ? $h : $w;
1416	my $children = $self->{children};	1447	my @children = $self->visible_children;
1417		1448
1418	my @req;	1449	my @req;
1419		1450
1420	if ($self->{homogeneous}) {	1451	if ($self->{homogeneous}) {
1421	@req = ($space / (@$children || 1)) x @$children;	1452	@req = ($space / (@children || 1)) x @children;
1422	} else {	1453	} else {
1423	@req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children;	1454	@req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @children;
1424	my $req = List::Util::sum @req;	1455	my $req = List::Util::sum @req;
1425		1456
1426	if ($req > $space) {	1457	if ($req > $space) {
1427	# ah well, not enough space	1458	# ah well, not enough space
1428	$_ *= $space / $req for @req;	1459	$_ *= $space / $req for @req;
1429	} else {	1460	} else {
1430	my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;	1461	my $expand = (List::Util::sum map $_->{expand}, @children) || 1;
1431		1462
1432	$space = ($space - $req) / $expand; # remaining space to give away	1463	$space = ($space - $req) / $expand; # remaining space to give away
1433		1464
1434	$req[$_] += $space * $children->[$_]{expand}	1465	$req[$_] += $space * $children[$_]{expand}
1435	for 0 .. $#$children;	1466	for 0 .. $#children;
1436	}	1467	}
1437	}	1468	}
1438		1469
1439	CFClient::UI::harmonize \@req;	1470	CFClient::UI::harmonize \@req;
1440		1471
1441	my $pos = 0;	1472	my $pos = 0;
1442	for (0 .. $#$children) {	1473	for (0 .. $#children) {
1443	my $alloc = $req[$_];	1474	my $alloc = $req[$_];
1444	$children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));	1475	$children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1445		1476
1446	$pos += $alloc;	1477	$pos += $alloc;
1447	}	1478	}
1448		1479
1449	1	1480	1
…		…
1554	return if $self->{text} eq "T$text";	1585	return if $self->{text} eq "T$text";
1555	$self->{text} = "T$text";	1586	$self->{text} = "T$text";
1556		1587
1557	$self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;	1588	$self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1558	$self->{layout}->set_text ($text);	1589	$self->{layout}->set_text ($text);
		1590
1559	delete $self->{req_h};	1591	delete $self->{size_req};
1560
1561	$self->realloc;	1592	$self->realloc;
1562	$self->update;	1593	$self->update;
1563	}	1594	}
1564		1595
1565	sub set_markup {	1596	sub set_markup {
…		…
1570		1601
1571	my $rgba = $markup =~ /span.*(?:foreground|background)/;	1602	my $rgba = $markup =~ /span.*(?:foreground|background)/;
1572		1603
1573	$self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;	1604	$self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1574	$self->{layout}->set_markup ($markup);	1605	$self->{layout}->set_markup ($markup);
		1606
1575	delete $self->{req_h};	1607	delete $self->{size_req};
1576
1577	$self->realloc;	1608	$self->realloc;
1578	$self->update;	1609	$self->update;
1579	}	1610	}
1580		1611
1581	sub size_request {	1612	sub size_request {
1582	my ($self) = @_;	1613	my ($self) = @_;
1583		1614
1584	if (exists $self->{req_h}) {	1615	$self->{size_req} ||= do {
1585	@$self{qw(req_w req_h)}
1586	} else {
1587	$self->{layout}->set_font ($self->{font}) if $self->{font};	1616	$self->{layout}->set_font ($self->{font}) if $self->{font};
1588	$self->{layout}->set_width ($self->{max_w} || -1);	1617	$self->{layout}->set_width ($self->{max_w} || -1);
1589	$self->{layout}->set_ellipsise ($self->{ellipsise});	1618	$self->{layout}->set_ellipsise ($self->{ellipsise});
1590	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});	1619	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1591	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	1620	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
…		…
1600		1629
1601	$w = List::Util::max $w, $w2;	1630	$w = List::Util::max $w, $w2;
1602	$h = List::Util::max $h, $h2;	1631	$h = List::Util::max $h, $h2;
1603	}	1632	}
1604		1633
1605	($w, $h)	1634	[$w, $h]
1606	}	1635	};
1607	}
1608		1636
		1637	@{ $self->{size_req} }
		1638	}
		1639
		1640	sub baseline_shift {
		1641	$_[0]{layout}->descent
		1642	}
		1643
1609	sub size_allocate {	1644	sub invoke_size_allocate {
1610	my ($self, $w, $h) = @_;	1645	my ($self, $w, $h) = @_;
1611		1646
1612	delete $self->{ox};	1647	delete $self->{ox};
1613		1648
1614	delete $self->{texture}	1649	delete $self->{texture}
1615	unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};	1650	unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
		1651
		1652	1
1616	}	1653	}
1617		1654
1618	sub set_fontsize {	1655	sub set_fontsize {
1619	my ($self, $fontsize) = @_;	1656	my ($self, $fontsize) = @_;
1620		1657
1621	$self->{fontsize} = $fontsize;	1658	$self->{fontsize} = $fontsize;
1622	delete $self->{texture};	1659	delete $self->{texture};
1623		1660
1624	$self->realloc;	1661	$self->realloc;
		1662	}
		1663
		1664	sub reconfigure {
		1665	my ($self) = @_;
		1666
		1667	delete $self->{size_req};
		1668
		1669	$self->SUPER::reconfigure;
1625	}	1670	}
1626		1671
1627	sub _draw {	1672	sub _draw {
1628	my ($self) = @_;	1673	my ($self) = @_;
1629		1674
…		…
1649	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}	1694	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1650	: ($self->{h} - $tex->{h}) * 0.5);	1695	: ($self->{h} - $tex->{h}) * 0.5);
1651	};	1696	};
1652		1697
1653	glEnable GL_TEXTURE_2D;	1698	glEnable GL_TEXTURE_2D;
1654	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	1699
		1700	my $w = List::Util::min $self->{w} + 4, $tex->{w};
		1701	my $h = List::Util::min $self->{h} + 2, $tex->{h};
1655		1702
1656	if ($tex->{format} == GL_ALPHA) {	1703	if ($tex->{format} == GL_ALPHA) {
		1704	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1657	glColor @{$self->{fg}};	1705	glColor @{$self->{fg}};
1658	$tex->draw_quad_alpha ($self->{ox}, $self->{oy});	1706	$tex->draw_quad_alpha ($self->{ox}, $self->{oy}, $w, $h);
1659	} else {	1707	} else {
		1708	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1660	$tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});	1709	$tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}, $w, $h);
1661	}	1710	}
1662		1711
1663	glDisable GL_TEXTURE_2D;	1712	glDisable GL_TEXTURE_2D;
1664	}	1713	}
1665		1714
…		…
1682	can_hover => 1,	1731	can_hover => 1,
1683	can_focus => 1,	1732	can_focus => 1,
1684	valign => 0,	1733	valign => 0,
1685	can_events => 1,	1734	can_events => 1,
1686	#text => ...	1735	#text => ...
		1736	#hidden => "*",
1687	@_	1737	@_
1688	)	1738	)
1689	}	1739	}
1690		1740
1691	sub _set_text {	1741	sub _set_text {
…		…
1698	$self->{last_activity} = $::NOW;	1748	$self->{last_activity} = $::NOW;
1699	$self->{text} = $text;	1749	$self->{text} = $text;
1700		1750
1701	$text =~ s/./*/g if $self->{hidden};	1751	$text =~ s/./*/g if $self->{hidden};
1702	$self->{layout}->set_text ("$text ");	1752	$self->{layout}->set_text ("$text ");
1703	delete $self->{req_h};	1753	delete $self->{size_req};
1704		1754
1705	$self->_emit (changed => $self->{text});	1755	$self->emit (changed => $self->{text});
1706		1756
1707	$self->realloc;	1757	$self->realloc;
1708	$self->update;	1758	$self->update;
1709	}	1759	}
1710		1760
…		…
1725	my ($w, $h) = $self->SUPER::size_request;	1775	my ($w, $h) = $self->SUPER::size_request;
1726		1776
1727	($w + 1, $h) # add 1 for cursor	1777	($w + 1, $h) # add 1 for cursor
1728	}	1778	}
1729		1779
1730	sub key_down {	1780	sub invoke_key_down {
1731	my ($self, $ev) = @_;	1781	my ($self, $ev) = @_;
1732		1782
1733	my $mod = $ev->{mod};	1783	my $mod = $ev->{mod};
1734	my $sym = $ev->{sym};	1784	my $sym = $ev->{sym};
1735	my $uni = $ev->{unicode};	1785	my $uni = $ev->{unicode};
…		…
1747	} elsif ($sym == CFClient::SDLK_HOME) {	1797	} elsif ($sym == CFClient::SDLK_HOME) {
1748	$self->{cursor} = 0;	1798	$self->{cursor} = 0;
1749	} elsif ($sym == CFClient::SDLK_END) {	1799	} elsif ($sym == CFClient::SDLK_END) {
1750	$self->{cursor} = length $text;	1800	$self->{cursor} = length $text;
1751	} elsif ($uni == 27) {	1801	} elsif ($uni == 27) {
1752	$self->_emit ('escape');	1802	$self->emit ('escape');
1753	} elsif ($uni) {	1803	} elsif ($uni) {
1754	substr $text, $self->{cursor}++, 0, chr $uni;	1804	substr $text, $self->{cursor}++, 0, chr $uni;
1755	} else {	1805	} else {
1756	return 0;	1806	return 0;
1757	}	1807	}
…		…
1761	$self->realloc;	1811	$self->realloc;
1762		1812
1763	1	1813	1
1764	}	1814	}
1765		1815
1766	sub focus_in {	1816	sub invoke_focus_in {
1767	my ($self) = @_;	1817	my ($self) = @_;
1768		1818
1769	$self->{last_activity} = $::NOW;	1819	$self->{last_activity} = $::NOW;
1770		1820
1771	$self->SUPER::focus_in;	1821	$self->SUPER::invoke_focus_in
1772	}	1822	}
1773		1823
1774	sub button_down {	1824	sub invoke_button_down {
1775	my ($self, $ev, $x, $y) = @_;	1825	my ($self, $ev, $x, $y) = @_;
1776		1826
1777	$self->SUPER::button_down ($ev, $x, $y);	1827	$self->SUPER::invoke_button_down ($ev, $x, $y);
1778		1828
1779	my $idx = $self->{layout}->xy_to_index ($x, $y);	1829	my $idx = $self->{layout}->xy_to_index ($x, $y);
1780		1830
1781	# byte-index to char-index	1831	# byte-index to char-index
1782	my $text = $self->{text};	1832	my $text = $self->{text};
…		…
1787	$self->update;	1837	$self->update;
1788		1838
1789	1	1839	1
1790	}	1840	}
1791		1841
1792	sub mouse_motion {	1842	sub invoke_mouse_motion {
1793	my ($self, $ev, $x, $y) = @_;	1843	my ($self, $ev, $x, $y) = @_;
1794	# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#	1844	# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1795		1845
1796	0	1846	1
1797	}	1847	}
1798		1848
1799	sub _draw {	1849	sub _draw {
1800	my ($self) = @_;	1850	my ($self) = @_;
1801		1851
…		…
1842		1892
1843	our @ISA = CFClient::UI::EntryBase::;	1893	our @ISA = CFClient::UI::EntryBase::;
1844		1894
1845	use CFClient::OpenGL;	1895	use CFClient::OpenGL;
1846		1896
1847	sub key_down {	1897	sub invoke_key_down {
1848	my ($self, $ev) = @_;	1898	my ($self, $ev) = @_;
1849		1899
1850	my $sym = $ev->{sym};	1900	my $sym = $ev->{sym};
1851		1901
1852	if ($sym == 13) {	1902	if ($sym == 13) {
1853	unshift @{$self->{history}},	1903	unshift @{$self->{history}},
1854	my $txt = $self->get_text;	1904	my $txt = $self->get_text;
		1905
1855	$self->{history_pointer} = -1;	1906	$self->{history_pointer} = -1;
1856	$self->{history_saveback} = '';	1907	$self->{history_saveback} = '';
1857	$self->_emit (activate => $txt);	1908	$self->emit (activate => $txt);
1858	$self->update;	1909	$self->update;
1859		1910
1860	} elsif ($sym == CFClient::SDLK_UP) {	1911	} elsif ($sym == CFClient::SDLK_UP) {
1861	if ($self->{history_pointer} < 0) {	1912	if ($self->{history_pointer} < 0) {
1862	$self->{history_saveback} = $self->get_text;	1913	$self->{history_saveback} = $self->get_text;
…		…
1878	} else {	1929	} else {
1879	$self->set_text ($self->{history_saveback});	1930	$self->set_text ($self->{history_saveback});
1880	}	1931	}
1881		1932
1882	} else {	1933	} else {
1883	return $self->SUPER::key_down ($ev)	1934	return $self->SUPER::invoke_key_down ($ev)
1884	}	1935	}
1885		1936
1886	1	1937	1
1887	}	1938	}
1888		1939
…		…
1912	can_events => 1,	1963	can_events => 1,
1913	@_	1964	@_
1914	)	1965	)
1915	}	1966	}
1916		1967
1917	sub activate { }
1918
1919	sub button_up {	1968	sub invoke_button_up {
1920	my ($self, $ev, $x, $y) = @_;	1969	my ($self, $ev, $x, $y) = @_;
1921		1970
1922	$self->emit ("activate")	1971	$self->emit ("activate")
1923	if $x >= 0 && $x < $self->{w}	1972	if $x >= 0 && $x < $self->{w}
1924	&& $y >= 0 && $y < $self->{h};	1973	&& $y >= 0 && $y < $self->{h};
…		…
1938	$tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});	1987	$tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1939		1988
1940	glDisable GL_TEXTURE_2D;	1989	glDisable GL_TEXTURE_2D;
1941		1990
1942	$self->SUPER::_draw;	1991	$self->SUPER::_draw;
		1992	}
		1993
		1994	#############################################################################
		1995
		1996	package CFClient::UI::ImageButton;
		1997
		1998	our @ISA = CFClient::UI::Image::;
		1999
		2000	use CFClient::OpenGL;
		2001
		2002	my %textures;
		2003
		2004	sub new {
		2005	my $class = shift;
		2006
		2007	my $self = $class->SUPER::new (
		2008	padding_x => 4,
		2009	padding_y => 4,
		2010	fg => [1, 1, 1],
		2011	active_fg => [0, 0, 1],
		2012	can_hover => 1,
		2013	align => 0,
		2014	valign => 0,
		2015	can_events => 1,
		2016	@_
		2017	);
		2018	}
		2019
		2020	sub invoke_button_up {
		2021	my ($self, $ev, $x, $y) = @_;
		2022
		2023	$self->emit ("activate")
		2024	if $x >= 0 && $x < $self->{w}
		2025	&& $y >= 0 && $y < $self->{h};
		2026
		2027	1
1943	}	2028	}
1944		2029
1945	#############################################################################	2030	#############################################################################
1946		2031
1947	package CFClient::UI::CheckBox;	2032	package CFClient::UI::CheckBox;
…		…
1974	my ($self) = @_;	2059	my ($self) = @_;
1975		2060
1976	(6) x 2	2061	(6) x 2
1977	}	2062	}
1978		2063
1979	sub button_down {	2064	sub invoke_button_down {
1980	my ($self, $ev, $x, $y) = @_;	2065	my ($self, $ev, $x, $y) = @_;
1981		2066
1982	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}	2067	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1983	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {	2068	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1984	$self->{state} = !$self->{state};	2069	$self->{state} = !$self->{state};
1985	$self->_emit (changed => $self->{state});	2070	$self->emit (changed => $self->{state});
1986	} else {	2071	} else {
1987	return 0	2072	return 0
1988	}	2073	}
1989		2074
1990	1	2075	1
…		…
2015	package CFClient::UI::Image;	2100	package CFClient::UI::Image;
2016		2101
2017	our @ISA = CFClient::UI::Base::;	2102	our @ISA = CFClient::UI::Base::;
2018		2103
2019	use CFClient::OpenGL;	2104	use CFClient::OpenGL;
2020	use Carp qw/confess/;
2021		2105
2022	our %loaded_images;	2106	our %texture_cache;
2023		2107
2024	sub new {	2108	sub new {
2025	my $class = shift;	2109	my $class = shift;
2026		2110
2027	my $self = $class->SUPER::new (can_events => 0, @_);	2111	my $self = $class->SUPER::new (
		2112	can_events => 0,
		2113	@_,
		2114	);
2028		2115
2029	$self->{image} or confess "Image has 'image' not set. This is a fatal error!";	2116	$self->{path}
		2117	or Carp::croak "required attribute 'path' not set";
2030		2118
2031	$loaded_images{$self->{image}} ||=	2119	$self->{tex} = $texture_cache{$self->{path}} ||=
2032	new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1;	2120	new_from_file CFClient::Texture CFClient::find_rcfile $self->{path}, mipmap => 1;
2033		2121
2034	my $tex = $self->{tex} = $loaded_images{$self->{image}};	2122	Scalar::Util::weaken $texture_cache{$self->{path}};
2035		2123
2036	Scalar::Util::weaken $loaded_images{$self->{image}};	2124	$self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2037
2038	$self->{aspect} = $tex->{w} / $tex->{h};
2039		2125
2040	$self	2126	$self
2041	}	2127	}
2042		2128
2043	sub size_request {	2129	sub size_request {
2044	my ($self) = @_;	2130	my ($self) = @_;
2045		2131
2046	($self->{tex}->{w}, $self->{tex}->{h})	2132	($self->{tex}{w}, $self->{tex}{h})
2047	}	2133	}
2048		2134
2049	sub _draw {	2135	sub _draw {
2050	my ($self) = @_;	2136	my ($self) = @_;
2051		2137
…		…
2287	$self->update;	2373	$self->update;
2288		2374
2289	$self	2375	$self
2290	}	2376	}
2291		2377
2292	sub changed { }
2293
2294	sub set_range {	2378	sub set_range {
2295	my ($self, $range) = @_;	2379	my ($self, $range) = @_;
2296		2380
2297	($range, $self->{range}) = ($self->{range}, $range);	2381	($range, $self->{range}) = ($self->{range}, $range);
2298		2382
2299	$self->update
2300	if "@$range" ne "@{$self->{range}}";	2383	if ("@$range" ne "@{$self->{range}}") {
		2384	$self->update;
		2385	$self->set_value ($self->{range}[0]);
		2386	}
2301	}	2387	}
2302		2388
2303	sub set_value {	2389	sub set_value {
2304	my ($self, $value) = @_;	2390	my ($self, $value) = @_;
2305		2391
…		…
2316	if $unit;	2402	if $unit;
2317		2403
2318	@{$self->{range}} = ($value, $lo, $hi, $page, $unit);	2404	@{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2319		2405
2320	if ($value != $old_value) {	2406	if ($value != $old_value) {
2321	$self->_emit (changed => $value);	2407	$self->emit (changed => $value);
2322	$self->update;	2408	$self->update;
2323	}	2409	}
2324	}	2410	}
2325		2411
2326	sub size_request {	2412	sub size_request {
2327	my ($self) = @_;	2413	my ($self) = @_;
2328		2414
2329	($self->{req_w}, $self->{req_h})	2415	($self->{req_w}, $self->{req_h})
2330	}	2416	}
2331		2417
2332	sub button_down {	2418	sub invoke_button_down {
2333	my ($self, $ev, $x, $y) = @_;	2419	my ($self, $ev, $x, $y) = @_;
2334		2420
2335	$self->SUPER::button_down ($ev, $x, $y);	2421	$self->SUPER::invoke_button_down ($ev, $x, $y);
2336		2422
2337	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];	2423	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2338		2424
2339	$self->mouse_motion ($ev, $x, $y)	2425	$self->invoke_mouse_motion ($ev, $x, $y)
2340	}	2426	}
2341		2427
2342	sub mouse_motion {	2428	sub invoke_mouse_motion {
2343	my ($self, $ev, $x, $y) = @_;	2429	my ($self, $ev, $x, $y) = @_;
2344		2430
2345	if ($GRAB == $self) {	2431	if ($GRAB == $self) {
2346	my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});	2432	my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2347		2433
…		…
2452	sub set_range { shift->{slider}->set_range (@_) }	2538	sub set_range { shift->{slider}->set_range (@_) }
2453	sub set_value { shift->{slider}->set_value (@_) }	2539	sub set_value { shift->{slider}->set_value (@_) }
2454		2540
2455	#############################################################################	2541	#############################################################################
2456		2542
2457	package CFClient::UI::TextView;	2543	package CFClient::UI::TextScroller;
2458		2544
2459	our @ISA = CFClient::UI::HBox::;	2545	our @ISA = CFClient::UI::HBox::;
2460		2546
2461	use CFClient::OpenGL;	2547	use CFClient::OpenGL;
2462		2548
…		…
2464	my $class = shift;	2550	my $class = shift;
2465		2551
2466	my $self = $class->SUPER::new (	2552	my $self = $class->SUPER::new (
2467	fontsize => 1,	2553	fontsize => 1,
2468	can_events => 0,	2554	can_events => 0,
		2555	indent => 0,
2469	#font => default_font	2556	#font => default_font
2470	@_,	2557	@_,
2471		2558
2472	layout => (new CFClient::Layout 1),	2559	layout => (new CFClient::Layout 1),
2473	par => [],	2560	par => [],
…		…
2488		2575
2489	$self->{fontsize} = $fontsize;	2576	$self->{fontsize} = $fontsize;
2490	$self->reflow;	2577	$self->reflow;
2491	}	2578	}
2492		2579
		2580	sub visible_children {
		2581	my ($self) = @_;
		2582
		2583	@{$self->{children}}[0,1]
		2584	}
		2585
2493	sub size_allocate {	2586	sub invoke_size_allocate {
2494	my ($self, $w, $h) = @_;	2587	my ($self, $w, $h) = @_;
2495		2588
2496	$self->SUPER::size_allocate ($w, $h);	2589	my ($empty, $slider, @other) = @{ $self->{children} };
		2590	$_->configure (@$_{qw(x y req_w req_h)}) for @other;
2497		2591
2498	$self->{layout}->set_font ($self->{font}) if $self->{font};	2592	$self->{layout}->set_font ($self->{font}) if $self->{font};
2499	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	2593	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2500	$self->{layout}->set_width ($self->{children}[0]{w});	2594	$self->{layout}->set_width ($empty->{w});
		2595	$self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2501		2596
2502	$self->reflow;	2597	$self->reflow;
2503	}
2504		2598
2505	sub text_size {	2599	$self->SUPER::invoke_size_allocate ($w, $h)
2506	my ($self, $text, $indent) = @_;	2600	}
		2601
		2602	sub get_layout {
		2603	my ($self, $para) = @_;
2507		2604
2508	my $layout = $self->{layout};	2605	my $layout = $self->{layout};
2509		2606
		2607	$layout->set_font ($self->{font}) if $self->{font};
		2608	$layout->set_foreground (@{$para->{fg}});
2510	$layout->set_height ($self->{fontsize} * $::FONTSIZE);	2609	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
2511	$layout->set_width ($self->{children}[0]{w} - $indent);	2610	$layout->set_width ($self->{children}[0]{w} - $para->{indent});
		2611	$layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2512	$layout->set_markup ($text);	2612	$layout->set_markup ($para->{markup});
		2613
		2614	$layout->set_shapes (
		2615	map
		2616	+(0, $_->baseline_shift +$_->{padding_y} - $_->{h}, $_->{w}, $_->{h}),
		2617	@{$para->{widget}}
2513		2618	);
		2619
2514	$layout->size	2620	$layout
2515	}	2621	}
2516		2622
2517	sub reflow {	2623	sub reflow {
2518	my ($self) = @_;	2624	my ($self) = @_;
2519		2625
…		…
2528	$self->{children}[1]->set_value ($offset);	2634	$self->{children}[1]->set_value ($offset);
2529	}	2635	}
2530		2636
2531	sub clear {	2637	sub clear {
2532	my ($self) = @_;	2638	my ($self) = @_;
		2639
		2640	my (undef, undef, @other) = @{ $self->{children} };
		2641	$self->remove ($_) for @other;
2533		2642
2534	$self->{par} = [];	2643	$self->{par} = [];
2535	$self->{height} = 0;	2644	$self->{height} = 0;
2536	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);	2645	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2537	}	2646	}
2538		2647
2539	sub add_paragraph {	2648	sub add_paragraph {
2540	my ($self, $color, $text, $indent) = @_;	2649	my ($self, $color, $para, $indent) = @_;
2541		2650
2542	for my $line (split /\n/, $text) {	2651	my ($text, @w) = ref $para ? @$para : $para;
2543	my ($w, $h) = $self->text_size ($line);	2652
2544	$self->{height} += $h;	2653	$para = {
2545	push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];	2654	w => 1e10,
		2655	wrapped => 1,
		2656	fg => $color,
		2657	indent => $indent,
		2658	markup => $text,
		2659	widget => \@w,
2546	}	2660	};
2547		2661
2548	$self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]);	2662	$self->add (@w) if @w;
		2663	push @{$self->{par}}, $para;
		2664
		2665	$self->{need_reflow}++;
		2666	$self->update;
		2667	}
		2668
		2669	sub scroll_to_bottom {
		2670	my ($self) = @_;
		2671
		2672	$self->{scroll_to_bottom} = 1;
		2673	$self->update;
2549	}	2674	}
2550		2675
2551	sub update {	2676	sub update {
2552	my ($self) = @_;	2677	my ($self) = @_;
2553		2678
…		…
2555		2680
2556	return unless $self->{h} > 0;	2681	return unless $self->{h} > 0;
2557		2682
2558	delete $self->{texture};	2683	delete $self->{texture};
2559		2684
2560	$ROOT->on_post_alloc ($self, sub {	2685	$ROOT->on_post_alloc ($self => sub {
2561	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};	2686	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2562		2687
2563	if (delete $self->{need_reflow}) {	2688	if (delete $self->{need_reflow}) {
2564	my $height = 0;	2689	my $height = 0;
2565		2690
2566	my $layout = $self->{layout};
2567
2568	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
2569
2570	for (@{$self->{par}}) {	2691	for my $para (@{$self->{par}}) {
2571	if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support	2692	if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2572	$layout->set_width ($W - $_->[3]);	2693	my $layout = $self->get_layout ($para);
2573	$layout->set_markup ($_->[4]);
2574	my ($w, $h) = $layout->size;	2694	my ($w, $h) = $layout->size;
2575	$_->[0] = $w + $_->[3];	2695
2576	$_->[1] = $h;	2696	$para->{w} = $w + $para->{indent};
		2697	$para->{h} = $h;
		2698	$para->{wrapped} = $layout->has_wrapped;
2577	}	2699	}
2578		2700
2579	$height += $_->[1];	2701	$height += $para->{h};
2580	}	2702	}
2581		2703
2582	$self->{height} = $height;	2704	$self->{height} = $height;
2583		2705
2584	$self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);	2706	$self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2585		2707
2586	delete $self->{texture};	2708	delete $self->{texture};
		2709	}
		2710
		2711	if (delete $self->{scroll_to_bottom}) {
		2712	$self->{children}[1]->set_value (1e10);
2587	}	2713	}
2588		2714
2589	$self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {	2715	$self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2590	glClearColor 0, 0, 0, 0;	2716	glClearColor 0, 0, 0, 0;
2591	glClear GL_COLOR_BUFFER_BIT;	2717	glClear GL_COLOR_BUFFER_BIT;
…		…
2595	my $y0 = $top;	2721	my $y0 = $top;
2596	my $y1 = $top + $H;	2722	my $y1 = $top + $H;
2597		2723
2598	my $y = 0;	2724	my $y = 0;
2599		2725
2600	my $layout = $self->{layout};
2601
2602	$layout->set_font ($self->{font}) if $self->{font};
2603
2604	glEnable GL_BLEND;	2726	glEnable GL_BLEND;
2605	#TODO# not correct in windows where rgba is forced off	2727	#TODO# not correct in windows where rgba is forced off
2606	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;	2728	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2607		2729
2608	for my $par (@{$self->{par}}) {	2730	for my $para (@{$self->{par}}) {
2609	my $h = $par->[1];	2731	my $h = $para->{h};
2610		2732
2611	if ($y0 < $y + $h && $y < $y1) {	2733	if ($y0 < $y + $h && $y < $y1) {
2612	$layout->set_foreground (@{ $par->[2] });	2734
2613	$layout->set_width ($W - $par->[3]);	2735	my $layout = $self->get_layout ($para);
2614	$layout->set_markup ($par->[4]);
2615		2736
2616	my ($w, $h, $data, $format, $internalformat) = $layout->render;	2737	my ($w, $h, $data, $format, $internalformat) = $layout->render;
2617		2738
2618	glRasterPos $par->[3], $y - $y0;	2739	glRasterPos $para->{indent}, $y - $y0;
2619	glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;	2740	glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
		2741
		2742	if (my @w = @{ $para->{widget} }) {
		2743	my @s = $layout->get_shapes;
		2744
		2745	for (@w) {
		2746	my ($dx, $dy) = splice @s, 0, 2, ();
		2747
		2748	$_->{x} = $dx + $para->{indent};
		2749	$_->{y} = $dy + $y - $y0;
		2750
		2751	$_->draw;
		2752	}
		2753	}
2620	}	2754	}
2621		2755
2622	$y += $h;	2756	$y += $h;
2623	}	2757	}
2624		2758
2625	glDisable GL_BLEND;	2759	glDisable GL_BLEND;
2626	};	2760	};
2627	});	2761	});
		2762	}
		2763
		2764	sub reconfigure {
		2765	my ($self) = @_;
		2766
		2767	$self->SUPER::reconfigure;
		2768
		2769	$_->{w} = 1e10 for @{ $self->{par} };
		2770	$self->reflow;
2628	}	2771	}
2629		2772
2630	sub _draw {	2773	sub _draw {
2631	my ($self) = @_;	2774	my ($self) = @_;
2632		2775
…		…
2635	glColor 0, 0, 0, 1;	2778	glColor 0, 0, 0, 1;
2636	$self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});	2779	$self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2637	glDisable GL_TEXTURE_2D;	2780	glDisable GL_TEXTURE_2D;
2638		2781
2639	$self->{children}[1]->draw;	2782	$self->{children}[1]->draw;
2640
2641	}	2783	}
2642		2784
2643	#############################################################################	2785	#############################################################################
2644		2786
2645	package CFClient::UI::Animator;	2787	package CFClient::UI::Animator;
…		…
2732	$tooltip .= "\n\n" . (ref $widget) . "\n"	2874	$tooltip .= "\n\n" . (ref $widget) . "\n"
2733	. "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"	2875	. "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2734	. "req $widget->{req_w} $widget->{req_h}\n"	2876	. "req $widget->{req_w} $widget->{req_h}\n"
2735	. "visible $widget->{visible}";	2877	. "visible $widget->{visible}";
2736	}	2878	}
		2879
		2880	$tooltip =~ s/^\n+//;
		2881	$tooltip =~ s/\n+$//;
2737		2882
2738	$self->add (new CFClient::UI::Label	2883	$self->add (new CFClient::UI::Label
2739	markup => $tooltip,	2884	markup => $tooltip,
2740	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,	2885	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2741	fontsize => 0.8,	2886	fontsize => 0.8,
…		…
2751	my ($w, $h) = @{$self->child}{qw(req_w req_h)};	2896	my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2752		2897
2753	($w + 4, $h + 4)	2898	($w + 4, $h + 4)
2754	}	2899	}
2755		2900
2756	sub size_allocate {	2901	sub invoke_size_allocate {
2757	my ($self, $w, $h) = @_;	2902	my ($self, $w, $h) = @_;
2758		2903
2759	$self->SUPER::size_allocate ($w - 4, $h - 4);	2904	$self->SUPER::invoke_size_allocate ($w - 4, $h - 4)
2760	}	2905	}
2761		2906
2762	sub visibility_change {	2907	sub invoke_visibility_change {
2763	my ($self, $visible) = @_;	2908	my ($self, $visible) = @_;
2764		2909
2765	return unless $visible;	2910	return unless $visible;
2766		2911
2767	$self->{root}->on_post_alloc ("move_$self" => sub {	2912	$self->{root}->on_post_alloc ("move_$self" => sub {
…		…
2769	or return;	2914	or return;
2770		2915
2771	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);	2916	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2772		2917
2773	($x, $y) = $widget->coord2global (-$self->{w}, 0)	2918	($x, $y) = $widget->coord2global (-$self->{w}, 0)
2774	if $x + $self->{w} > $::WIDTH;	2919	if $x + $self->{w} > $self->{root}{w};
2775		2920
2776	$self->move_abs ($x, $y);	2921	$self->move_abs ($x, $y);
2777	});	2922	});
2778	}	2923	}
2779		2924
…		…
2874	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});	3019	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2875	glDisable GL_TEXTURE_2D;	3020	glDisable GL_TEXTURE_2D;
2876	}	3021	}
2877	}	3022	}
2878		3023
2879	sub DESTROY {	3024	sub destroy {
2880	my ($self) = @_;	3025	my ($self) = @_;
2881		3026
2882	$self->{timer}->cancel	3027	$self->{timer}->cancel
2883	if $self->{timer};	3028	if $self->{timer};
2884		3029
2885	$self->SUPER::DESTROY;	3030	$self->SUPER::destroy;
2886	}	3031	}
2887		3032
2888	#############################################################################	3033	#############################################################################
2889		3034
2890	package CFClient::UI::Buttonbar;	3035	package CFClient::UI::Buttonbar;
…		…
2911	);	3056	);
2912		3057
2913	$self->add ($self->{vbox} = new CFClient::UI::VBox);	3058	$self->add ($self->{vbox} = new CFClient::UI::VBox);
2914		3059
2915	for my $item (@{ $self->{items} }) {	3060	for my $item (@{ $self->{items} }) {
2916	my ($widget, $cb) = @$item;	3061	my ($widget, $cb, $tooltip) = @$item;
2917		3062
2918	# handle various types of items, only text for now	3063	# handle various types of items, only text for now
2919	if (!ref $widget) {	3064	if (!ref $widget) {
2920	$widget = new CFClient::UI::Label	3065	$widget = new CFClient::UI::Label
2921	can_hover => 1,	3066	can_hover => 1,
2922	can_events => 1,	3067	can_events => 1,
2923	text => $widget;	3068	markup => $widget,
		3069	tooltip => $tooltip
2924	}	3070	}
2925		3071
2926	$self->{item}{$widget} = $item;	3072	$self->{item}{$widget} = $item;
2927		3073
2928	$self->{vbox}->add ($widget);	3074	$self->{vbox}->add ($widget);
…		…
2933		3079
2934	# popup given the event (must be a mouse button down event currently)	3080	# popup given the event (must be a mouse button down event currently)
2935	sub popup {	3081	sub popup {
2936	my ($self, $ev) = @_;	3082	my ($self, $ev) = @_;
2937		3083
2938	$self->_emit ("popdown");	3084	$self->emit ("popdown");
2939		3085
2940	# maybe save $GRAB? must be careful about events...	3086	# maybe save $GRAB? must be careful about events...
2941	$GRAB = $self;	3087	$GRAB = $self;
2942	$self->{button} = $ev->{button};	3088	$self->{button} = $ev->{button};
2943		3089
2944	$self->show;	3090	$self->show;
2945	$self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);	3091	$self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2946	}	3092	}
2947		3093
2948	sub mouse_motion {	3094	sub invoke_mouse_motion {
2949	my ($self, $ev, $x, $y) = @_;	3095	my ($self, $ev, $x, $y) = @_;
2950		3096
2951	# TODO: should use vbox->find_widget or so	3097	# TODO: should use vbox->find_widget or so
2952	$HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});	3098	$HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2953	$self->{hover} = $self->{item}{$HOVER};	3099	$self->{hover} = $self->{item}{$HOVER};
2954		3100
2955	0	3101	0
2956	}	3102	}
2957		3103
2958	sub button_up {	3104	sub invoke_button_up {
2959	my ($self, $ev, $x, $y) = @_;	3105	my ($self, $ev, $x, $y) = @_;
2960		3106
2961	if ($ev->{button} == $self->{button}) {	3107	if ($ev->{button} == $self->{button}) {
2962	undef $GRAB;	3108	undef $GRAB;
2963	$self->hide;	3109	$self->hide;
2964		3110
2965	$self->_emit ("popdown");	3111	$self->emit ("popdown");
2966	$self->{hover}[1]->() if $self->{hover};	3112	$self->{hover}[1]->() if $self->{hover};
2967	} else {	3113	} else {
2968	return 0	3114	return 0
2969	}	3115	}
2970		3116
…		…
3007	: $self->{children}[$page_or_widget];	3153	: $self->{children}[$page_or_widget];
3008		3154
3009	$self->{current} = $widget;	3155	$self->{current} = $widget;
3010	$self->{current}->configure (0, 0, $self->{w}, $self->{h});	3156	$self->{current}->configure (0, 0, $self->{w}, $self->{h});
3011		3157
3012	$self->_emit (page_changed => $self->{current});	3158	$self->emit (page_changed => $self->{current});
3013		3159
3014	$self->realloc;	3160	$self->realloc;
3015	}	3161	}
3016		3162
3017	sub visible_children {	3163	sub visible_children {
…		…
3022	my ($self) = @_;	3168	my ($self) = @_;
3023		3169
3024	$self->{current}->size_request	3170	$self->{current}->size_request
3025	}	3171	}
3026		3172
3027	sub size_allocate {	3173	sub invoke_size_allocate {
3028	my ($self, $w, $h) = @_;	3174	my ($self, $w, $h) = @_;
3029		3175
3030	$self->{current}->configure (0, 0, $w, $h);	3176	$self->{current}->configure (0, 0, $w, $h);
		3177
		3178	1
3031	}	3179	}
3032		3180
3033	sub _draw {	3181	sub _draw {
3034	my ($self) = @_;	3182	my ($self) = @_;
3035		3183
…		…
3074		3222
3075	sub set_current_page {	3223	sub set_current_page {
3076	my ($self, $page) = @_;	3224	my ($self, $page) = @_;
3077		3225
3078	$self->{multiplexer}->set_current_page ($page);	3226	$self->{multiplexer}->set_current_page ($page);
3079	$self->_emit (page_changed => $self->{multiplexer}{current});	3227	$self->emit (page_changed => $self->{multiplexer}{current});
		3228	}
		3229
		3230	#############################################################################
		3231
		3232	package CFClient::UI::Combobox;
		3233
		3234	use utf8;
		3235
		3236	our @ISA = CFClient::UI::Button::;
		3237
		3238	sub new {
		3239	my $class = shift;
		3240
		3241	my $self = $class->SUPER::new (
		3242	options => [], # [value, title, longdesc], ...
		3243	value => undef,
		3244	@_,
		3245	);
		3246
		3247	$self->_set_value ($self->{value});
		3248
		3249	$self
		3250	}
		3251
		3252	sub invoke_button_down {
		3253	my ($self, $ev) = @_;
		3254
		3255	my @menu_items;
		3256
		3257	for (@{ $self->{options} }) {
		3258	my ($value, $title, $tooltip) = @$_;
		3259
		3260	push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
		3261	}
		3262
		3263	CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
		3264	}
		3265
		3266	sub _set_value {
		3267	my ($self, $value) = @_;
		3268
		3269	my ($item) = grep $_->[0] eq $value, @{ $self->{options} }
		3270	or return;
		3271
		3272	$self->{value} = $item->[0];
		3273	$self->set_markup ("$item->[1] ⇓");
		3274	$self->set_tooltip ($item->[2]);
		3275	}
		3276
		3277	sub set_value {
		3278	my ($self, $value) = @_;
		3279
		3280	return unless $self->{value} ne $value;
		3281
		3282	$self->_set_value ($value);
		3283	$self->emit (changed => $value);
3080	}	3284	}
3081		3285
3082	#############################################################################	3286	#############################################################################
3083		3287
3084	package CFClient::UI::Statusbox;	3288	package CFClient::UI::Statusbox;
…		…
3183	$item->{count}++;	3387	$item->{count}++;
3184	} else {	3388	} else {
3185	$item->{count} = 1;	3389	$item->{count} = 1;
3186	$item->{text} = $item->{tooltip} = $text;	3390	$item->{text} = $item->{tooltip} = $text;
3187	}	3391	}
3188	$item->{id} = ++$self->{id};	3392	$item->{id} += 0.2;#d#
3189	$item->{timeout} = $timeout;	3393	$item->{timeout} = $timeout;
3190	delete $item->{label};	3394	delete $item->{label};
3191	} else {	3395	} else {
3192	$self->{item}{$group} = {	3396	$self->{item}{$group} = {
3193	id => ++$self->{id},	3397	id => ++$self->{id},
…		…
3212		3416
3213	$self->reorder;	3417	$self->reorder;
3214	$self->SUPER::reconfigure;	3418	$self->SUPER::reconfigure;
3215	}	3419	}
3216		3420
3217	sub DESTROY {	3421	sub destroy {
3218	my ($self) = @_;	3422	my ($self) = @_;
3219		3423
3220	$self->{timer}->cancel;	3424	$self->{timer}->cancel;
3221		3425
3222	$self->SUPER::DESTROY;	3426	$self->SUPER::destroy;
3223	}	3427	}
3224		3428
3225	#############################################################################	3429	#############################################################################
3226		3430
3227	package CFClient::UI::Inventory;	3431	package CFClient::UI::Inventory;
…		…
3328	$self->update_binding_widgets;	3532	$self->update_binding_widgets;
3329		3533
3330	$self	3534	$self
3331	}	3535	}
3332		3536
		3537	sub cfg_bind {
		3538	my ($self, $mod, $sym, $cmds) = @_;
		3539	$::CFG->{profile}{default}{bindings}{$mod}{$sym} = $cmds;
		3540	::update_bindings ();
		3541	}
		3542
		3543	sub cfg_unbind {
		3544	my ($self, $mod, $sym, $cmds) = @_;
		3545	delete $::CFG->{profile}{default}{bindings}{$mod}{$sym};
		3546	::update_bindings ();
		3547	}
		3548
3333	sub commit {	3549	sub commit {
3334	my ($self) = @_;	3550	my ($self) = @_;
3335	my ($mod, $sym, $cmds) = $self->get_binding;	3551	my ($mod, $sym, $cmds) = $self->get_binding;
3336	if ($sym != 0 && @$cmds > 0) {	3552	if ($sym != 0 && @$cmds > 0) {
3337	$::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)	3553	$::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
…		…
3371	my ($self) = @_;	3587	my ($self) = @_;
3372	$self->ask_for_bind (1);	3588	$self->ask_for_bind (1);
3373	}	3589	}
3374		3590
3375	sub ask_for_bind {	3591	sub ask_for_bind {
3376	my ($self, $commit) = @_;	3592	my ($self, $commit, $end_cb) = @_;
3377		3593
3378	CFClient::Binder::open_binding_dialog (sub {	3594	CFClient::Binder::open_binding_dialog (sub {
3379	my ($mod, $sym) = @_;	3595	my ($mod, $sym) = @_;
3380	$self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?	3596	$self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3381	$self->update_binding_widgets;	3597	$self->update_binding_widgets;
3382	$self->commit if $commit;	3598	$self->commit if $commit;
		3599	$end_cb->() if $end_cb;
3383	});	3600	});
3384	}	3601	}
3385		3602
3386	# $mod and $sym are the modifiers and key symbol	3603	# $mod and $sym are the modifiers and key symbol
3387	# $cmds is a array ref of strings (the commands)	3604	# $cmds is a array ref of strings (the commands)
…		…
3405	}	3622	}
3406		3623
3407	# this is a shortcut method that asks for a binding	3624	# this is a shortcut method that asks for a binding
3408	# and then just binds it.	3625	# and then just binds it.
3409	sub do_quick_binding {	3626	sub do_quick_binding {
3410	my ($self, $cmds) = @_;	3627	my ($self, $cmds, $end_cb) = @_;
3411	$self->set_binding (undef, undef, $cmds, sub {	3628	$self->set_binding (undef, undef, $cmds, sub { $self->cfg_bind (@_) });
3412	$::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3413	});
3414	$self->ask_for_bind (1);	3629	$self->ask_for_bind (1, $end_cb);
3415	}	3630	}
3416		3631
3417	sub update_binding_widgets {	3632	sub update_binding_widgets {
3418	my ($self) = @_;	3633	my ($self) = @_;
3419	my ($mod, $sym, $cmds) = $self->get_binding;	3634	my ($mod, $sym, $cmds) = $self->get_binding;
…		…
3475	commands => [],	3690	commands => [],
3476	@_,	3691	@_,
3477	)	3692	)
3478	}	3693	}
3479		3694
3480	# XXX: Do sorting? Argl...	3695	my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
		3696
		3697	my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
		3698	"<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
		3699	my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
		3700	"<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
		3701	my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
		3702	"<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
		3703	my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
		3704	"<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
		3705	my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
		3706	"<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
		3707
		3708	sub rebuild_spell_list {
		3709	my ($self) = @_;
		3710
		3711	$CFClient::UI::ROOT->on_refresh ($self => sub {
		3712	$self->clear;
		3713
		3714	return unless $::CONN;
		3715
		3716	$self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);
		3717	$self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL);
		3718	$self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
		3719	$self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
		3720	$self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
		3721
		3722	my $row = 0;
		3723
		3724	for (sort { $a cmp $b } keys %{ $self->{spell} }) {
		3725	my $spell = $self->{spell}{$_};
		3726
		3727	$row++;
		3728
		3729	my $spell_cb = sub {
		3730	my ($widget, $ev) = @_;
		3731
		3732	if ($ev->{button} == 1) {
		3733	$::CONN->user_send ("cast $spell->{name}");
		3734	} elsif ($ev->{button} == 2) {
		3735	$::CONN->user_send ("invoke $spell->{name}");
		3736	} elsif ($ev->{button} == 3) {
		3737	(new CFClient::UI::Menu
		3738	items => [
		3739	["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
		3740	["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
		3741	],
		3742	)->popup ($ev);
		3743	} else {
		3744	return 0;
		3745	}
		3746
		3747	1
		3748	};
		3749
		3750	my $tooltip = "$spell->{message}$TOOLTIP_ALL";
		3751
		3752	#TODO: add path info to tooltip
		3753	#$self->add (6, $row, new CFClient::UI::Label text => $spell->{path});
		3754
		3755	$self->add (0, $row, new CFClient::UI::Face
		3756	face => $spell->{face},
		3757	can_hover => 1,
		3758	can_events => 1,
		3759	tooltip => $tooltip,
		3760	on_button_down => $spell_cb,
		3761	);
		3762
		3763	$self->add (1, $row, new CFClient::UI::Label
		3764	expand => 1,
		3765	text => $spell->{name},
		3766	can_hover => 1,
		3767	can_events => 1,
		3768	tooltip => $tooltip,
		3769	on_button_down => $spell_cb,
		3770	);
		3771
		3772	$self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
		3773	$self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
		3774	$self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
		3775	$self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
		3776	}
		3777	});
		3778	}
		3779
3481	sub add_spell {	3780	sub add_spell {
3482	my ($self, $spell) = @_;	3781	my ($self, $spell) = @_;
		3782
3483	$self->{spells}->{$spell->{name}} = $spell;	3783	$self->{spell}->{$spell->{name}} = $spell;
3484		3784	$self->rebuild_spell_list;
3485	$self->add (0, $self->{tbl_idx}, new CFClient::UI::Face
3486	face => $spell->{face},
3487	can_hover => 1,
3488	can_events => 1,
3489	tooltip => $spell->{message});
3490
3491	$self->add (1, $self->{tbl_idx}, new CFClient::UI::Label
3492	text => $spell->{name},
3493	can_hover => 1,
3494	can_events => 1,
3495	tooltip => $spell->{message},
3496	expand => 1);
3497
3498	$self->add (2, $self->{tbl_idx}, new CFClient::UI::Label
3499	text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
3500	$spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
3501	expand => 1);
3502
3503	$self->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
3504	text => "bind to key",
3505	on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
3506	}
3507
3508	sub rebuild_spell_list {
3509	my ($self) = @_;
3510	$self->{tbl_idx} = 0;
3511	$self->add_spell ($_) for values %{$self->{spells}};
3512	}	3785	}
3513		3786
3514	sub remove_spell {	3787	sub remove_spell {
3515	my ($self, $spell) = @_;	3788	my ($self, $spell) = @_;
		3789
3516	delete $self->{spells}->{$spell->{name}};	3790	delete $self->{spell}->{$spell->{name}};
		3791	$self->rebuild_spell_list;
		3792	}
		3793
		3794	sub clear_spells {
		3795	my ($self) = @_;
		3796
		3797	$self->{spell} = {};
3517	$self->rebuild_spell_list;	3798	$self->rebuild_spell_list;
3518	}	3799	}
3519		3800
3520	#############################################################################	3801	#############################################################################
3521		3802
…		…
3558	$coord = $max - $size if $coord > $max - $size;	3839	$coord = $max - $size if $coord > $max - $size;
3559		3840
3560	int $coord + 0.5	3841	int $coord + 0.5
3561	}	3842	}
3562		3843
3563	sub size_allocate {	3844	sub invoke_size_allocate {
3564	my ($self, $w, $h) = @_;	3845	my ($self, $w, $h) = @_;
3565		3846
3566	for my $child ($self->children) {	3847	for my $child ($self->children) {
3567	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};	3848	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3568		3849
…		…
3572	$X = _to_pixel $X, $W, $self->{w};	3853	$X = _to_pixel $X, $W, $self->{w};
3573	$Y = _to_pixel $Y, $H, $self->{h};	3854	$Y = _to_pixel $Y, $H, $self->{h};
3574		3855
3575	$child->configure ($X, $Y, $W, $H);	3856	$child->configure ($X, $Y, $W, $H);
3576	}	3857	}
		3858
		3859	1
3577	}	3860	}
3578		3861
3579	sub coord2local {	3862	sub coord2local {
3580	my ($self, $x, $y) = @_;	3863	my ($self, $x, $y) = @_;
3581		3864

Diff Legend

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