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.291 by root, Tue Jun 6 02:55:50 2006 UTC vs.
Revision 1.323 by root, Wed Jul 5 03:01:01 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
…		…
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;
…		…
1590		1627
1591	my ($w, $h) = $self->{layout}->size;	1628	my ($w, $h) = $self->{layout}->size;
1592		1629
1593	if (exists $self->{template}) {	1630	if (exists $self->{template}) {
1594	$self->{template}->set_font ($self->{font}) if $self->{font};	1631	$self->{template}->set_font ($self->{font}) if $self->{font};
		1632	$self->{template}->set_width ($self->{max_w} || -1);
1595	$self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);	1633	$self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1596		1634
1597	my ($w2, $h2) = $self->{template}->size;	1635	my ($w2, $h2) = $self->{template}->size;
1598		1636
1599	$w = List::Util::max $w, $w2;	1637	$w = List::Util::max $w, $w2;
…		…
1604	};	1642	};
1605		1643
1606	@{ $self->{size_req} }	1644	@{ $self->{size_req} }
1607	}	1645	}
1608		1646
		1647	sub baseline_shift {
		1648	$_[0]{layout}->descent
		1649	}
		1650
1609	sub size_allocate {	1651	sub invoke_size_allocate {
1610	my ($self, $w, $h) = @_;	1652	my ($self, $w, $h) = @_;
1611		1653
1612	delete $self->{ox};	1654	delete $self->{ox};
1613		1655
1614	delete $self->{texture}	1656	delete $self->{texture}
1615	unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};	1657	unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
		1658
		1659	1
1616	}	1660	}
1617		1661
1618	sub set_fontsize {	1662	sub set_fontsize {
1619	my ($self, $fontsize) = @_;	1663	my ($self, $fontsize) = @_;
1620		1664
1621	$self->{fontsize} = $fontsize;	1665	$self->{fontsize} = $fontsize;
		1666	delete $self->{size_req};
1622	delete $self->{texture};	1667	delete $self->{texture};
1623		1668
1624	$self->realloc;	1669	$self->realloc;
1625	}	1670	}
1626		1671
1627	sub reconfigure {	1672	sub reconfigure {
1628	my ($self) = @_;	1673	my ($self) = @_;
1629		1674
1630	delete $self->{size_req};	1675	delete $self->{size_req};
		1676	delete $self->{texture};
1631		1677
1632	$self->SUPER::reconfigure;	1678	$self->SUPER::reconfigure;
1633	}	1679	}
1634		1680
1635	sub _draw {	1681	sub _draw {
1636	my ($self) = @_;	1682	my ($self) = @_;
1637		1683
1638	$self->SUPER::_draw; # draw background, if applicable	1684	$self->SUPER::_draw; # draw background, if applicable
1639		1685
1640	my $tex = $self->{texture} ||= do {	1686	my $size = $self->{texture} ||= do {
1641	$self->{layout}->set_foreground (@{$self->{fg}});	1687	$self->{layout}->set_foreground (@{$self->{fg}});
1642	$self->{layout}->set_font ($self->{font}) if $self->{font};	1688	$self->{layout}->set_font ($self->{font}) if $self->{font};
1643	$self->{layout}->set_width ($self->{w});	1689	$self->{layout}->set_width ($self->{w});
1644	$self->{layout}->set_ellipsise ($self->{ellipsise});	1690	$self->{layout}->set_ellipsise ($self->{ellipsise});
1645	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});	1691	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1646	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	1692	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1647		1693
1648	new_from_layout CFClient::Texture $self->{layout}	1694	[$self->{layout}->size]
1649	};	1695	};
1650		1696
1651	unless (exists $self->{ox}) {	1697	unless (exists $self->{ox}) {
1652	$self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}	1698	$self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1653	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}	1699	: $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
1654	: ($self->{w} - $tex->{w}) * 0.5);	1700	: ($self->{w} - $size->[0]) * 0.5);
1655		1701
1656	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}	1702	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1657	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}	1703	: $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1658	: ($self->{h} - $tex->{h}) * 0.5);	1704	: ($self->{h} - $size->[1]) * 0.5);
1659	};	1705	};
1660		1706
1661	glEnable GL_TEXTURE_2D;	1707	my $w = List::Util::min $self->{w} + 4, $size->[0];
		1708	my $h = List::Util::min $self->{h} + 2, $size->[1];
