ViewVC Help

View File | Revision Log | Show Annotations | Download File

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

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.292 by root, Tue Jun 6 03:02:15 2006 UTC vs.
Revision 1.317 by root, Sun Jul 2 18:52:05 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	$FOCUS = $self;
430		429
431	$self->_emit (focus_in => $focus);	430	$self->update;
432		431
433	$focus->update if $focus;	432	0
434	$FOCUS->update;
435	}	433	}
436		434
437	sub focus_out {	435	sub invoke_focus_out {
438	my ($self) = @_;	436	my ($self) = @_;
439		437
440	return unless $FOCUS == $self;	438	return unless $FOCUS == $self;
441		439
442	my $focus = $FOCUS; undef $FOCUS;	440	undef $FOCUS;
443		441
444	$self->_emit (focus_out => $focus);	442	$self->update;
445		443
446	$focus->update if $focus; #?
447
448	$::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus	444	$::MAPWIDGET->grab_focus #d# focus mapwidget if no other widget has focus
449	unless $FOCUS;	445	unless $FOCUS;
450	}
451		446
		447	0
		448	}
		449
		450	sub grab_focus {
		451	my ($self) = @_;
		452
		453	$FOCUS->emit ("focus_out") if $FOCUS;
		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
…		…
985	$self->add ($child) if $child;	986	$self->add ($child) if $child;
986		987
987	$self	988	$self
988	}	989	}
989		990
		991	#TODO# update range on size_allocate depending on child
		992
990	sub add {	993	sub add {
991	my ($self, $widget) = @_;	994	my ($self, $widget) = @_;
992		995
993	$self->{vp}->add ($self->{child} = $widget);	996	$self->{vp}->add ($self->{child} = $widget);
994	}	997	}
995		998
		999	sub update_slider {
		1000	my ($self) = @_;
		1001
		1002	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $self->{vp}->child->{h}, $self->{vp}{h}, 1]);
		1003	}
		1004
996	sub update {	1005	sub update {
997	my ($self) = @_;	1006	my ($self) = @_;
998		1007
999	$self->SUPER::update;	1008	$self->SUPER::update;
1000		1009
1001	# todo: overwrite size_allocate of child	1010	$self->update_slider;
1002	my $child = $self->{vp}->child;
1003	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
1004	}	1011	}
1005		1012
1006	sub size_allocate {	1013	sub invoke_size_allocate {
1007	my ($self, $w, $h) = @_;	1014	my ($self, $w, $h) = @_;
1008		1015
		1016	$self->update_slider;
		1017
1009	$self->SUPER::size_allocate ($w, $h);	1018	$self->SUPER::invoke_size_allocate ($w, $h)
1010
1011	my $child = $self->{vp}->child;
1012	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
1013	}	1019	}
1014
1015	#TODO# update range on size_allocate depending on child
1016	# update viewport offset on scroll
1017		1020
1018	#############################################################################	1021	#############################################################################
1019		1022
1020	package CFClient::UI::Frame;	1023	package CFClient::UI::Frame;
1021		1024
…		…
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->emit ("delete") };
		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;
		1151
		1152	$self->child->configure ($border, $border, $w, $h);
		1153
		1154	$self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
		1155	if $self->{close_button};
		1156
		1157	1
		1158	}
		1159
		1160	sub invoke_delete {
		1161	my ($self) = @_;
		1162
		1163	$self->hide;
1137		1164
1138	$self->child->configure ($border, $border, $w, $h);	1165	1
1139	}	1166	}
1140		1167
1141	sub button_down {	1168	sub invoke_button_down {
1142	my ($self, $ev, $x, $y) = @_;	1169	my ($self, $ev, $x, $y) = @_;
1143		1170
1144	my ($w, $h) = @$self{qw(w h)};	1171	my ($w, $h) = @$self{qw(w h)};
1145	my $border = $self->border;	1172	my $border = $self->border;
1146		1173
…		…
1177		1204
1178	($x, $y) = ($ev->{x}, $ev->{y});	1205	($x, $y) = ($ev->{x}, $ev->{y});
1179		1206
1180	$self->move_abs ($bx + $x - $ox, $by + $y - $oy);	1207	$self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1181	# HACK: the next line is required to enforce placement	1208	# HACK: the next line is required to enforce placement
1182	$self->{parent}->size_allocate ($self->{parent}{w}, $self->{parent}{h});	1209	$self->{parent}->invoke_size_allocate ($self->{parent}{w}, $self->{parent}{h});
1183	};	1210	};
1184	} else {	1211	} else {
1185	return 0;	1212	return 0;
1186	}	1213	}
1187		1214
1188	1	1215	1
1189	}	1216	}
1190		1217
1191	sub button_up {	1218	sub invoke_button_up {
1192	my ($self, $ev, $x, $y) = @_;	1219	my ($self, $ev, $x, $y) = @_;
1193		1220
1194	!!delete $self->{motion}	1221	! ! delete $self->{motion}
1195	}	1222	}
1196		1223
1197	sub mouse_motion {	1224	sub invoke_mouse_motion {
1198	my ($self, $ev, $x, $y) = @_;	1225	my ($self, $ev, $x, $y) = @_;
1199		1226
1200	$self->{motion}->($ev, $x, $y) if $self->{motion};	1227	$self->{motion}->($ev, $x, $y) if $self->{motion};
1201		1228
1202	!!$self->{motion}	1229	! ! $self->{motion}
1203	}	1230	}
1204		1231
1205	sub _draw {	1232	sub _draw {
1206	my ($self) = @_;	1233	my ($self) = @_;
1207		1234
…		…
1233		1260
1234	glDisable GL_TEXTURE_2D;	1261	glDisable GL_TEXTURE_2D;
1235		1262
1236	$child->draw;	1263	$child->draw;
1237		1264
1238	if ($self->{title}) {	1265	if ($self->{title_widget}) {
1239	glTranslate 0, $border - $self->{h};	1266	glTranslate 0, $border - $self->{h};
1240	$self->{title}->_draw;	1267	$self->{title_widget}->_draw;
		1268
		1269	glTranslate 0, - ($border - $self->{h});
1241	}	1270	}
		1271
		1272	$self->{close_button}->draw
		1273	if $self->{close_button};
1242	}	1274	}
1243		1275
1244	#############################################################################	1276	#############################################################################
1245		1277
1246	package CFClient::UI::Table;	1278	package CFClient::UI::Table;
…		…
1269		1301
1270	$child->set_parent ($self);	1302	$child->set_parent ($self);
1271	$self->{children}[$y][$x] = $child;	1303	$self->{children}[$y][$x] = $child;
1272		1304
1273	$self->realloc;	1305	$self->realloc;
		1306	}
		1307
		1308	sub remove {
		1309	my ($self, $child) = @_;
		1310
		1311	# TODO: not yet implemented
1274	}	1312	}
1275		1313
1276	# TODO: move to container class maybe? send children a signal on removal?	1314	# TODO: move to container class maybe? send children a signal on removal?
1277	sub clear {	1315	sub clear {
1278	my ($self) = @_;	1316	my ($self) = @_;
…		…
1319	(sum @$ws),	1357	(sum @$ws),
1320	(sum @$hs),	1358	(sum @$hs),
1321	)	1359	)
1322	}	1360	}
1323		1361
1324	sub size_allocate {	1362	sub invoke_size_allocate {
1325	my ($self, $w, $h) = @_;	1363	my ($self, $w, $h) = @_;
1326		1364
1327	my ($ws, $hs) = $self->get_wh;	1365	my ($ws, $hs) = $self->get_wh;
1328		1366
1329	my $req_w = (sum @$ws) || 1;	1367	my $req_w = (sum @$ws) || 1;
…		…
1361	}	1399	}
1362		1400
1363	$y += $row_h;	1401	$y += $row_h;
1364	}	1402	}
1365		1403
		1404	1
