ViewVC Help

View File | Revision Log | Show Annotations | Download File

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

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.286 by root, Mon Jun 5 03:48:49 2006 UTC vs.
Revision 1.320 by root, Tue Jul 4 23:23:32 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
…		…
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);
		1597
1559	delete $self->{req_h};	1598	delete $self->{size_req};
1560
1561	$self->realloc;	1599	$self->realloc;
1562	$self->update;	1600	$self->update;
1563	}	1601	}
1564		1602
1565	sub set_markup {	1603	sub set_markup {
…		…
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);
		1612
1575	delete $self->{req_h};	1613	delete $self->{size_req};
1576
1577	$self->realloc;	1614	$self->realloc;
1578	$self->update;	1615	$self->update;
1579	}	1616	}
1580		1617
1581	sub size_request {	1618	sub size_request {
1582	my ($self) = @_;	1619	my ($self) = @_;
1583		1620
1584	if (exists $self->{req_h}) {	1621	$self->{size_req} ||= do {
1585	@$self{qw(req_w req_h)}
1586	} else {
1587	$self->{layout}->set_font ($self->{font}) if $self->{font};	1622	$self->{layout}->set_font ($self->{font}) if $self->{font};
1588	$self->{layout}->set_width ($self->{max_w} || -1);	1623	$self->{layout}->set_width ($self->{max_w} || -1);
1589	$self->{layout}->set_ellipsise ($self->{ellipsise});	1624	$self->{layout}->set_ellipsise ($self->{ellipsise});
1590	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});	1625	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1591	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	1626	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
…		…
1600		1635
1601	$w = List::Util::max $w, $w2;	1636	$w = List::Util::max $w, $w2;
1602	$h = List::Util::max $h, $h2;	1637	$h = List::Util::max $h, $h2;
1603	}	1638	}
1604		1639
1605	($w, $h)	1640	[$w, $h]
1606	}	1641	};
1607	}
1608		1642
		1643	@{ $self->{size_req} }
		1644	}
		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
		1671	sub reconfigure {
		1672	my ($self) = @_;
		1673
		1674	delete $self->{size_req};
		1675	delete $self->{texture};
		1676
		1677	$self->SUPER::reconfigure;
		1678	}
		1679
1627	sub _draw {	1680	sub _draw {
1628	my ($self) = @_;	1681	my ($self) = @_;
1629		1682
1630	$self->SUPER::_draw; # draw background, if applicable	1683	$self->SUPER::_draw; # draw background, if applicable
1631		1684
1632	my $tex = $self->{texture} ||= do {	1685	my $size = $self->{texture} ||= do {
1633	$self->{layout}->set_foreground (@{$self->{fg}});	1686	$self->{layout}->set_foreground (@{$self->{fg}});
1634	$self->{layout}->set_font ($self->{font}) if $self->{font};	1687	$self->{layout}->set_font ($self->{font}) if $self->{font};
1635	$self->{layout}->set_width ($self->{w});	1688	$self->{layout}->set_width ($self->{w});
1636	$self->{layout}->set_ellipsise ($self->{ellipsise});	1689	$self->{layout}->set_ellipsise ($self->{ellipsise});
1637	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});	1690	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1638	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	1691	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1639		1692
1640	new_from_layout CFClient::Texture $self->{layout}	1693	$self->{size_req}
1641	};	1694	};
1642		1695
1643	unless (exists $self->{ox}) {	1696	unless (exists $self->{ox}) {
1644	$self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}	1697	$self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1645	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}	1698	: $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
1646	: ($self->{w} - $tex->{w}) * 0.5);	1699	: ($self->{w} - $size->[0]) * 0.5);
1647		1700
1648	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}	1701	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1649	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}	1702	: $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1650	: ($self->{h} - $tex->{h}) * 0.5);	1703	: ($self->{h} - $size->[1]) * 0.5);
1651	};	1704	};
1652		1705
1653	glEnable GL_TEXTURE_2D;	1706	my $w = List::Util::min $self->{w} + 4, $size->[0];
1654	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	1707	my $h = List::Util::min $self->{h} + 2, $size->[1];
1655		1708
1656	if ($tex->{format} == GL_ALPHA) {	1709	$self->{layout}->render ($self->{ox}, $self->{oy});
1657	glColor @{$self->{fg}};
1658	$tex->draw_quad_alpha ($self->{ox}, $self->{oy});
1659	} else {
1660	$tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1661	}
1662
1663	glDisable GL_TEXTURE_2D;
1664	}	1710	}
1665		1711
1666	#############################################################################	1712	#############################################################################
1667		1713
1668	package CFClient::UI::EntryBase;	1714	package CFClient::UI::EntryBase;
…		…
1682	can_hover => 1,	1728	can_hover => 1,
1683	can_focus => 1,	1729	can_focus => 1,
1684	valign => 0,	1730	valign => 0,
1685	can_events => 1,	1731	can_events => 1,
1686	#text => ...	1732	#text => ...
		1733	#hidden => "*",
