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.301 by elmex, Mon Jun 12 12:28:06 2006 UTC vs.
Revision 1.321 by root, Tue Jul 4 23:44:23 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) = @_;
…		…
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
…		…
1497	#font => default_font	1536	#font => default_font
1498	#text => initial text	1537	#text => initial text
1499	#markup => initial narkup	1538	#markup => initial narkup
1500	#max_w => maximum pixel width	1539	#max_w => maximum pixel width
1501	ellipsise => 3, # end	1540	ellipsise => 3, # end
1502	layout => (new CFClient::Layout),	1541	layout => (new CFClient::Layout 2),
1503	fontsize => 1,	1542	fontsize => 1,
1504	align => -1,	1543	align => -1,
1505	valign => -1,	1544	valign => -1,
1506	padding_x => 2,	1545	padding_x => 2,
1507	padding_y => 2,	1546	padding_y => 2,
1508	can_events => 0,	1547	can_events => 0,
1509	%arg	1548	%arg
1510	);	1549	);
1511		1550
1512	if (exists $self->{template}) {	1551	if (exists $self->{template}) {
1513	my $layout = new CFClient::Layout;	1552	my $layout = new CFClient::Layout 2;
1514	$layout->set_text (delete $self->{template});	1553	$layout->set_text (delete $self->{template});
1515	$self->{template} = $layout;	1554	$self->{template} = $layout;
1516	}	1555	}
1517		1556
1518	if (exists $self->{markup}) {	1557	if (exists $self->{markup}) {
…		…
1552	my ($self, $text) = @_;	1591	my ($self, $text) = @_;
1553		1592
1554	return if $self->{text} eq "T$text";	1593	return if $self->{text} eq "T$text";
1555	$self->{text} = "T$text";	1594	$self->{text} = "T$text";
1556		1595
1557	$self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1558	$self->{layout}->set_text ($text);	1596	$self->{layout}->set_text ($text);
1559		1597
1560	delete $self->{size_req};	1598	delete $self->{size_req};
1561	$self->realloc;	1599	$self->realloc;
1562	$self->update;	1600	$self->update;
…		…
1568	return if $self->{text} eq "M$markup";	1606	return if $self->{text} eq "M$markup";
1569	$self->{text} = "M$markup";	1607	$self->{text} = "M$markup";
1570		1608
1571	my $rgba = $markup =~ /span.*(?:foreground|background)/;	1609	my $rgba = $markup =~ /span.*(?:foreground|background)/;
1572		1610
1573	$self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1574	$self->{layout}->set_markup ($markup);	1611	$self->{layout}->set_markup ($markup);
1575		1612
1576	delete $self->{size_req};	1613	delete $self->{size_req};
1577	$self->realloc;	1614	$self->realloc;
1578	$self->update;	1615	$self->update;
…		…
1604	};	1641	};
1605		1642
1606	@{ $self->{size_req} }	1643	@{ $self->{size_req} }
1607	}	1644	}
1608		1645
		1646	sub baseline_shift {
		1647	$_[0]{layout}->descent
		1648	}
		1649