1366	}	1405	}
1367		1406
1368	sub find_widget {	1407	sub find_widget {
1369	my ($self, $x, $y) = @_;	1408	my ($self, $x, $y) = @_;
1370		1409
…		…
1407	(List::Util::sum map $_->{req_w}, @{$self->{children}}),	1446	(List::Util::sum map $_->{req_w}, @{$self->{children}}),
1408	(List::Util::max map $_->{req_h}, @{$self->{children}}),	1447	(List::Util::max map $_->{req_h}, @{$self->{children}}),
1409	)	1448	)
1410	}	1449	}
1411		1450
1412	sub size_allocate {	1451	sub invoke_size_allocate {
1413	my ($self, $w, $h) = @_;	1452	my ($self, $w, $h) = @_;
1414		1453
1415	my $space = $self->{vertical} ? $h : $w;	1454	my $space = $self->{vertical} ? $h : $w;
1416	my $children = $self->{children};	1455	my @children = $self->visible_children;
1417		1456
1418	my @req;	1457	my @req;
1419		1458
1420	if ($self->{homogeneous}) {	1459	if ($self->{homogeneous}) {
1421	@req = ($space / (@$children || 1)) x @$children;	1460	@req = ($space / (@children || 1)) x @children;
1422	} else {	1461	} else {
1423	@req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children;	1462	@req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @children;
1424	my $req = List::Util::sum @req;	1463	my $req = List::Util::sum @req;
1425		1464
1426	if ($req > $space) {	1465	if ($req > $space) {
1427	# ah well, not enough space	1466	# ah well, not enough space
1428	$_ *= $space / $req for @req;	1467	$_ *= $space / $req for @req;
1429	} else {	1468	} else {
1430	my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;	1469	my $expand = (List::Util::sum map $_->{expand}, @children) || 1;
1431		1470
1432	$space = ($space - $req) / $expand; # remaining space to give away	1471	$space = ($space - $req) / $expand; # remaining space to give away
1433		1472
1434	$req[$_] += $space * $children->[$_]{expand}	1473	$req[$_] += $space * $children[$_]{expand}
1435	for 0 .. $#$children;	1474	for 0 .. $#children;
1436	}	1475	}
1437	}	1476	}
1438		1477
1439	CFClient::UI::harmonize \@req;	1478	CFClient::UI::harmonize \@req;
1440		1479
1441	my $pos = 0;	1480	my $pos = 0;
1442	for (0 .. $#$children) {	1481	for (0 .. $#children) {
1443	my $alloc = $req[$_];	1482	my $alloc = $req[$_];
1444	$children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));	1483	$children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1445		1484
1446	$pos += $alloc;	1485	$pos += $alloc;
1447	}	1486	}
1448		1487
1449	1	1488	1
…		…
1604	};	1643	};
1605		1644
1606	@{ $self->{size_req} }	1645	@{ $self->{size_req} }
1607	}	1646	}
1608		1647
		1648	sub baseline_shift {
		1649	$_[0]{layout}->descent
		1650	}
		1651
1609	sub size_allocate {	1652	sub invoke_size_allocate {
1610	my ($self, $w, $h) = @_;	1653	my ($self, $w, $h) = @_;
1611		1654
1612	delete $self->{ox};	1655	delete $self->{ox};
1613		1656
1614	delete $self->{texture}	1657	delete $self->{texture}
1615	unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};	1658	unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
		1659
		1660	1
1616	}	1661	}
1617		1662
1618	sub set_fontsize {	1663	sub set_fontsize {
1619	my ($self, $fontsize) = @_;	1664	my ($self, $fontsize) = @_;
1620		1665
1621	$self->{fontsize} = $fontsize;	1666	$self->{fontsize} = $fontsize;
		1667	delete $self->{size_req};
1622	delete $self->{texture};	1668	delete $self->{texture};
1623		1669
1624	$self->realloc;	1670	$self->realloc;
1625	}	1671	}
1626		1672
…		…
1658	: ($self->{h} - $tex->{h}) * 0.5);	1704	: ($self->{h} - $tex->{h}) * 0.5);
1659	};	1705	};
1660		1706
1661	glEnable GL_TEXTURE_2D;	1707	glEnable GL_TEXTURE_2D;
1662		1708
		1709	my $w = List::Util::min $self->{w} + 4, $tex->{w};
		1710	my $h = List::Util::min $self->{h} + 2, $tex->{h};
		1711