1687	@_	1734	@_
1688	)	1735	)
1689	}	1736	}
1690		1737
1691	sub _set_text {	1738	sub _set_text {
…		…
1698	$self->{last_activity} = $::NOW;	1745	$self->{last_activity} = $::NOW;
1699	$self->{text} = $text;	1746	$self->{text} = $text;
1700		1747
1701	$text =~ s/./*/g if $self->{hidden};	1748	$text =~ s/./*/g if $self->{hidden};
1702	$self->{layout}->set_text ("$text ");	1749	$self->{layout}->set_text ("$text ");
1703	delete $self->{req_h};	1750	delete $self->{size_req};
1704		1751
1705	$self->_emit (changed => $self->{text});	1752	$self->emit (changed => $self->{text});
1706		1753
1707	$self->realloc;	1754	$self->realloc;
1708	$self->update;	1755	$self->update;
1709	}	1756	}
1710		1757
…		…
1725	my ($w, $h) = $self->SUPER::size_request;	1772	my ($w, $h) = $self->SUPER::size_request;
1726		1773
1727	($w + 1, $h) # add 1 for cursor	1774	($w + 1, $h) # add 1 for cursor
1728	}	1775	}
1729		1776
1730	sub key_down {	1777	sub invoke_key_down {
1731	my ($self, $ev) = @_;	1778	my ($self, $ev) = @_;
1732		1779
1733	my $mod = $ev->{mod};	1780	my $mod = $ev->{mod};
1734	my $sym = $ev->{sym};	1781	my $sym = $ev->{sym};
1735	my $uni = $ev->{unicode};	1782	my $uni = $ev->{unicode};
…		…
1747	} elsif ($sym == CFClient::SDLK_HOME) {	1794	} elsif ($sym == CFClient::SDLK_HOME) {
1748	$self->{cursor} = 0;	1795	$self->{cursor} = 0;
1749	} elsif ($sym == CFClient::SDLK_END) {	1796	} elsif ($sym == CFClient::SDLK_END) {
1750	$self->{cursor} = length $text;	1797	$self->{cursor} = length $text;
1751	} elsif ($uni == 27) {	1798	} elsif ($uni == 27) {
1752	$self->_emit ('escape');	1799	$self->emit ('escape');
1753	} elsif ($uni) {	1800	} elsif ($uni) {
1754	substr $text, $self->{cursor}++, 0, chr $uni;	1801	substr $text, $self->{cursor}++, 0, chr $uni;
1755	} else {	1802	} else {
1756	return 0;	1803	return 0;
1757	}	1804	}
…		…
1761	$self->realloc;	1808	$self->realloc;
1762		1809
1763	1	1810	1
1764	}	1811	}
1765		1812
1766	sub focus_in {	1813	sub invoke_focus_in {
1767	my ($self) = @_;	1814	my ($self) = @_;
1768		1815
1769	$self->{last_activity} = $::NOW;	1816	$self->{last_activity} = $::NOW;
1770		1817
1771	$self->SUPER::focus_in;	1818	$self->SUPER::invoke_focus_in
1772	}	1819	}
1773		1820
1774	sub button_down {	1821	sub invoke_button_down {
1775	my ($self, $ev, $x, $y) = @_;	1822	my ($self, $ev, $x, $y) = @_;
1776		1823
1777	$self->SUPER::button_down ($ev, $x, $y);	1824	$self->SUPER::invoke_button_down ($ev, $x, $y);
1778		1825
1779	my $idx = $self->{layout}->xy_to_index ($x, $y);	1826	my $idx = $self->{layout}->xy_to_index ($x, $y);
1780		1827
1781	# byte-index to char-index	1828	# byte-index to char-index
1782	my $text = $self->{text};	1829	my $text = $self->{text};
…		…
1787	$self->update;	1834	$self->update;
1788		1835
1789	1	1836	1
1790	}	1837	}
1791		1838
1792	sub mouse_motion {	1839	sub invoke_mouse_motion {
1793	my ($self, $ev, $x, $y) = @_;	1840	my ($self, $ev, $x, $y) = @_;
1794	# 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#
1795		1842
1796	0	1843	1
1797	}	1844	}
1798		1845
1799	sub _draw {	1846	sub _draw {
1800	my ($self) = @_;	1847	my ($self) = @_;
1801		1848
…		…
1842		1889
1843	our @ISA = CFClient::UI::EntryBase::;	1890	our @ISA = CFClient::UI::EntryBase::;
1844		1891
1845	use CFClient::OpenGL;	1892	use CFClient::OpenGL;
1846		1893
1847	sub key_down {	1894	sub invoke_key_down {
1848	my ($self, $ev) = @_;	1895	my ($self, $ev) = @_;
1849		1896
1850	my $sym = $ev->{sym};	1897	my $sym = $ev->{sym};
1851		1898
1852	if ($sym == 13) {	1899	if ($sym == 13) {
1853	unshift @{$self->{history}},	1900	unshift @{$self->{history}},
1854	my $txt = $self->get_text;	1901	my $txt = $self->get_text;
		1902
1855	$self->{history_pointer} = -1;	1903	$self->{history_pointer} = -1;
1856	$self->{history_saveback} = '';	1904	$self->{history_saveback} = '';
1857	$self->_emit (activate => $txt);	1905	$self->emit (activate => $txt);
1858	$self->update;	1906	$self->update;
1859		1907
1860	} elsif ($sym == CFClient::SDLK_UP) {	1908	} elsif ($sym == CFClient::SDLK_UP) {
1861	if ($self->{history_pointer} < 0) {	1909	if ($self->{history_pointer} < 0) {
1862	$self->{history_saveback} = $self->get_text;	1910	$self->{history_saveback} = $self->get_text;
…		…
1878	} else {	1926	} else {
1879	$self->set_text ($self->{history_saveback});	1927	$self->set_text ($self->{history_saveback});
1880	}	1928	}
1881		1929
1882	} else {	1930	} else {
1883	return $self->SUPER::key_down ($ev)	1931	return $self->SUPER::invoke_key_down ($ev)
1884	}	1932	}
1885		1933
1886	1	1934	1
1887	}	1935	}
1888		1936
…		…
1912	can_events => 1,	1960	can_events => 1,
1913	@_	1961	@_
1914	)	1962	)
1915	}	1963	}
1916		1964
1917	sub activate { }
1918
1919	sub button_up {	1965	sub invoke_button_up {
1920	my ($self, $ev, $x, $y) = @_;	1966	my ($self, $ev, $x, $y) = @_;
1921		1967
1922	$self->emit ("activate")	1968	$self->emit ("activate")
1923	if $x >= 0 && $x < $self->{w}	1969	if $x >= 0 && $x < $self->{w}
1924	&& $y >= 0 && $y < $self->{h};	1970	&& $y >= 0 && $y < $self->{h};
…		…
1938	$tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});	1984	$tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1939		1985
1940	glDisable GL_TEXTURE_2D;	1986	glDisable GL_TEXTURE_2D;
1941		1987
1942	$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
1943	}	2025	}
1944		2026
1945	#############################################################################	2027	#############################################################################
1946		2028
1947	package CFClient::UI::CheckBox;	2029	package CFClient::UI::CheckBox;
…		…
1974	my ($self) = @_;	2056	my ($self) = @_;
1975		2057
1976	(6) x 2	2058	(6) x 2
1977	}	2059	}
1978		2060
		2061	sub toggle {
		2062	my ($self) = @_;
		2063
		2064	$self->{state} = !$self->{state};
		2065	$self->emit (changed => $self->{state});
		2066	$self->update;
		2067	}
		2068