1609	sub size_allocate {	1650	sub invoke_size_allocate {
1610	my ($self, $w, $h) = @_;	1651	my ($self, $w, $h) = @_;
1611		1652
1612	delete $self->{ox};	1653	delete $self->{ox};
1613		1654
1614	delete $self->{texture}	1655	delete $self->{texture}
1615	unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};	1656	unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
		1657
		1658	1
1616	}	1659	}
1617		1660
1618	sub set_fontsize {	1661	sub set_fontsize {
1619	my ($self, $fontsize) = @_;	1662	my ($self, $fontsize) = @_;
1620		1663
1621	$self->{fontsize} = $fontsize;	1664	$self->{fontsize} = $fontsize;
		1665	delete $self->{size_req};
1622	delete $self->{texture};	1666	delete $self->{texture};
1623		1667
1624	$self->realloc;	1668	$self->realloc;
1625	}	1669	}
1626		1670
1627	sub reconfigure {	1671	sub reconfigure {
1628	my ($self) = @_;	1672	my ($self) = @_;
1629		1673
1630	delete $self->{size_req};	1674	delete $self->{size_req};
		1675	delete $self->{texture};
1631		1676
1632	$self->SUPER::reconfigure;	1677	$self->SUPER::reconfigure;
1633	}	1678	}
1634		1679
1635	sub _draw {	1680	sub _draw {
1636	my ($self) = @_;	1681	my ($self) = @_;
1637		1682
1638	$self->SUPER::_draw; # draw background, if applicable	1683	$self->SUPER::_draw; # draw background, if applicable
1639		1684
1640	my $tex = $self->{texture} ||= do {	1685	my $size = $self->{texture} ||= do {
1641	$self->{layout}->set_foreground (@{$self->{fg}});	1686	$self->{layout}->set_foreground (@{$self->{fg}});
1642	$self->{layout}->set_font ($self->{font}) if $self->{font};	1687	$self->{layout}->set_font ($self->{font}) if $self->{font};
1643	$self->{layout}->set_width ($self->{w});	1688	$self->{layout}->set_width ($self->{w});
1644	$self->{layout}->set_ellipsise ($self->{ellipsise});	1689	$self->{layout}->set_ellipsise ($self->{ellipsise});
1645	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});	1690	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1646	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	1691	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1647		1692
1648	new_from_layout CFClient::Texture $self->{layout}	1693	$self->{size_req}
1649	};	1694	};
1650		1695
1651	unless (exists $self->{ox}) {	1696	unless (exists $self->{ox}) {
1652	$self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}	1697	$self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1653	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}	1698	: $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
1654	: ($self->{w} - $tex->{w}) * 0.5);	1699	: ($self->{w} - $size->[0]) * 0.5);
1655		1700
1656	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}	1701	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1657	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}	1702	: $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1658	: ($self->{h} - $tex->{h}) * 0.5);	1703	: ($self->{h} - $size->[1]) * 0.5);
1659	};	1704	};
1660		1705
1661	glEnable GL_TEXTURE_2D;
1662
1663	my $w = List::Util::min $self->{w} + 4, $tex->{w};	1706	my $w = List::Util::min $self->{w} + 4, $size->[0];
1664	my $h = List::Util::min $self->{h} + 2, $tex->{h};	1707	my $h = List::Util::min $self->{h} + 2, $size->[1];
1665		1708
1666	if ($tex->{format} == GL_ALPHA) {	1709	$self->{layout}->render ($self->{ox}, $self->{oy});
1667	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1668	glColor @{$self->{fg}};
1669	$tex->draw_quad_alpha ($self->{ox}, $self->{oy}, $w, $h);
1670	} else {
1671	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1672	$tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}, $w, $h);
1673	}
1674
1675	glDisable GL_TEXTURE_2D;
1676	}	1710	}
1677		1711
1678	#############################################################################	1712	#############################################################################
1679		1713
1680	package CFClient::UI::EntryBase;	1714	package CFClient::UI::EntryBase;
…		…
1713		1747
1714	$text =~ s/./*/g if $self->{hidden};	1748	$text =~ s/./*/g if $self->{hidden};
1715	$self->{layout}->set_text ("$text ");	1749	$self->{layout}->set_text ("$text ");
1716	delete $self->{size_req};	1750	delete $self->{size_req};
1717		1751
1718	$self->_emit (changed => $self->{text});	1752	$self->emit (changed => $self->{text});
1719		1753
1720	$self->realloc;	1754	$self->realloc;
1721	$self->update;	1755	$self->update;
1722	}	1756	}
1723		1757
…		…
1738	my ($w, $h) = $self->SUPER::size_request;	1772	my ($w, $h) = $self->SUPER::size_request;
1739		1773
1740	($w + 1, $h) # add 1 for cursor	1774	($w + 1, $h) # add 1 for cursor
1741	}	1775	}
1742		1776
1743	sub key_down {	1777	sub invoke_key_down {
1744	my ($self, $ev) = @_;	1778	my ($self, $ev) = @_;
1745		1779
1746	my $mod = $ev->{mod};	1780	my $mod = $ev->{mod};
1747	my $sym = $ev->{sym};	1781	my $sym = $ev->{sym};
1748	my $uni = $ev->{unicode};	1782	my $uni = $ev->{unicode};
…		…
1760	} elsif ($sym == CFClient::SDLK_HOME) {	1794	} elsif ($sym == CFClient::SDLK_HOME) {
1761	$self->{cursor} = 0;	1795	$self->{cursor} = 0;
1762	} elsif ($sym == CFClient::SDLK_END) {	1796	} elsif ($sym == CFClient::SDLK_END) {
1763	$self->{cursor} = length $text;	1797	$self->{cursor} = length $text;
1764	} elsif ($uni == 27) {	1798	} elsif ($uni == 27) {
1765	$self->_emit ('escape');	1799	$self->emit ('escape');
1766	} elsif ($uni) {	1800	} elsif ($uni) {
1767	substr $text, $self->{cursor}++, 0, chr $uni;	1801	substr $text, $self->{cursor}++, 0, chr $uni;
1768	} else {	1802	} else {
1769	return 0;	1803	return 0;
1770	}	1804	}
…		…
1774	$self->realloc;	1808	$self->realloc;
1775		1809
1776	1	1810	1
1777	}	1811	}
1778		1812
1779	sub focus_in {	1813	sub invoke_focus_in {
1780	my ($self) = @_;	1814	my ($self) = @_;
1781		1815
1782	$self->{last_activity} = $::NOW;	1816	$self->{last_activity} = $::NOW;
1783		1817
1784	$self->SUPER::focus_in;	1818	$self->SUPER::invoke_focus_in
1785	}	1819	}
1786		1820
1787	sub button_down {	1821	sub invoke_button_down {
1788	my ($self, $ev, $x, $y) = @_;	1822	my ($self, $ev, $x, $y) = @_;
1789		1823
1790	$self->SUPER::button_down ($ev, $x, $y);	1824	$self->SUPER::invoke_button_down ($ev, $x, $y);
1791		1825
1792	my $idx = $self->{layout}->xy_to_index ($x, $y);	1826	my $idx = $self->{layout}->xy_to_index ($x, $y);
1793		1827
1794	# byte-index to char-index	1828	# byte-index to char-index
1795	my $text = $self->{text};	1829	my $text = $self->{text};
…		…
1800	$self->update;	1834	$self->update;
1801		1835
1802	1	1836	1
1803	}	1837	}
1804		1838
1805	sub mouse_motion {	1839	sub invoke_mouse_motion {
1806	my ($self, $ev, $x, $y) = @_;	1840	my ($self, $ev, $x, $y) = @_;
1807	# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#	1841	# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1808		1842
1809	0	1843	1
1810	}	1844	}
1811		1845
1812	sub _draw {	1846	sub _draw {
1813	my ($self) = @_;	1847	my ($self) = @_;
1814		1848
…		…
1855		1889
1856	our @ISA = CFClient::UI::EntryBase::;	1890	our @ISA = CFClient::UI::EntryBase::;
1857		1891
1858	use CFClient::OpenGL;	1892	use CFClient::OpenGL;
1859		1893
1860	sub key_down {	1894	sub invoke_key_down {
1861	my ($self, $ev) = @_;	1895	my ($self, $ev) = @_;
1862		1896
1863	my $sym = $ev->{sym};	1897	my $sym = $ev->{sym};
1864		1898
1865	if ($sym == 13) {	1899	if ($sym == 13) {
1866	unshift @{$self->{history}},	1900	unshift @{$self->{history}},
1867	my $txt = $self->get_text;	1901	my $txt = $self->get_text;
		1902
1868	$self->{history_pointer} = -1;	1903	$self->{history_pointer} = -1;
1869	$self->{history_saveback} = '';	1904	$self->{history_saveback} = '';
1870	$self->_emit (activate => $txt);	1905	$self->emit (activate => $txt);
1871	$self->update;	1906	$self->update;
1872		1907
1873	} elsif ($sym == CFClient::SDLK_UP) {	1908	} elsif ($sym == CFClient::SDLK_UP) {
1874	if ($self->{history_pointer} < 0) {	1909	if ($self->{history_pointer} < 0) {
1875	$self->{history_saveback} = $self->get_text;	1910	$self->{history_saveback} = $self->get_text;
…		…
1891	} else {	1926	} else {
1892	$self->set_text ($self->{history_saveback});	1927	$self->set_text ($self->{history_saveback});
1893	}	1928	}
1894		1929
1895	} else {	1930	} else {
1896	return $self->SUPER::key_down ($ev)	1931	return $self->SUPER::invoke_key_down ($ev)
1897	}	1932	}
1898		1933
1899	1	1934	1
1900	}	1935	}
1901		1936
…		…
1925	can_events => 1,	1960	can_events => 1,
1926	@_	1961	@_
1927	)	1962	)
1928	}	1963	}
1929		1964
1930	sub activate { }
1931
1932	sub button_up {	1965	sub invoke_button_up {
1933	my ($self, $ev, $x, $y) = @_;	1966	my ($self, $ev, $x, $y) = @_;
1934		1967
1935	$self->emit ("activate")	1968	$self->emit ("activate")
1936	if $x >= 0 && $x < $self->{w}	1969	if $x >= 0 && $x < $self->{w}
1937	&& $y >= 0 && $y < $self->{h};	1970	&& $y >= 0 && $y < $self->{h};
…		…
1951	$tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});	1984	$tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1952		1985
1953	glDisable GL_TEXTURE_2D;	1986	glDisable GL_TEXTURE_2D;
1954		1987
1955	$self->SUPER::_draw;	1988	$self->SUPER::_draw;
		1989	}
		1990
		1991	#############################################################################
		1992
		1993	package CFClient::UI::ImageButton;
		1994
		1995	our @ISA = CFClient::UI::Image::;
		1996
		1997	use CFClient::OpenGL;
		1998
		1999	my %textures;
		2000
		2001	sub new {
		2002	my $class = shift;
		2003
		2004	my $self = $class->SUPER::new (
		2005	padding_x => 4,
		2006	padding_y => 4,
		2007	fg => [1, 1, 1],
		2008	active_fg => [0, 0, 1],
		2009	can_hover => 1,
		2010	align => 0,
		2011	valign => 0,
		2012	can_events => 1,
		2013	@_
		2014	);
		2015	}
		2016
		2017	sub invoke_button_up {
		2018	my ($self, $ev, $x, $y) = @_;
		2019
		2020	$self->emit ("activate")
		2021	if $x >= 0 && $x < $self->{w}
		2022	&& $y >= 0 && $y < $self->{h};
		2023
		2024	1
1956	}	2025	}
1957		2026
1958	#############################################################################	2027	#############################################################################
1959		2028
1960	package CFClient::UI::CheckBox;	2029	package CFClient::UI::CheckBox;
…		…
1987	my ($self) = @_;	2056	my ($self) = @_;
1988		2057
1989	(6) x 2	2058	(6) x 2
1990	}	2059	}
1991		2060
		2061	sub toggle {
		2062	my ($self) = @_;
		2063
		2064	$self->{state} = !$self->{state};
		2065	$self->emit (changed => $self->{state});
		2066	$self->update;
		2067	}
		2068