1663	if ($tex->{format} == GL_ALPHA) {	1712	if ($tex->{format} == GL_ALPHA) {
1664	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	1713	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1665	glColor @{$self->{fg}};	1714	glColor @{$self->{fg}};
1666	$tex->draw_quad_alpha ($self->{ox}, $self->{oy});	1715	$tex->draw_quad_alpha ($self->{ox}, $self->{oy}, $w, $h);
1667	} else {	1716	} else {
1668	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	1717	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1669	$tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});	1718	$tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}, $w, $h);
1670	}	1719	}
1671		1720
1672	glDisable GL_TEXTURE_2D;	1721	glDisable GL_TEXTURE_2D;
1673	}	1722	}
1674		1723
…		…
1710		1759
1711	$text =~ s/./*/g if $self->{hidden};	1760	$text =~ s/./*/g if $self->{hidden};
1712	$self->{layout}->set_text ("$text ");	1761	$self->{layout}->set_text ("$text ");
1713	delete $self->{size_req};	1762	delete $self->{size_req};
1714		1763
1715	$self->_emit (changed => $self->{text});	1764	$self->emit (changed => $self->{text});
1716		1765
1717	$self->realloc;	1766	$self->realloc;
1718	$self->update;	1767	$self->update;
1719	}	1768	}
1720		1769
…		…
1735	my ($w, $h) = $self->SUPER::size_request;	1784	my ($w, $h) = $self->SUPER::size_request;
1736		1785
1737	($w + 1, $h) # add 1 for cursor	1786	($w + 1, $h) # add 1 for cursor
1738	}	1787	}
1739		1788
1740	sub key_down {	1789	sub invoke_key_down {
1741	my ($self, $ev) = @_;	1790	my ($self, $ev) = @_;
1742		1791
1743	my $mod = $ev->{mod};	1792	my $mod = $ev->{mod};
1744	my $sym = $ev->{sym};	1793	my $sym = $ev->{sym};
1745	my $uni = $ev->{unicode};	1794	my $uni = $ev->{unicode};
…		…
1757	} elsif ($sym == CFClient::SDLK_HOME) {	1806	} elsif ($sym == CFClient::SDLK_HOME) {
1758	$self->{cursor} = 0;	1807	$self->{cursor} = 0;
1759	} elsif ($sym == CFClient::SDLK_END) {	1808	} elsif ($sym == CFClient::SDLK_END) {
1760	$self->{cursor} = length $text;	1809	$self->{cursor} = length $text;
1761	} elsif ($uni == 27) {	1810	} elsif ($uni == 27) {
1762	$self->_emit ('escape');	1811	$self->emit ('escape');
1763	} elsif ($uni) {	1812	} elsif ($uni) {
1764	substr $text, $self->{cursor}++, 0, chr $uni;	1813	substr $text, $self->{cursor}++, 0, chr $uni;
1765	} else {	1814	} else {
1766	return 0;	1815	return 0;
1767	}	1816	}
…		…
1771	$self->realloc;	1820	$self->realloc;
1772		1821
1773	1	1822	1
1774	}	1823	}
1775		1824
1776	sub focus_in {	1825	sub invoke_focus_in {
1777	my ($self) = @_;	1826	my ($self) = @_;
1778		1827
1779	$self->{last_activity} = $::NOW;	1828	$self->{last_activity} = $::NOW;
1780		1829
1781	$self->SUPER::focus_in;	1830	$self->SUPER::invoke_focus_in
1782	}	1831	}
1783		1832
1784	sub button_down {	1833	sub invoke_button_down {
1785	my ($self, $ev, $x, $y) = @_;	1834	my ($self, $ev, $x, $y) = @_;
1786		1835
1787	$self->SUPER::button_down ($ev, $x, $y);	1836	$self->SUPER::invoke_button_down ($ev, $x, $y);
1788		1837
1789	my $idx = $self->{layout}->xy_to_index ($x, $y);	1838	my $idx = $self->{layout}->xy_to_index ($x, $y);
1790		1839
1791	# byte-index to char-index	1840	# byte-index to char-index
1792	my $text = $self->{text};	1841	my $text = $self->{text};
…		…
1797	$self->update;	1846	$self->update;
1798		1847
1799	1	1848	1
1800	}	1849	}
1801		1850
1802	sub mouse_motion {	1851	sub invoke_mouse_motion {
1803	my ($self, $ev, $x, $y) = @_;	1852	my ($self, $ev, $x, $y) = @_;
1804	# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#	1853	# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1805		1854
1806	0	1855	1
1807	}	1856	}
1808		1857
1809	sub _draw {	1858	sub _draw {
1810	my ($self) = @_;	1859	my ($self) = @_;
1811		1860
…		…
1852		1901
1853	our @ISA = CFClient::UI::EntryBase::;	1902	our @ISA = CFClient::UI::EntryBase::;
1854		1903
1855	use CFClient::OpenGL;	1904	use CFClient::OpenGL;
1856		1905
1857	sub key_down {	1906	sub invoke_key_down {
1858	my ($self, $ev) = @_;	1907	my ($self, $ev) = @_;
1859		1908
1860	my $sym = $ev->{sym};	1909	my $sym = $ev->{sym};
1861		1910
1862	if ($sym == 13) {	1911	if ($sym == 13) {
1863	unshift @{$self->{history}},	1912	unshift @{$self->{history}},
1864	my $txt = $self->get_text;	1913	my $txt = $self->get_text;
		1914
1865	$self->{history_pointer} = -1;	1915	$self->{history_pointer} = -1;
1866	$self->{history_saveback} = '';	1916	$self->{history_saveback} = '';
1867	$self->_emit (activate => $txt);	1917	$self->emit (activate => $txt);
1868	$self->update;	1918	$self->update;
1869		1919
1870	} elsif ($sym == CFClient::SDLK_UP) {	1920	} elsif ($sym == CFClient::SDLK_UP) {
1871	if ($self->{history_pointer} < 0) {	1921	if ($self->{history_pointer} < 0) {
1872	$self->{history_saveback} = $self->get_text;	1922	$self->{history_saveback} = $self->get_text;
…		…
1888	} else {	1938	} else {
1889	$self->set_text ($self->{history_saveback});	1939	$self->set_text ($self->{history_saveback});
1890	}	1940	}
1891		1941
1892	} else {	1942	} else {
1893	return $self->SUPER::key_down ($ev)	1943	return $self->SUPER::invoke_key_down ($ev)
1894	}	1944	}
1895		1945
1896	1	1946	1
1897	}	1947	}
1898		1948
…		…
1922	can_events => 1,	1972	can_events => 1,
1923	@_	1973	@_
1924	)	1974	)
1925	}	1975	}
1926		1976
1927	sub activate { }
1928
1929	sub button_up {	1977	sub invoke_button_up {
1930	my ($self, $ev, $x, $y) = @_;	1978	my ($self, $ev, $x, $y) = @_;
1931		1979
1932	$self->emit ("activate")	1980	$self->emit ("activate")
1933	if $x >= 0 && $x < $self->{w}	1981	if $x >= 0 && $x < $self->{w}
1934	&& $y >= 0 && $y < $self->{h};	1982	&& $y >= 0 && $y < $self->{h};
…		…
1948	$tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});	1996	$tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1949		1997
1950	glDisable GL_TEXTURE_2D;	1998	glDisable GL_TEXTURE_2D;
1951		1999
1952	$self->SUPER::_draw;	2000	$self->SUPER::_draw;
		2001	}
		2002
		2003	#############################################################################
		2004
		2005	package CFClient::UI::ImageButton;
		2006
		2007	our @ISA = CFClient::UI::Image::;
		2008
		2009	use CFClient::OpenGL;
		2010
		2011	my %textures;
		2012
		2013	sub new {
		2014	my $class = shift;
		2015
		2016	my $self = $class->SUPER::new (
		2017	padding_x => 4,
		2018	padding_y => 4,
		2019	fg => [1, 1, 1],
		2020	active_fg => [0, 0, 1],
		2021	can_hover => 1,
		2022	align => 0,
		2023	valign => 0,
		2024	can_events => 1,
		2025	@_
		2026	);
		2027	}
		2028
		2029	sub invoke_button_up {
		2030	my ($self, $ev, $x, $y) = @_;
		2031
		2032	$self->emit ("activate")
		2033	if $x >= 0 && $x < $self->{w}
		2034	&& $y >= 0 && $y < $self->{h};
		2035
		2036	1
1953	}	2037	}
1954		2038
1955	#############################################################################	2039	#############################################################################
1956		2040
1957	package CFClient::UI::CheckBox;	2041	package CFClient::UI::CheckBox;
…		…
1984	my ($self) = @_;	2068	my ($self) = @_;
1985		2069
1986	(6) x 2	2070	(6) x 2
1987	}	2071	}
1988		2072
1989	sub button_down {	2073	sub invoke_button_down {
1990	my ($self, $ev, $x, $y) = @_;	2074	my ($self, $ev, $x, $y) = @_;
1991		2075
1992	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}	2076	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1993	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {	2077	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1994	$self->{state} = !$self->{state};	2078	$self->{state} = !$self->{state};
1995	$self->_emit (changed => $self->{state});	2079	$self->emit (changed => $self->{state});
1996	} else {	2080	} else {
1997	return 0	2081	return 0
1998	}	2082	}
1999		2083
2000	1	2084	1
…		…
2025	package CFClient::UI::Image;	2109	package CFClient::UI::Image;
2026		2110
2027	our @ISA = CFClient::UI::Base::;	2111	our @ISA = CFClient::UI::Base::;
2028		2112
2029	use CFClient::OpenGL;	2113	use CFClient::OpenGL;
2030	use Carp qw/confess/;
2031		2114
2032	our %loaded_images;	2115	our %texture_cache;
2033		2116
2034	sub new {	2117	sub new {
2035	my $class = shift;	2118	my $class = shift;
2036		2119
2037	my $self = $class->SUPER::new (can_events => 0, @_);	2120	my $self = $class->SUPER::new (
		2121	can_events => 0,
		2122	@_,
		2123	);
2038		2124
2039	$self->{image} or confess "Image has 'image' not set. This is a fatal error!";	2125	$self->{path}
		2126	or Carp::croak "required attribute 'path' not set";
2040		2127
2041	$loaded_images{$self->{image}} ||=	2128	$self->{tex} = $texture_cache{$self->{path}} ||=
2042	new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1;	2129	new_from_file CFClient::Texture CFClient::find_rcfile $self->{path}, mipmap => 1;
2043		2130
2044	my $tex = $self->{tex} = $loaded_images{$self->{image}};	2131	Scalar::Util::weaken $texture_cache{$self->{path}};
2045		2132
2046	Scalar::Util::weaken $loaded_images{$self->{image}};	2133	$self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2047
2048	$self->{aspect} = $tex->{w} / $tex->{h};
2049		2134
2050	$self	2135	$self
2051	}	2136	}
2052		2137
2053	sub size_request {	2138	sub size_request {
2054	my ($self) = @_;	2139	my ($self) = @_;
2055		2140
2056	($self->{tex}->{w}, $self->{tex}->{h})	2141	($self->{tex}{w}, $self->{tex}{h})
2057	}	2142	}
2058		2143
2059	sub _draw {	2144	sub _draw {
2060	my ($self) = @_;	2145	my ($self) = @_;
2061		2146
…		…
2170	my $ycut1 = max 0, min 1, $ycut;	2255	my $ycut1 = max 0, min 1, $ycut;
2171	my $ycut2 = max 0, min 1, $ycut - 1;	2256	my $ycut2 = max 0, min 1, $ycut - 1;
2172		2257
2173	my $h1 = $self->{h} * (1 - $ycut1);	2258	my $h1 = $self->{h} * (1 - $ycut1);
2174	my $h2 = $self->{h} * (1 - $ycut2);	2259	my $h2 = $self->{h} * (1 - $ycut2);
		2260	my $h3 = $self->{h};
		2261
		2262	$_ = $_ * (284-4)/288 + 4/288 for ($h1, $h2, $h3);
2175		2263
2176	glEnable GL_BLEND;	2264	glEnable GL_BLEND;
2177	glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,	2265	glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2178	GL_ONE, GL_ONE_MINUS_SRC_ALPHA;	2266	GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2179	glEnable GL_TEXTURE_2D;	2267	glEnable GL_TEXTURE_2D;
…		…
2198		2286
2199	if ($t3) {	2287	if ($t3) {
2200	glBindTexture GL_TEXTURE_2D, $t3->{name};	2288	glBindTexture GL_TEXTURE_2D, $t3->{name};
2201	glBegin GL_QUADS;	2289	glBegin GL_QUADS;
2202	glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;	2290	glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2203	glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h};	2291	glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2204	glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h};	2292	glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2205	glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;	2293	glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2206	glEnd;	2294	glEnd;
2207	}	2295	}
2208		2296
2209	glDisable GL_BLEND;	2297	glDisable GL_BLEND;
…		…
2297	$self->update;	2385	$self->update;
2298		2386
2299	$self	2387	$self
2300	}	2388	}
2301		2389
2302	sub changed { }
2303
2304	sub set_range {	2390	sub set_range {
2305	my ($self, $range) = @_;	2391	my ($self, $range) = @_;
2306		2392
2307	($range, $self->{range}) = ($self->{range}, $range);	2393	($range, $self->{range}) = ($self->{range}, $range);
2308		2394
2309	$self->update
2310	if "@$range" ne "@{$self->{range}}";	2395	if ("@$range" ne "@{$self->{range}}") {
		2396	$self->update;
		2397	$self->set_value ($self->{range}[0]);
		2398	}
2311	}	2399	}
2312		2400
2313	sub set_value {	2401	sub set_value {
2314	my ($self, $value) = @_;	2402	my ($self, $value) = @_;
2315		2403
…		…
2326	if $unit;	2414	if $unit;
2327		2415
2328	@{$self->{range}} = ($value, $lo, $hi, $page, $unit);	2416	@{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2329		2417
2330	if ($value != $old_value) {	2418	if ($value != $old_value) {
2331	$self->_emit (changed => $value);	2419	$self->emit (changed => $value);
2332	$self->update;	2420	$self->update;
2333	}	2421	}
2334	}	2422	}
2335		2423
2336	sub size_request {	2424	sub size_request {
2337	my ($self) = @_;	2425	my ($self) = @_;
2338		2426
2339	($self->{req_w}, $self->{req_h})	2427	($self->{req_w}, $self->{req_h})
2340	}	2428	}
2341		2429
2342	sub button_down {	2430	sub invoke_button_down {
2343	my ($self, $ev, $x, $y) = @_;	2431	my ($self, $ev, $x, $y) = @_;
2344		2432
2345	$self->SUPER::button_down ($ev, $x, $y);	2433	$self->SUPER::invoke_button_down ($ev, $x, $y);
2346		2434
2347	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];	2435	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2348		2436
2349	$self->mouse_motion ($ev, $x, $y)	2437	$self->invoke_mouse_motion ($ev, $x, $y)
2350	}	2438	}
2351		2439
2352	sub mouse_motion {	2440	sub invoke_mouse_motion {
2353	my ($self, $ev, $x, $y) = @_;	2441	my ($self, $ev, $x, $y) = @_;
2354		2442
2355	if ($GRAB == $self) {	2443	if ($GRAB == $self) {
2356	my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});	2444	my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2357		2445
…		…
2462	sub set_range { shift->{slider}->set_range (@_) }	2550	sub set_range { shift->{slider}->set_range (@_) }
2463	sub set_value { shift->{slider}->set_value (@_) }	2551	sub set_value { shift->{slider}->set_value (@_) }
2464		2552
2465	#############################################################################	2553	#############################################################################
2466		2554
2467	package CFClient::UI::TextView;	2555	package CFClient::UI::TextScroller;
2468		2556
2469	our @ISA = CFClient::UI::HBox::;	2557	our @ISA = CFClient::UI::HBox::;
2470		2558
2471	use CFClient::OpenGL;	2559	use CFClient::OpenGL;
2472		2560
…		…
2474	my $class = shift;	2562	my $class = shift;
2475		2563
2476	my $self = $class->SUPER::new (	2564	my $self = $class->SUPER::new (
2477	fontsize => 1,	2565	fontsize => 1,
2478	can_events => 0,	2566	can_events => 0,
		2567	indent => 0,
2479	#font => default_font	2568	#font => default_font
2480	@_,	2569	@_,
2481		2570
2482	layout => (new CFClient::Layout 1),	2571	layout => (new CFClient::Layout 1),
2483	par => [],	2572	par => [],
…		…
2498		2587
2499	$self->{fontsize} = $fontsize;	2588	$self->{fontsize} = $fontsize;
2500	$self->reflow;	2589	$self->reflow;
2501	}	2590	}
2502		2591
		2592	sub size_request {
		2593	my ($self) = @_;
		2594
		2595	my ($empty, $slider) = @{ $self->{children} };
		2596
		2597	local $self->{children} = [$empty, $slider];
		2598	$self->SUPER::size_request
		2599	}
		2600
2503	sub size_allocate {	2601	sub invoke_size_allocate {
2504	my ($self, $w, $h) = @_;	2602	my ($self, $w, $h) = @_;
2505		2603
2506	$self->SUPER::size_allocate ($w, $h);	2604	my ($empty, $slider, @other) = @{ $self->{children} };
		2605	$_->configure (@$_{qw(x y req_w req_h)}) for @other;
2507		2606
2508	$self->{layout}->set_font ($self->{font}) if $self->{font};	2607	$self->{layout}->set_font ($self->{font}) if $self->{font};
2509	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	2608	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2510	$self->{layout}->set_width ($self->{children}[0]{w});	2609	$self->{layout}->set_width ($empty->{w});
2511	$self->{layout}->set_indent (-$self->{fontsize} * $::FONTSIZE * 4);	2610	$self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2512		2611
2513	$self->reflow;	2612	$self->reflow;
2514	}
2515		2613
2516	sub text_size {	2614	local $self->{children} = [$empty, $slider];
2517	my ($self, $text, $indent) = @_;	2615	$self->SUPER::invoke_size_allocate ($w, $h)
		2616	}
		2617
		2618	sub get_layout {
		2619	my ($self, $para) = @_;
2518		2620
2519	my $layout = $self->{layout};	2621	my $layout = $self->{layout};
2520		2622
		2623	$layout->set_font ($self->{font}) if $self->{font};
		2624	$layout->set_foreground (@{$para->{fg}});
2521	$layout->set_height ($self->{fontsize} * $::FONTSIZE);	2625	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
2522	$layout->set_width ($self->{children}[0]{w} - $indent);	2626	$layout->set_width ($self->{children}[0]{w} - $para->{indent});
2523	$layout->set_indent (-$self->{fontsize} * $::FONTSIZE * 4);	2627	$layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2524	$layout->set_markup ($text);	2628	$layout->set_markup ($para->{markup});
		2629
		2630	$layout->set_shapes (
		2631	map
		2632	+(0, $_->baseline_shift +$_->{padding_y} - $_->{h}, $_->{w}, $_->{h}),
		2633	@{$para->{widget}}
2525		2634	);
		2635
2526	$layout->size	2636	$layout
2527	}	2637	}
2528		2638
2529	sub reflow {	2639	sub reflow {
2530	my ($self) = @_;	2640	my ($self) = @_;
2531		2641
…		…
2540	$self->{children}[1]->set_value ($offset);	2650	$self->{children}[1]->set_value ($offset);
2541	}	2651	}
2542		2652
2543	sub clear {	2653	sub clear {
2544	my ($self) = @_;	2654	my ($self) = @_;
		2655
		2656	my (undef, undef, @other) = @{ $self->{children} };
		2657	$self->remove ($_) for @other;
2545		2658
2546	$self->{par} = [];	2659	$self->{par} = [];
2547	$self->{height} = 0;	2660	$self->{height} = 0;
2548	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);	2661	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2549	}	2662	}
2550		2663
2551	sub add_paragraph {	2664	sub add_paragraph {
2552	my ($self, $color, $text, $indent) = @_;	2665	my ($self, $color, $para, $indent) = @_;
2553		2666
2554	for my $line (split /\n/, $text) {	2667	my ($text, @w) = ref $para ? @$para : $para;
2555	my ($w, $h) = $self->text_size ($line);	2668
2556	$self->{height} += $h;	2669	$para = {
2557	push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];	2670	w => 1e10,
		2671	wrapped => 1,
		2672	fg => $color,
		2673	indent => $indent,
		2674	markup => $text,
		2675	widget => \@w,
2558	}	2676	};
2559		2677
2560	$self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]);	2678	$self->add (@w) if @w;
		2679	push @{$self->{par}}, $para;
		2680
		2681	$self->{need_reflow}++;
		2682	$self->update;
		2683	}
		2684
		2685	sub scroll_to_bottom {
		2686	my ($self) = @_;
		2687
		2688	$self->{scroll_to_bottom} = 1;
		2689	$self->update;
2561	}	2690	}
2562		2691
2563	sub update {	2692	sub update {
2564	my ($self) = @_;	2693	my ($self) = @_;
2565		2694
…		…
2567		2696
2568	return unless $self->{h} > 0;	2697	return unless $self->{h} > 0;
2569		2698
2570	delete $self->{texture};	2699	delete $self->{texture};
2571		2700
2572	$ROOT->on_post_alloc ($self, sub {	2701	$ROOT->on_post_alloc ($self => sub {
2573	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};	2702	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2574		2703
2575	if (delete $self->{need_reflow}) {	2704	if (delete $self->{need_reflow}) {
2576	my $height = 0;	2705	my $height = 0;
2577		2706
2578	my $layout = $self->{layout};
2579
2580	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
2581
2582	for (@{$self->{par}}) {	2707	for my $para (@{$self->{par}}) {
2583	if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support	2708	if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2584	$layout->set_width ($W - $_->[3]);	2709	my $layout = $self->get_layout ($para);
2585	$layout->set_indent (-$self->{fontsize} * $::FONTSIZE * 4);
2586	$layout->set_markup ($_->[4]);
2587	my ($w, $h) = $layout->size;	2710	my ($w, $h) = $layout->size;
2588	$_->[0] = $w + $_->[3];	2711
2589	$_->[1] = $h;	2712	$para->{w} = $w + $para->{indent};
		2713	$para->{h} = $h;
		2714	$para->{wrapped} = $layout->has_wrapped;
2590	}	2715	}
2591		2716
2592	$height += $_->[1];	2717	$height += $para->{h};
2593	}	2718	}
2594		2719
2595	$self->{height} = $height;	2720	$self->{height} = $height;
2596		2721
2597	$self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);	2722	$self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2598		2723
2599	delete $self->{texture};	2724	delete $self->{texture};
		2725	}
		2726
		2727	if (delete $self->{scroll_to_bottom}) {
		2728	$self->{children}[1]->set_value (1e10);
2600	}	2729	}
2601		2730
2602	$self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {	2731	$self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2603	glClearColor 0, 0, 0, 0;	2732	glClearColor 0, 0, 0, 0;
2604	glClear GL_COLOR_BUFFER_BIT;	2733	glClear GL_COLOR_BUFFER_BIT;
…		…
2608	my $y0 = $top;	2737	my $y0 = $top;
2609	my $y1 = $top + $H;	2738	my $y1 = $top + $H;
2610		2739
2611	my $y = 0;	2740	my $y = 0;
2612		2741
2613	my $layout = $self->{layout};
2614
2615	$layout->set_font ($self->{font}) if $self->{font};
2616
2617	glEnable GL_BLEND;	2742	glEnable GL_BLEND;
2618	#TODO# not correct in windows where rgba is forced off	2743	#TODO# not correct in windows where rgba is forced off
2619	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;	2744	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2620		2745
2621	for my $par (@{$self->{par}}) {	2746	for my $para (@{$self->{par}}) {
2622	my $h = $par->[1];	2747	my $h = $para->{h};
2623		2748
2624	if ($y0 < $y + $h && $y < $y1) {	2749	if ($y0 < $y + $h && $y < $y1) {
2625	$layout->set_foreground (@{ $par->[2] });	2750
2626	$layout->set_width ($W - $par->[3]);	2751	my $layout = $self->get_layout ($para);
2627	$layout->set_indent (-$self->{fontsize} * $::FONTSIZE * 4);
2628	$layout->set_markup ($par->[4]);
2629		2752
2630	my ($w, $h, $data, $format, $internalformat) = $layout->render;	2753	my ($w, $h, $data, $format, $internalformat) = $layout->render;
2631		2754
2632	glRasterPos $par->[3], $y - $y0;	2755	glRasterPos $para->{indent}, $y - $y0;
2633	glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;	2756	glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
		2757
		2758	if (my @w = @{ $para->{widget} }) {
		2759	my @s = $layout->get_shapes;
		2760
		2761	glDisable GL_BLEND;
		2762	for (@w) {
		2763	my ($dx, $dy) = splice @s, 0, 2, ();
		2764
		2765	$_->{x} = $dx + $para->{indent};
		2766	$_->{y} = $dy + $y - $y0;
		2767
		2768	$_->draw;
		2769	}
		2770	glEnable GL_BLEND;
		2771	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
		2772	}
2634	}	2773	}
2635		2774
2636	$y += $h;	2775	$y += $h;
2637	}	2776	}
2638		2777
2639	glDisable GL_BLEND;	2778	glDisable GL_BLEND;
2640	};	2779	};
2641	});	2780	});
		2781	}
		2782
		2783	sub reconfigure {
		2784	my ($self) = @_;
		2785
		2786	$self->SUPER::reconfigure;
		2787
		2788	$_->{w} = 1e10 for @{ $self->{par} };
		2789	$self->reflow;
2642	}	2790	}
2643		2791
2644	sub _draw {	2792	sub _draw {
2645	my ($self) = @_;	2793	my ($self) = @_;
2646		2794
…		…
2649	glColor 0, 0, 0, 1;	2797	glColor 0, 0, 0, 1;
2650	$self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});	2798	$self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2651	glDisable GL_TEXTURE_2D;	2799	glDisable GL_TEXTURE_2D;
2652		2800
2653	$self->{children}[1]->draw;	2801	$self->{children}[1]->draw;
2654
2655	}	2802	}
2656		2803
2657	#############################################################################	2804	#############################################################################
2658		2805
2659	package CFClient::UI::Animator;	2806	package CFClient::UI::Animator;
…		…
2746	$tooltip .= "\n\n" . (ref $widget) . "\n"	2893	$tooltip .= "\n\n" . (ref $widget) . "\n"
2747	. "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"	2894	. "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2748	. "req $widget->{req_w} $widget->{req_h}\n"	2895	. "req $widget->{req_w} $widget->{req_h}\n"
2749	. "visible $widget->{visible}";	2896	. "visible $widget->{visible}";
2750	}	2897	}
		2898
		2899	$tooltip =~ s/^\n+//;
		2900	$tooltip =~ s/\n+$//;