1662		1709
1663	if ($tex->{format} == GL_ALPHA) {	1710	$self->{layout}->render ($self->{ox}, $self->{oy});
1664	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1665	glColor @{$self->{fg}};
1666	$tex->draw_quad_alpha ($self->{ox}, $self->{oy});
1667	} else {
1668	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1669	$tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1670	}
1671
1672	glDisable GL_TEXTURE_2D;
1673	}	1711	}
1674		1712
1675	#############################################################################	1713	#############################################################################
1676		1714
1677	package CFClient::UI::EntryBase;	1715	package CFClient::UI::EntryBase;
…		…
1710		1748
1711	$text =~ s/./*/g if $self->{hidden};	1749	$text =~ s/./*/g if $self->{hidden};
1712	$self->{layout}->set_text ("$text ");	1750	$self->{layout}->set_text ("$text ");
1713	delete $self->{size_req};	1751	delete $self->{size_req};
1714		1752
1715	$self->_emit (changed => $self->{text});	1753	$self->emit (changed => $self->{text});
1716		1754
1717	$self->realloc;	1755	$self->realloc;
1718	$self->update;	1756	$self->update;
1719	}	1757	}
1720		1758
…		…
1735	my ($w, $h) = $self->SUPER::size_request;	1773	my ($w, $h) = $self->SUPER::size_request;
1736		1774
1737	($w + 1, $h) # add 1 for cursor	1775	($w + 1, $h) # add 1 for cursor
1738	}	1776	}
1739		1777
1740	sub key_down {	1778	sub invoke_key_down {
1741	my ($self, $ev) = @_;	1779	my ($self, $ev) = @_;
1742		1780
1743	my $mod = $ev->{mod};	1781	my $mod = $ev->{mod};
1744	my $sym = $ev->{sym};	1782	my $sym = $ev->{sym};
1745	my $uni = $ev->{unicode};	1783	my $uni = $ev->{unicode};
…		…
1757	} elsif ($sym == CFClient::SDLK_HOME) {	1795	} elsif ($sym == CFClient::SDLK_HOME) {
1758	$self->{cursor} = 0;	1796	$self->{cursor} = 0;
1759	} elsif ($sym == CFClient::SDLK_END) {	1797	} elsif ($sym == CFClient::SDLK_END) {
1760	$self->{cursor} = length $text;	1798	$self->{cursor} = length $text;
1761	} elsif ($uni == 27) {	1799	} elsif ($uni == 27) {
1762	$self->_emit ('escape');	1800	$self->emit ('escape');
1763	} elsif ($uni) {	1801	} elsif ($uni) {
1764	substr $text, $self->{cursor}++, 0, chr $uni;	1802	substr $text, $self->{cursor}++, 0, chr $uni;
1765	} else {	1803	} else {
1766	return 0;	1804	return 0;
1767	}	1805	}
…		…
1771	$self->realloc;	1809	$self->realloc;
1772		1810
1773	1	1811	1
1774	}	1812	}
1775		1813
1776	sub focus_in {	1814	sub invoke_focus_in {
1777	my ($self) = @_;	1815	my ($self) = @_;
1778		1816
1779	$self->{last_activity} = $::NOW;	1817	$self->{last_activity} = $::NOW;
1780		1818
1781	$self->SUPER::focus_in;	1819	$self->SUPER::invoke_focus_in
1782	}	1820	}
1783		1821
1784	sub button_down {	1822	sub invoke_button_down {
1785	my ($self, $ev, $x, $y) = @_;	1823	my ($self, $ev, $x, $y) = @_;
1786		1824
1787	$self->SUPER::button_down ($ev, $x, $y);	1825	$self->SUPER::invoke_button_down ($ev, $x, $y);
1788		1826
1789	my $idx = $self->{layout}->xy_to_index ($x, $y);	1827	my $idx = $self->{layout}->xy_to_index ($x, $y);
1790		1828
1791	# byte-index to char-index	1829	# byte-index to char-index
1792	my $text = $self->{text};	1830	my $text = $self->{text};
…		…
1797	$self->update;	1835	$self->update;
1798		1836
1799	1	1837	1
1800	}	1838	}
1801		1839
1802	sub mouse_motion {	1840	sub invoke_mouse_motion {
1803	my ($self, $ev, $x, $y) = @_;	1841	my ($self, $ev, $x, $y) = @_;
1804	# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#	1842	# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1805		1843
1806	0	1844	1
1807	}	1845	}
1808		1846
1809	sub _draw {	1847	sub _draw {
1810	my ($self) = @_;	1848	my ($self) = @_;
1811		1849
…		…
1852		1890
1853	our @ISA = CFClient::UI::EntryBase::;	1891	our @ISA = CFClient::UI::EntryBase::;
1854		1892
1855	use CFClient::OpenGL;	1893	use CFClient::OpenGL;
1856		1894
1857	sub key_down {	1895	sub invoke_key_down {
1858	my ($self, $ev) = @_;	1896	my ($self, $ev) = @_;
1859		1897
1860	my $sym = $ev->{sym};	1898	my $sym = $ev->{sym};
1861		1899
1862	if ($sym == 13) {	1900	if ($sym == 13) {
1863	unshift @{$self->{history}},	1901	unshift @{$self->{history}},
1864	my $txt = $self->get_text;	1902	my $txt = $self->get_text;
		1903
1865	$self->{history_pointer} = -1;	1904	$self->{history_pointer} = -1;
1866	$self->{history_saveback} = '';	1905	$self->{history_saveback} = '';
1867	$self->_emit (activate => $txt);	1906	$self->emit (activate => $txt);
1868	$self->update;	1907	$self->update;
1869		1908
1870	} elsif ($sym == CFClient::SDLK_UP) {	1909	} elsif ($sym == CFClient::SDLK_UP) {
1871	if ($self->{history_pointer} < 0) {	1910	if ($self->{history_pointer} < 0) {
1872	$self->{history_saveback} = $self->get_text;	1911	$self->{history_saveback} = $self->get_text;
…		…
1888	} else {	1927	} else {
1889	$self->set_text ($self->{history_saveback});	1928	$self->set_text ($self->{history_saveback});
1890	}	1929	}
1891		1930
1892	} else {	1931	} else {
1893	return $self->SUPER::key_down ($ev)	1932	return $self->SUPER::invoke_key_down ($ev)
1894	}	1933	}
1895		1934
1896	1	1935	1
1897	}	1936	}
1898		1937
…		…
1922	can_events => 1,	1961	can_events => 1,
1923	@_	1962	@_
1924	)	1963	)
1925	}	1964	}
1926		1965
1927	sub activate { }
1928
1929	sub button_up {	1966	sub invoke_button_up {
1930	my ($self, $ev, $x, $y) = @_;	1967	my ($self, $ev, $x, $y) = @_;
1931		1968
1932	$self->emit ("activate")	1969	$self->emit ("activate")
1933	if $x >= 0 && $x < $self->{w}	1970	if $x >= 0 && $x < $self->{w}
1934	&& $y >= 0 && $y < $self->{h};	1971	&& $y >= 0 && $y < $self->{h};
…		…
1948	$tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});	1985	$tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1949		1986
1950	glDisable GL_TEXTURE_2D;	1987	glDisable GL_TEXTURE_2D;
1951		1988
1952	$self->SUPER::_draw;	1989	$self->SUPER::_draw;
		1990	}
		1991
		1992	#############################################################################
		1993
		1994	package CFClient::UI::ImageButton;
		1995
		1996	our @ISA = CFClient::UI::Image::;
		1997
		1998	use CFClient::OpenGL;
		1999
		2000	my %textures;
		2001
		2002	sub new {
		2003	my $class = shift;
		2004
		2005	my $self = $class->SUPER::new (
		2006	padding_x => 4,
		2007	padding_y => 4,
		2008	fg => [1, 1, 1],
		2009	active_fg => [0, 0, 1],
		2010	can_hover => 1,
		2011	align => 0,
		2012	valign => 0,
		2013	can_events => 1,
		2014	@_
		2015	);
		2016	}
		2017
		2018	sub invoke_button_up {
		2019	my ($self, $ev, $x, $y) = @_;
		2020
		2021	$self->emit ("activate")
		2022	if $x >= 0 && $x < $self->{w}
		2023	&& $y >= 0 && $y < $self->{h};
		2024
		2025	1
1953	}	2026	}
1954		2027
1955	#############################################################################	2028	#############################################################################
1956		2029
1957	package CFClient::UI::CheckBox;	2030	package CFClient::UI::CheckBox;
…		…
1984	my ($self) = @_;	2057	my ($self) = @_;
1985		2058
1986	(6) x 2	2059	(6) x 2
1987	}	2060	}
1988		2061
		2062	sub toggle {
		2063	my ($self) = @_;
		2064
		2065	$self->{state} = !$self->{state};
		2066	$self->emit (changed => $self->{state});
		2067	$self->update;
		2068	}
		2069