1992	sub button_down {	2069	sub invoke_button_down {
1993	my ($self, $ev, $x, $y) = @_;	2070	my ($self, $ev, $x, $y) = @_;
1994		2071
1995	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}	2072	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1996	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {	2073	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1997	$self->{state} = !$self->{state};	2074	$self->toggle;
1998	$self->_emit (changed => $self->{state});
1999	} else {	2075	} else {
2000	return 0	2076	return 0
2001	}	2077	}
2002		2078
2003	1	2079	1
…		…
2028	package CFClient::UI::Image;	2104	package CFClient::UI::Image;
2029		2105
2030	our @ISA = CFClient::UI::Base::;	2106	our @ISA = CFClient::UI::Base::;
2031		2107
2032	use CFClient::OpenGL;	2108	use CFClient::OpenGL;
2033	use Carp qw/confess/;
2034		2109
2035	our %loaded_images;	2110	our %texture_cache;
2036		2111
2037	sub new {	2112	sub new {
2038	my $class = shift;	2113	my $class = shift;
2039		2114
2040	my $self = $class->SUPER::new (can_events => 0, @_);	2115	my $self = $class->SUPER::new (
		2116	can_events => 0,
		2117	@_,
		2118	);
2041		2119
2042	$self->{image} or confess "Image has 'image' not set. This is a fatal error!";	2120	$self->{path}
		2121	or Carp::croak "required attribute 'path' not set";
2043		2122
2044	$loaded_images{$self->{image}} ||=	2123	$self->{tex} = $texture_cache{$self->{path}} ||=
2045	new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1;	2124	new_from_file CFClient::Texture CFClient::find_rcfile $self->{path}, mipmap => 1;
2046		2125
2047	my $tex = $self->{tex} = $loaded_images{$self->{image}};	2126	Scalar::Util::weaken $texture_cache{$self->{path}};
2048		2127
2049	Scalar::Util::weaken $loaded_images{$self->{image}};	2128	$self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2050
2051	$self->{aspect} = $tex->{w} / $tex->{h};
2052		2129
2053	$self	2130	$self
2054	}	2131	}
2055		2132
2056	sub size_request {	2133	sub size_request {
2057	my ($self) = @_;	2134	my ($self) = @_;
2058		2135
2059	($self->{tex}->{w}, $self->{tex}->{h})	2136	($self->{tex}{w}, $self->{tex}{h})
2060	}	2137	}
2061		2138
2062	sub _draw {	2139	sub _draw {
2063	my ($self) = @_;	2140	my ($self) = @_;
2064		2141
…		…
2173	my $ycut1 = max 0, min 1, $ycut;	2250	my $ycut1 = max 0, min 1, $ycut;
2174	my $ycut2 = max 0, min 1, $ycut - 1;	2251	my $ycut2 = max 0, min 1, $ycut - 1;
2175		2252
2176	my $h1 = $self->{h} * (1 - $ycut1);	2253	my $h1 = $self->{h} * (1 - $ycut1);
2177	my $h2 = $self->{h} * (1 - $ycut2);	2254	my $h2 = $self->{h} * (1 - $ycut2);
		2255	my $h3 = $self->{h};
		2256
		2257	$_ = $_ * (284-4)/288 + 4/288 for ($h1, $h2, $h3);
2178		2258
2179	glEnable GL_BLEND;	2259	glEnable GL_BLEND;
2180	glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,	2260	glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2181	GL_ONE, GL_ONE_MINUS_SRC_ALPHA;	2261	GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2182	glEnable GL_TEXTURE_2D;	2262	glEnable GL_TEXTURE_2D;
…		…
2201		2281
2202	if ($t3) {	2282	if ($t3) {
2203	glBindTexture GL_TEXTURE_2D, $t3->{name};	2283	glBindTexture GL_TEXTURE_2D, $t3->{name};
2204	glBegin GL_QUADS;	2284	glBegin GL_QUADS;
2205	glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;	2285	glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2206	glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h};	2286	glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2207	glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h};	2287	glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2208	glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;	2288	glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2209	glEnd;	2289	glEnd;
2210	}	2290	}
2211		2291
2212	glDisable GL_BLEND;	2292	glDisable GL_BLEND;
…		…
2300	$self->update;	2380	$self->update;
2301		2381
2302	$self	2382	$self
2303	}	2383	}
2304		2384
2305	sub changed { }
2306
2307	sub set_range {	2385	sub set_range {
2308	my ($self, $range) = @_;	2386	my ($self, $range) = @_;
2309		2387
2310	($range, $self->{range}) = ($self->{range}, $range);	2388	($range, $self->{range}) = ($self->{range}, $range);
2311		2389
…		…
2331	if $unit;	2409	if $unit;
2332		2410
2333	@{$self->{range}} = ($value, $lo, $hi, $page, $unit);	2411	@{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2334		2412
2335	if ($value != $old_value) {	2413	if ($value != $old_value) {
2336	$self->_emit (changed => $value);	2414	$self->emit (changed => $value);
2337	$self->update;	2415	$self->update;
2338	}	2416	}
2339	}	2417	}
2340		2418
2341	sub size_request {	2419	sub size_request {
2342	my ($self) = @_;	2420	my ($self) = @_;
2343		2421
2344	($self->{req_w}, $self->{req_h})	2422	($self->{req_w}, $self->{req_h})
2345	}	2423	}
2346		2424
2347	sub button_down {	2425	sub invoke_button_down {
2348	my ($self, $ev, $x, $y) = @_;	2426	my ($self, $ev, $x, $y) = @_;
2349		2427
2350	$self->SUPER::button_down ($ev, $x, $y);	2428	$self->SUPER::invoke_button_down ($ev, $x, $y);
2351		2429
2352	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];	2430	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2353		2431
2354	$self->mouse_motion ($ev, $x, $y)	2432	$self->invoke_mouse_motion ($ev, $x, $y)
2355	}	2433	}
2356		2434
2357	sub mouse_motion {	2435	sub invoke_mouse_motion {
2358	my ($self, $ev, $x, $y) = @_;	2436	my ($self, $ev, $x, $y) = @_;
2359		2437
2360	if ($GRAB == $self) {	2438	if ($GRAB == $self) {
2361	my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});	2439	my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2362		2440
…		…
2483	can_events => 0,	2561	can_events => 0,
2484	indent => 0,	2562	indent => 0,
2485	#font => default_font	2563	#font => default_font
2486	@_,	2564	@_,
2487		2565
2488	layout => (new CFClient::Layout 1),	2566	layout => (new CFClient::Layout 2),
2489	par => [],	2567	par => [],
2490	height => 0,	2568	height => 0,
2491	children => [	2569	children => [
2492	(new CFClient::UI::Empty expand => 1),	2570	(new CFClient::UI::Empty expand => 1),
2493	(new CFClient::UI::Slider vertical => 1),	2571	(new CFClient::UI::Slider vertical => 1),
…		…
2504		2582
2505	$self->{fontsize} = $fontsize;	2583	$self->{fontsize} = $fontsize;
2506	$self->reflow;	2584	$self->reflow;
2507	}	2585	}
2508		2586
		2587	sub size_request {
		2588	my ($self) = @_;
		2589
		2590	my ($empty, $slider) = @{ $self->{children} };
		2591
		2592	local $self->{children} = [$empty, $slider];
		2593	$self->SUPER::size_request
		2594	}
		2595
2509	sub size_allocate {	2596	sub invoke_size_allocate {
2510	my ($self, $w, $h) = @_;	2597	my ($self, $w, $h) = @_;
2511		2598
2512	$self->SUPER::size_allocate ($w, $h);	2599	my ($empty, $slider, @other) = @{ $self->{children} };
		2600	$_->configure (@$_{qw(x y req_w req_h)}) for @other;
2513		2601
2514	$self->{layout}->set_font ($self->{font}) if $self->{font};	2602	$self->{layout}->set_font ($self->{font}) if $self->{font};
2515	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	2603	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2516	$self->{layout}->set_width ($self->{children}[0]{w});	2604	$self->{layout}->set_width ($empty->{w});
2517	$self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});	2605	$self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2518		2606
2519	$self->reflow;	2607	$self->reflow;
2520	}
2521		2608
2522	sub text_size {	2609	local $self->{children} = [$empty, $slider];
2523	my ($self, $text, $indent) = @_;	2610	$self->SUPER::invoke_size_allocate ($w, $h)
		2611	}
		2612
		2613	sub get_layout {
		2614	my ($self, $para) = @_;
2524		2615
2525	my $layout = $self->{layout};	2616	my $layout = $self->{layout};
2526		2617
		2618	$layout->set_font ($self->{font}) if $self->{font};
		2619	$layout->set_foreground (@{$para->{fg}});
2527	$layout->set_height ($self->{fontsize} * $::FONTSIZE);	2620	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
2528	$layout->set_width ($self->{children}[0]{w} - $indent);	2621	$layout->set_width ($self->{children}[0]{w} - $para->{indent});
2529	$layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});	2622	$layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2530	$layout->set_markup ($text);	2623	$layout->set_markup ($para->{markup});
		2624
		2625	$layout->set_shapes (
		2626	map
		2627	+(0, $_->baseline_shift +$_->{padding_y} - $_->{h}, $_->{w}, $_->{h}),
		2628	@{$para->{widget}}
2531		2629	);
		2630