1979	sub button_down {	2069	sub invoke_button_down {
1980	my ($self, $ev, $x, $y) = @_;	2070	my ($self, $ev, $x, $y) = @_;
1981		2071
1982	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}	2072	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1983	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {	2073	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1984	$self->{state} = !$self->{state};	2074	$self->toggle;
1985	$self->_emit (changed => $self->{state});
1986	} else {	2075	} else {
1987	return 0	2076	return 0
1988	}	2077	}
1989		2078
1990	1	2079	1
…		…
2015	package CFClient::UI::Image;	2104	package CFClient::UI::Image;
2016		2105
2017	our @ISA = CFClient::UI::Base::;	2106	our @ISA = CFClient::UI::Base::;
2018		2107
2019	use CFClient::OpenGL;	2108	use CFClient::OpenGL;
2020	use Carp qw/confess/;
2021		2109
2022	our %loaded_images;	2110	our %texture_cache;
2023		2111
2024	sub new {	2112	sub new {
2025	my $class = shift;	2113	my $class = shift;
2026		2114
2027	my $self = $class->SUPER::new (can_events => 0, @_);	2115	my $self = $class->SUPER::new (
		2116	can_events => 0,
		2117	@_,
		2118	);
2028		2119
2029	$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";
2030		2122
2031	$loaded_images{$self->{image}} ||=	2123	$self->{tex} = $texture_cache{$self->{path}} ||=
2032	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;
2033		2125
2034	my $tex = $self->{tex} = $loaded_images{$self->{image}};	2126	Scalar::Util::weaken $texture_cache{$self->{path}};
2035		2127
2036	Scalar::Util::weaken $loaded_images{$self->{image}};	2128	$self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2037
2038	$self->{aspect} = $tex->{w} / $tex->{h};
2039		2129
2040	$self	2130	$self
2041	}	2131	}
2042		2132
2043	sub size_request {	2133	sub size_request {
2044	my ($self) = @_;	2134	my ($self) = @_;
2045		2135
2046	($self->{tex}->{w}, $self->{tex}->{h})	2136	($self->{tex}{w}, $self->{tex}{h})
2047	}	2137	}
2048		2138
2049	sub _draw {	2139	sub _draw {
2050	my ($self) = @_;	2140	my ($self) = @_;
2051		2141
…		…
2160	my $ycut1 = max 0, min 1, $ycut;	2250	my $ycut1 = max 0, min 1, $ycut;
2161	my $ycut2 = max 0, min 1, $ycut - 1;	2251	my $ycut2 = max 0, min 1, $ycut - 1;
2162		2252
2163	my $h1 = $self->{h} * (1 - $ycut1);	2253	my $h1 = $self->{h} * (1 - $ycut1);
2164	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);
2165		2258
2166	glEnable GL_BLEND;	2259	glEnable GL_BLEND;
2167	glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,	2260	glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2168	GL_ONE, GL_ONE_MINUS_SRC_ALPHA;	2261	GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2169	glEnable GL_TEXTURE_2D;	2262	glEnable GL_TEXTURE_2D;
…		…
2188		2281
2189	if ($t3) {	2282	if ($t3) {
2190	glBindTexture GL_TEXTURE_2D, $t3->{name};	2283	glBindTexture GL_TEXTURE_2D, $t3->{name};
2191	glBegin GL_QUADS;	2284	glBegin GL_QUADS;
2192	glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;	2285	glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2193	glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h};	2286	glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2194	glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h};	2287	glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2195	glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;	2288	glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2196	glEnd;	2289	glEnd;
2197	}	2290	}
2198		2291
2199	glDisable GL_BLEND;	2292	glDisable GL_BLEND;
…		…
2287	$self->update;	2380	$self->update;
2288		2381
2289	$self	2382	$self
2290	}	2383	}
2291		2384
2292	sub changed { }
2293
2294	sub set_range {	2385	sub set_range {
2295	my ($self, $range) = @_;	2386	my ($self, $range) = @_;
2296		2387
2297	($range, $self->{range}) = ($self->{range}, $range);	2388	($range, $self->{range}) = ($self->{range}, $range);
2298		2389
2299	$self->update
2300	if "@$range" ne "@{$self->{range}}";	2390	if ("@$range" ne "@{$self->{range}}") {
		2391	$self->update;
		2392	$self->set_value ($self->{range}[0]);
		2393	}
2301	}	2394	}
2302		2395
2303	sub set_value {	2396	sub set_value {
2304	my ($self, $value) = @_;	2397	my ($self, $value) = @_;
2305		2398
…		…
2316	if $unit;	2409	if $unit;
2317		2410
2318	@{$self->{range}} = ($value, $lo, $hi, $page, $unit);	2411	@{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2319		2412
2320	if ($value != $old_value) {	2413	if ($value != $old_value) {
2321	$self->_emit (changed => $value);	2414	$self->emit (changed => $value);
2322	$self->update;	2415	$self->update;
2323	}	2416	}
2324	}	2417	}
2325		2418
2326	sub size_request {	2419	sub size_request {
2327	my ($self) = @_;	2420	my ($self) = @_;
2328		2421
2329	($self->{req_w}, $self->{req_h})	2422	($self->{req_w}, $self->{req_h})
2330	}	2423	}
2331		2424
2332	sub button_down {	2425	sub invoke_button_down {
2333	my ($self, $ev, $x, $y) = @_;	2426	my ($self, $ev, $x, $y) = @_;
2334		2427
2335	$self->SUPER::button_down ($ev, $x, $y);	2428	$self->SUPER::invoke_button_down ($ev, $x, $y);
2336		2429
2337	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];	2430	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2338		2431
2339	$self->mouse_motion ($ev, $x, $y)	2432	$self->invoke_mouse_motion ($ev, $x, $y)
2340	}	2433	}
2341		2434
2342	sub mouse_motion {	2435	sub invoke_mouse_motion {
2343	my ($self, $ev, $x, $y) = @_;	2436	my ($self, $ev, $x, $y) = @_;
2344		2437
2345	if ($GRAB == $self) {	2438	if ($GRAB == $self) {
2346	my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});	2439	my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2347		2440
…		…
2452	sub set_range { shift->{slider}->set_range (@_) }	2545	sub set_range { shift->{slider}->set_range (@_) }
2453	sub set_value { shift->{slider}->set_value (@_) }	2546	sub set_value { shift->{slider}->set_value (@_) }
2454		2547
2455	#############################################################################	2548	#############################################################################
2456		2549
2457	package CFClient::UI::TextView;	2550	package CFClient::UI::TextScroller;
2458		2551
2459	our @ISA = CFClient::UI::HBox::;	2552	our @ISA = CFClient::UI::HBox::;
2460		2553
2461	use CFClient::OpenGL;	2554	use CFClient::OpenGL;
2462		2555
…		…
2464	my $class = shift;	2557	my $class = shift;
2465		2558
2466	my $self = $class->SUPER::new (	2559	my $self = $class->SUPER::new (
2467	fontsize => 1,	2560	fontsize => 1,
2468	can_events => 0,	2561	can_events => 0,
		2562	indent => 0,
2469	#font => default_font	2563	#font => default_font
2470	@_,	2564	@_,
2471		2565
2472	layout => (new CFClient::Layout 1),	2566	layout => (new CFClient::Layout 2),
2473	par => [],	2567	par => [],
2474	height => 0,	2568	height => 0,
2475	children => [	2569	children => [
2476	(new CFClient::UI::Empty expand => 1),	2570	(new CFClient::UI::Empty expand => 1),
2477	(new CFClient::UI::Slider vertical => 1),	2571	(new CFClient::UI::Slider vertical => 1),
…		…
2488		2582
2489	$self->{fontsize} = $fontsize;	2583	$self->{fontsize} = $fontsize;
2490	$self->reflow;	2584	$self->reflow;
2491	}	2585	}
2492		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
2493	sub size_allocate {	2596	sub invoke_size_allocate {
2494	my ($self, $w, $h) = @_;	2597	my ($self, $w, $h) = @_;
2495		2598
2496	$self->SUPER::size_allocate ($w, $h);	2599	my ($empty, $slider, @other) = @{ $self->{children} };
		2600	$_->configure (@$_{qw(x y req_w req_h)}) for @other;
2497		2601
2498	$self->{layout}->set_font ($self->{font}) if $self->{font};	2602	$self->{layout}->set_font ($self->{font}) if $self->{font};
2499	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	2603	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2500	$self->{layout}->set_width ($self->{children}[0]{w});	2604	$self->{layout}->set_width ($empty->{w});
		2605	$self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2501		2606
2502	$self->reflow;	2607	$self->reflow;
2503	}
2504		2608
2505	sub text_size {	2609	local $self->{children} = [$empty, $slider];
2506	my ($self, $text, $indent) = @_;	2610	$self->SUPER::invoke_size_allocate ($w, $h)
		2611	}
		2612
		2613	sub get_layout {
		2614	my ($self, $para) = @_;
2507		2615
2508	my $layout = $self->{layout};	2616	my $layout = $self->{layout};
2509		2617
		2618	$layout->set_font ($self->{font}) if $self->{font};
		2619	$layout->set_foreground (@{$para->{fg}});
2510	$layout->set_height ($self->{fontsize} * $::FONTSIZE);	2620	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
2511	$layout->set_width ($self->{children}[0]{w} - $indent);	2621	$layout->set_width ($self->{children}[0]{w} - $para->{indent});
		2622	$layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2512	$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}}
2513		2629	);
		2630
2514	$layout->size	2631	$layout
2515	}	2632	}
2516		2633
2517	sub reflow {	2634	sub reflow {
2518	my ($self) = @_;	2635	my ($self) = @_;
2519		2636
…		…
2528	$self->{children}[1]->set_value ($offset);	2645	$self->{children}[1]->set_value ($offset);
2529	}	2646	}
2530		2647
2531	sub clear {	2648	sub clear {
2532	my ($self) = @_;	2649	my ($self) = @_;
		2650
		2651	my (undef, undef, @other) = @{ $self->{children} };
		2652	$self->remove ($_) for @other;
2533		2653
2534	$self->{par} = [];	2654	$self->{par} = [];
2535	$self->{height} = 0;	2655	$self->{height} = 0;
2536	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);	2656	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2537	}	2657	}
2538		2658
2539	sub add_paragraph {	2659	sub add_paragraph {
2540	my ($self, $color, $text, $indent) = @_;	2660	my ($self, $color, $para, $indent) = @_;
2541		2661
2542	for my $line (split /\n/, $text) {	2662	my ($text, @w) = ref $para ? @$para : $para;
2543	my ($w, $h) = $self->text_size ($line);	2663
2544	$self->{height} += $h;	2664	$para = {
2545	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,
2546	}	2671	};
2547		2672
2548	$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;
2549	}	2685	}
2550		2686
2551	sub update {	2687	sub update {
2552	my ($self) = @_;	2688	my ($self) = @_;
2553		2689
…		…
2555		2691
2556	return unless $self->{h} > 0;	2692	return unless $self->{h} > 0;
2557		2693
2558	delete $self->{texture};	2694	delete $self->{texture};
2559		2695
2560	$ROOT->on_post_alloc ($self, sub {	2696	$ROOT->on_post_alloc ($self => sub {
2561	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};	2697	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2562		2698
2563	if (delete $self->{need_reflow}) {	2699	if (delete $self->{need_reflow}) {
2564	my $height = 0;	2700	my $height = 0;
2565		2701
2566	my $layout = $self->{layout};
2567
2568	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
2569
2570	for (@{$self->{par}}) {	2702	for my $para (@{$self->{par}}) {
2571	if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support	2703	if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2572	$layout->set_width ($W - $_->[3]);	2704	my $layout = $self->get_layout ($para);
2573	$layout->set_markup ($_->[4]);
2574	my ($w, $h) = $layout->size;	2705	my ($w, $h) = $layout->size;
2575	$_->[0] = $w + $_->[3];	2706
2576	$_->[1] = $h;	2707	$para->{w} = $w + $para->{indent};
		2708	$para->{h} = $h;
		2709	$para->{wrapped} = $layout->has_wrapped;
2577	}	2710	}
2578		2711
2579	$height += $_->[1];	2712	$height += $para->{h};
2580	}	2713	}
2581		2714
2582	$self->{height} = $height;	2715	$self->{height} = $height;
2583		2716
2584	$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]);
2585		2718
2586	delete $self->{texture};	2719	delete $self->{texture};
		2720	}
		2721
		2722	if (delete $self->{scroll_to_bottom}) {
		2723	$self->{children}[1]->set_value (1e10);
2587	}	2724	}
2588		2725
2589	$self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {	2726	$self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2590	glClearColor 0, 0, 0, 0;	2727	glClearColor 0, 0, 0, 0;
2591	glClear GL_COLOR_BUFFER_BIT;	2728	glClear GL_COLOR_BUFFER_BIT;
…		…
2595	my $y0 = $top;	2732	my $y0 = $top;
2596	my $y1 = $top + $H;	2733	my $y1 = $top + $H;
2597		2734
2598	my $y = 0;	2735	my $y = 0;
2599		2736
2600	my $layout = $self->{layout};
2601
2602	$layout->set_font ($self->{font}) if $self->{font};
2603
2604	glEnable GL_BLEND;
2605	#TODO# not correct in windows where rgba is forced off
2606	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2607
2608	for my $par (@{$self->{par}}) {	2737	for my $para (@{$self->{par}}) {
2609	my $h = $par->[1];	2738	my $h = $para->{h};
2610		2739
2611	if ($y0 < $y + $h && $y < $y1) {	2740	if ($y0 < $y + $h && $y < $y1) {
2612	$layout->set_foreground (@{ $par->[2] });
2613	$layout->set_width ($W - $par->[3]);
2614	$layout->set_markup ($par->[4]);
2615		2741
2616	my ($w, $h, $data, $format, $internalformat) = $layout->render;	2742	my $layout = $self->get_layout ($para);
2617		2743
2618	glRasterPos $par->[3], $y - $y0;	2744	$layout->render ($para->{indent}, $y - $y0);
2619	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	}
2620	}	2758	}
2621		2759
2622	$y += $h;	2760	$y += $h;
2623	}	2761	}
2624
2625	glDisable GL_BLEND;
2626	};	2762	};
2627	});	2763	});
		2764	}
		2765
		2766	sub reconfigure {
		2767	my ($self) = @_;
		2768
		2769	$self->SUPER::reconfigure;
		2770
		2771	$_->{w} = 1e10 for @{ $self->{par} };
		2772	$self->reflow;
2628	}	2773	}
2629		2774
2630	sub _draw {	2775	sub _draw {
2631	my ($self) = @_;	2776	my ($self) = @_;
2632		2777
…		…
2635	glColor 0, 0, 0, 1;	2780	glColor 0, 0, 0, 1;
2636	$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});
2637	glDisable GL_TEXTURE_2D;	2782	glDisable GL_TEXTURE_2D;
2638		2783
2639	$self->{children}[1]->draw;	2784	$self->{children}[1]->draw;
2640
2641	}	2785	}
2642		2786
2643	#############################################################################	2787	#############################################################################
2644		2788
2645	package CFClient::UI::Animator;	2789	package CFClient::UI::Animator;
…		…
2732	$tooltip .= "\n\n" . (ref $widget) . "\n"	2876	$tooltip .= "\n\n" . (ref $widget) . "\n"
2733	. "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"	2877	. "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2734	. "req $widget->{req_w} $widget->{req_h}\n"	2878	. "req $widget->{req_w} $widget->{req_h}\n"
2735	. "visible $widget->{visible}";	2879	. "visible $widget->{visible}";
2736	}	2880	}
		2881
		2882	$tooltip =~ s/^\n+//;
		2883	$tooltip =~ s/\n+$//;