2751		2901
2752	$self->add (new CFClient::UI::Label	2902	$self->add (new CFClient::UI::Label
2753	markup => $tooltip,	2903	markup => $tooltip,
2754	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,	2904	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2755	fontsize => 0.8,	2905	fontsize => 0.8,
…		…
2765	my ($w, $h) = @{$self->child}{qw(req_w req_h)};	2915	my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2766		2916
2767	($w + 4, $h + 4)	2917	($w + 4, $h + 4)
2768	}	2918	}
2769		2919
2770	sub size_allocate {	2920	sub invoke_size_allocate {
2771	my ($self, $w, $h) = @_;	2921	my ($self, $w, $h) = @_;
2772		2922
2773	$self->SUPER::size_allocate ($w - 4, $h - 4);	2923	$self->SUPER::invoke_size_allocate ($w - 4, $h - 4)
2774	}	2924	}
2775		2925
2776	sub visibility_change {	2926	sub invoke_visibility_change {
2777	my ($self, $visible) = @_;	2927	my ($self, $visible) = @_;
2778		2928
2779	return unless $visible;	2929	return unless $visible;
2780		2930
2781	$self->{root}->on_post_alloc ("move_$self" => sub {	2931	$self->{root}->on_post_alloc ("move_$self" => sub {
…		…
2783	or return;	2933	or return;
2784		2934
2785	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);	2935	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2786		2936
2787	($x, $y) = $widget->coord2global (-$self->{w}, 0)	2937	($x, $y) = $widget->coord2global (-$self->{w}, 0)
2788	if $x + $self->{w} > $::WIDTH;	2938	if $x + $self->{w} > $self->{root}{w};
2789		2939
2790	$self->move_abs ($x, $y);	2940	$self->move_abs ($x, $y);
2791	});	2941	});
2792	}	2942	}
2793		2943
…		…
2888	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});	3038	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2889	glDisable GL_TEXTURE_2D;	3039	glDisable GL_TEXTURE_2D;
2890	}	3040	}
2891	}	3041	}
2892		3042
2893	sub DESTROY {	3043	sub destroy {
2894	my ($self) = @_;	3044	my ($self) = @_;
2895		3045
2896	$self->{timer}->cancel	3046	$self->{timer}->cancel
2897	if $self->{timer};	3047	if $self->{timer};
2898		3048
2899	$self->SUPER::DESTROY;	3049	$self->SUPER::destroy;
2900	}	3050	}
2901		3051
2902	#############################################################################	3052	#############################################################################
2903		3053
2904	package CFClient::UI::Buttonbar;	3054	package CFClient::UI::Buttonbar;
…		…
2932	# handle various types of items, only text for now	3082	# handle various types of items, only text for now
2933	if (!ref $widget) {	3083	if (!ref $widget) {
2934	$widget = new CFClient::UI::Label	3084	$widget = new CFClient::UI::Label
2935	can_hover => 1,	3085	can_hover => 1,
2936	can_events => 1,	3086	can_events => 1,
2937	text => $widget,	3087	markup => $widget,
2938	tooltip => $tooltip	3088	tooltip => $tooltip
2939	}	3089	}
2940		3090
2941	$self->{item}{$widget} = $item;	3091	$self->{item}{$widget} = $item;
2942		3092
…		…
2948		3098
2949	# popup given the event (must be a mouse button down event currently)	3099	# popup given the event (must be a mouse button down event currently)
2950	sub popup {	3100	sub popup {
2951	my ($self, $ev) = @_;	3101	my ($self, $ev) = @_;
2952		3102
2953	$self->_emit ("popdown");	3103	$self->emit ("popdown");
2954		3104
2955	# maybe save $GRAB? must be careful about events...	3105	# maybe save $GRAB? must be careful about events...
2956	$GRAB = $self;	3106	$GRAB = $self;
2957	$self->{button} = $ev->{button};	3107	$self->{button} = $ev->{button};
2958		3108
2959	$self->show;	3109	$self->show;
2960	$self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);	3110	$self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2961	}	3111	}
2962		3112
2963	sub mouse_motion {	3113	sub invoke_mouse_motion {
2964	my ($self, $ev, $x, $y) = @_;	3114	my ($self, $ev, $x, $y) = @_;
2965		3115
2966	# TODO: should use vbox->find_widget or so	3116	# TODO: should use vbox->find_widget or so
2967	$HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});	3117	$HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2968	$self->{hover} = $self->{item}{$HOVER};	3118	$self->{hover} = $self->{item}{$HOVER};
2969		3119
2970	0	3120	0
2971	}	3121	}
2972		3122
2973	sub button_up {	3123	sub invoke_button_up {
2974	my ($self, $ev, $x, $y) = @_;	3124	my ($self, $ev, $x, $y) = @_;
2975		3125
2976	if ($ev->{button} == $self->{button}) {	3126	if ($ev->{button} == $self->{button}) {
2977	undef $GRAB;	3127	undef $GRAB;
2978	$self->hide;	3128	$self->hide;
2979		3129
2980	$self->_emit ("popdown");	3130	$self->emit ("popdown");
2981	$self->{hover}[1]->() if $self->{hover};	3131	$self->{hover}[1]->() if $self->{hover};
2982	} else {	3132	} else {
2983	return 0	3133	return 0
2984	}	3134	}
2985		3135
…		…
3022	: $self->{children}[$page_or_widget];	3172	: $self->{children}[$page_or_widget];
3023		3173
3024	$self->{current} = $widget;	3174	$self->{current} = $widget;
3025	$self->{current}->configure (0, 0, $self->{w}, $self->{h});	3175	$self->{current}->configure (0, 0, $self->{w}, $self->{h});
3026		3176
3027	$self->_emit (page_changed => $self->{current});	3177	$self->emit (page_changed => $self->{current});
3028		3178
3029	$self->realloc;	3179	$self->realloc;
3030	}	3180	}
3031		3181
3032	sub visible_children {	3182	sub visible_children {
…		…
3037	my ($self) = @_;	3187	my ($self) = @_;
3038		3188
3039	$self->{current}->size_request	3189	$self->{current}->size_request
3040	}	3190	}
3041		3191
3042	sub size_allocate {	3192	sub invoke_size_allocate {
3043	my ($self, $w, $h) = @_;	3193	my ($self, $w, $h) = @_;
3044		3194
3045	$self->{current}->configure (0, 0, $w, $h);	3195	$self->{current}->configure (0, 0, $w, $h);
		3196
		3197	1
3046	}	3198	}
3047		3199
3048	sub _draw {	3200	sub _draw {
3049	my ($self) = @_;	3201	my ($self) = @_;
3050		3202
…		…
3089		3241
3090	sub set_current_page {	3242	sub set_current_page {
3091	my ($self, $page) = @_;	3243	my ($self, $page) = @_;
3092		3244
3093	$self->{multiplexer}->set_current_page ($page);	3245	$self->{multiplexer}->set_current_page ($page);
3094	$self->_emit (page_changed => $self->{multiplexer}{current});	3246	$self->emit (page_changed => $self->{multiplexer}{current});
3095	}	3247	}
3096		3248
3097	#############################################################################	3249	#############################################################################
3098		3250
3099	package CFClient::UI::Combobox;	3251	package CFClient::UI::Combobox;
…		…
3104		3256
3105	sub new {	3257	sub new {
3106	my $class = shift;	3258	my $class = shift;
3107		3259
3108	my $self = $class->SUPER::new (	3260	my $self = $class->SUPER::new (
3109	options => [], # [title, value, tooltip], ...	3261	options => [], # [value, title, longdesc], ...
3110	value => undef,	3262	value => undef,
3111	@_,	3263	@_,
3112	);	3264	);
3113		3265
3114	$self->_set_value ($self->{value});	3266	$self->_set_value ($self->{value});
3115		3267
3116	$self	3268	$self
3117	}	3269	}
3118		3270
3119	sub button_down {	3271	sub invoke_button_down {
3120	my ($self, $ev) = @_;	3272	my ($self, $ev) = @_;
3121		3273
3122	my @menu_items;	3274	my @menu_items;
3123		3275
3124	for (@{ $self->{options} }) {	3276	for (@{ $self->{options} }) {
3125	my ($title, $value, $tooltip) = @$_;	3277	my ($value, $title, $tooltip) = @$_;
3126		3278
3127	push @menu_items, [$tooltip, sub { $self->set_value ($value) }];	3279	push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3128	}	3280	}
3129		3281
3130	CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);	3282	CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
3131	}	3283	}
3132		3284
3133	sub _set_value {	3285	sub _set_value {
3134	my ($self, $value) = @_;	3286	my ($self, $value) = @_;
3135		3287
3136	my ($item) = grep $_->[1] eq $value, @{ $self->{options} }	3288	my ($item) = grep $_->[0] eq $value, @{ $self->{options} }
3137	or return;	3289	or return;
3138		3290
3139	$self->{value} = $item->[1];	3291	$self->{value} = $item->[0];
3140	$self->set_markup ("$item->[0] ⇓");	3292	$self->set_markup ("$item->[1] ⇓");
3141	$self->set_tooltip ($item->[2]);	3293	$self->set_tooltip ($item->[2]);
3142	}	3294	}
3143		3295
3144	sub set_value {	3296	sub set_value {
3145	my ($self, $value) = @_;	3297	my ($self, $value) = @_;
3146		3298
3147	return unless $self->{value} ne $value;	3299	return unless $self->{value} ne $value;
3148		3300
3149	$self->_set_value ($value);	3301	$self->_set_value ($value);
3150	$self->_emit (changed => $value);	3302	$self->emit (changed => $value);
3151	}	3303	}
3152		3304
3153	#############################################################################	3305	#############################################################################
3154		3306
3155	package CFClient::UI::Statusbox;	3307	package CFClient::UI::Statusbox;
…		…
3254	$item->{count}++;	3406	$item->{count}++;
3255	} else {	3407	} else {
3256	$item->{count} = 1;	3408	$item->{count} = 1;
3257	$item->{text} = $item->{tooltip} = $text;	3409	$item->{text} = $item->{tooltip} = $text;
3258	}	3410	}
3259	$item->{id} = ++$self->{id};	3411	$item->{id} += 0.2;#d#
3260	$item->{timeout} = $timeout;	3412	$item->{timeout} = $timeout;
3261	delete $item->{label};	3413	delete $item->{label};
3262	} else {	3414	} else {
3263	$self->{item}{$group} = {	3415	$self->{item}{$group} = {
3264	id => ++$self->{id},	3416	id => ++$self->{id},
…		…
3270	count => 1,	3422	count => 1,
3271	%arg,	3423	%arg,
3272	};	3424	};
3273	}	3425	}
3274		3426
		3427	$ROOT->on_refresh (reorder => sub {
3275	$self->reorder;	3428	$self->reorder;
		3429	});