2532	$layout->size	2631	$layout
2533	}	2632	}
2534		2633
2535	sub reflow {	2634	sub reflow {
2536	my ($self) = @_;	2635	my ($self) = @_;
2537		2636
…		…
2546	$self->{children}[1]->set_value ($offset);	2645	$self->{children}[1]->set_value ($offset);
2547	}	2646	}
2548		2647
2549	sub clear {	2648	sub clear {
2550	my ($self) = @_;	2649	my ($self) = @_;
		2650
		2651	my (undef, undef, @other) = @{ $self->{children} };
		2652	$self->remove ($_) for @other;
2551		2653
2552	$self->{par} = [];	2654	$self->{par} = [];
2553	$self->{height} = 0;	2655	$self->{height} = 0;
2554	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);	2656	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2555	}	2657	}
2556		2658
2557	sub add_paragraph {	2659	sub add_paragraph {
2558	my ($self, $color, $text, $indent) = @_;	2660	my ($self, $color, $para, $indent) = @_;
2559		2661
2560	for my $line (split /\n/, $text) {	2662	my ($text, @w) = ref $para ? @$para : $para;
2561	my ($w, $h) = $self->text_size ($line);	2663
2562	$self->{height} += $h;	2664	$para = {
2563	push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];	2665	w => 1e10,
		2666	wrapped => 1,
		2667	fg => $color,
		2668	indent => $indent,
		2669	markup => $text,
		2670	widget => \@w,
2564	}	2671	};
2565		2672
2566	$self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]);	2673	$self->add (@w) if @w;
		2674	push @{$self->{par}}, $para;
		2675
		2676	$self->{need_reflow}++;
		2677	$self->update;
		2678	}
		2679
		2680	sub scroll_to_bottom {
		2681	my ($self) = @_;
		2682
		2683	$self->{scroll_to_bottom} = 1;
		2684	$self->update;
2567	}	2685	}
2568		2686
2569	sub update {	2687	sub update {
2570	my ($self) = @_;	2688	my ($self) = @_;
2571		2689
…		…
2579	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};	2697	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2580		2698
2581	if (delete $self->{need_reflow}) {	2699	if (delete $self->{need_reflow}) {
2582	my $height = 0;	2700	my $height = 0;
2583		2701
2584	my $layout = $self->{layout};
2585
2586	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
2587
2588	for (@{$self->{par}}) {	2702	for my $para (@{$self->{par}}) {
2589	if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support	2703	if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2590	$layout->set_width ($W - $_->[3]);	2704	my $layout = $self->get_layout ($para);
2591	$layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2592	$layout->set_markup ($_->[4]);
2593	my ($w, $h) = $layout->size;	2705	my ($w, $h) = $layout->size;
2594	$_->[0] = $w + $_->[3];	2706
2595	$_->[1] = $h;	2707	$para->{w} = $w + $para->{indent};
		2708	$para->{h} = $h;
		2709	$para->{wrapped} = $layout->has_wrapped;
2596	}	2710	}
2597		2711
2598	$height += $_->[1];	2712	$height += $para->{h};
2599	}	2713	}
2600		2714
2601	$self->{height} = $height;	2715	$self->{height} = $height;
2602		2716
2603	$self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);	2717	$self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2604		2718
2605	delete $self->{texture};	2719	delete $self->{texture};
		2720	}
		2721
		2722	if (delete $self->{scroll_to_bottom}) {
		2723	$self->{children}[1]->set_value (1e10);
2606	}	2724	}
2607		2725
2608	$self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {	2726	$self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2609	glClearColor 0, 0, 0, 0;	2727	glClearColor 0, 0, 0, 0;
2610	glClear GL_COLOR_BUFFER_BIT;	2728	glClear GL_COLOR_BUFFER_BIT;
…		…
2614	my $y0 = $top;	2732	my $y0 = $top;
2615	my $y1 = $top + $H;	2733	my $y1 = $top + $H;
2616		2734
2617	my $y = 0;	2735	my $y = 0;
2618		2736
2619	my $layout = $self->{layout};
2620
2621	$layout->set_font ($self->{font}) if $self->{font};
2622
2623	glEnable GL_BLEND;
2624	#TODO# not correct in windows where rgba is forced off
2625	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2626
2627	for my $par (@{$self->{par}}) {	2737	for my $para (@{$self->{par}}) {
2628	my $h = $par->[1];	2738	my $h = $para->{h};
2629		2739
2630	if ($y0 < $y + $h && $y < $y1) {	2740	if ($y0 < $y + $h && $y < $y1) {
2631	$layout->set_foreground (@{ $par->[2] });
2632	$layout->set_width ($W - $par->[3]);
2633	$layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2634	$layout->set_markup ($par->[4]);
2635		2741
2636	my ($w, $h, $data, $format, $internalformat) = $layout->render;	2742	my $layout = $self->get_layout ($para);
2637		2743
2638	glRasterPos $par->[3], $y - $y0;	2744	$layout->render ($para->{indent}, $y - $y0);
2639	glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;	2745
		2746	if (my @w = @{ $para->{widget} }) {
		2747	my @s = $layout->get_shapes;
		2748
		2749	for (@w) {
		2750	my ($dx, $dy) = splice @s, 0, 2, ();
		2751
		2752	$_->{x} = $dx + $para->{indent};
		2753	$_->{y} = $dy + $y - $y0;
		2754
		2755	$_->draw;
		2756	}
		2757	}
2640	}	2758	}
2641		2759
2642	$y += $h;	2760	$y += $h;
2643	}	2761	}
2644
2645	glDisable GL_BLEND;
2646	};	2762	};
2647	});	2763	});
		2764	}
		2765
		2766	sub reconfigure {
		2767	my ($self) = @_;
		2768
		2769	$self->SUPER::reconfigure;
		2770
		2771	$_->{w} = 1e10 for @{ $self->{par} };
		2772	$self->reflow;
2648	}	2773	}
2649		2774
2650	sub _draw {	2775	sub _draw {
2651	my ($self) = @_;	2776	my ($self) = @_;
2652		2777
…		…
2655	glColor 0, 0, 0, 1;	2780	glColor 0, 0, 0, 1;
2656	$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});
2657	glDisable GL_TEXTURE_2D;	2782	glDisable GL_TEXTURE_2D;
2658		2783
2659	$self->{children}[1]->draw;	2784	$self->{children}[1]->draw;
2660
2661	}	2785	}
2662		2786
2663	#############################################################################	2787	#############################################################################
2664		2788
2665	package CFClient::UI::Animator;	2789	package CFClient::UI::Animator;
…		…
2774	my ($w, $h) = @{$self->child}{qw(req_w req_h)};	2898	my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2775		2899
2776	($w + 4, $h + 4)	2900	($w + 4, $h + 4)
2777	}	2901	}
2778		2902
2779	sub size_allocate {	2903	sub invoke_size_allocate {
2780	my ($self, $w, $h) = @_;	2904	my ($self, $w, $h) = @_;
2781		2905
2782	$self->SUPER::size_allocate ($w - 4, $h - 4);	2906	$self->SUPER::invoke_size_allocate ($w - 4, $h - 4)
2783	}	2907	}
2784		2908
2785	sub visibility_change {	2909	sub invoke_visibility_change {
2786	my ($self, $visible) = @_;	2910	my ($self, $visible) = @_;
2787		2911
2788	return unless $visible;	2912	return unless $visible;
2789		2913
2790	$self->{root}->on_post_alloc ("move_$self" => sub {	2914	$self->{root}->on_post_alloc ("move_$self" => sub {
…		…
2897	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});	3021	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2898	glDisable GL_TEXTURE_2D;	3022	glDisable GL_TEXTURE_2D;
2899	}	3023	}
2900	}	3024	}
2901		3025
2902	sub DESTROY {	3026	sub destroy {
2903	my ($self) = @_;	3027	my ($self) = @_;
2904		3028
2905	$self->{timer}->cancel	3029	$self->{timer}->cancel
2906	if $self->{timer};	3030	if $self->{timer};
2907		3031
2908	$self->SUPER::DESTROY;	3032	$self->SUPER::destroy;
2909	}	3033	}
2910		3034
2911	#############################################################################	3035	#############################################################################
2912		3036
2913	package CFClient::UI::Buttonbar;	3037	package CFClient::UI::Buttonbar;
…		…
2957		3081
2958	# 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)
2959	sub popup {	3083	sub popup {
2960	my ($self, $ev) = @_;	3084	my ($self, $ev) = @_;
2961		3085
2962	$self->_emit ("popdown");	3086	$self->emit ("popdown");
2963		3087
2964	# maybe save $GRAB? must be careful about events...	3088	# maybe save $GRAB? must be careful about events...
2965	$GRAB = $self;	3089	$GRAB = $self;
2966	$self->{button} = $ev->{button};	3090	$self->{button} = $ev->{button};
2967		3091
2968	$self->show;	3092	$self->show;
2969	$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);
2970	}	3094	}
2971		3095
2972	sub mouse_motion {	3096	sub invoke_mouse_motion {
2973	my ($self, $ev, $x, $y) = @_;	3097	my ($self, $ev, $x, $y) = @_;
2974		3098
2975	# TODO: should use vbox->find_widget or so	3099	# TODO: should use vbox->find_widget or so
2976	$HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});	3100	$HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2977	$self->{hover} = $self->{item}{$HOVER};	3101	$self->{hover} = $self->{item}{$HOVER};
2978		3102
2979	0	3103	0
2980	}	3104	}
2981		3105
2982	sub button_up {	3106	sub invoke_button_up {
2983	my ($self, $ev, $x, $y) = @_;	3107	my ($self, $ev, $x, $y) = @_;
2984		3108
2985	if ($ev->{button} == $self->{button}) {	3109	if ($ev->{button} == $self->{button}) {
2986	undef $GRAB;	3110	undef $GRAB;
2987	$self->hide;	3111	$self->hide;
2988		3112
2989	$self->_emit ("popdown");	3113	$self->emit ("popdown");
2990	$self->{hover}[1]->() if $self->{hover};	3114	$self->{hover}[1]->() if $self->{hover};
2991	} else {	3115	} else {
2992	return 0	3116	return 0
2993	}	3117	}
2994		3118
…		…
3021		3145
3022	$self->{current} = $self->{children}[0]	3146	$self->{current} = $self->{children}[0]
3023	if @{ $self->{children} };	3147	if @{ $self->{children} };
3024	}	3148	}
3025		3149
		3150	sub get_current_page {
		3151	my ($self) = @_;
		3152
		3153	$self->{current}
		3154	}
		3155