2737		2884
2738	$self->add (new CFClient::UI::Label	2885	$self->add (new CFClient::UI::Label
2739	markup => $tooltip,	2886	markup => $tooltip,
2740	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,	2887	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2741	fontsize => 0.8,	2888	fontsize => 0.8,
…		…
2751	my ($w, $h) = @{$self->child}{qw(req_w req_h)};	2898	my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2752		2899
2753	($w + 4, $h + 4)	2900	($w + 4, $h + 4)
2754	}	2901	}
2755		2902
2756	sub size_allocate {	2903	sub invoke_size_allocate {
2757	my ($self, $w, $h) = @_;	2904	my ($self, $w, $h) = @_;
2758		2905
2759	$self->SUPER::size_allocate ($w - 4, $h - 4);	2906	$self->SUPER::invoke_size_allocate ($w - 4, $h - 4)
2760	}	2907	}
2761		2908
2762	sub visibility_change {	2909	sub invoke_visibility_change {
2763	my ($self, $visible) = @_;	2910	my ($self, $visible) = @_;
2764		2911
2765	return unless $visible;	2912	return unless $visible;
2766		2913
2767	$self->{root}->on_post_alloc ("move_$self" => sub {	2914	$self->{root}->on_post_alloc ("move_$self" => sub {
…		…
2769	or return;	2916	or return;
2770		2917
2771	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);	2918	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2772		2919
2773	($x, $y) = $widget->coord2global (-$self->{w}, 0)	2920	($x, $y) = $widget->coord2global (-$self->{w}, 0)
2774	if $x + $self->{w} > $::WIDTH;	2921	if $x + $self->{w} > $self->{root}{w};
2775		2922
2776	$self->move_abs ($x, $y);	2923	$self->move_abs ($x, $y);
2777	});	2924	});
2778	}	2925	}
2779		2926
…		…
2874	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});	3021	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2875	glDisable GL_TEXTURE_2D;	3022	glDisable GL_TEXTURE_2D;
2876	}	3023	}
2877	}	3024	}
2878		3025
2879	sub DESTROY {	3026	sub destroy {
2880	my ($self) = @_;	3027	my ($self) = @_;
2881		3028
2882	$self->{timer}->cancel	3029	$self->{timer}->cancel
2883	if $self->{timer};	3030	if $self->{timer};
2884		3031
2885	$self->SUPER::DESTROY;	3032	$self->SUPER::destroy;
2886	}	3033	}
2887		3034
2888	#############################################################################	3035	#############################################################################
2889		3036
2890	package CFClient::UI::Buttonbar;	3037	package CFClient::UI::Buttonbar;
…		…
2911	);	3058	);
2912		3059
2913	$self->add ($self->{vbox} = new CFClient::UI::VBox);	3060	$self->add ($self->{vbox} = new CFClient::UI::VBox);
2914		3061
2915	for my $item (@{ $self->{items} }) {	3062	for my $item (@{ $self->{items} }) {
2916	my ($widget, $cb) = @$item;	3063	my ($widget, $cb, $tooltip) = @$item;
2917		3064
2918	# handle various types of items, only text for now	3065	# handle various types of items, only text for now
2919	if (!ref $widget) {	3066	if (!ref $widget) {
2920	$widget = new CFClient::UI::Label	3067	$widget = new CFClient::UI::Label
2921	can_hover => 1,	3068	can_hover => 1,
2922	can_events => 1,	3069	can_events => 1,
2923	text => $widget;	3070	markup => $widget,
		3071	tooltip => $tooltip
2924	}	3072	}
2925		3073
2926	$self->{item}{$widget} = $item;	3074	$self->{item}{$widget} = $item;
2927		3075
2928	$self->{vbox}->add ($widget);	3076	$self->{vbox}->add ($widget);
…		…
2933		3081
2934	# 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)
2935	sub popup {	3083	sub popup {
2936	my ($self, $ev) = @_;	3084	my ($self, $ev) = @_;
2937		3085
2938	$self->_emit ("popdown");	3086	$self->emit ("popdown");
2939		3087
2940	# maybe save $GRAB? must be careful about events...	3088	# maybe save $GRAB? must be careful about events...
2941	$GRAB = $self;	3089	$GRAB = $self;
2942	$self->{button} = $ev->{button};	3090	$self->{button} = $ev->{button};
2943		3091
2944	$self->show;	3092	$self->show;
2945	$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);
2946	}	3094	}
2947		3095
2948	sub mouse_motion {	3096	sub invoke_mouse_motion {
2949	my ($self, $ev, $x, $y) = @_;	3097	my ($self, $ev, $x, $y) = @_;
2950		3098
2951	# TODO: should use vbox->find_widget or so	3099	# TODO: should use vbox->find_widget or so
2952	$HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});	3100	$HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2953	$self->{hover} = $self->{item}{$HOVER};	3101	$self->{hover} = $self->{item}{$HOVER};
2954		3102
2955	0	3103	0
2956	}	3104	}
2957		3105
2958	sub button_up {	3106	sub invoke_button_up {
2959	my ($self, $ev, $x, $y) = @_;	3107	my ($self, $ev, $x, $y) = @_;
2960		3108
2961	if ($ev->{button} == $self->{button}) {	3109	if ($ev->{button} == $self->{button}) {
2962	undef $GRAB;	3110	undef $GRAB;
2963	$self->hide;	3111	$self->hide;
2964		3112
2965	$self->_emit ("popdown");	3113	$self->emit ("popdown");
2966	$self->{hover}[1]->() if $self->{hover};	3114	$self->{hover}[1]->() if $self->{hover};
2967	} else {	3115	} else {
2968	return 0	3116	return 0
2969	}	3117	}
2970		3118
…		…
2997		3145
2998	$self->{current} = $self->{children}[0]	3146	$self->{current} = $self->{children}[0]
2999	if @{ $self->{children} };	3147	if @{ $self->{children} };
3000	}	3148	}
3001		3149
		3150	sub get_current_page {
		3151	my ($self) = @_;
		3152
		3153	$self->{current}
		3154	}
		3155