3276	}	3430	}
3277		3431
3278	sub reconfigure {	3432	sub reconfigure {
3279	my ($self) = @_;	3433	my ($self) = @_;
3280		3434
…		…
3283		3437
3284	$self->reorder;	3438	$self->reorder;
3285	$self->SUPER::reconfigure;	3439	$self->SUPER::reconfigure;
3286	}	3440	}
3287		3441
3288	sub DESTROY {	3442	sub destroy {
3289	my ($self) = @_;	3443	my ($self) = @_;
3290		3444
3291	$self->{timer}->cancel;	3445	$self->{timer}->cancel;
3292		3446
3293	$self->SUPER::DESTROY;	3447	$self->SUPER::destroy;
3294	}	3448	}
3295		3449
3296	#############################################################################	3450	#############################################################################
3297		3451
3298	package CFClient::UI::Inventory;	3452	package CFClient::UI::Inventory;
…		…
3317	return unless $items;	3471	return unless $items;
3318		3472
3319	my @items = sort {	3473	my @items = sort {
3320	($a->{type} <=> $b->{type})	3474	($a->{type} <=> $b->{type})
3321	or ($a->{name} cmp $b->{name})	3475	or ($a->{name} cmp $b->{name})
3322	} @$items;	3476	} values %$items;
3323		3477
3324	$self->{real_items} = \@items;	3478	$self->{real_items} = \@items;
3325		3479
3326	my $row = 0;	3480	my $row = 0;
3327	for my $item (@items) {	3481	for my $item (@items) {
…		…
3330	$self->{child}->add (0, $row, $item->{face_widget});	3484	$self->{child}->add (0, $row, $item->{face_widget});
3331	$self->{child}->add (1, $row, $item->{desc_widget});	3485	$self->{child}->add (1, $row, $item->{desc_widget});
3332	$self->{child}->add (2, $row, $item->{weight_widget});	3486	$self->{child}->add (2, $row, $item->{weight_widget});
3333		3487
3334	$row++;	3488	$row++;
3335	}
3336	}
3337
3338	#############################################################################
3339
3340	package CFClient::UI::BindEditor;
3341
3342	our @ISA = CFClient::UI::FancyFrame::;
3343
3344	sub new {
3345	my $class = shift;
3346
3347	my $self = $class->SUPER::new (binding => [], commands => [], @_);
3348
3349	$self->add (my $vb = new CFClient::UI::VBox);
3350
3351
3352	$vb->add ($self->{rec_btn} = new CFClient::UI::Button
3353	text => "start recording",
3354	tooltip => "Start/Stops recording of actions."
3355	."All subsequent actions after the recording started will be captured."
3356	."The actions are displayed after the record was stopped."
3357	."To bind the action you have to click on the 'Bind' button",
3358	on_activate => sub {
3359	unless ($self->{recording}) {
3360	$self->start;
3361	} else {
3362	$self->stop;
3363	}
3364	});
3365
3366	$vb->add (new CFClient::UI::Label text => "Actions:");
3367	$vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3368
3369	$vb->add (new CFClient::UI::Label text => "Bound to: ");
3370	$vb->add (my $hb = new CFClient::UI::HBox);
3371	$hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3372	$hb->add (new CFClient::UI::Button
3373	text => "bind",
3374	tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3375	on_activate => sub {
3376	$self->ask_for_bind;
3377	});
3378
3379	$vb->add (my $hb = new CFClient::UI::HBox);
3380	$hb->add (new CFClient::UI::Button
3381	text => "ok",
3382	expand => 1,
3383	tooltip => "This closes the binding editor and saves the binding",
3384	on_activate => sub {
3385	$self->hide;
3386	$self->commit;
3387	});
3388
3389	$hb->add (new CFClient::UI::Button
3390	text => "cancel",
3391	expand => 1,
3392	tooltip => "This closes the binding editor without saving",
3393	on_activate => sub {
3394	$self->hide;
3395	$self->{binding_cancel}->()
3396	if $self->{binding_cancel};
3397	});
3398
3399	$self->update_binding_widgets;
3400
3401	$self
3402	}
3403
3404	sub commit {
3405	my ($self) = @_;
3406	my ($mod, $sym, $cmds) = $self->get_binding;
3407	if ($sym != 0 && @$cmds > 0) {
3408	$::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3409	."'. Don't forget 'Save Config'!");
3410	$self->{binding_change}->($mod, $sym, $cmds)
3411	if $self->{binding_change};
3412	} else {
3413	$::STATUSBOX->add ("No action bound, no key or action specified!");
3414	$self->{binding_cancel}->()
3415	if $self->{binding_cancel};
3416	}
3417	}
3418
3419	sub start {
3420	my ($self) = @_;
3421
3422	$self->{rec_btn}->set_text ("stop recording");
3423	$self->{recording} = 1;
3424	$self->clear_command_list;
3425	$::CONN->start_record if $::CONN;
3426	}
3427
3428	sub stop {
3429	my ($self) = @_;
3430
3431	$self->{rec_btn}->set_text ("start recording");
3432	$self->{recording} = 0;
3433
3434	my $rec;
3435	$rec = $::CONN->stop_record if $::CONN;
3436	return unless ref $rec eq 'ARRAY';
3437	$self->set_command_list ($rec);
3438	}
3439
3440
3441	sub ask_for_bind_and_commit {
3442	my ($self) = @_;
3443	$self->ask_for_bind (1);
3444	}
3445
3446	sub ask_for_bind {
3447	my ($self, $commit) = @_;
3448
3449	CFClient::Binder::open_binding_dialog (sub {
3450	my ($mod, $sym) = @_;
3451	$self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3452	$self->update_binding_widgets;
3453	$self->commit if $commit;
3454	});
3455	}
3456
3457	# $mod and $sym are the modifiers and key symbol
3458	# $cmds is a array ref of strings (the commands)
3459	# $cb is the callback that is executed on OK
3460	# $ccb is the callback that is executed on CANCEL and
3461	# when the binding was unsuccessful on OK
3462	sub set_binding {
3463	my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3464
3465	$self->clear_command_list;
3466	$self->{recording} = 0;
3467	$self->{rec_btn}->set_text ("start recording");
3468
3469	$self->{binding} = [$mod, $sym];
3470	$self->{commands} = $cmds;
3471
3472	$self->{binding_change} = $cb;
3473	$self->{binding_cancel} = $ccb;
3474
3475	$self->update_binding_widgets;
3476	}
3477
3478	# this is a shortcut method that asks for a binding
3479	# and then just binds it.
3480	sub do_quick_binding {
3481	my ($self, $cmds) = @_;
3482	$self->set_binding (undef, undef, $cmds, sub {
3483	$::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3484	});
3485	$self->ask_for_bind (1);
3486	}
3487
3488	sub update_binding_widgets {
3489	my ($self) = @_;
3490	my ($mod, $sym, $cmds) = $self->get_binding;
3491	$self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3492	$self->set_command_list ($cmds);
3493	}
3494
3495	sub get_binding {
3496	my ($self) = @_;
3497	return (
3498	$self->{binding}->[0],
3499	$self->{binding}->[1],
3500	[ grep { defined $_ } @{$self->{commands}} ]
3501	);
3502	}
3503
3504	sub clear_command_list {
3505	my ($self) = @_;
3506	$self->{cmdbox}->clear ();
3507	}
3508
3509	sub set_command_list {
3510	my ($self, $cmds) = @_;
3511
3512	$self->{cmdbox}->clear ();
3513	$self->{commands} = $cmds;
3514
3515	my $idx = 0;
3516
3517	for (@$cmds) {
3518	$self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3519
3520	my $i = $idx;
3521	$hb->add (new CFClient::UI::Label text => $_);
3522	$hb->add (new CFClient::UI::Button
3523	text => "delete",
3524	tooltip => "Deletes the action from the record",
3525	on_activate => sub {
3526	$self->{cmdbox}->remove ($hb);
3527	$cmds->[$i] = undef;
3528	});
3529
3530
3531	$idx++
3532	}	3489	}
3533	}	3490	}
3534		3491
3535	#############################################################################	3492	#############################################################################
3536		3493
…		…
3546	commands => [],	3503	commands => [],
3547	@_,	3504	@_,
3548	)	3505	)
3549	}	3506	}
3550		3507
		3508	my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
		3509
		3510	my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
		3511	"<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
		3512	my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
		3513	"<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3551	my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>	3514	my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3552	"<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.");	3515	"<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3553	my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>	3516	my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3554	"<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.");	3517	"<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3555	my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>	3518	my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3556	"<b>Damage</b>. The amount of damage the spell deals when it hits.");	3519	"<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3557		3520