3026	sub set_current_page {	3156	sub set_current_page {
3027	my ($self, $page_or_widget) = @_;	3157	my ($self, $page_or_widget) = @_;
3028		3158
3029	my $widget = ref $page_or_widget	3159	my $widget = ref $page_or_widget
3030	? $page_or_widget	3160	? $page_or_widget
3031	: $self->{children}[$page_or_widget];	3161	: $self->{children}[$page_or_widget];
3032		3162
3033	$self->{current} = $widget;	3163	$self->{current} = $widget;
3034	$self->{current}->configure (0, 0, $self->{w}, $self->{h});	3164	$self->{current}->configure (0, 0, $self->{w}, $self->{h});
3035		3165
3036	$self->_emit (page_changed => $self->{current});	3166	$self->emit (page_changed => $self->{current});
3037		3167
3038	$self->realloc;	3168	$self->realloc;
3039	}	3169	}
3040		3170
3041	sub visible_children {	3171	sub visible_children {
…		…
3046	my ($self) = @_;	3176	my ($self) = @_;
3047		3177
3048	$self->{current}->size_request	3178	$self->{current}->size_request
3049	}	3179	}
3050		3180
3051	sub size_allocate {	3181	sub invoke_size_allocate {
3052	my ($self, $w, $h) = @_;	3182	my ($self, $w, $h) = @_;
3053		3183
3054	$self->{current}->configure (0, 0, $w, $h);	3184	$self->{current}->configure (0, 0, $w, $h);
		3185
		3186	1
3055	}	3187	}
3056		3188
3057	sub _draw {	3189	sub _draw {
3058	my ($self) = @_;	3190	my ($self) = @_;
3059		3191
…		…
3094	);	3226	);
3095		3227
3096	$self->{multiplexer}->add ($widget);	3228	$self->{multiplexer}->add ($widget);
3097	}	3229	}
3098		3230
		3231	sub get_current_page {
		3232	my ($self) = @_;
		3233
		3234	$self->{multiplexer}->get_current_page
		3235	}
		3236