1989	sub button_down {	2070	sub invoke_button_down {
1990	my ($self, $ev, $x, $y) = @_;	2071	my ($self, $ev, $x, $y) = @_;
1991		2072
1992	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}	2073	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1993	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {	2074	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1994	$self->{state} = !$self->{state};	2075	$self->toggle;
1995	$self->_emit (changed => $self->{state});
1996	} else {	2076	} else {
1997	return 0	2077	return 0
1998	}	2078	}
1999		2079
2000	1	2080	1
…		…
2025	package CFClient::UI::Image;	2105	package CFClient::UI::Image;
2026		2106
2027	our @ISA = CFClient::UI::Base::;	2107	our @ISA = CFClient::UI::Base::;
2028		2108
2029	use CFClient::OpenGL;	2109	use CFClient::OpenGL;
2030	use Carp qw/confess/;
2031		2110
2032	our %loaded_images;	2111	our %texture_cache;
2033		2112
2034	sub new {	2113	sub new {
2035	my $class = shift;	2114	my $class = shift;
2036		2115
2037	my $self = $class->SUPER::new (can_events => 0, @_);	2116	my $self = $class->SUPER::new (
		2117	can_events => 0,
		2118	@_,
		2119	);
2038		2120
2039	$self->{image} or confess "Image has 'image' not set. This is a fatal error!";	2121	$self->{path}
		2122	or Carp::croak "required attribute 'path' not set";
2040		2123
2041	$loaded_images{$self->{image}} ||=	2124	$self->{tex} = $texture_cache{$self->{path}} ||=
2042	new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1;	2125	new_from_file CFClient::Texture CFClient::find_rcfile $self->{path}, mipmap => 1;
2043		2126
2044	my $tex = $self->{tex} = $loaded_images{$self->{image}};	2127	Scalar::Util::weaken $texture_cache{$self->{path}};
2045		2128
2046	Scalar::Util::weaken $loaded_images{$self->{image}};	2129	$self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2047
2048	$self->{aspect} = $tex->{w} / $tex->{h};
2049		2130
2050	$self	2131	$self
2051	}	2132	}
2052		2133
2053	sub size_request {	2134	sub size_request {
2054	my ($self) = @_;	2135	my ($self) = @_;
2055		2136
2056	($self->{tex}->{w}, $self->{tex}->{h})	2137	($self->{tex}{w}, $self->{tex}{h})
2057	}	2138	}
2058		2139
2059	sub _draw {	2140	sub _draw {
2060	my ($self) = @_;	2141	my ($self) = @_;
2061		2142
…		…
2170	my $ycut1 = max 0, min 1, $ycut;	2251	my $ycut1 = max 0, min 1, $ycut;
2171	my $ycut2 = max 0, min 1, $ycut - 1;	2252	my $ycut2 = max 0, min 1, $ycut - 1;
2172		2253
2173	my $h1 = $self->{h} * (1 - $ycut1);	2254	my $h1 = $self->{h} * (1 - $ycut1);
2174	my $h2 = $self->{h} * (1 - $ycut2);	2255	my $h2 = $self->{h} * (1 - $ycut2);
		2256	my $h3 = $self->{h};
		2257
		2258	$_ = $_ * (284-4)/288 + 4/288 for ($h1, $h2, $h3);
2175		2259
2176	glEnable GL_BLEND;	2260	glEnable GL_BLEND;
2177	glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,	2261	glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2178	GL_ONE, GL_ONE_MINUS_SRC_ALPHA;	2262	GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2179	glEnable GL_TEXTURE_2D;	2263	glEnable GL_TEXTURE_2D;
…		…
2198		2282
2199	if ($t3) {	2283	if ($t3) {
2200	glBindTexture GL_TEXTURE_2D, $t3->{name};	2284	glBindTexture GL_TEXTURE_2D, $t3->{name};
2201	glBegin GL_QUADS;	2285	glBegin GL_QUADS;
2202	glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;	2286	glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2203	glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h};	2287	glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2204	glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h};	2288	glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2205	glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;	2289	glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2206	glEnd;	2290	glEnd;
2207	}	2291	}
2208		2292
2209	glDisable GL_BLEND;	2293	glDisable GL_BLEND;
…		…
2297	$self->update;	2381	$self->update;
2298		2382
2299	$self	2383	$self
2300	}	2384	}
2301		2385
2302	sub changed { }
2303
2304	sub set_range {	2386	sub set_range {
2305	my ($self, $range) = @_;	2387	my ($self, $range) = @_;
2306		2388
2307	($range, $self->{range}) = ($self->{range}, $range);	2389	($range, $self->{range}) = ($self->{range}, $range);
2308		2390
2309	$self->update
2310	if "@$range" ne "@{$self->{range}}";	2391	if ("@$range" ne "@{$self->{range}}") {
		2392	$self->update;
		2393	$self->set_value ($self->{range}[0]);
		2394	}
2311	}	2395	}
2312		2396
2313	sub set_value {	2397	sub set_value {
2314	my ($self, $value) = @_;	2398	my ($self, $value) = @_;
2315		2399
…		…
2326	if $unit;	2410	if $unit;
2327		2411
2328	@{$self->{range}} = ($value, $lo, $hi, $page, $unit);	2412	@{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2329		2413
2330	if ($value != $old_value) {	2414	if ($value != $old_value) {
2331	$self->_emit (changed => $value);	2415	$self->emit (changed => $value);
2332	$self->update;	2416	$self->update;
2333	}	2417	}
2334	}	2418	}
2335		2419
2336	sub size_request {	2420	sub size_request {
2337	my ($self) = @_;	2421	my ($self) = @_;
2338		2422
2339	($self->{req_w}, $self->{req_h})	2423	($self->{req_w}, $self->{req_h})
2340	}	2424	}
2341		2425
2342	sub button_down {	2426	sub invoke_button_down {
2343	my ($self, $ev, $x, $y) = @_;	2427	my ($self, $ev, $x, $y) = @_;
2344		2428
2345	$self->SUPER::button_down ($ev, $x, $y);	2429	$self->SUPER::invoke_button_down ($ev, $x, $y);
2346		2430
2347	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];	2431	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2348		2432
2349	$self->mouse_motion ($ev, $x, $y)	2433	$self->invoke_mouse_motion ($ev, $x, $y)
2350	}	2434	}
2351		2435
2352	sub mouse_motion {	2436	sub invoke_mouse_motion {
2353	my ($self, $ev, $x, $y) = @_;	2437	my ($self, $ev, $x, $y) = @_;
2354		2438
2355	if ($GRAB == $self) {	2439	if ($GRAB == $self) {
2356	my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});	2440	my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2357		2441
…		…
2462	sub set_range { shift->{slider}->set_range (@_) }	2546	sub set_range { shift->{slider}->set_range (@_) }
2463	sub set_value { shift->{slider}->set_value (@_) }	2547	sub set_value { shift->{slider}->set_value (@_) }
2464		2548
2465	#############################################################################	2549	#############################################################################
2466		2550
2467	package CFClient::UI::TextView;	2551	package CFClient::UI::TextScroller;
2468		2552
2469	our @ISA = CFClient::UI::HBox::;	2553	our @ISA = CFClient::UI::HBox::;
2470		2554
2471	use CFClient::OpenGL;	2555	use CFClient::OpenGL;
2472		2556
…		…
2474	my $class = shift;	2558	my $class = shift;
2475		2559
2476	my $self = $class->SUPER::new (	2560	my $self = $class->SUPER::new (
2477	fontsize => 1,	2561	fontsize => 1,
2478	can_events => 0,	2562	can_events => 0,
		2563	indent => 0,
2479	#font => default_font	2564	#font => default_font
2480	@_,	2565	@_,
2481		2566
2482	layout => (new CFClient::Layout 1),	2567	layout => (new CFClient::Layout),
2483	par => [],	2568	par => [],
2484	height => 0,	2569	height => 0,
2485	children => [	2570	children => [
2486	(new CFClient::UI::Empty expand => 1),	2571	(new CFClient::UI::Empty expand => 1),
2487	(new CFClient::UI::Slider vertical => 1),	2572	(new CFClient::UI::Slider vertical => 1),
…		…
2498		2583
2499	$self->{fontsize} = $fontsize;	2584	$self->{fontsize} = $fontsize;
2500	$self->reflow;	2585	$self->reflow;
2501	}	2586	}
2502		2587
		2588	sub size_request {
		2589	my ($self) = @_;
		2590
		2591	my ($empty, $slider) = @{ $self->{children} };
		2592
		2593	local $self->{children} = [$empty, $slider];
		2594	$self->SUPER::size_request
		2595	}
		2596
2503	sub size_allocate {	2597	sub invoke_size_allocate {
2504	my ($self, $w, $h) = @_;	2598	my ($self, $w, $h) = @_;
2505		2599
2506	$self->SUPER::size_allocate ($w, $h);	2600	my ($empty, $slider, @other) = @{ $self->{children} };
		2601	$_->configure (@$_{qw(x y req_w req_h)}) for @other;
2507		2602
2508	$self->{layout}->set_font ($self->{font}) if $self->{font};	2603	$self->{layout}->set_font ($self->{font}) if $self->{font};
2509	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	2604	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2510	$self->{layout}->set_width ($self->{children}[0]{w});	2605	$self->{layout}->set_width ($empty->{w});
		2606	$self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2511		2607
2512	$self->reflow;	2608	$self->reflow;
2513	}
2514		2609
2515	sub text_size {	2610	local $self->{children} = [$empty, $slider];
2516	my ($self, $text, $indent) = @_;	2611	$self->SUPER::invoke_size_allocate ($w, $h)
		2612	}
		2613
		2614	sub get_layout {
		2615	my ($self, $para) = @_;
2517		2616
2518	my $layout = $self->{layout};	2617	my $layout = $self->{layout};
2519		2618
		2619	$layout->set_font ($self->{font}) if $self->{font};
		2620	$layout->set_foreground (@{$para->{fg}});
2520	$layout->set_height ($self->{fontsize} * $::FONTSIZE);	2621	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
2521	$layout->set_width ($self->{children}[0]{w} - $indent);	2622	$layout->set_width ($self->{children}[0]{w} - $para->{indent});
		2623	$layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2522	$layout->set_markup ($text);	2624	$layout->set_markup ($para->{markup});
		2625
		2626	$layout->set_shapes (
		2627	map
		2628	+(0, $_->baseline_shift +$_->{padding_y} - $_->{h}, $_->{w}, $_->{h}),
		2629	@{$para->{widget}}
2523		2630	);
		2631
2524	$layout->size	2632	$layout
2525	}	2633	}
2526		2634
2527	sub reflow {	2635	sub reflow {
2528	my ($self) = @_;	2636	my ($self) = @_;
2529		2637
…		…
2538	$self->{children}[1]->set_value ($offset);	2646	$self->{children}[1]->set_value ($offset);
2539	}	2647	}
2540		2648
2541	sub clear {	2649	sub clear {
2542	my ($self) = @_;	2650	my ($self) = @_;
		2651
		2652	my (undef, undef, @other) = @{ $self->{children} };
		2653	$self->remove ($_) for @other;
2543		2654
2544	$self->{par} = [];	2655	$self->{par} = [];
2545	$self->{height} = 0;	2656	$self->{height} = 0;
2546	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);	2657	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2547	}	2658	}
2548		2659
2549	sub add_paragraph {	2660	sub add_paragraph {
2550	my ($self, $color, $text, $indent) = @_;	2661	my ($self, $color, $para, $indent) = @_;
2551		2662
2552	for my $line (split /\n/, $text) {	2663	my ($text, @w) = ref $para ? @$para : $para;
2553	my ($w, $h) = $self->text_size ($line);	2664
2554	$self->{height} += $h;	2665	$para = {
2555	push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];	2666	w => 1e10,
		2667	wrapped => 1,
		2668	fg => $color,
		2669	indent => $indent,
		2670	markup => $text,
		2671	widget => \@w,
2556	}	2672	};
2557		2673
2558	$self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]);	2674	$self->add (@w) if @w;
		2675	push @{$self->{par}}, $para;
		2676
		2677	$self->{need_reflow}++;
		2678	$self->update;
		2679	}
		2680
		2681	sub scroll_to_bottom {
		2682	my ($self) = @_;
		2683
		2684	$self->{scroll_to_bottom} = 1;
		2685	$self->update;
2559	}	2686	}
2560		2687
2561	sub update {	2688	sub update {
2562	my ($self) = @_;	2689	my ($self) = @_;
2563		2690
…		…
2565		2692
2566	return unless $self->{h} > 0;	2693	return unless $self->{h} > 0;
2567		2694
2568	delete $self->{texture};	2695	delete $self->{texture};
2569		2696
2570	$ROOT->on_post_alloc ($self, sub {	2697	$ROOT->on_post_alloc ($self => sub {
2571	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};	2698	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2572		2699
2573	if (delete $self->{need_reflow}) {	2700	if (delete $self->{need_reflow}) {
2574	my $height = 0;	2701	my $height = 0;
2575		2702
2576	my $layout = $self->{layout};
2577
2578	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
2579
2580	for (@{$self->{par}}) {	2703	for my $para (@{$self->{par}}) {
2581	if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support	2704	if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2582	$layout->set_width ($W - $_->[3]);	2705	my $layout = $self->get_layout ($para);
2583	$layout->set_markup ($_->[4]);
2584	my ($w, $h) = $layout->size;	2706	my ($w, $h) = $layout->size;
2585	$_->[0] = $w + $_->[3];	2707
2586	$_->[1] = $h;	2708	$para->{w} = $w + $para->{indent};
		2709	$para->{h} = $h;
		2710	$para->{wrapped} = $layout->has_wrapped;
2587	}	2711	}
2588		2712
2589	$height += $_->[1];	2713	$height += $para->{h};
2590	}	2714	}
2591		2715
2592	$self->{height} = $height;	2716	$self->{height} = $height;
2593		2717
2594	$self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);	2718	$self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2595		2719
2596	delete $self->{texture};	2720	delete $self->{texture};
		2721	}
		2722
		2723	if (delete $self->{scroll_to_bottom}) {
		2724	$self->{children}[1]->set_value (1e10);
2597	}	2725	}
2598		2726
2599	$self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {	2727	$self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2600	glClearColor 0, 0, 0, 0;	2728	glClearColor 0, 0, 0, 0;
2601	glClear GL_COLOR_BUFFER_BIT;	2729	glClear GL_COLOR_BUFFER_BIT;
…		…
2605	my $y0 = $top;	2733	my $y0 = $top;
2606	my $y1 = $top + $H;	2734	my $y1 = $top + $H;
2607		2735
2608	my $y = 0;	2736	my $y = 0;
2609		2737
2610	my $layout = $self->{layout};
2611
2612	$layout->set_font ($self->{font}) if $self->{font};
2613
2614	glEnable GL_BLEND;
2615	#TODO# not correct in windows where rgba is forced off
2616	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2617
2618	for my $par (@{$self->{par}}) {	2738	for my $para (@{$self->{par}}) {
2619	my $h = $par->[1];	2739	my $h = $para->{h};
2620		2740
2621	if ($y0 < $y + $h && $y < $y1) {	2741	if ($y0 < $y + $h && $y < $y1) {
2622	$layout->set_foreground (@{ $par->[2] });
2623	$layout->set_width ($W - $par->[3]);
2624	$layout->set_markup ($par->[4]);
2625		2742
2626	my ($w, $h, $data, $format, $internalformat) = $layout->render;	2743	my $layout = $self->get_layout ($para);
2627		2744
2628	glRasterPos $par->[3], $y - $y0;	2745	$layout->render ($para->{indent}, $y - $y0);
2629	glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;	2746
		2747	if (my @w = @{ $para->{widget} }) {
		2748	my @s = $layout->get_shapes;
		2749
		2750	for (@w) {
		2751	my ($dx, $dy) = splice @s, 0, 2, ();
		2752
		2753	$_->{x} = $dx + $para->{indent};
		2754	$_->{y} = $dy + $y - $y0;
		2755
		2756	$_->draw;
		2757	}
		2758	}
2630	}	2759	}
2631		2760
2632	$y += $h;	2761	$y += $h;
2633	}	2762	}
2634
2635	glDisable GL_BLEND;
2636	};	2763	};
2637	});	2764	});
		2765	}
		2766
		2767	sub reconfigure {
		2768	my ($self) = @_;
		2769
		2770	$self->SUPER::reconfigure;
		2771
		2772	$_->{w} = 1e10 for @{ $self->{par} };
		2773	$self->reflow;
2638	}	2774	}
2639		2775
2640	sub _draw {	2776	sub _draw {
2641	my ($self) = @_;	2777	my ($self) = @_;
2642		2778
…		…
2645	glColor 0, 0, 0, 1;	2781	glColor 0, 0, 0, 1;
2646	$self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});	2782	$self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2647	glDisable GL_TEXTURE_2D;	2783	glDisable GL_TEXTURE_2D;
2648		2784
2649	$self->{children}[1]->draw;	2785	$self->{children}[1]->draw;
2650
2651	}	2786	}
2652		2787
2653	#############################################################################	2788	#############################################################################
2654		2789
2655	package CFClient::UI::Animator;	2790	package CFClient::UI::Animator;
…		…
2742	$tooltip .= "\n\n" . (ref $widget) . "\n"	2877	$tooltip .= "\n\n" . (ref $widget) . "\n"
2743	. "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"	2878	. "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2744	. "req $widget->{req_w} $widget->{req_h}\n"	2879	. "req $widget->{req_w} $widget->{req_h}\n"
2745	. "visible $widget->{visible}";	2880	. "visible $widget->{visible}";
2746	}	2881	}
		2882
		2883	$tooltip =~ s/^\n+//;
		2884	$tooltip =~ s/\n+$//;
