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

Diff Legend

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