3558	sub rebuild_spell_list {	3521	sub rebuild_spell_list {
3559	my ($self) = @_;	3522	my ($self) = @_;
3560		3523
3561	$CFClient::UI::ROOT->on_refresh ($self => sub {	3524	$CFClient::UI::ROOT->on_refresh ($self => sub {
3562	$self->clear;	3525	$self->clear;
3563		3526
		3527	return unless $::CONN;
		3528
3564	$self->add (1, 0, new CFClient::UI::Label text => "Spell Name");	3529	$self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);
		3530	$self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL);
3565	$self->add (2, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);	3531	$self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3566	$self->add (3, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);	3532	$self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3567	$self->add (4, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);	3533	$self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3568		3534
3569	my $row = 0;	3535	my $row = 0;
3570		3536
3571	for (sort { $a cmp $b } keys %{ $self->{spell} }) {	3537	for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3572	my $spell = $self->{spell}{$_};	3538	my $spell = $self->{spell}{$_};
3573		3539
3574	$row++;	3540	$row++;
		3541
		3542	my $spell_cb = sub {
		3543	my ($widget, $ev) = @_;
		3544
		3545	if ($ev->{button} == 1) {
		3546	$::CONN->user_send ("cast $spell->{name}");
		3547	} elsif ($ev->{button} == 2) {
		3548	$::CONN->user_send ("invoke $spell->{name}");
		3549	} elsif ($ev->{button} == 3) {
		3550	(new CFClient::UI::Menu
		3551	items => [
		3552	["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
		3553	["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
		3554	],
		3555	)->popup ($ev);
		3556	} else {
		3557	return 0;
		3558	}
		3559
		3560	1
		3561	};
		3562
		3563	my $tooltip = "$spell->{message}$TOOLTIP_ALL";
		3564
		3565	#TODO: add path info to tooltip
		3566	#$self->add (6, $row, new CFClient::UI::Label text => $spell->{path});
3575		3567
3576	$self->add (0, $row, new CFClient::UI::Face	3568	$self->add (0, $row, new CFClient::UI::Face
3577	face => $spell->{face},	3569	face => $spell->{face},
3578	can_hover => 1,	3570	can_hover => 1,
3579	can_events => 1,	3571	can_events => 1,
3580	tooltip => $spell->{message},	3572	tooltip => $tooltip,
		3573	on_button_down => $spell_cb,
3581	);	3574	);
3582		3575
3583	$self->add (1, $row, new CFClient::UI::Label	3576	$self->add (1, $row, new CFClient::UI::Label
3584	expand => 1,	3577	expand => 1,
3585	text => $spell->{name},	3578	text => $spell->{name},
3586	can_hover => 1,	3579	can_hover => 1,
3587	can_events => 1,	3580	can_events => 1,
3588	tooltip => $spell->{message},	3581	tooltip => $tooltip,
		3582	on_button_down => $spell_cb,
3589	);	3583	);
3590		3584
		3585	$self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3591	$self->add (2, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);	3586	$self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3592	$self->add (3, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);	3587	$self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3593	$self->add (4, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);	3588	$self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3594
3595	# TODO: should be done via popup
3596	$self->add (5, $row, new CFClient::UI::Button
3597	text => "bind",
3598	tooltip => "bind spell readying (cast command) to key",
3599	on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) },
3600	);
3601	}	3589	}
3602	});	3590	});
3603	}	3591	}
3604		3592
3605	sub add_spell {	3593	sub add_spell {
…		…
3611		3599
3612	sub remove_spell {	3600	sub remove_spell {
3613	my ($self, $spell) = @_;	3601	my ($self, $spell) = @_;
3614		3602
3615	delete $self->{spell}->{$spell->{name}};	3603	delete $self->{spell}->{$spell->{name}};
		3604	$self->rebuild_spell_list;
		3605	}
		3606
		3607	sub clear_spells {
		3608	my ($self) = @_;
		3609
		3610	$self->{spell} = {};
3616	$self->rebuild_spell_list;	3611	$self->rebuild_spell_list;
3617	}	3612	}
3618		3613
3619	#############################################################################	3614	#############################################################################
3620		3615
…		…
3657	$coord = $max - $size if $coord > $max - $size;	3652	$coord = $max - $size if $coord > $max - $size;
3658		3653
3659	int $coord + 0.5	3654	int $coord + 0.5
3660	}	3655	}
3661		3656
3662	sub size_allocate {	3657	sub invoke_size_allocate {
3663	my ($self, $w, $h) = @_;	3658	my ($self, $w, $h) = @_;
3664		3659
3665	for my $child ($self->children) {	3660	for my $child ($self->children) {
3666	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};	3661	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3667		3662
…		…
3671	$X = _to_pixel $X, $W, $self->{w};	3666	$X = _to_pixel $X, $W, $self->{w};
3672	$Y = _to_pixel $Y, $H, $self->{h};	3667	$Y = _to_pixel $Y, $H, $self->{h};
3673		3668
3674	$child->configure ($X, $Y, $W, $H);	3669	$child->configure ($X, $Y, $W, $H);
3675	}	3670	}
		3671
		3672	1
3676	}	3673	}
3677		3674
3678	sub coord2local {	3675	sub coord2local {
3679	my ($self, $x, $y) = @_;	3676	my ($self, $x, $y) = @_;
3680		3677

Diff Legend

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