2747		2885
2748	$self->add (new CFClient::UI::Label	2886	$self->add (new CFClient::UI::Label
2749	markup => $tooltip,	2887	markup => $tooltip,
2750	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,	2888	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2751	fontsize => 0.8,	2889	fontsize => 0.8,
…		…
2761	my ($w, $h) = @{$self->child}{qw(req_w req_h)};	2899	my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2762		2900
2763	($w + 4, $h + 4)	2901	($w + 4, $h + 4)
2764	}	2902	}
2765		2903
2766	sub size_allocate {	2904	sub invoke_size_allocate {
2767	my ($self, $w, $h) = @_;	2905	my ($self, $w, $h) = @_;
2768		2906
2769	$self->SUPER::size_allocate ($w - 4, $h - 4);	2907	$self->SUPER::invoke_size_allocate ($w - 4, $h - 4)
2770	}	2908	}
2771		2909
2772	sub visibility_change {	2910	sub invoke_visibility_change {
2773	my ($self, $visible) = @_;	2911	my ($self, $visible) = @_;
2774		2912
2775	return unless $visible;	2913	return unless $visible;
2776		2914
2777	$self->{root}->on_post_alloc ("move_$self" => sub {	2915	$self->{root}->on_post_alloc ("move_$self" => sub {
…		…
2779	or return;	2917	or return;
2780		2918
2781	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);	2919	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2782		2920
2783	($x, $y) = $widget->coord2global (-$self->{w}, 0)	2921	($x, $y) = $widget->coord2global (-$self->{w}, 0)
2784	if $x + $self->{w} > $::WIDTH;	2922	if $x + $self->{w} > $self->{root}{w};
2785		2923
2786	$self->move_abs ($x, $y);	2924	$self->move_abs ($x, $y);
2787	});	2925	});
2788	}	2926	}
2789		2927
…		…
2884	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});	3022	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2885	glDisable GL_TEXTURE_2D;	3023	glDisable GL_TEXTURE_2D;
2886	}	3024	}
2887	}	3025	}
2888		3026
2889	sub DESTROY {	3027	sub destroy {
2890	my ($self) = @_;	3028	my ($self) = @_;
2891		3029
2892	$self->{timer}->cancel	3030	$self->{timer}->cancel
2893	if $self->{timer};	3031	if $self->{timer};
2894		3032
2895	$self->SUPER::DESTROY;	3033	$self->SUPER::destroy;
2896	}	3034	}
2897		3035
2898	#############################################################################	3036	#############################################################################
2899		3037
2900	package CFClient::UI::Buttonbar;	3038	package CFClient::UI::Buttonbar;
…		…
2925	for my $item (@{ $self->{items} }) {	3063	for my $item (@{ $self->{items} }) {
2926	my ($widget, $cb, $tooltip) = @$item;	3064	my ($widget, $cb, $tooltip) = @$item;
2927		3065
2928	# handle various types of items, only text for now	3066	# handle various types of items, only text for now
2929	if (!ref $widget) {	3067	if (!ref $widget) {
		3068	if ($widget =~ /\t/) {
		3069	my ($left, $right) = split /\t/, $widget, 2;
		3070
		3071	$widget = new CFClient::UI::HBox
		3072	can_hover => 1,
		3073	can_events => 1,
		3074	tooltip => $tooltip,
		3075	children => [
		3076	(new CFClient::UI::Label markup => $left, expand => 1),
		3077	(new CFClient::UI::Label markup => $right, align => +1),
		3078	],
		3079	;
		3080
		3081	} else {
2930	$widget = new CFClient::UI::Label	3082	$widget = new CFClient::UI::Label
2931	can_hover => 1,	3083	can_hover => 1,
2932	can_events => 1,	3084	can_events => 1,
2933	text => $widget,	3085	markup => $widget,
2934	tooltip => $tooltip	3086	tooltip => $tooltip;
		3087	}
2935	}	3088	}
2936		3089
2937	$self->{item}{$widget} = $item;	3090	$self->{item}{$widget} = $item;
2938		3091
2939	$self->{vbox}->add ($widget);	3092	$self->{vbox}->add ($widget);
…		…
2944		3097
2945	# popup given the event (must be a mouse button down event currently)	3098	# popup given the event (must be a mouse button down event currently)
2946	sub popup {	3099	sub popup {
2947	my ($self, $ev) = @_;	3100	my ($self, $ev) = @_;
2948		3101
2949	$self->_emit ("popdown");	3102	$self->emit ("popdown");
2950		3103
2951	# maybe save $GRAB? must be careful about events...	3104	# maybe save $GRAB? must be careful about events...
2952	$GRAB = $self;	3105	$GRAB = $self;
2953	$self->{button} = $ev->{button};	3106	$self->{button} = $ev->{button};
2954		3107
2955	$self->show;	3108	$self->show;
2956	$self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);	3109	$self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2957	}	3110	}
2958		3111
2959	sub mouse_motion {	3112	sub invoke_mouse_motion {
2960	my ($self, $ev, $x, $y) = @_;	3113	my ($self, $ev, $x, $y) = @_;
2961		3114
2962	# TODO: should use vbox->find_widget or so	3115	# TODO: should use vbox->find_widget or so
2963	$HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});	3116	$HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2964	$self->{hover} = $self->{item}{$HOVER};	3117	$self->{hover} = $self->{item}{$HOVER};
2965		3118
2966	0	3119	0
2967	}	3120	}
2968		3121
2969	sub button_up {	3122	sub invoke_button_up {
2970	my ($self, $ev, $x, $y) = @_;	3123	my ($self, $ev, $x, $y) = @_;
2971		3124
2972	if ($ev->{button} == $self->{button}) {	3125	if ($ev->{button} == $self->{button}) {
2973	undef $GRAB;	3126	undef $GRAB;
2974	$self->hide;	3127	$self->hide;
2975		3128
2976	$self->_emit ("popdown");	3129	$self->emit ("popdown");
2977	$self->{hover}[1]->() if $self->{hover};	3130	$self->{hover}[1]->() if $self->{hover};
2978	} else {	3131	} else {
2979	return 0	3132	return 0
2980	}	3133	}
2981		3134
…		…
3008		3161
3009	$self->{current} = $self->{children}[0]	3162	$self->{current} = $self->{children}[0]
3010	if @{ $self->{children} };	3163	if @{ $self->{children} };
3011	}	3164	}
3012		3165
		3166	sub get_current_page {
		3167	my ($self) = @_;
		3168
		3169	$self->{current}
		3170	}
		3171