3099	sub set_current_page {	3237	sub set_current_page {
3100	my ($self, $page) = @_;	3238	my ($self, $page) = @_;
3101		3239
3102	$self->{multiplexer}->set_current_page ($page);	3240	$self->{multiplexer}->set_current_page ($page);
3103	$self->_emit (page_changed => $self->{multiplexer}{current});	3241	$self->emit (page_changed => $self->{multiplexer}{current});
3104	}	3242	}
3105		3243
3106	#############################################################################	3244	#############################################################################
3107		3245
3108	package CFClient::UI::Combobox;	3246	package CFClient::UI::Combobox;
…		…
3123	$self->_set_value ($self->{value});	3261	$self->_set_value ($self->{value});
3124		3262
3125	$self	3263	$self
3126	}	3264	}
3127		3265
3128	sub button_down {	3266	sub invoke_button_down {
3129	my ($self, $ev) = @_;	3267	my ($self, $ev) = @_;
3130		3268
3131	my @menu_items;	3269	my @menu_items;
3132		3270
3133	for (@{ $self->{options} }) {	3271	for (@{ $self->{options} }) {
…		…
3154	my ($self, $value) = @_;	3292	my ($self, $value) = @_;
3155		3293
3156	return unless $self->{value} ne $value;	3294	return unless $self->{value} ne $value;
3157		3295
3158	$self->_set_value ($value);	3296	$self->_set_value ($value);
3159	$self->_emit (changed => $value);	3297	$self->emit (changed => $value);
3160	}	3298	}
3161		3299
3162	#############################################################################	3300	#############################################################################
3163		3301
3164	package CFClient::UI::Statusbox;	3302	package CFClient::UI::Statusbox;
…		…
3279	count => 1,	3417	count => 1,
3280	%arg,	3418	%arg,
3281	};	3419	};
3282	}	3420	}
3283		3421
		3422	$ROOT->on_refresh (reorder => sub {
3284	$self->reorder;	3423	$self->reorder;
		3424	});