3002	sub set_current_page {	3156	sub set_current_page {
3003	my ($self, $page_or_widget) = @_;	3157	my ($self, $page_or_widget) = @_;
3004		3158
3005	my $widget = ref $page_or_widget	3159	my $widget = ref $page_or_widget
3006	? $page_or_widget	3160	? $page_or_widget
3007	: $self->{children}[$page_or_widget];	3161	: $self->{children}[$page_or_widget];
3008		3162
3009	$self->{current} = $widget;	3163	$self->{current} = $widget;
3010	$self->{current}->configure (0, 0, $self->{w}, $self->{h});	3164	$self->{current}->configure (0, 0, $self->{w}, $self->{h});
3011		3165
3012	$self->_emit (page_changed => $self->{current});	3166	$self->emit (page_changed => $self->{current});
3013		3167
3014	$self->realloc;	3168	$self->realloc;
3015	}	3169	}
3016		3170
3017	sub visible_children {	3171	sub visible_children {
…		…
3022	my ($self) = @_;	3176	my ($self) = @_;
3023		3177
3024	$self->{current}->size_request	3178	$self->{current}->size_request
3025	}	3179	}
3026		3180
3027	sub size_allocate {	3181	sub invoke_size_allocate {
3028	my ($self, $w, $h) = @_;	3182	my ($self, $w, $h) = @_;
3029		3183
3030	$self->{current}->configure (0, 0, $w, $h);	3184	$self->{current}->configure (0, 0, $w, $h);
		3185
		3186	1
3031	}	3187	}
3032		3188
3033	sub _draw {	3189	sub _draw {
3034	my ($self) = @_;	3190	my ($self) = @_;
3035		3191
…		…
3070	);	3226	);
3071		3227
3072	$self->{multiplexer}->add ($widget);	3228	$self->{multiplexer}->add ($widget);
3073	}	3229	}
3074		3230
		3231	sub get_current_page {
		3232	my ($self) = @_;
		3233
		3234	$self->{multiplexer}->get_current_page
		3235	}
		3236