3013	sub set_current_page {	3172	sub set_current_page {
3014	my ($self, $page_or_widget) = @_;	3173	my ($self, $page_or_widget) = @_;
3015		3174
3016	my $widget = ref $page_or_widget	3175	my $widget = ref $page_or_widget
3017	? $page_or_widget	3176	? $page_or_widget
3018	: $self->{children}[$page_or_widget];	3177	: $self->{children}[$page_or_widget];
3019		3178
3020	$self->{current} = $widget;	3179	$self->{current} = $widget;
3021	$self->{current}->configure (0, 0, $self->{w}, $self->{h});	3180	$self->{current}->configure (0, 0, $self->{w}, $self->{h});
3022		3181
3023	$self->_emit (page_changed => $self->{current});	3182	$self->emit (page_changed => $self->{current});
3024		3183
3025	$self->realloc;	3184	$self->realloc;
3026	}	3185	}
3027		3186
3028	sub visible_children {	3187	sub visible_children {
…		…
3033	my ($self) = @_;	3192	my ($self) = @_;
3034		3193
3035	$self->{current}->size_request	3194	$self->{current}->size_request
3036	}	3195	}
3037		3196
3038	sub size_allocate {	3197	sub invoke_size_allocate {
3039	my ($self, $w, $h) = @_;	3198	my ($self, $w, $h) = @_;
3040		3199
3041	$self->{current}->configure (0, 0, $w, $h);	3200	$self->{current}->configure (0, 0, $w, $h);
		3201
		3202	1
3042	}	3203	}
3043		3204
3044	sub _draw {	3205	sub _draw {
3045	my ($self) = @_;	3206	my ($self) = @_;
3046		3207
…		…
3081	);	3242	);
3082		3243
3083	$self->{multiplexer}->add ($widget);	3244	$self->{multiplexer}->add ($widget);
3084	}	3245	}
3085		3246
		3247	sub get_current_page {
		3248	my ($self) = @_;
		3249
		3250	$self->{multiplexer}->get_current_page
		3251	}
		3252
