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.284 by root, Mon Jun 5 03:06:04 2006 UTC vs.
Revision 1.322 by root, Wed Jul 5 01:53:24 2006 UTC

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

Diff Legend

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