3075	sub set_current_page {	3237	sub set_current_page {
3076	my ($self, $page) = @_;	3238	my ($self, $page) = @_;
3077		3239
3078	$self->{multiplexer}->set_current_page ($page);	3240	$self->{multiplexer}->set_current_page ($page);
3079	$self->_emit (page_changed => $self->{multiplexer}{current});	3241	$self->emit (page_changed => $self->{multiplexer}{current});
		3242	}
		3243
		3244	#############################################################################
		3245
		3246	package CFClient::UI::Combobox;
		3247
		3248	use utf8;
		3249
		3250	our @ISA = CFClient::UI::Button::;
		3251
		3252	sub new {
		3253	my $class = shift;
		3254
		3255	my $self = $class->SUPER::new (
		3256	options => [], # [value, title, longdesc], ...
		3257	value => undef,
		3258	@_,
		3259	);
		3260
		3261	$self->_set_value ($self->{value});
		3262
		3263	$self
		3264	}
		3265
		3266	sub invoke_button_down {
		3267	my ($self, $ev) = @_;
		3268
		3269	my @menu_items;
		3270
		3271	for (@{ $self->{options} }) {
		3272	my ($value, $title, $tooltip) = @$_;
		3273
		3274	push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
		3275	}
		3276
		3277	CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
		3278	}
		3279
		3280	sub _set_value {
		3281	my ($self, $value) = @_;
		3282
		3283	my ($item) = grep $_->[0] eq $value, @{ $self->{options} }
		3284	or return;
		3285
		3286	$self->{value} = $item->[0];
		3287	$self->set_markup ("$item->[1] ⇓");
		3288	$self->set_tooltip ($item->[2]);
		3289	}
		3290
		3291	sub set_value {
		3292	my ($self, $value) = @_;
		3293
		3294	return unless $self->{value} ne $value;
		3295
		3296	$self->_set_value ($value);
		3297	$self->emit (changed => $value);
3080	}	3298	}
3081		3299
3082	#############################################################################	3300	#############################################################################
3083		3301
3084	package CFClient::UI::Statusbox;	3302	package CFClient::UI::Statusbox;
…		…
3183	$item->{count}++;	3401	$item->{count}++;
3184	} else {	3402	} else {
3185	$item->{count} = 1;	3403	$item->{count} = 1;
3186	$item->{text} = $item->{tooltip} = $text;	3404	$item->{text} = $item->{tooltip} = $text;
3187	}	3405	}
3188	$item->{id} = ++$self->{id};	3406	$item->{id} += 0.2;#d#
3189	$item->{timeout} = $timeout;	3407	$item->{timeout} = $timeout;
3190	delete $item->{label};	3408	delete $item->{label};
3191	} else {	3409	} else {
3192	$self->{item}{$group} = {	3410	$self->{item}{$group} = {
3193	id => ++$self->{id},	3411	id => ++$self->{id},
…		…
3199	count => 1,	3417	count => 1,
3200	%arg,	3418	%arg,
3201	};	3419	};
3202	}	3420	}
3203		3421
		3422	$ROOT->on_refresh (reorder => sub {
3204	$self->reorder;	3423	$self->reorder;
		3424	});