3086	sub set_current_page {	3253	sub set_current_page {
3087	my ($self, $page) = @_;	3254	my ($self, $page) = @_;
3088		3255
3089	$self->{multiplexer}->set_current_page ($page);	3256	$self->{multiplexer}->set_current_page ($page);
3090	$self->_emit (page_changed => $self->{multiplexer}{current});	3257	$self->emit (page_changed => $self->{multiplexer}{current});
3091	}	3258	}
3092		3259
3093	#############################################################################	3260	#############################################################################
3094		3261
3095	package CFClient::UI::Combobox;	3262	package CFClient::UI::Combobox;
…		…
3100		3267
3101	sub new {	3268	sub new {
3102	my $class = shift;	3269	my $class = shift;
3103		3270
3104	my $self = $class->SUPER::new (	3271	my $self = $class->SUPER::new (
3105	options => [], # [title, value, tooltip], ...	3272	options => [], # [value, title, longdesc], ...
3106	value => undef,	3273	value => undef,
3107	@_,	3274	@_,
3108	);	3275	);
3109		3276
3110	$self->_set_value ($self->{value});	3277	$self->_set_value ($self->{value});
3111		3278
3112	$self	3279	$self
3113	}	3280	}
3114		3281
3115	sub button_down {	3282	sub invoke_button_down {
3116	my ($self, $ev) = @_;	3283	my ($self, $ev) = @_;
3117		3284
3118	my @menu_items;	3285	my @menu_items;
3119		3286
3120	for (@{ $self->{options} }) {	3287	for (@{ $self->{options} }) {
3121	my ($title, $value, $tooltip) = @$_;	3288	my ($value, $title, $tooltip) = @$_;
3122		3289
3123	push @menu_items, [$tooltip, sub { $self->set_value ($value) }];	3290	push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3124	}	3291	}
3125		3292
3126	CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);	3293	CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
3127	}	3294	}
3128		3295
3129	sub _set_value {	3296	sub _set_value {
3130	my ($self, $value) = @_;	3297	my ($self, $value) = @_;
3131		3298
3132	my ($item) = grep $_->[1] eq $value, @{ $self->{options} }	3299	my ($item) = grep $_->[0] eq $value, @{ $self->{options} }
3133	or return;	3300	or return;
3134		3301
3135	$self->{value} = $item->[1];	3302	$self->{value} = $item->[0];
3136	$self->set_markup ("$item->[0] ⇓");	3303	$self->set_markup ("$item->[1] ⇓");
3137	$self->set_tooltip ($item->[2]);	3304	$self->set_tooltip ($item->[2]);
3138	}	3305	}
3139		3306
3140	sub set_value {	3307	sub set_value {
3141	my ($self, $value) = @_;	3308	my ($self, $value) = @_;
3142		3309
3143	return unless $self->{value} ne $value;	3310	return unless $self->{value} ne $value;
3144		3311
3145	$self->_set_value ($value);	3312	$self->_set_value ($value);
3146	$self->_emit (changed => $value);	3313	$self->emit (changed => $value);
3147	}	3314	}
3148		3315
3149	#############################################################################	3316	#############################################################################
3150		3317
3151	package CFClient::UI::Statusbox;	3318	package CFClient::UI::Statusbox;
…		…
3250	$item->{count}++;	3417	$item->{count}++;
3251	} else {	3418	} else {
3252	$item->{count} = 1;	3419	$item->{count} = 1;
3253	$item->{text} = $item->{tooltip} = $text;	3420	$item->{text} = $item->{tooltip} = $text;
3254	}	3421	}
3255	$item->{id} = ++$self->{id};	3422	$item->{id} += 0.2;#d#
3256	$item->{timeout} = $timeout;	3423	$item->{timeout} = $timeout;
3257	delete $item->{label};	3424	delete $item->{label};
3258	} else {	3425	} else {
3259	$self->{item}{$group} = {	3426	$self->{item}{$group} = {
3260	id => ++$self->{id},	3427	id => ++$self->{id},
…		…
3266	count => 1,	3433	count => 1,
3267	%arg,	3434	%arg,
3268	};	3435	};
3269	}	3436	}
3270		3437
		3438	$ROOT->on_refresh (reorder => sub {
3271	$self->reorder;	3439	$self->reorder;
		3440	});