3285	}	3425	}
3286		3426
3287	sub reconfigure {	3427	sub reconfigure {
3288	my ($self) = @_;	3428	my ($self) = @_;
3289		3429
…		…
3292		3432
3293	$self->reorder;	3433	$self->reorder;
3294	$self->SUPER::reconfigure;	3434	$self->SUPER::reconfigure;
3295	}	3435	}
3296		3436
3297	sub DESTROY {	3437	sub destroy {
3298	my ($self) = @_;	3438	my ($self) = @_;
3299		3439
3300	$self->{timer}->cancel;	3440	$self->{timer}->cancel;
3301		3441
3302	$self->SUPER::DESTROY;	3442	$self->SUPER::destroy;
3303	}	3443	}
3304		3444
3305	#############################################################################	3445	#############################################################################
3306		3446
3307	package CFClient::UI::Inventory;	3447	package CFClient::UI::Inventory;
3308		3448
3309	our @ISA = CFClient::UI::ScrolledWindow::;	3449	our @ISA = CFClient::UI::Table::;
3310		3450
3311	sub new {	3451	sub new {
3312	my $class = shift;	3452	my $class = shift;
3313		3453
3314	my $self = $class->SUPER::new (	3454	my $self = $class->SUPER::new (
3315	child => (new CFClient::UI::Table col_expand => [0, 1, 0]),	3455	col_expand => [0, 1, 0],
3316	@_,	3456	@_,
3317	);	3457	);
3318		3458
3319	$self	3459	$self
3320	}	3460	}
3321		3461
3322	sub set_items {	3462	sub set_items {
3323	my ($self, $items) = @_;	3463	my ($self, $items) = @_;
3324		3464
3325	$self->{child}->clear;	3465	$self->clear;
3326	return unless $items;	3466	return unless $items;
3327		3467
3328	my @items = sort {	3468	my @items = sort {
3329	($a->{type} <=> $b->{type})	3469	($a->{type} <=> $b->{type})
3330	or ($a->{name} cmp $b->{name})	3470	or ($a->{name} cmp $b->{name})
3331	} @$items;	3471	} values %$items;
3332		3472
3333	$self->{real_items} = \@items;	3473	$self->{real_items} = \@items;
3334		3474
3335	my $row = 0;	3475	my $row = 0;
3336	for my $item (@items) {	3476	for my $item (@items) {
3337	CFClient::Item::update_widgets $item;	3477	CFClient::Item::update_widgets $item;
3338		3478
3339	$self->{child}->add (0, $row, $item->{face_widget});	3479	$self->add (0, $row, $item->{face_widget});
3340	$self->{child}->add (1, $row, $item->{desc_widget});	3480	$self->add (1, $row, $item->{desc_widget});
3341	$self->{child}->add (2, $row, $item->{weight_widget});	3481	$self->add (2, $row, $item->{weight_widget});
3342		3482
3343	$row++;	3483	$row++;
3344	}
3345	}
3346
3347	#############################################################################
3348
3349	package CFClient::UI::BindEditor;
3350
3351	our @ISA = CFClient::UI::FancyFrame::;
3352
3353	sub new {
3354	my $class = shift;
3355
3356	my $self = $class->SUPER::new (binding => [], commands => [], @_);
3357
3358	$self->add (my $vb = new CFClient::UI::VBox);
3359
3360
3361	$vb->add ($self->{rec_btn} = new CFClient::UI::Button
3362	text => "start recording",
3363	tooltip => "Start/Stops recording of actions."
3364	."All subsequent actions after the recording started will be captured."
3365	."The actions are displayed after the record was stopped."
3366	."To bind the action you have to click on the 'Bind' button",
3367	on_activate => sub {
3368	unless ($self->{recording}) {
3369	$self->start;
3370	} else {
3371	$self->stop;
3372	}
3373	});
3374
3375	$vb->add (new CFClient::UI::Label text => "Actions:");
3376	$vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3377
3378	$vb->add (new CFClient::UI::Label text => "Bound to: ");
3379	$vb->add (my $hb = new CFClient::UI::HBox);
3380	$hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3381	$hb->add (new CFClient::UI::Button
3382	text => "bind",
3383	tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3384	on_activate => sub {
3385	$self->ask_for_bind;
3386	});
3387
3388	$vb->add (my $hb = new CFClient::UI::HBox);
3389	$hb->add (new CFClient::UI::Button
3390	text => "ok",
3391	expand => 1,
3392	tooltip => "This closes the binding editor and saves the binding",
3393	on_activate => sub {
3394	$self->hide;
3395	$self->commit;
3396	});
3397
3398	$hb->add (new CFClient::UI::Button
3399	text => "cancel",
3400	expand => 1,
3401	tooltip => "This closes the binding editor without saving",
3402	on_activate => sub {
3403	$self->hide;
3404	$self->{binding_cancel}->()
3405	if $self->{binding_cancel};
3406	});
3407
3408	$self->update_binding_widgets;
3409
3410	$self
3411	}
3412
3413	sub commit {
3414	my ($self) = @_;
3415	my ($mod, $sym, $cmds) = $self->get_binding;
3416	if ($sym != 0 && @$cmds > 0) {
3417	$::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3418	."'. Don't forget 'Save Config'!");
3419	$self->{binding_change}->($mod, $sym, $cmds)
3420	if $self->{binding_change};
3421	} else {
3422	$::STATUSBOX->add ("No action bound, no key or action specified!");
3423	$self->{binding_cancel}->()
3424	if $self->{binding_cancel};
3425	}
3426	}
3427
3428	sub start {
3429	my ($self) = @_;
3430
3431	$self->{rec_btn}->set_text ("stop recording");
3432	$self->{recording} = 1;
3433	$self->clear_command_list;
3434	$::CONN->start_record if $::CONN;
3435	}
3436
3437	sub stop {
3438	my ($self) = @_;
3439
3440	$self->{rec_btn}->set_text ("start recording");
3441	$self->{recording} = 0;
3442
3443	my $rec;
3444	$rec = $::CONN->stop_record if $::CONN;
3445	return unless ref $rec eq 'ARRAY';
3446	$self->set_command_list ($rec);
3447	}
3448
3449
3450	sub ask_for_bind_and_commit {
3451	my ($self) = @_;
3452	$self->ask_for_bind (1);
3453	}
3454
3455	sub ask_for_bind {
3456	my ($self, $commit) = @_;
3457
3458	CFClient::Binder::open_binding_dialog (sub {
3459	my ($mod, $sym) = @_;
3460	$self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3461	$self->update_binding_widgets;
3462	$self->commit if $commit;
3463	});
3464	}
3465
3466	# $mod and $sym are the modifiers and key symbol
3467	# $cmds is a array ref of strings (the commands)
3468	# $cb is the callback that is executed on OK
3469	# $ccb is the callback that is executed on CANCEL and
3470	# when the binding was unsuccessful on OK
3471	sub set_binding {
3472	my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3473
3474	$self->clear_command_list;
3475	$self->{recording} = 0;
3476	$self->{rec_btn}->set_text ("start recording");
3477
3478	$self->{binding} = [$mod, $sym];
3479	$self->{commands} = $cmds;
3480
3481	$self->{binding_change} = $cb;
3482	$self->{binding_cancel} = $ccb;
3483
3484	$self->update_binding_widgets;
3485	}
3486
3487	# this is a shortcut method that asks for a binding
3488	# and then just binds it.
3489	sub do_quick_binding {
3490	my ($self, $cmds) = @_;
3491	$self->set_binding (undef, undef, $cmds, sub {
3492	$::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3493	});
3494	$self->ask_for_bind (1);
3495	}
3496
3497	sub update_binding_widgets {
3498	my ($self) = @_;
3499	my ($mod, $sym, $cmds) = $self->get_binding;
3500	$self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3501	$self->set_command_list ($cmds);
3502	}
3503
3504	sub get_binding {
3505	my ($self) = @_;
3506	return (
3507	$self->{binding}->[0],
3508	$self->{binding}->[1],
3509	[ grep { defined $_ } @{$self->{commands}} ]
3510	);
3511	}
3512
3513	sub clear_command_list {
3514	my ($self) = @_;
3515	$self->{cmdbox}->clear ();
3516	}
3517
3518	sub set_command_list {
3519	my ($self, $cmds) = @_;
3520
3521	$self->{cmdbox}->clear ();
3522	$self->{commands} = $cmds;
3523
3524	my $idx = 0;
3525
3526	for (@$cmds) {
3527	$self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3528
3529	my $i = $idx;
3530	$hb->add (new CFClient::UI::Label text => $_);
3531	$hb->add (new CFClient::UI::Button
3532	text => "delete",
3533	tooltip => "Deletes the action from the record",
3534	on_activate => sub {
3535	$self->{cmdbox}->remove ($hb);
3536	$cmds->[$i] = undef;
3537	});
3538
3539
3540	$idx++
3541	}	3484	}
3542	}	3485	}
3543		3486
3544	#############################################################################	3487	#############################################################################
3545		3488
…		…
3574	my ($self) = @_;	3517	my ($self) = @_;
3575		3518
3576	$CFClient::UI::ROOT->on_refresh ($self => sub {	3519	$CFClient::UI::ROOT->on_refresh ($self => sub {
3577	$self->clear;	3520	$self->clear;
3578		3521
		3522	return unless $::CONN;
		3523
3579	$self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);	3524	$self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3580	$self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL);	3525	$self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL);
3581	$self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);	3526	$self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3582	$self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);	3527	$self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3583	$self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);	3528	$self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
…		…
3597	} elsif ($ev->{button} == 2) {	3542	} elsif ($ev->{button} == 2) {
3598	$::CONN->user_send ("invoke $spell->{name}");	3543	$::CONN->user_send ("invoke $spell->{name}");
3599	} elsif ($ev->{button} == 3) {	3544	} elsif ($ev->{button} == 3) {
3600	(new CFClient::UI::Menu	3545	(new CFClient::UI::Menu
3601	items => [	3546	items => [
3602	["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],	3547	["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3603	["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],	3548	["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3604	],	3549	],
3605	)->popup ($ev);	3550	)->popup ($ev);
3606	} else {	3551	} else {
3607	return 0;	3552	return 0;
…		…
3702	$coord = $max - $size if $coord > $max - $size;	3647	$coord = $max - $size if $coord > $max - $size;
3703		3648
3704	int $coord + 0.5	3649	int $coord + 0.5
3705	}	3650	}
3706		3651
3707	sub size_allocate {	3652	sub invoke_size_allocate {
3708	my ($self, $w, $h) = @_;	3653	my ($self, $w, $h) = @_;
3709		3654
3710	for my $child ($self->children) {	3655	for my $child ($self->children) {
3711	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};	3656	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3712		3657
…		…
3716	$X = _to_pixel $X, $W, $self->{w};	3661	$X = _to_pixel $X, $W, $self->{w};
3717	$Y = _to_pixel $Y, $H, $self->{h};	3662	$Y = _to_pixel $Y, $H, $self->{h};
3718		3663
3719	$child->configure ($X, $Y, $W, $H);	3664	$child->configure ($X, $Y, $W, $H);
3720	}	3665	}
		3666
		3667	1
3721	}	3668	}
3722		3669
3723	sub coord2local {	3670	sub coord2local {
3724	my ($self, $x, $y) = @_;	3671	my ($self, $x, $y) = @_;
3725		3672

Diff Legend

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