3205	}	3425	}
3206		3426
3207	sub reconfigure {	3427	sub reconfigure {
3208	my ($self) = @_;	3428	my ($self) = @_;
3209		3429
…		…
3212		3432
3213	$self->reorder;	3433	$self->reorder;
3214	$self->SUPER::reconfigure;	3434	$self->SUPER::reconfigure;
3215	}	3435	}
3216		3436
3217	sub DESTROY {	3437	sub destroy {
3218	my ($self) = @_;	3438	my ($self) = @_;
3219		3439
3220	$self->{timer}->cancel;	3440	$self->{timer}->cancel;
3221		3441
3222	$self->SUPER::DESTROY;	3442	$self->SUPER::destroy;
3223	}	3443	}
3224		3444
3225	#############################################################################	3445	#############################################################################
3226		3446
3227	package CFClient::UI::Inventory;	3447	package CFClient::UI::Inventory;
3228		3448
3229	our @ISA = CFClient::UI::ScrolledWindow::;	3449	our @ISA = CFClient::UI::Table::;
3230		3450
3231	sub new {	3451	sub new {
3232	my $class = shift;	3452	my $class = shift;
3233		3453
3234	my $self = $class->SUPER::new (	3454	my $self = $class->SUPER::new (
3235	child => (new CFClient::UI::Table col_expand => [0, 1, 0]),	3455	col_expand => [0, 1, 0],
3236	@_,	3456	@_,
3237	);	3457	);
3238		3458
3239	$self	3459	$self
3240	}	3460	}
3241		3461
3242	sub set_items {	3462	sub set_items {
3243	my ($self, $items) = @_;	3463	my ($self, $items) = @_;
3244		3464
3245	$self->{child}->clear;	3465	$self->clear;
3246	return unless $items;	3466	return unless $items;
3247		3467
3248	my @items = sort {	3468	my @items = sort {
3249	($a->{type} <=> $b->{type})	3469	($a->{type} <=> $b->{type})
3250	or ($a->{name} cmp $b->{name})	3470	or ($a->{name} cmp $b->{name})
3251	} @$items;	3471	} values %$items;
3252		3472
3253	$self->{real_items} = \@items;	3473	$self->{real_items} = \@items;
3254		3474
3255	my $row = 0;	3475	my $row = 0;
3256	for my $item (@items) {	3476	for my $item (@items) {
3257	CFClient::Item::update_widgets $item;	3477	CFClient::Item::update_widgets $item;
3258		3478
3259	$self->{child}->add (0, $row, $item->{face_widget});	3479	$self->add (0, $row, $item->{face_widget});
3260	$self->{child}->add (1, $row, $item->{desc_widget});	3480	$self->add (1, $row, $item->{desc_widget});
3261	$self->{child}->add (2, $row, $item->{weight_widget});	3481	$self->add (2, $row, $item->{weight_widget});
3262		3482
3263	$row++;	3483	$row++;
3264	}
3265	}
3266
3267	#############################################################################
3268
3269	package CFClient::UI::BindEditor;
3270
3271	our @ISA = CFClient::UI::FancyFrame::;
3272
3273	sub new {
3274	my $class = shift;
3275
3276	my $self = $class->SUPER::new (binding => [], commands => [], @_);
3277
3278	$self->add (my $vb = new CFClient::UI::VBox);
3279
3280
3281	$vb->add ($self->{rec_btn} = new CFClient::UI::Button
3282	text => "start recording",
3283	tooltip => "Start/Stops recording of actions."
3284	."All subsequent actions after the recording started will be captured."
3285	."The actions are displayed after the record was stopped."
3286	."To bind the action you have to click on the 'Bind' button",
3287	on_activate => sub {
3288	unless ($self->{recording}) {
3289	$self->start;
3290	} else {
3291	$self->stop;
3292	}
3293	});
3294
3295	$vb->add (new CFClient::UI::Label text => "Actions:");
3296	$vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3297
3298	$vb->add (new CFClient::UI::Label text => "Bound to: ");
3299	$vb->add (my $hb = new CFClient::UI::HBox);
3300	$hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3301	$hb->add (new CFClient::UI::Button
3302	text => "bind",
3303	tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3304	on_activate => sub {
3305	$self->ask_for_bind;
3306	});
3307
3308	$vb->add (my $hb = new CFClient::UI::HBox);
3309	$hb->add (new CFClient::UI::Button
3310	text => "ok",
3311	expand => 1,
3312	tooltip => "This closes the binding editor and saves the binding",
3313	on_activate => sub {
3314	$self->hide;
3315	$self->commit;
3316	});
3317
3318	$hb->add (new CFClient::UI::Button
3319	text => "cancel",
3320	expand => 1,
3321	tooltip => "This closes the binding editor without saving",
3322	on_activate => sub {
3323	$self->hide;
3324	$self->{binding_cancel}->()
3325	if $self->{binding_cancel};
3326	});
3327
3328	$self->update_binding_widgets;
3329
3330	$self
3331	}
3332
3333	sub commit {
3334	my ($self) = @_;
3335	my ($mod, $sym, $cmds) = $self->get_binding;
3336	if ($sym != 0 && @$cmds > 0) {
3337	$::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3338	."'. Don't forget 'Save Config'!");
3339	$self->{binding_change}->($mod, $sym, $cmds)
3340	if $self->{binding_change};
3341	} else {
3342	$::STATUSBOX->add ("No action bound, no key or action specified!");
3343	$self->{binding_cancel}->()
3344	if $self->{binding_cancel};
3345	}
3346	}
3347
3348	sub start {
3349	my ($self) = @_;
3350
3351	$self->{rec_btn}->set_text ("stop recording");
3352	$self->{recording} = 1;
3353	$self->clear_command_list;
3354	$::CONN->start_record if $::CONN;
3355	}
3356
3357	sub stop {
3358	my ($self) = @_;
3359
3360	$self->{rec_btn}->set_text ("start recording");
3361	$self->{recording} = 0;
3362
3363	my $rec;
3364	$rec = $::CONN->stop_record if $::CONN;
3365	return unless ref $rec eq 'ARRAY';
3366	$self->set_command_list ($rec);
3367	}
3368
3369
3370	sub ask_for_bind_and_commit {
3371	my ($self) = @_;
3372	$self->ask_for_bind (1);
3373	}
3374
3375	sub ask_for_bind {
3376	my ($self, $commit) = @_;
3377
3378	CFClient::Binder::open_binding_dialog (sub {
3379	my ($mod, $sym) = @_;
3380	$self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3381	$self->update_binding_widgets;
3382	$self->commit if $commit;
3383	});
3384	}
3385
3386	# $mod and $sym are the modifiers and key symbol
3387	# $cmds is a array ref of strings (the commands)
3388	# $cb is the callback that is executed on OK
3389	# $ccb is the callback that is executed on CANCEL and
3390	# when the binding was unsuccessful on OK
3391	sub set_binding {
3392	my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3393
3394	$self->clear_command_list;
3395	$self->{recording} = 0;
3396	$self->{rec_btn}->set_text ("start recording");
3397
3398	$self->{binding} = [$mod, $sym];
3399	$self->{commands} = $cmds;
3400
3401	$self->{binding_change} = $cb;
3402	$self->{binding_cancel} = $ccb;
3403
3404	$self->update_binding_widgets;
3405	}
3406
3407	# this is a shortcut method that asks for a binding
3408	# and then just binds it.
3409	sub do_quick_binding {
3410	my ($self, $cmds) = @_;
3411	$self->set_binding (undef, undef, $cmds, sub {
3412	$::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3413	});
3414	$self->ask_for_bind (1);
3415	}
3416
3417	sub update_binding_widgets {
3418	my ($self) = @_;
3419	my ($mod, $sym, $cmds) = $self->get_binding;
3420	$self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3421	$self->set_command_list ($cmds);
3422	}
3423
3424	sub get_binding {
3425	my ($self) = @_;
3426	return (
3427	$self->{binding}->[0],
3428	$self->{binding}->[1],
3429	[ grep { defined $_ } @{$self->{commands}} ]
3430	);
3431	}
3432
3433	sub clear_command_list {
3434	my ($self) = @_;
3435	$self->{cmdbox}->clear ();
3436	}
3437
3438	sub set_command_list {
3439	my ($self, $cmds) = @_;
3440
3441	$self->{cmdbox}->clear ();
3442	$self->{commands} = $cmds;
3443
3444	my $idx = 0;
3445
3446	for (@$cmds) {
3447	$self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3448
3449	my $i = $idx;
3450	$hb->add (new CFClient::UI::Label text => $_);
3451	$hb->add (new CFClient::UI::Button
3452	text => "delete",
3453	tooltip => "Deletes the action from the record",
3454	on_activate => sub {
3455	$self->{cmdbox}->remove ($hb);
3456	$cmds->[$i] = undef;
3457	});
3458
3459
3460	$idx++
3461	}	3484	}
3462	}	3485	}
3463		3486
3464	#############################################################################	3487	#############################################################################
3465		3488
…		…
3475	commands => [],	3498	commands => [],
3476	@_,	3499	@_,
3477	)	3500	)
3478	}	3501	}
3479		3502
3480	# XXX: Do sorting? Argl...	3503	my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
		3504
		3505	my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
		3506	"<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
		3507	my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
		3508	"<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
		3509	my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
		3510	"<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
		3511	my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
		3512	"<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
		3513	my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
		3514	"<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
		3515
		3516	sub rebuild_spell_list {
		3517	my ($self) = @_;
		3518
		3519	$CFClient::UI::ROOT->on_refresh ($self => sub {
		3520	$self->clear;
		3521
		3522	return unless $::CONN;
		3523
		3524	$self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);
		3525	$self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL);
		3526	$self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
		3527	$self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
		3528	$self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
		3529
		3530	my $row = 0;
		3531
		3532	for (sort { $a cmp $b } keys %{ $self->{spell} }) {
		3533	my $spell = $self->{spell}{$_};
		3534
		3535	$row++;
		3536
		3537	my $spell_cb = sub {
		3538	my ($widget, $ev) = @_;
		3539
		3540	if ($ev->{button} == 1) {
		3541	$::CONN->user_send ("cast $spell->{name}");
		3542	} elsif ($ev->{button} == 2) {
		3543	$::CONN->user_send ("invoke $spell->{name}");
		3544	} elsif ($ev->{button} == 3) {
		3545	(new CFClient::UI::Menu
		3546	items => [
		3547	["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
		3548	["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
		3549	],
		3550	)->popup ($ev);
		3551	} else {
		3552	return 0;
		3553	}
		3554
		3555	1
		3556	};
		3557
		3558	my $tooltip = "$spell->{message}$TOOLTIP_ALL";
		3559
		3560	#TODO: add path info to tooltip
		3561	#$self->add (6, $row, new CFClient::UI::Label text => $spell->{path});
		3562
		3563	$self->add (0, $row, new CFClient::UI::Face
		3564	face => $spell->{face},
		3565	can_hover => 1,
		3566	can_events => 1,
		3567	tooltip => $tooltip,
		3568	on_button_down => $spell_cb,
		3569	);
		3570
		3571	$self->add (1, $row, new CFClient::UI::Label
		3572	expand => 1,
		3573	text => $spell->{name},
		3574	can_hover => 1,
		3575	can_events => 1,
		3576	tooltip => $tooltip,
		3577	on_button_down => $spell_cb,
		3578	);
		3579
		3580	$self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
		3581	$self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
		3582	$self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
		3583	$self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
		3584	}
		3585	});
		3586	}
		3587