3272	}	3441	}
3273		3442
3274	sub reconfigure {	3443	sub reconfigure {
3275	my ($self) = @_;	3444	my ($self) = @_;
3276		3445
…		…
3279		3448
3280	$self->reorder;	3449	$self->reorder;
3281	$self->SUPER::reconfigure;	3450	$self->SUPER::reconfigure;
3282	}	3451	}
3283		3452
3284	sub DESTROY {	3453	sub destroy {
3285	my ($self) = @_;	3454	my ($self) = @_;
3286		3455
3287	$self->{timer}->cancel;	3456	$self->{timer}->cancel;
3288		3457
3289	$self->SUPER::DESTROY;	3458	$self->SUPER::destroy;
3290	}	3459	}
3291		3460
3292	#############################################################################	3461	#############################################################################
3293		3462
3294	package CFClient::UI::Inventory;	3463	package CFClient::UI::Inventory;
3295		3464
3296	our @ISA = CFClient::UI::ScrolledWindow::;	3465	our @ISA = CFClient::UI::Table::;
3297		3466
3298	sub new {	3467	sub new {
3299	my $class = shift;	3468	my $class = shift;
3300		3469
3301	my $self = $class->SUPER::new (	3470	my $self = $class->SUPER::new (
3302	child => (new CFClient::UI::Table col_expand => [0, 1, 0]),	3471	col_expand => [0, 1, 0],
3303	@_,	3472	@_,
3304	);	3473	);
3305		3474
3306	$self	3475	$self
3307	}	3476	}
3308		3477
3309	sub set_items {	3478	sub set_items {
3310	my ($self, $items) = @_;	3479	my ($self, $items) = @_;
3311		3480
3312	$self->{child}->clear;	3481	$self->clear;
3313	return unless $items;	3482	return unless $items;
3314		3483
3315	my @items = sort {	3484	my @items = sort {
3316	($a->{type} <=> $b->{type})	3485	($a->{type} <=> $b->{type})
3317	or ($a->{name} cmp $b->{name})	3486	or ($a->{name} cmp $b->{name})
3318	} @$items;	3487	} values %$items;
3319		3488
3320	$self->{real_items} = \@items;	3489	$self->{real_items} = \@items;
3321		3490
3322	my $row = 0;	3491	my $row = 0;
3323	for my $item (@items) {	3492	for my $item (@items) {
3324	CFClient::Item::update_widgets $item;	3493	CFClient::Item::update_widgets $item;
3325		3494
3326	$self->{child}->add (0, $row, $item->{face_widget});	3495	$self->add (0, $row, $item->{face_widget});
3327	$self->{child}->add (1, $row, $item->{desc_widget});	3496	$self->add (1, $row, $item->{desc_widget});
3328	$self->{child}->add (2, $row, $item->{weight_widget});	3497	$self->add (2, $row, $item->{weight_widget});
3329		3498
3330	$row++;	3499	$row++;
3331	}
3332	}
3333
3334	#############################################################################
3335
3336	package CFClient::UI::BindEditor;
3337
3338	our @ISA = CFClient::UI::FancyFrame::;
3339
3340	sub new {
3341	my $class = shift;
3342
3343	my $self = $class->SUPER::new (binding => [], commands => [], @_);
3344
3345	$self->add (my $vb = new CFClient::UI::VBox);
3346
3347
3348	$vb->add ($self->{rec_btn} = new CFClient::UI::Button
3349	text => "start recording",
3350	tooltip => "Start/Stops recording of actions."
3351	."All subsequent actions after the recording started will be captured."
3352	."The actions are displayed after the record was stopped."
3353	."To bind the action you have to click on the 'Bind' button",
3354	on_activate => sub {
3355	unless ($self->{recording}) {
3356	$self->start;
3357	} else {
3358	$self->stop;
3359	}
3360	});
3361
3362	$vb->add (new CFClient::UI::Label text => "Actions:");
3363	$vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3364
3365	$vb->add (new CFClient::UI::Label text => "Bound to: ");
3366	$vb->add (my $hb = new CFClient::UI::HBox);
3367	$hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3368	$hb->add (new CFClient::UI::Button
3369	text => "bind",
3370	tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3371	on_activate => sub {
3372	$self->ask_for_bind;
3373	});
3374
3375	$vb->add (my $hb = new CFClient::UI::HBox);
3376	$hb->add (new CFClient::UI::Button
3377	text => "ok",
3378	expand => 1,
3379	tooltip => "This closes the binding editor and saves the binding",
3380	on_activate => sub {
3381	$self->hide;
3382	$self->commit;
3383	});
3384
3385	$hb->add (new CFClient::UI::Button
3386	text => "cancel",
3387	expand => 1,
3388	tooltip => "This closes the binding editor without saving",
3389	on_activate => sub {
3390	$self->hide;
3391	$self->{binding_cancel}->()
3392	if $self->{binding_cancel};
3393	});
3394
3395	$self->update_binding_widgets;
3396
3397	$self
3398	}
3399
3400	sub commit {
3401	my ($self) = @_;
3402	my ($mod, $sym, $cmds) = $self->get_binding;
3403	if ($sym != 0 && @$cmds > 0) {
3404	$::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3405	."'. Don't forget 'Save Config'!");
3406	$self->{binding_change}->($mod, $sym, $cmds)
3407	if $self->{binding_change};
3408	} else {
3409	$::STATUSBOX->add ("No action bound, no key or action specified!");
3410	$self->{binding_cancel}->()
3411	if $self->{binding_cancel};
3412	}
3413	}
3414
3415	sub start {
3416	my ($self) = @_;
3417
3418	$self->{rec_btn}->set_text ("stop recording");
3419	$self->{recording} = 1;
3420	$self->clear_command_list;
3421	$::CONN->start_record if $::CONN;
3422	}
3423
3424	sub stop {
3425	my ($self) = @_;
3426
3427	$self->{rec_btn}->set_text ("start recording");
3428	$self->{recording} = 0;
3429
3430	my $rec;
3431	$rec = $::CONN->stop_record if $::CONN;
3432	return unless ref $rec eq 'ARRAY';
3433	$self->set_command_list ($rec);
3434	}
3435
3436
3437	sub ask_for_bind_and_commit {
3438	my ($self) = @_;
3439	$self->ask_for_bind (1);
3440	}
3441
3442	sub ask_for_bind {
3443	my ($self, $commit) = @_;
3444
3445	CFClient::Binder::open_binding_dialog (sub {
3446	my ($mod, $sym) = @_;
3447	$self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3448	$self->update_binding_widgets;
3449	$self->commit if $commit;
3450	});
3451	}
3452
3453	# $mod and $sym are the modifiers and key symbol
3454	# $cmds is a array ref of strings (the commands)
3455	# $cb is the callback that is executed on OK
3456	# $ccb is the callback that is executed on CANCEL and
3457	# when the binding was unsuccessful on OK
3458	sub set_binding {
3459	my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3460
3461	$self->clear_command_list;
3462	$self->{recording} = 0;
3463	$self->{rec_btn}->set_text ("start recording");
3464
3465	$self->{binding} = [$mod, $sym];
3466	$self->{commands} = $cmds;
3467
3468	$self->{binding_change} = $cb;
3469	$self->{binding_cancel} = $ccb;
3470
3471	$self->update_binding_widgets;
3472	}
3473
3474	# this is a shortcut method that asks for a binding
3475	# and then just binds it.
3476	sub do_quick_binding {
3477	my ($self, $cmds) = @_;
3478	$self->set_binding (undef, undef, $cmds, sub {
3479	$::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3480	});
3481	$self->ask_for_bind (1);
3482	}
3483
3484	sub update_binding_widgets {
3485	my ($self) = @_;
3486	my ($mod, $sym, $cmds) = $self->get_binding;
3487	$self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3488	$self->set_command_list ($cmds);
3489	}
3490
3491	sub get_binding {
3492	my ($self) = @_;
3493	return (
3494	$self->{binding}->[0],
3495	$self->{binding}->[1],
3496	[ grep { defined $_ } @{$self->{commands}} ]
3497	);
3498	}
3499
3500	sub clear_command_list {
3501	my ($self) = @_;
3502	$self->{cmdbox}->clear ();
3503	}
3504
3505	sub set_command_list {
3506	my ($self, $cmds) = @_;
3507
3508	$self->{cmdbox}->clear ();
3509	$self->{commands} = $cmds;
3510
3511	my $idx = 0;
3512
3513	for (@$cmds) {
3514	$self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3515
3516	my $i = $idx;
3517	$hb->add (new CFClient::UI::Label text => $_);
3518	$hb->add (new CFClient::UI::Button
3519	text => "delete",
3520	tooltip => "Deletes the action from the record",
3521	on_activate => sub {
3522	$self->{cmdbox}->remove ($hb);
3523	$cmds->[$i] = undef;
3524	});
3525
3526
3527	$idx++
3528	}	3500	}
3529	}	3501	}
3530		3502
3531	#############################################################################	3503	#############################################################################
3532		3504
…		…
3542	commands => [],	3514	commands => [],
3543	@_,	3515	@_,
3544	)	3516	)
3545	}	3517	}
3546		3518
		3519	my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
		3520
		3521	my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
		3522	"<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
		3523	my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
		3524	"<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3547	my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>	3525	my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3548	"<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.");	3526	"<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3549	my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>	3527	my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3550	"<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.");	3528	"<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3551	my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>	3529	my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3552	"<b>Damage</b>. The amount of damage the spell deals when it hits.");	3530	"<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3553		3531
3554	sub rebuild_spell_list {	3532	sub rebuild_spell_list {
3555	my ($self) = @_;	3533	my ($self) = @_;
3556		3534
3557	$CFClient::UI::ROOT->on_refresh ($self => sub {	3535	$CFClient::UI::ROOT->on_refresh ($self => sub {
3558	$self->clear;	3536	$self->clear;
3559		3537
		3538	return unless $::CONN;
		3539
3560	$self->add (1, 0, new CFClient::UI::Label text => "Spell Name");	3540	$self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);
		3541	$self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL);
3561	$self->add (2, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);	3542	$self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3562	$self->add (3, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);	3543	$self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3563	$self->add (4, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);	3544	$self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3564		3545
3565	my $row = 0;	3546	my $row = 0;
3566		3547
3567	for (sort { $a cmp $b } keys %{ $self->{spell} }) {	3548	for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3568	my $spell = $self->{spell}{$_};	3549	my $spell = $self->{spell}{$_};
3569		3550
3570	$row++;	3551	$row++;
		3552
		3553	my $spell_cb = sub {
		3554	my ($widget, $ev) = @_;
		3555
		3556	if ($ev->{button} == 1) {
		3557	$::CONN->user_send ("cast $spell->{name}");
		3558	} elsif ($ev->{button} == 2) {
		3559	$::CONN->user_send ("invoke $spell->{name}");
		3560	} elsif ($ev->{button} == 3) {
		3561	(new CFClient::UI::Menu
		3562	items => [
		3563	["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
		3564	["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
		3565	],
		3566	)->popup ($ev);
		3567	} else {
		3568	return 0;
		3569	}
		3570
		3571	1
		3572	};
		3573
		3574	my $tooltip = "$spell->{message}$TOOLTIP_ALL";
		3575
		3576	#TODO: add path info to tooltip
		3577	#$self->add (6, $row, new CFClient::UI::Label text => $spell->{path});
3571		3578
3572	$self->add (0, $row, new CFClient::UI::Face	3579	$self->add (0, $row, new CFClient::UI::Face
3573	face => $spell->{face},	3580	face => $spell->{face},
3574	can_hover => 1,	3581	can_hover => 1,
3575	can_events => 1,	3582	can_events => 1,
3576	tooltip => $spell->{message},	3583	tooltip => $tooltip,
		3584	on_button_down => $spell_cb,
3577	);	3585	);
3578		3586
3579	$self->add (1, $row, new CFClient::UI::Label	3587	$self->add (1, $row, new CFClient::UI::Label
3580	expand => 1,	3588	expand => 1,
3581	text => $spell->{name},	3589	text => $spell->{name},
3582	can_hover => 1,	3590	can_hover => 1,
3583	can_events => 1,	3591	can_events => 1,
3584	tooltip => $spell->{message},	3592	tooltip => $tooltip,
		3593	on_button_down => $spell_cb,
3585	);	3594	);
3586		3595
		3596	$self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3587	$self->add (2, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);	3597	$self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3588	$self->add (3, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);	3598	$self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3589	$self->add (4, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);	3599	$self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3590
3591	# TODO: should be done via popup
3592	$self->add (5, $row, new CFClient::UI::Button
3593	text => "bind",
3594	tooltip => "bind spell readying (cast command) to key",
3595	on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) },
3596	);
3597	}	3600	}
3598	});	3601	});
3599	}	3602	}
3600		3603
3601	sub add_spell {	3604	sub add_spell {
…		…
3607		3610
3608	sub remove_spell {	3611	sub remove_spell {
3609	my ($self, $spell) = @_;	3612	my ($self, $spell) = @_;
3610		3613
3611	delete $self->{spell}->{$spell->{name}};	3614	delete $self->{spell}->{$spell->{name}};
		3615	$self->rebuild_spell_list;
		3616	}
		3617
		3618	sub clear_spells {
		3619	my ($self) = @_;
		3620
		3621	$self->{spell} = {};
3612	$self->rebuild_spell_list;	3622	$self->rebuild_spell_list;
3613	}	3623	}
3614		3624
3615	#############################################################################	3625	#############################################################################
3616		3626
…		…
3653	$coord = $max - $size if $coord > $max - $size;	3663	$coord = $max - $size if $coord > $max - $size;
3654		3664
3655	int $coord + 0.5	3665	int $coord + 0.5
3656	}	3666	}
3657		3667
3658	sub size_allocate {	3668	sub invoke_size_allocate {
3659	my ($self, $w, $h) = @_;	3669	my ($self, $w, $h) = @_;
3660		3670
3661	for my $child ($self->children) {	3671	for my $child ($self->children) {
3662	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};	3672	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3663		3673
…		…
3667	$X = _to_pixel $X, $W, $self->{w};	3677	$X = _to_pixel $X, $W, $self->{w};
3668	$Y = _to_pixel $Y, $H, $self->{h};	3678	$Y = _to_pixel $Y, $H, $self->{h};
3669		3679
3670	$child->configure ($X, $Y, $W, $H);	3680	$child->configure ($X, $Y, $W, $H);
3671	}	3681	}
		3682
		3683	1
3672	}	3684	}
3673		3685
3674	sub coord2local {	3686	sub coord2local {
3675	my ($self, $x, $y) = @_;	3687	my ($self, $x, $y) = @_;
3676		3688

Diff Legend

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