3481	sub add_spell {	3588	sub add_spell {
3482	my ($self, $spell) = @_;	3589	my ($self, $spell) = @_;
		3590
3483	$self->{spells}->{$spell->{name}} = $spell;	3591	$self->{spell}->{$spell->{name}} = $spell;
3484		3592	$self->rebuild_spell_list;
3485	$self->add (0, $self->{tbl_idx}, new CFClient::UI::Face
3486	face => $spell->{face},
3487	can_hover => 1,
3488	can_events => 1,
3489	tooltip => $spell->{message});
3490
3491	$self->add (1, $self->{tbl_idx}, new CFClient::UI::Label
3492	text => $spell->{name},
3493	can_hover => 1,
3494	can_events => 1,
3495	tooltip => $spell->{message},
3496	expand => 1);
3497
3498	$self->add (2, $self->{tbl_idx}, new CFClient::UI::Label
3499	text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
3500	$spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
3501	expand => 1);
3502
3503	$self->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
3504	text => "bind to key",
3505	on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
3506	}
3507
3508	sub rebuild_spell_list {
3509	my ($self) = @_;
3510	$self->{tbl_idx} = 0;
3511	$self->add_spell ($_) for values %{$self->{spells}};
3512	}	3593	}
3513		3594
3514	sub remove_spell {	3595	sub remove_spell {
3515	my ($self, $spell) = @_;	3596	my ($self, $spell) = @_;
		3597
3516	delete $self->{spells}->{$spell->{name}};	3598	delete $self->{spell}->{$spell->{name}};
		3599	$self->rebuild_spell_list;
		3600	}
		3601
		3602	sub clear_spells {
		3603	my ($self) = @_;
		3604
		3605	$self->{spell} = {};
3517	$self->rebuild_spell_list;	3606	$self->rebuild_spell_list;
3518	}	3607	}
3519		3608
3520	#############################################################################	3609	#############################################################################
3521		3610
…		…
3558	$coord = $max - $size if $coord > $max - $size;	3647	$coord = $max - $size if $coord > $max - $size;
3559		3648
3560	int $coord + 0.5	3649	int $coord + 0.5
3561	}	3650	}
3562		3651
3563	sub size_allocate {	3652	sub invoke_size_allocate {
3564	my ($self, $w, $h) = @_;	3653	my ($self, $w, $h) = @_;
3565		3654
3566	for my $child ($self->children) {	3655	for my $child ($self->children) {
3567	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)};
3568		3657
…		…
3572	$X = _to_pixel $X, $W, $self->{w};	3661	$X = _to_pixel $X, $W, $self->{w};
3573	$Y = _to_pixel $Y, $H, $self->{h};	3662	$Y = _to_pixel $Y, $H, $self->{h};
3574		3663
3575	$child->configure ($X, $Y, $W, $H);	3664	$child->configure ($X, $Y, $W, $H);
3576	}	3665	}
		3666
		3667	1
3577	}	3668	}
3578		3669
3579	sub coord2local {	3670	sub coord2local {
3580	my ($self, $x, $y) = @_;	3671	my ($self, $x, $y) = @_;
3581		3672
…		…
3746	($draw_x, $draw_y, $draw_w, $draw_h) =	3837	($draw_x, $draw_y, $draw_w, $draw_h) =
3747	(0, 0, $self->{w}, $self->{h});	3838	(0, 0, $self->{w}, $self->{h});
3748	}	3839	}
3749		3840
3750	$self->_draw;	3841	$self->_draw;
		3842
		3843	#TODO#d# display texture cache
		3844	{
		3845	glEnable GL_TEXTURE_2D;
		3846	glBindTexture GL_TEXTURE_2D, 41;
		3847	glColor 1, 1, 1, 1;
		3848	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
		3849	glEnable GL_BLEND;
		3850	glBlendFunc GL_SRC_ALPHA, GL_ZERO;
		3851	glBegin GL_QUADS;
		3852	glTexCoord 0,1; glVertex 0,0;
		3853	glTexCoord 1,1; glVertex 255,0;
		3854	glTexCoord 1,0; glVertex 255,255;
		3855	glTexCoord 0,0; glVertex 0,255;
		3856	glEnd;
		3857	glDisable GL_BLEND;
		3858	glDisable GL_TEXTURE_2D;
		3859	}
		3860
3751	}	3861	}
3752		3862
3753	#############################################################################	3863	#############################################################################
3754		3864
3755	package CFClient::UI;	3865	package CFClient::UI;

Diff Legend

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