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.290 by root, Mon Jun 5 22:30:35 2006 UTC vs.
Revision 1.328 by root, Sat Jul 22 13:43:05 2006 UTC

…		…
82	}	82	}
83		83
84	sub feed_sdl_button_down_event {	84	sub feed_sdl_button_down_event {
85	my ($ev) = @_;	85	my ($ev) = @_;
86	my ($x, $y) = ($ev->{x}, $ev->{y});	86	my ($x, $y) = ($ev->{x}, $ev->{y});
		87
		88	warn "button down $ev->{button}\n";#d#
87		89
88	if (!$BUTTON_STATE) {	90	if (!$BUTTON_STATE) {
89	my $widget = $ROOT->find_widget ($x, $y);	91	my $widget = $ROOT->find_widget ($x, $y);
90		92
91	$GRAB = $widget;	93	$GRAB = $widget;
…		…
272		274
273	return unless $self->{visible};	275	return unless $self->{visible};
274		276
275	$_->set_invisible for $self->children;	277	$_->set_invisible for $self->children;
276		278
		279	delete $self->{visible};
277	delete $self->{root};	280	delete $self->{root};
278	delete $self->{visible};
279		281
280	undef $GRAB if $GRAB == $self;	282	undef $GRAB if $GRAB == $self;
281	undef $HOVER if $HOVER == $self;	283	undef $HOVER if $HOVER == $self;
282		284
283	$CFClient::UI::TOOLTIP_WATCHER->cb->()	285	$CFClient::UI::TOOLTIP_WATCHER->cb->()
284	if $TOOLTIP->{owner} == $self;	286	if $TOOLTIP->{owner} == $self;
285		287
286	$self->focus_out;	288	$self->emit ("focus_out");
287
288	$self->emit (visibility_change => 0);	289	$self->emit (visibility_change => 0);
289	}	290	}
290		291
291	sub set_visibility {	292	sub set_visibility {
292	my ($self, $visible) = @_;	293	my ($self, $visible) = @_;
…		…
315	}	316	}
316		317
317	sub move_abs {	318	sub move_abs {
318	my ($self, $x, $y, $z) = @_;	319	my ($self, $x, $y, $z) = @_;
319		320
320	$self->{x} = List::Util::max 0, int $x;	321	$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;	322	$self->{y} = List::Util::max 0, List::Util::min $self->{root}{h} - $self->{h}, int $y;
322	$self->{z} = $z if defined $z;	323	$self->{z} = $z if defined $z;
323		324
324	$self->update;	325	$self->update;
325	}	326	}
326		327
…		…
334	}	335	}
335		336
336	sub size_request {	337	sub size_request {
337	require Carp;	338	require Carp;
338	Carp::confess "size_request is abstract";	339	Carp::confess "size_request is abstract";
		340	}
		341
		342	sub baseline_shift {
		343	0
339	}	344	}
340		345
341	sub configure {	346	sub configure {
342	my ($self, $x, $y, $w, $h) = @_;	347	my ($self, $x, $y, $w, $h) = @_;
343		348
…		…
367		372
368	$self->{root}{size_alloc}{$self+0} = $self;	373	$self->{root}{size_alloc}{$self+0} = $self;
369	}	374	}
370	}	375	}
371		376
372	sub size_allocate {
373	# nothing to be done
374	}
375
376	sub children {	377	sub children {
377	# nop	378	# nop
378	}	379	}
379		380
380	sub visible_children {	381	sub visible_children {
…		…
418	my ($self, $x, $y) = @_;	419	my ($self, $x, $y) = @_;
419		420
420	$self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})	421	$self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
421	}	422	}
422		423
423	sub focus_in {	424	sub invoke_focus_in {
424	my ($self) = @_;	425	my ($self) = @_;
425		426
426	return if $FOCUS == $self;	427	return if $FOCUS == $self;
427	return unless $self->{can_focus};	428	return unless $self->{can_focus};
428		429
429	my $focus = $FOCUS; $FOCUS = $self;	430	$FOCUS = $self;
430		431
431	$self->_emit (focus_in => $focus);	432	$self->update;
432		433
433	$focus->update if $focus;	434	0
434	$FOCUS->update;
435	}	435	}
436		436
437	sub focus_out {	437	sub invoke_focus_out {
438	my ($self) = @_;	438	my ($self) = @_;
439		439
440	return unless $FOCUS == $self;	440	return unless $FOCUS == $self;
441		441
442	my $focus = $FOCUS; undef $FOCUS;	442	undef $FOCUS;
443		443
444	$self->_emit (focus_out => $focus);	444	$self->update;
445		445
446	$focus->update if $focus; #?
447
448	$::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus	446	$::MAPWIDGET->grab_focus #d# focus mapwidget if no other widget has focus
449	unless $FOCUS;	447	unless $FOCUS;
450	}
451		448
		449	0
		450	}
		451
		452	sub grab_focus {
		453	my ($self) = @_;
		454
		455	$FOCUS->emit ("focus_out") if $FOCUS;
		456	$self->emit ("focus_in");
		457	}
		458
452	sub mouse_motion { 0 }	459	sub invoke_mouse_motion { 0 }
453	sub button_up { 0 }	460	sub invoke_button_up { 0 }
454	sub key_down { 0 }	461	sub invoke_key_down { 0 }
455	sub key_up { 0 }	462	sub invoke_key_up { 0 }
456		463
457	sub button_down {	464	sub invoke_button_down {
458	my ($self, $ev, $x, $y) = @_;	465	my ($self, $ev, $x, $y) = @_;
459		466
460	$self->focus_in;	467	$self->grab_focus;
		468
		469	warn "button down $ev->{button} $x $y\n";#d#
461		470
462	0	471	0
		472	}
		473
		474	sub connect {
		475	my ($self, $signal, $cb) = @_;
		476
		477	push @{ $self->{signal_cb}{$signal} }, $cb;
		478	}
		479
		480	sub emit {
		481	my ($self, $signal, @args) = @_;
		482
		483	#d##TODO# stop propagating at first true, do not use sum
		484	(List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}) # before
		485	|| ($self->can ("invoke_$signal") || sub { 1 })->($self, @args) # closure
		486	|| ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent
463	}	487	}
464		488
465	sub find_widget {	489	sub find_widget {
466	my ($self, $x, $y) = @_;	490	my ($self, $x, $y) = @_;
467		491
…		…
477	sub set_parent {	501	sub set_parent {
478	my ($self, $parent) = @_;	502	my ($self, $parent) = @_;
479		503
480	Scalar::Util::weaken ($self->{parent} = $parent);	504	Scalar::Util::weaken ($self->{parent} = $parent);
481	$self->set_visible if $parent->{visible};	505	$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	}	506	}
506		507
507	sub realloc {	508	sub realloc {
508	my ($self) = @_;	509	my ($self) = @_;
509		510
…		…
542	return unless $self->{h} && $self->{w};	543	return unless $self->{h} && $self->{w};
543		544
544	# update screen rectangle	545	# update screen rectangle
545	local $draw_x = $draw_x + $self->{x};	546	local $draw_x = $draw_x + $self->{x};
546	local $draw_y = $draw_y + $self->{y};	547	local $draw_y = $draw_y + $self->{y};
547	local $draw_w = $draw_x + $self->{w};
548	local $draw_h = $draw_y + $self->{h};
549		548
550	# skip widgets that are entirely outside the drawing area	549	# skip widgets that are entirely outside the drawing area
551	return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)	550	return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
552	|| ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);	551	|| ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
553		552
…		…
592	}	591	}
593		592
594	sub DESTROY {	593	sub DESTROY {
595	my ($self) = @_;	594	my ($self) = @_;
596		595
		596	return if CFClient::in_destruct;
		597
597	delete $WIDGET{$self+0};	598	delete $WIDGET{$self+0};
598	#$self->deactivate;	599
		600	eval { $self->destroy };
		601	warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
599	}	602	}
600		603
601	#############################################################################	604	#############################################################################
602		605
603	package CFClient::UI::DrawBG;	606	package CFClient::UI::DrawBG;
…		…
768	}	771	}
769		772
770	sub add {	773	sub add {
771	my ($self, $child) = @_;	774	my ($self, $child) = @_;
772		775
773	$self->{children} = [];	776	$self->SUPER::remove ($_) for @{ $self->{children} };
774
775	$self->SUPER::add ($child);	777	$self->SUPER::add ($child);
776	}	778	}
777		779
778	sub remove {	780	sub remove {
779	my ($self, $widget) = @_;	781	my ($self, $widget) = @_;
…		…
788		790
789	sub size_request {	791	sub size_request {
790	$_[0]{children}[0]->size_request	792	$_[0]{children}[0]->size_request
791	}	793	}
792		794
793	sub size_allocate {	795	sub invoke_size_allocate {
794	my ($self, $w, $h) = @_;	796	my ($self, $w, $h) = @_;
795		797
796	$self->{children}[0]->configure (0, 0, $w, $h);	798	$self->{children}[0]->configure (0, 0, $w, $h);
		799
		800	1
797	}	801	}
798		802
799	#############################################################################	803	#############################################################################
800		804
801	# back-buffered drawing area	805	# back-buffered drawing area
…		…
817		821
818	$ROOT->on_post_alloc ($self => sub { $self->render_child });	822	$ROOT->on_post_alloc ($self => sub { $self->render_child });
819	$self->SUPER::update;	823	$self->SUPER::update;
820	}	824	}
821		825
822	sub size_allocate {	826	sub invoke_size_allocate {
823	my ($self, $w, $h) = @_;	827	my ($self, $w, $h) = @_;
824		828
825	$self->SUPER::size_allocate ($w, $h);
826	$self->update;	829	$self->update;
		830
		831	$self->SUPER::invoke_size_allocate ($w, $h)
827	}	832	}
828		833
829	sub _render {	834	sub _render {
830	my ($self) = @_;	835	my ($self) = @_;
831		836
…		…
892	$h = 10 if $self->{scroll_y};	897	$h = 10 if $self->{scroll_y};
893		898
894	($w, $h)	899	($w, $h)
895	}	900	}
896		901
897	sub size_allocate {	902	sub invoke_size_allocate {
898	my ($self, $w, $h) = @_;	903	my ($self, $w, $h) = @_;
899		904
900	my $child = $self->child;	905	my $child = $self->child;
901		906
902	$w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};	907	$w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
903	$h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};	908	$h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
904		909
905	$self->child->configure (0, 0, $w, $h);	910	$self->child->configure (0, 0, $w, $h);
906	$self->update;	911	$self->update;
		912
		913	1
907	}	914	}
908		915
909	sub set_offset {	916	sub set_offset {
910	my ($self, $x, $y) = @_;	917	my ($self, $x, $y) = @_;
911		918
…		…
985	$self->add ($child) if $child;	992	$self->add ($child) if $child;
986		993
987	$self	994	$self
988	}	995	}
989		996
		997	#TODO# update range on size_allocate depending on child
		998
990	sub add {	999	sub add {
991	my ($self, $widget) = @_;	1000	my ($self, $widget) = @_;
992		1001
993	$self->{vp}->add ($self->{child} = $widget);	1002	$self->{vp}->add ($self->{child} = $widget);
994	}	1003	}
995		1004
		1005	sub invoke_button_down {
		1006	my ($self, $ev) = @_;
		1007
		1008	warn "button down $ev->{button}\n";#d#
		1009
		1010	0
		1011	}
		1012
		1013	sub update_slider {
		1014	my ($self) = @_;
		1015
		1016	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $self->{vp}->child->{h}, $self->{vp}{h}, 1]);
		1017	}
		1018
996	sub update {	1019	sub update {
997	my ($self) = @_;	1020	my ($self) = @_;
998		1021
999	$self->SUPER::update;	1022	$self->SUPER::update;
1000		1023
1001	# todo: overwrite size_allocate of child	1024	$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	}	1025	}
1005		1026
1006	sub size_allocate {	1027	sub invoke_size_allocate {
1007	my ($self, $w, $h) = @_;	1028	my ($self, $w, $h) = @_;
1008		1029
		1030	$self->update_slider;
		1031
1009	$self->SUPER::size_allocate ($w, $h);	1032	$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	}	1033	}
1014
1015	#TODO# update range on size_allocate depending on child
1016	# update viewport offset on scroll
1017		1034
1018	#############################################################################	1035	#############################################################################
1019		1036
1020	package CFClient::UI::Frame;	1037	package CFClient::UI::Frame;
1021		1038
…		…
1072	qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);	1089	qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1073		1090
1074	sub new {	1091	sub new {
1075	my ($class, %arg) = @_;	1092	my ($class, %arg) = @_;
1076		1093
1077	my $title = delete $arg{title};
1078
1079	my $self = $class->SUPER::new (	1094	my $self = $class->SUPER::new (
1080	bg => [1, 1, 1, 1],	1095	bg => [1, 1, 1, 1],
1081	border_bg => [1, 1, 1, 1],	1096	border_bg => [1, 1, 1, 1],
1082	border => 0.6,	1097	border => 0.6,
1083	can_events => 1,	1098	can_events => 1,
1084	min_w => 16,	1099	min_w => 64,
1085	min_h => 16,	1100	min_h => 32,
1086	%arg,	1101	%arg,
1087	);	1102	);
1088		1103
1089	$self->{title} = new CFClient::UI::Label	1104	$self->{title_widget} = new CFClient::UI::Label
1090	align => 0,	1105	align => 0,
1091	valign => 1,	1106	valign => 1,
1092	text => $title,	1107	text => $self->{title},
1093	fontsize => $self->{border}	1108	fontsize => $self->{border},
1094	if defined $title;	1109	if exists $self->{title};
		1110
		1111	if ($self->{has_close_button}) {
		1112	$self->{close_button} =
		1113	new CFClient::UI::ImageButton
		1114	path => 'x1_close.png',
		1115	on_activate => sub { $self->emit ("delete") };
		1116
		1117	$self->CFClient::UI::Container::add ($self->{close_button});
		1118	}
1095		1119
1096	$self	1120	$self
1097	}	1121	}
1098		1122
1099	sub add {	1123	sub add {
1100	my ($self, @widgets) = @_;	1124	my ($self, @widgets) = @_;
1101		1125
1102	$self->SUPER::add (@widgets);	1126	$self->SUPER::add (@widgets);
		1127	$self->CFClient::UI::Container::add ($self->{close_button}) if $self->{close_button};
1103	$self->CFClient::UI::Container::add ($self->{title}) if $self->{title};	1128	$self->CFClient::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1104	}	1129	}
1105		1130
1106	sub border {	1131	sub border {
1107	int $_[0]{border} * $::FONTSIZE	1132	int $_[0]{border} * $::FONTSIZE
1108	}	1133	}
1109		1134
1110	sub size_request {	1135	sub size_request {
1111	my ($self) = @_;	1136	my ($self) = @_;
1112		1137
1113	$self->{title}->size_request	1138	$self->{title_widget}->size_request
1114	if $self->{title};	1139	if $self->{title_widget};
		1140
		1141	$self->{close_button}->size_request
		1142	if $self->{close_button};
1115		1143
1116	my ($w, $h) = $self->SUPER::size_request;	1144	my ($w, $h) = $self->SUPER::size_request;
1117		1145
1118	(	1146	(
1119	$w + $self->border * 2,	1147	$w + $self->border * 2,
1120	$h + $self->border * 2,	1148	$h + $self->border * 2,
1121	)	1149	)
1122	}	1150	}
1123		1151
1124	sub size_allocate {	1152	sub invoke_size_allocate {
1125	my ($self, $w, $h) = @_;	1153	my ($self, $w, $h) = @_;
1126		1154
1127	if ($self->{title}) {	1155	if ($self->{title_widget}) {
1128	$self->{title}{w} = $w;	1156	$self->{title_widget}{w} = $w;
1129	$self->{title}{h} = $h;	1157	$self->{title_widget}{h} = $h;
1130	$self->{title}->size_allocate ($w, $h);	1158	$self->{title_widget}->invoke_size_allocate ($w, $h);
1131	}	1159	}
1132		1160
1133	my $border = $self->border;	1161	my $border = $self->border;
1134		1162
1135	$h -= List::Util::max 0, $border * 2;	1163	$h -= List::Util::max 0, $border * 2;
1136	$w -= List::Util::max 0, $border * 2;	1164	$w -= List::Util::max 0, $border * 2;
		1165
		1166	$self->child->configure ($border, $border, $w, $h);
		1167
		1168	$self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
		1169	if $self->{close_button};
		1170
		1171	1
		1172	}
		1173
		1174	sub invoke_delete {
		1175	my ($self) = @_;
		1176
		1177	$self->hide;
1137		1178
1138	$self->child->configure ($border, $border, $w, $h);	1179	1
1139	}	1180	}
1140		1181
1141	sub button_down {	1182	sub invoke_button_down {
1142	my ($self, $ev, $x, $y) = @_;	1183	my ($self, $ev, $x, $y) = @_;
1143		1184
1144	my ($w, $h) = @$self{qw(w h)};	1185	my ($w, $h) = @$self{qw(w h)};
1145	my $border = $self->border;	1186	my $border = $self->border;
1146		1187
…		…
1177		1218
1178	($x, $y) = ($ev->{x}, $ev->{y});	1219	($x, $y) = ($ev->{x}, $ev->{y});
1179		1220
1180	$self->move_abs ($bx + $x - $ox, $by + $y - $oy);	1221	$self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1181	# HACK: the next line is required to enforce placement	1222	# HACK: the next line is required to enforce placement
1182	$self->{parent}->size_allocate ($self->{parent}{w}, $self->{parent}{h});	1223	$self->{parent}->invoke_size_allocate ($self->{parent}{w}, $self->{parent}{h});
1183	};	1224	};
1184	} else {	1225	} else {
1185	return 0;	1226	return 0;
1186	}	1227	}
1187		1228
1188	1	1229	1
1189	}	1230	}
1190		1231
1191	sub button_up {	1232	sub invoke_button_up {
1192	my ($self, $ev, $x, $y) = @_;	1233	my ($self, $ev, $x, $y) = @_;
1193		1234
1194	!!delete $self->{motion}	1235	! ! delete $self->{motion}
1195	}	1236	}
1196		1237
1197	sub mouse_motion {	1238	sub invoke_mouse_motion {
1198	my ($self, $ev, $x, $y) = @_;	1239	my ($self, $ev, $x, $y) = @_;
1199		1240
1200	$self->{motion}->($ev, $x, $y) if $self->{motion};	1241	$self->{motion}->($ev, $x, $y) if $self->{motion};
1201		1242
1202	!!$self->{motion}	1243	! ! $self->{motion}
1203	}	1244	}
1204		1245
1205	sub _draw {	1246	sub _draw {
1206	my ($self) = @_;	1247	my ($self) = @_;
1207		1248
…		…
1233		1274
1234	glDisable GL_TEXTURE_2D;	1275	glDisable GL_TEXTURE_2D;
1235		1276
1236	$child->draw;	1277	$child->draw;
1237		1278
1238	if ($self->{title}) {	1279	if ($self->{title_widget}) {
1239	glTranslate 0, $border - $self->{h};	1280	glTranslate 0, $border - $self->{h};
1240	$self->{title}->_draw;	1281	$self->{title_widget}->_draw;
		1282
		1283	glTranslate 0, - ($border - $self->{h});
1241	}	1284	}
		1285
		1286	$self->{close_button}->draw
		1287	if $self->{close_button};
1242	}	1288	}
1243		1289
1244	#############################################################################	1290	#############################################################################
1245		1291
1246	package CFClient::UI::Table;	1292	package CFClient::UI::Table;
…		…
1269		1315
1270	$child->set_parent ($self);	1316	$child->set_parent ($self);
1271	$self->{children}[$y][$x] = $child;	1317	$self->{children}[$y][$x] = $child;
1272		1318
1273	$self->realloc;	1319	$self->realloc;
		1320	}
		1321
		1322	sub remove {
		1323	my ($self, $child) = @_;
		1324
		1325	# TODO: not yet implemented
1274	}	1326	}
1275		1327
1276	# TODO: move to container class maybe? send children a signal on removal?	1328	# TODO: move to container class maybe? send children a signal on removal?
1277	sub clear {	1329	sub clear {
1278	my ($self) = @_;	1330	my ($self) = @_;
…		…
1319	(sum @$ws),	1371	(sum @$ws),
1320	(sum @$hs),	1372	(sum @$hs),
1321	)	1373	)
1322	}	1374	}
1323		1375
1324	sub size_allocate {	1376	sub invoke_size_allocate {
1325	my ($self, $w, $h) = @_;	1377	my ($self, $w, $h) = @_;
1326		1378
1327	my ($ws, $hs) = $self->get_wh;	1379	my ($ws, $hs) = $self->get_wh;
1328		1380
1329	my $req_w = (sum @$ws) || 1;	1381	my $req_w = (sum @$ws) || 1;
…		…
1361	}	1413	}
1362		1414
1363	$y += $row_h;	1415	$y += $row_h;
1364	}	1416	}
1365		1417
		1418	1
1366	}	1419	}
1367		1420
1368	sub find_widget {	1421	sub find_widget {
1369	my ($self, $x, $y) = @_;	1422	my ($self, $x, $y) = @_;
1370		1423
…		…
1407	(List::Util::sum map $_->{req_w}, @{$self->{children}}),	1460	(List::Util::sum map $_->{req_w}, @{$self->{children}}),
1408	(List::Util::max map $_->{req_h}, @{$self->{children}}),	1461	(List::Util::max map $_->{req_h}, @{$self->{children}}),
1409	)	1462	)
1410	}	1463	}
1411		1464
1412	sub size_allocate {	1465	sub invoke_size_allocate {
1413	my ($self, $w, $h) = @_;	1466	my ($self, $w, $h) = @_;
1414		1467
1415	my $space = $self->{vertical} ? $h : $w;	1468	my $space = $self->{vertical} ? $h : $w;
1416	my $children = $self->{children};	1469	my @children = $self->visible_children;
1417		1470
1418	my @req;	1471	my @req;
1419		1472
1420	if ($self->{homogeneous}) {	1473	if ($self->{homogeneous}) {
1421	@req = ($space / (@$children || 1)) x @$children;	1474	@req = ($space / (@children || 1)) x @children;
1422	} else {	1475	} else {
1423	@req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children;	1476	@req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @children;
1424	my $req = List::Util::sum @req;	1477	my $req = List::Util::sum @req;
1425		1478
1426	if ($req > $space) {	1479	if ($req > $space) {
1427	# ah well, not enough space	1480	# ah well, not enough space
1428	$_ *= $space / $req for @req;	1481	$_ *= $space / $req for @req;
1429	} else {	1482	} else {
1430	my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;	1483	my $expand = (List::Util::sum map $_->{expand}, @children) || 1;
1431		1484
1432	$space = ($space - $req) / $expand; # remaining space to give away	1485	$space = ($space - $req) / $expand; # remaining space to give away
1433		1486
1434	$req[$_] += $space * $children->[$_]{expand}	1487	$req[$_] += $space * $children[$_]{expand}
1435	for 0 .. $#$children;	1488	for 0 .. $#children;
1436	}	1489	}
1437	}	1490	}
1438		1491
1439	CFClient::UI::harmonize \@req;	1492	CFClient::UI::harmonize \@req;
1440		1493
1441	my $pos = 0;	1494	my $pos = 0;
1442	for (0 .. $#$children) {	1495	for (0 .. $#children) {
1443	my $alloc = $req[$_];	1496	my $alloc = $req[$_];
1444	$children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));	1497	$children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1445		1498
1446	$pos += $alloc;	1499	$pos += $alloc;
1447	}	1500	}
1448		1501
1449	1	1502	1
…		…
1552	my ($self, $text) = @_;	1605	my ($self, $text) = @_;
1553		1606
1554	return if $self->{text} eq "T$text";	1607	return if $self->{text} eq "T$text";
1555	$self->{text} = "T$text";	1608	$self->{text} = "T$text";
1556		1609
1557	$self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1558	$self->{layout}->set_text ($text);	1610	$self->{layout}->set_text ($text);
1559		1611
1560	delete $self->{size_req};	1612	delete $self->{size_req};
1561	$self->realloc;	1613	$self->realloc;
1562	$self->update;	1614	$self->update;
…		…
1568	return if $self->{text} eq "M$markup";	1620	return if $self->{text} eq "M$markup";
1569	$self->{text} = "M$markup";	1621	$self->{text} = "M$markup";
1570		1622
1571	my $rgba = $markup =~ /span.*(?:foreground|background)/;	1623	my $rgba = $markup =~ /span.*(?:foreground|background)/;
1572		1624
1573	$self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1574	$self->{layout}->set_markup ($markup);	1625	$self->{layout}->set_markup ($markup);
1575		1626
1576	delete $self->{size_req};	1627	delete $self->{size_req};
1577	$self->realloc;	1628	$self->realloc;
1578	$self->update;	1629	$self->update;
…		…
1590		1641
1591	my ($w, $h) = $self->{layout}->size;	1642	my ($w, $h) = $self->{layout}->size;
1592		1643
1593	if (exists $self->{template}) {	1644	if (exists $self->{template}) {
1594	$self->{template}->set_font ($self->{font}) if $self->{font};	1645	$self->{template}->set_font ($self->{font}) if $self->{font};
		1646	$self->{template}->set_width ($self->{max_w} || -1);
1595	$self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);	1647	$self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1596		1648
1597	my ($w2, $h2) = $self->{template}->size;	1649	my ($w2, $h2) = $self->{template}->size;
1598		1650
1599	$w = List::Util::max $w, $w2;	1651	$w = List::Util::max $w, $w2;
…		…
1604	};	1656	};
1605		1657
1606	@{ $self->{size_req} }	1658	@{ $self->{size_req} }
1607	}	1659	}
1608		1660
		1661	sub baseline_shift {
		1662	$_[0]{layout}->descent
		1663	}
		1664
1609	sub size_allocate {	1665	sub invoke_size_allocate {
1610	my ($self, $w, $h) = @_;	1666	my ($self, $w, $h) = @_;
1611		1667
1612	delete $self->{ox};	1668	delete $self->{ox};
1613		1669
1614	delete $self->{texture}	1670	delete $self->{texture}
1615	unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};	1671	unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
		1672
		1673	1
1616	}	1674	}
1617		1675
1618	sub set_fontsize {	1676	sub set_fontsize {
1619	my ($self, $fontsize) = @_;	1677	my ($self, $fontsize) = @_;
1620		1678
1621	$self->{fontsize} = $fontsize;	1679	$self->{fontsize} = $fontsize;
		1680	delete $self->{size_req};
1622	delete $self->{texture};	1681	delete $self->{texture};
1623		1682
1624	$self->realloc;	1683	$self->realloc;
1625	}	1684	}
1626		1685
1627	sub reconfigure {	1686	sub reconfigure {
1628	my ($self) = @_;	1687	my ($self) = @_;
1629		1688
1630	delete $self->{size_req};	1689	delete $self->{size_req};
		1690	delete $self->{texture};
1631		1691
1632	$self->SUPER::reconfigure;	1692	$self->SUPER::reconfigure;
1633	}	1693	}
1634		1694
1635	sub _draw {	1695	sub _draw {
1636	my ($self) = @_;	1696	my ($self) = @_;
1637		1697
1638	$self->SUPER::_draw; # draw background, if applicable	1698	$self->SUPER::_draw; # draw background, if applicable
1639		1699
1640	my $tex = $self->{texture} ||= do {	1700	my $size = $self->{texture} ||= do {
1641	$self->{layout}->set_foreground (@{$self->{fg}});	1701	$self->{layout}->set_foreground (@{$self->{fg}});
1642	$self->{layout}->set_font ($self->{font}) if $self->{font};	1702	$self->{layout}->set_font ($self->{font}) if $self->{font};
1643	$self->{layout}->set_width ($self->{w});	1703	$self->{layout}->set_width ($self->{w});
1644	$self->{layout}->set_ellipsise ($self->{ellipsise});	1704	$self->{layout}->set_ellipsise ($self->{ellipsise});
1645	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});	1705	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1646	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	1706	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1647		1707
1648	new_from_layout CFClient::Texture $self->{layout}	1708	[$self->{layout}->size]
1649	};	1709	};
1650		1710
1651	unless (exists $self->{ox}) {	1711	unless (exists $self->{ox}) {
1652	$self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}	1712	$self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1653	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}	1713	: $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
1654	: ($self->{w} - $tex->{w}) * 0.5);	1714	: ($self->{w} - $size->[0]) * 0.5);
1655		1715
1656	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}	1716	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1657	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}	1717	: $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1658	: ($self->{h} - $tex->{h}) * 0.5);	1718	: ($self->{h} - $size->[1]) * 0.5);
1659	};	1719	};
1660		1720
1661	glEnable GL_TEXTURE_2D;	1721	my $w = List::Util::min $self->{w} + 4, $size->[0];
		1722	my $h = List::Util::min $self->{h} + 2, $size->[1];
1662		1723
1663	if ($tex->{format} == GL_ALPHA) {	1724	$self->{layout}->render ($self->{ox}, $self->{oy});
1664	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1665	glColor @{$self->{fg}};
1666	$tex->draw_quad_alpha ($self->{ox}, $self->{oy});
1667	} else {
1668	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1669	$tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1670	}
1671
1672	glDisable GL_TEXTURE_2D;
1673	}	1725	}
1674		1726
1675	#############################################################################	1727	#############################################################################
1676		1728
1677	package CFClient::UI::EntryBase;	1729	package CFClient::UI::EntryBase;
…		…
1691	can_hover => 1,	1743	can_hover => 1,
1692	can_focus => 1,	1744	can_focus => 1,
1693	valign => 0,	1745	valign => 0,
1694	can_events => 1,	1746	can_events => 1,
1695	#text => ...	1747	#text => ...
		1748	#hidden => "*",
1696	@_	1749	@_
1697	)	1750	)
1698	}	1751	}
1699		1752
1700	sub _set_text {	1753	sub _set_text {
…		…
1709		1762
1710	$text =~ s/./*/g if $self->{hidden};	1763	$text =~ s/./*/g if $self->{hidden};
1711	$self->{layout}->set_text ("$text ");	1764	$self->{layout}->set_text ("$text ");
1712	delete $self->{size_req};	1765	delete $self->{size_req};
1713		1766
1714	$self->_emit (changed => $self->{text});	1767	$self->emit (changed => $self->{text});
1715		1768
1716	$self->realloc;	1769	$self->realloc;
1717	$self->update;	1770	$self->update;
1718	}	1771	}
1719		1772
…		…
1734	my ($w, $h) = $self->SUPER::size_request;	1787	my ($w, $h) = $self->SUPER::size_request;
1735		1788
1736	($w + 1, $h) # add 1 for cursor	1789	($w + 1, $h) # add 1 for cursor
1737	}	1790	}
1738		1791
1739	sub key_down {	1792	sub invoke_key_down {
1740	my ($self, $ev) = @_;	1793	my ($self, $ev) = @_;
1741		1794
1742	my $mod = $ev->{mod};	1795	my $mod = $ev->{mod};
1743	my $sym = $ev->{sym};	1796	my $sym = $ev->{sym};
1744	my $uni = $ev->{unicode};	1797	my $uni = $ev->{unicode};
…		…
1756	} elsif ($sym == CFClient::SDLK_HOME) {	1809	} elsif ($sym == CFClient::SDLK_HOME) {
1757	$self->{cursor} = 0;	1810	$self->{cursor} = 0;
1758	} elsif ($sym == CFClient::SDLK_END) {	1811	} elsif ($sym == CFClient::SDLK_END) {
1759	$self->{cursor} = length $text;	1812	$self->{cursor} = length $text;
1760	} elsif ($uni == 27) {	1813	} elsif ($uni == 27) {
1761	$self->_emit ('escape');	1814	$self->emit ('escape');
1762	} elsif ($uni) {	1815	} elsif ($uni) {
1763	substr $text, $self->{cursor}++, 0, chr $uni;	1816	substr $text, $self->{cursor}++, 0, chr $uni;
1764	} else {	1817	} else {
1765	return 0;	1818	return 0;
1766	}	1819	}
…		…
1770	$self->realloc;	1823	$self->realloc;
1771		1824
1772	1	1825	1
1773	}	1826	}
1774		1827
1775	sub focus_in {	1828	sub invoke_focus_in {
1776	my ($self) = @_;	1829	my ($self) = @_;
1777		1830
1778	$self->{last_activity} = $::NOW;	1831	$self->{last_activity} = $::NOW;
1779		1832
1780	$self->SUPER::focus_in;	1833	$self->SUPER::invoke_focus_in
1781	}	1834	}
1782		1835
1783	sub button_down {	1836	sub invoke_button_down {
1784	my ($self, $ev, $x, $y) = @_;	1837	my ($self, $ev, $x, $y) = @_;
1785		1838
1786	$self->SUPER::button_down ($ev, $x, $y);	1839	$self->SUPER::invoke_button_down ($ev, $x, $y);
1787		1840
1788	my $idx = $self->{layout}->xy_to_index ($x, $y);	1841	my $idx = $self->{layout}->xy_to_index ($x, $y);
1789		1842
1790	# byte-index to char-index	1843	# byte-index to char-index
1791	my $text = $self->{text};	1844	my $text = $self->{text};
1792	utf8::encode $text;	1845	utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1793	$self->{cursor} = length substr $text, 0, $idx;	1846	$self->{cursor} = length $text;
1794		1847
1795	$self->_set_text ($self->{text});	1848	$self->_set_text ($self->{text});
1796	$self->update;	1849	$self->update;
1797		1850
1798	1	1851	1
1799	}	1852	}
1800		1853
1801	sub mouse_motion {	1854	sub invoke_mouse_motion {
1802	my ($self, $ev, $x, $y) = @_;	1855	my ($self, $ev, $x, $y) = @_;
1803	# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#	1856	# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1804		1857
1805	0	1858	1
1806	}	1859	}
1807		1860
1808	sub _draw {	1861	sub _draw {
1809	my ($self) = @_;	1862	my ($self) = @_;
1810		1863
…		…
1851		1904
1852	our @ISA = CFClient::UI::EntryBase::;	1905	our @ISA = CFClient::UI::EntryBase::;
1853		1906
1854	use CFClient::OpenGL;	1907	use CFClient::OpenGL;
1855		1908
1856	sub key_down {	1909	sub invoke_key_down {
1857	my ($self, $ev) = @_;	1910	my ($self, $ev) = @_;
1858		1911
1859	my $sym = $ev->{sym};	1912	my $sym = $ev->{sym};
1860		1913
1861	if ($sym == 13) {	1914	if ($sym == 13) {
1862	unshift @{$self->{history}},	1915	unshift @{$self->{history}},
1863	my $txt = $self->get_text;	1916	my $txt = $self->get_text;
		1917
1864	$self->{history_pointer} = -1;	1918	$self->{history_pointer} = -1;
1865	$self->{history_saveback} = '';	1919	$self->{history_saveback} = '';
1866	$self->_emit (activate => $txt);	1920	$self->emit (activate => $txt);
1867	$self->update;	1921	$self->update;
1868		1922
1869	} elsif ($sym == CFClient::SDLK_UP) {	1923	} elsif ($sym == CFClient::SDLK_UP) {
1870	if ($self->{history_pointer} < 0) {	1924	if ($self->{history_pointer} < 0) {
1871	$self->{history_saveback} = $self->get_text;	1925	$self->{history_saveback} = $self->get_text;
…		…
1887	} else {	1941	} else {
1888	$self->set_text ($self->{history_saveback});	1942	$self->set_text ($self->{history_saveback});
1889	}	1943	}
1890		1944
1891	} else {	1945	} else {
1892	return $self->SUPER::key_down ($ev)	1946	return $self->SUPER::invoke_key_down ($ev)
1893	}	1947	}
1894		1948
1895	1	1949	1
1896	}	1950	}
1897		1951
…		…
1921	can_events => 1,	1975	can_events => 1,
1922	@_	1976	@_
1923	)	1977	)
1924	}	1978	}
1925		1979
1926	sub activate { }
1927
1928	sub button_up {	1980	sub invoke_button_up {
1929	my ($self, $ev, $x, $y) = @_;	1981	my ($self, $ev, $x, $y) = @_;
1930		1982
1931	$self->emit ("activate")	1983	$self->emit ("activate")
1932	if $x >= 0 && $x < $self->{w}	1984	if $x >= 0 && $x < $self->{w}
1933	&& $y >= 0 && $y < $self->{h};	1985	&& $y >= 0 && $y < $self->{h};
…		…
1947	$tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});	1999	$tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1948		2000
1949	glDisable GL_TEXTURE_2D;	2001	glDisable GL_TEXTURE_2D;
1950		2002
1951	$self->SUPER::_draw;	2003	$self->SUPER::_draw;
		2004	}
		2005
		2006	#############################################################################
		2007
		2008	package CFClient::UI::ImageButton;
		2009
		2010	our @ISA = CFClient::UI::Image::;
		2011
		2012	use CFClient::OpenGL;
		2013
		2014	my %textures;
		2015
		2016	sub new {
		2017	my $class = shift;
		2018
		2019	my $self = $class->SUPER::new (
		2020	padding_x => 4,
		2021	padding_y => 4,
		2022	fg => [1, 1, 1],
		2023	active_fg => [0, 0, 1],
		2024	can_hover => 1,
		2025	align => 0,
		2026	valign => 0,
		2027	can_events => 1,
		2028	@_
		2029	);
		2030	}
		2031
		2032	sub invoke_button_up {
		2033	my ($self, $ev, $x, $y) = @_;
		2034
		2035	$self->emit ("activate")
		2036	if $x >= 0 && $x < $self->{w}
		2037	&& $y >= 0 && $y < $self->{h};
		2038
		2039	1
1952	}	2040	}
1953		2041
1954	#############################################################################	2042	#############################################################################
1955		2043
1956	package CFClient::UI::CheckBox;	2044	package CFClient::UI::CheckBox;
…		…
1983	my ($self) = @_;	2071	my ($self) = @_;
1984		2072
1985	(6) x 2	2073	(6) x 2
1986	}	2074	}
1987		2075
		2076	sub toggle {
		2077	my ($self) = @_;
		2078
		2079	$self->{state} = !$self->{state};
		2080	$self->emit (changed => $self->{state});
		2081	$self->update;
		2082	}
		2083
1988	sub button_down {	2084	sub invoke_button_down {
1989	my ($self, $ev, $x, $y) = @_;	2085	my ($self, $ev, $x, $y) = @_;
1990		2086
1991	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}	2087	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1992	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {	2088	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1993	$self->{state} = !$self->{state};	2089	$self->toggle;
1994	$self->_emit (changed => $self->{state});
1995	} else {	2090	} else {
1996	return 0	2091	return 0
1997	}	2092	}
1998		2093
1999	1	2094	1
…		…
2024	package CFClient::UI::Image;	2119	package CFClient::UI::Image;
2025		2120
2026	our @ISA = CFClient::UI::Base::;	2121	our @ISA = CFClient::UI::Base::;
2027		2122
2028	use CFClient::OpenGL;	2123	use CFClient::OpenGL;
2029	use Carp qw/confess/;
2030		2124
2031	our %loaded_images;	2125	our %texture_cache;
2032		2126
2033	sub new {	2127	sub new {
2034	my $class = shift;	2128	my $class = shift;
2035		2129
2036	my $self = $class->SUPER::new (can_events => 0, @_);	2130	my $self = $class->SUPER::new (
		2131	can_events => 0,
		2132	@_,
		2133	);
2037		2134
2038	$self->{image} or confess "Image has 'image' not set. This is a fatal error!";	2135	$self->{path} || $self->{tex}
		2136	or Carp::croak "'path' or 'tex' attributes required";
2039		2137
2040	$loaded_images{$self->{image}} ||=	2138	$self->{tex} ||= $texture_cache{$self->{path}} ||=
2041	new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1;	2139	new_from_file CFClient::Texture CFClient::find_rcfile $self->{path}, mipmap => 1;
2042		2140
2043	my $tex = $self->{tex} = $loaded_images{$self->{image}};	2141	Scalar::Util::weaken $texture_cache{$self->{path}};
2044		2142
2045	Scalar::Util::weaken $loaded_images{$self->{image}};	2143	$self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2046
2047	$self->{aspect} = $tex->{w} / $tex->{h};
2048		2144
2049	$self	2145	$self
2050	}	2146	}
2051		2147
2052	sub size_request {	2148	sub size_request {
2053	my ($self) = @_;	2149	my ($self) = @_;
2054		2150
2055	($self->{tex}->{w}, $self->{tex}->{h})	2151	($self->{tex}{w}, $self->{tex}{h})
2056	}	2152	}
2057		2153
2058	sub _draw {	2154	sub _draw {
2059	my ($self) = @_;	2155	my ($self) = @_;
2060		2156
…		…
2169	my $ycut1 = max 0, min 1, $ycut;	2265	my $ycut1 = max 0, min 1, $ycut;
2170	my $ycut2 = max 0, min 1, $ycut - 1;	2266	my $ycut2 = max 0, min 1, $ycut - 1;
2171		2267
2172	my $h1 = $self->{h} * (1 - $ycut1);	2268	my $h1 = $self->{h} * (1 - $ycut1);
2173	my $h2 = $self->{h} * (1 - $ycut2);	2269	my $h2 = $self->{h} * (1 - $ycut2);
		2270	my $h3 = $self->{h};
		2271
		2272	$_ = $_ * (284-4)/288 + 4/288 for ($h1, $h2, $h3);
2174		2273
2175	glEnable GL_BLEND;	2274	glEnable GL_BLEND;
2176	glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,	2275	glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2177	GL_ONE, GL_ONE_MINUS_SRC_ALPHA;	2276	GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2178	glEnable GL_TEXTURE_2D;	2277	glEnable GL_TEXTURE_2D;
…		…
2197		2296
2198	if ($t3) {	2297	if ($t3) {
2199	glBindTexture GL_TEXTURE_2D, $t3->{name};	2298	glBindTexture GL_TEXTURE_2D, $t3->{name};
2200	glBegin GL_QUADS;	2299	glBegin GL_QUADS;
2201	glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;	2300	glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2202	glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h};	2301	glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2203	glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h};	2302	glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2204	glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;	2303	glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2205	glEnd;	2304	glEnd;
2206	}	2305	}
2207		2306
2208	glDisable GL_BLEND;	2307	glDisable GL_BLEND;
…		…
2296	$self->update;	2395	$self->update;
2297		2396
2298	$self	2397	$self
2299	}	2398	}
2300		2399
2301	sub changed { }
2302
2303	sub set_range {	2400	sub set_range {
2304	my ($self, $range) = @_;	2401	my ($self, $range) = @_;
2305		2402
2306	($range, $self->{range}) = ($self->{range}, $range);	2403	($range, $self->{range}) = ($self->{range}, $range);
2307		2404
2308	$self->update
2309	if "@$range" ne "@{$self->{range}}";	2405	if ("@$range" ne "@{$self->{range}}") {
		2406	$self->update;
		2407	$self->set_value ($self->{range}[0]);
		2408	}
2310	}	2409	}
2311		2410
2312	sub set_value {	2411	sub set_value {
2313	my ($self, $value) = @_;	2412	my ($self, $value) = @_;
2314		2413
…		…
2325	if $unit;	2424	if $unit;
2326		2425
2327	@{$self->{range}} = ($value, $lo, $hi, $page, $unit);	2426	@{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2328		2427
2329	if ($value != $old_value) {	2428	if ($value != $old_value) {
2330	$self->_emit (changed => $value);	2429	$self->emit (changed => $value);
2331	$self->update;	2430	$self->update;
2332	}	2431	}
2333	}	2432	}
2334		2433
2335	sub size_request {	2434	sub size_request {
2336	my ($self) = @_;	2435	my ($self) = @_;
2337		2436
2338	($self->{req_w}, $self->{req_h})	2437	($self->{req_w}, $self->{req_h})
2339	}	2438	}
2340		2439
2341	sub button_down {	2440	sub invoke_button_down {
2342	my ($self, $ev, $x, $y) = @_;	2441	my ($self, $ev, $x, $y) = @_;
2343		2442
2344	$self->SUPER::button_down ($ev, $x, $y);	2443	$self->SUPER::invoke_button_down ($ev, $x, $y);
2345		2444
2346	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];	2445	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2347		2446
2348	$self->mouse_motion ($ev, $x, $y)	2447	$self->invoke_mouse_motion ($ev, $x, $y)
2349	}	2448	}
2350		2449
2351	sub mouse_motion {	2450	sub invoke_mouse_motion {
2352	my ($self, $ev, $x, $y) = @_;	2451	my ($self, $ev, $x, $y) = @_;
2353		2452
2354	if ($GRAB == $self) {	2453	if ($GRAB == $self) {
2355	my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});	2454	my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2356		2455
…		…
2461	sub set_range { shift->{slider}->set_range (@_) }	2560	sub set_range { shift->{slider}->set_range (@_) }
2462	sub set_value { shift->{slider}->set_value (@_) }	2561	sub set_value { shift->{slider}->set_value (@_) }
2463		2562
2464	#############################################################################	2563	#############################################################################
2465		2564
2466	package CFClient::UI::TextView;	2565	package CFClient::UI::TextScroller;
2467		2566
2468	our @ISA = CFClient::UI::HBox::;	2567	our @ISA = CFClient::UI::HBox::;
2469		2568
2470	use CFClient::OpenGL;	2569	use CFClient::OpenGL;
2471		2570
…		…
2473	my $class = shift;	2572	my $class = shift;
2474		2573
2475	my $self = $class->SUPER::new (	2574	my $self = $class->SUPER::new (
2476	fontsize => 1,	2575	fontsize => 1,
2477	can_events => 0,	2576	can_events => 0,
		2577	indent => 0,
2478	#font => default_font	2578	#font => default_font
2479	@_,	2579	@_,
2480		2580
2481	layout => (new CFClient::Layout 1),	2581	layout => (new CFClient::Layout),
2482	par => [],	2582	par => [],
2483	height => 0,	2583	height => 0,
2484	children => [	2584	children => [
2485	(new CFClient::UI::Empty expand => 1),	2585	(new CFClient::UI::Empty expand => 1),
2486	(new CFClient::UI::Slider vertical => 1),	2586	(new CFClient::UI::Slider vertical => 1),
…		…
2497		2597
2498	$self->{fontsize} = $fontsize;	2598	$self->{fontsize} = $fontsize;
2499	$self->reflow;	2599	$self->reflow;
2500	}	2600	}
2501		2601
		2602	sub size_request {
		2603	my ($self) = @_;
		2604
		2605	my ($empty, $slider) = @{ $self->{children} };
		2606
		2607	local $self->{children} = [$empty, $slider];
		2608	$self->SUPER::size_request
		2609	}
		2610
2502	sub size_allocate {	2611	sub invoke_size_allocate {
2503	my ($self, $w, $h) = @_;	2612	my ($self, $w, $h) = @_;
2504		2613
2505	$self->SUPER::size_allocate ($w, $h);	2614	my ($empty, $slider, @other) = @{ $self->{children} };
		2615	$_->configure (@$_{qw(x y req_w req_h)}) for @other;
2506		2616
2507	$self->{layout}->set_font ($self->{font}) if $self->{font};	2617	$self->{layout}->set_font ($self->{font}) if $self->{font};
2508	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	2618	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2509	$self->{layout}->set_width ($self->{children}[0]{w});	2619	$self->{layout}->set_width ($empty->{w});
		2620	$self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2510		2621
2511	$self->reflow;	2622	$self->reflow;
2512	}
2513		2623
2514	sub text_size {	2624	local $self->{children} = [$empty, $slider];
2515	my ($self, $text, $indent) = @_;	2625	$self->SUPER::invoke_size_allocate ($w, $h)
		2626	}
		2627
		2628	sub get_layout {
		2629	my ($self, $para) = @_;
2516		2630
2517	my $layout = $self->{layout};	2631	my $layout = $self->{layout};
2518		2632
		2633	$layout->set_font ($self->{font}) if $self->{font};
		2634	$layout->set_foreground (@{$para->{fg}});
2519	$layout->set_height ($self->{fontsize} * $::FONTSIZE);	2635	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
2520	$layout->set_width ($self->{children}[0]{w} - $indent);	2636	$layout->set_width ($self->{children}[0]{w} - $para->{indent});
		2637	$layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2521	$layout->set_markup ($text);	2638	$layout->set_markup ($para->{markup});
		2639
		2640	$layout->set_shapes (
		2641	map
		2642	+(0, $_->baseline_shift +$_->{padding_y} - $_->{h}, $_->{w}, $_->{h}),
		2643	@{$para->{widget}}
2522		2644	);
		2645
2523	$layout->size	2646	$layout
2524	}	2647	}
2525		2648
2526	sub reflow {	2649	sub reflow {
2527	my ($self) = @_;	2650	my ($self) = @_;
2528		2651
…		…
2537	$self->{children}[1]->set_value ($offset);	2660	$self->{children}[1]->set_value ($offset);
2538	}	2661	}
2539		2662
2540	sub clear {	2663	sub clear {
2541	my ($self) = @_;	2664	my ($self) = @_;
		2665
		2666	my (undef, undef, @other) = @{ $self->{children} };
		2667	$self->remove ($_) for @other;
2542		2668
2543	$self->{par} = [];	2669	$self->{par} = [];
2544	$self->{height} = 0;	2670	$self->{height} = 0;
2545	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);	2671	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2546	}	2672	}
2547		2673
2548	sub add_paragraph {	2674	sub add_paragraph {
2549	my ($self, $color, $text, $indent) = @_;	2675	my ($self, $color, $para, $indent) = @_;
2550		2676
2551	for my $line (split /\n/, $text) {	2677	my ($text, @w) = ref $para ? @$para : $para;
2552	my ($w, $h) = $self->text_size ($line);	2678
2553	$self->{height} += $h;	2679	$para = {
2554	push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];	2680	w => 1e10,
		2681	wrapped => 1,
		2682	fg => $color,
		2683	indent => $indent,
		2684	markup => $text,
		2685	widget => \@w,
2555	}	2686	};
2556		2687
2557	$self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]);	2688	$self->add (@w) if @w;
		2689	push @{$self->{par}}, $para;
		2690
		2691	$self->{need_reflow}++;
		2692	$self->update;
		2693	}
		2694
		2695	sub scroll_to_bottom {
		2696	my ($self) = @_;
		2697
		2698	$self->{scroll_to_bottom} = 1;
		2699	$self->update;
2558	}	2700	}
2559		2701
2560	sub update {	2702	sub update {
2561	my ($self) = @_;	2703	my ($self) = @_;
2562		2704
…		…
2564		2706
2565	return unless $self->{h} > 0;	2707	return unless $self->{h} > 0;
2566		2708
2567	delete $self->{texture};	2709	delete $self->{texture};
2568		2710
2569	$ROOT->on_post_alloc ($self, sub {	2711	$ROOT->on_post_alloc ($self => sub {
2570	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};	2712	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2571		2713
2572	if (delete $self->{need_reflow}) {	2714	if (delete $self->{need_reflow}) {
2573	my $height = 0;	2715	my $height = 0;
2574		2716
2575	my $layout = $self->{layout};
2576
2577	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
2578
2579	for (@{$self->{par}}) {	2717	for my $para (@{$self->{par}}) {
2580	if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support	2718	if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2581	$layout->set_width ($W - $_->[3]);	2719	my $layout = $self->get_layout ($para);
2582	$layout->set_markup ($_->[4]);
2583	my ($w, $h) = $layout->size;	2720	my ($w, $h) = $layout->size;
2584	$_->[0] = $w + $_->[3];	2721
2585	$_->[1] = $h;	2722	$para->{w} = $w + $para->{indent};
		2723	$para->{h} = $h;
		2724	$para->{wrapped} = $layout->has_wrapped;
2586	}	2725	}
2587		2726
2588	$height += $_->[1];	2727	$height += $para->{h};
2589	}	2728	}
2590		2729
2591	$self->{height} = $height;	2730	$self->{height} = $height;
2592		2731
2593	$self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);	2732	$self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2594		2733
2595	delete $self->{texture};	2734	delete $self->{texture};
		2735	}
		2736
		2737	if (delete $self->{scroll_to_bottom}) {
		2738	$self->{children}[1]->set_value (1e10);
2596	}	2739	}
2597		2740
2598	$self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {	2741	$self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2599	glClearColor 0, 0, 0, 0;	2742	glClearColor 0, 0, 0, 0;
2600	glClear GL_COLOR_BUFFER_BIT;	2743	glClear GL_COLOR_BUFFER_BIT;
…		…
2604	my $y0 = $top;	2747	my $y0 = $top;
2605	my $y1 = $top + $H;	2748	my $y1 = $top + $H;
2606		2749
2607	my $y = 0;	2750	my $y = 0;
2608		2751
2609	my $layout = $self->{layout};
2610
2611	$layout->set_font ($self->{font}) if $self->{font};
2612
2613	glEnable GL_BLEND;
2614	#TODO# not correct in windows where rgba is forced off
2615	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2616
2617	for my $par (@{$self->{par}}) {	2752	for my $para (@{$self->{par}}) {
2618	my $h = $par->[1];	2753	my $h = $para->{h};
2619		2754
2620	if ($y0 < $y + $h && $y < $y1) {	2755	if ($y0 < $y + $h && $y < $y1) {
2621	$layout->set_foreground (@{ $par->[2] });
2622	$layout->set_width ($W - $par->[3]);
2623	$layout->set_markup ($par->[4]);
2624		2756
2625	my ($w, $h, $data, $format, $internalformat) = $layout->render;	2757	my $layout = $self->get_layout ($para);
2626		2758
2627	glRasterPos $par->[3], $y - $y0;	2759	$layout->render ($para->{indent}, $y - $y0);
2628	glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;	2760
		2761	if (my @w = @{ $para->{widget} }) {
		2762	my @s = $layout->get_shapes;
		2763
		2764	for (@w) {
		2765	my ($dx, $dy) = splice @s, 0, 2, ();
		2766
		2767	$_->{x} = $dx + $para->{indent};
		2768	$_->{y} = $dy + $y - $y0;
		2769
		2770	$_->draw;
		2771	}
		2772	}
2629	}	2773	}
2630		2774
2631	$y += $h;	2775	$y += $h;
2632	}	2776	}
2633
2634	glDisable GL_BLEND;
2635	};	2777	};
2636	});	2778	});
		2779	}
		2780
		2781	sub reconfigure {
		2782	my ($self) = @_;
		2783
		2784	$self->SUPER::reconfigure;
		2785
		2786	$_->{w} = 1e10 for @{ $self->{par} };
		2787	$self->reflow;
2637	}	2788	}
2638		2789
2639	sub _draw {	2790	sub _draw {
2640	my ($self) = @_;	2791	my ($self) = @_;
2641		2792
…		…
2644	glColor 0, 0, 0, 1;	2795	glColor 0, 0, 0, 1;
2645	$self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});	2796	$self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2646	glDisable GL_TEXTURE_2D;	2797	glDisable GL_TEXTURE_2D;
2647		2798
2648	$self->{children}[1]->draw;	2799	$self->{children}[1]->draw;
2649
2650	}	2800	}
2651		2801
2652	#############################################################################	2802	#############################################################################
2653		2803
2654	package CFClient::UI::Animator;	2804	package CFClient::UI::Animator;
…		…
2741	$tooltip .= "\n\n" . (ref $widget) . "\n"	2891	$tooltip .= "\n\n" . (ref $widget) . "\n"
2742	. "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"	2892	. "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2743	. "req $widget->{req_w} $widget->{req_h}\n"	2893	. "req $widget->{req_w} $widget->{req_h}\n"
2744	. "visible $widget->{visible}";	2894	. "visible $widget->{visible}";
2745	}	2895	}
		2896
		2897	$tooltip =~ s/^\n+//;
		2898	$tooltip =~ s/\n+$//;
2746		2899
2747	$self->add (new CFClient::UI::Label	2900	$self->add (new CFClient::UI::Label
2748	markup => $tooltip,	2901	markup => $tooltip,
2749	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,	2902	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2750	fontsize => 0.8,	2903	fontsize => 0.8,
…		…
2760	my ($w, $h) = @{$self->child}{qw(req_w req_h)};	2913	my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2761		2914
2762	($w + 4, $h + 4)	2915	($w + 4, $h + 4)
2763	}	2916	}
2764		2917
2765	sub size_allocate {	2918	sub invoke_size_allocate {
2766	my ($self, $w, $h) = @_;	2919	my ($self, $w, $h) = @_;
2767		2920
2768	$self->SUPER::size_allocate ($w - 4, $h - 4);	2921	$self->SUPER::invoke_size_allocate ($w - 4, $h - 4)
2769	}	2922	}
2770		2923
2771	sub visibility_change {	2924	sub invoke_visibility_change {
2772	my ($self, $visible) = @_;	2925	my ($self, $visible) = @_;
2773		2926
2774	return unless $visible;	2927	return unless $visible;
2775		2928
2776	$self->{root}->on_post_alloc ("move_$self" => sub {	2929	$self->{root}->on_post_alloc ("move_$self" => sub {
…		…
2778	or return;	2931	or return;
2779		2932
2780	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);	2933	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2781		2934
2782	($x, $y) = $widget->coord2global (-$self->{w}, 0)	2935	($x, $y) = $widget->coord2global (-$self->{w}, 0)
2783	if $x + $self->{w} > $::WIDTH;	2936	if $x + $self->{w} > $self->{root}{w};
2784		2937
2785	$self->move_abs ($x, $y);	2938	$self->move_abs ($x, $y);
2786	});	2939	});
2787	}	2940	}
2788		2941
…		…
2883	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});	3036	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2884	glDisable GL_TEXTURE_2D;	3037	glDisable GL_TEXTURE_2D;
2885	}	3038	}
2886	}	3039	}
2887		3040
2888	sub DESTROY {	3041	sub destroy {
2889	my ($self) = @_;	3042	my ($self) = @_;
2890		3043
2891	$self->{timer}->cancel	3044	$self->{timer}->cancel
2892	if $self->{timer};	3045	if $self->{timer};
2893		3046
2894	$self->SUPER::DESTROY;	3047	$self->SUPER::destroy;
2895	}	3048	}
2896		3049
2897	#############################################################################	3050	#############################################################################
2898		3051
2899	package CFClient::UI::Buttonbar;	3052	package CFClient::UI::Buttonbar;
…		…
2920	);	3073	);
2921		3074
2922	$self->add ($self->{vbox} = new CFClient::UI::VBox);	3075	$self->add ($self->{vbox} = new CFClient::UI::VBox);
2923		3076
2924	for my $item (@{ $self->{items} }) {	3077	for my $item (@{ $self->{items} }) {
2925	my ($widget, $cb) = @$item;	3078	my ($widget, $cb, $tooltip) = @$item;
2926		3079
2927	# handle various types of items, only text for now	3080	# handle various types of items, only text for now
2928	if (!ref $widget) {	3081	if (!ref $widget) {
		3082	if ($widget =~ /\t/) {
		3083	my ($left, $right) = split /\t/, $widget, 2;
		3084
		3085	$widget = new CFClient::UI::HBox
		3086	can_hover => 1,
		3087	can_events => 1,
		3088	tooltip => $tooltip,
		3089	children => [
		3090	(new CFClient::UI::Label markup => $left, expand => 1),
		3091	(new CFClient::UI::Label markup => $right, align => +1),
		3092	],
		3093	;
		3094
		3095	} else {
2929	$widget = new CFClient::UI::Label	3096	$widget = new CFClient::UI::Label
2930	can_hover => 1,	3097	can_hover => 1,
2931	can_events => 1,	3098	can_events => 1,
2932	text => $widget;	3099	markup => $widget,
		3100	tooltip => $tooltip;
		3101	}
2933	}	3102	}
2934		3103
2935	$self->{item}{$widget} = $item;	3104	$self->{item}{$widget} = $item;
2936		3105
2937	$self->{vbox}->add ($widget);	3106	$self->{vbox}->add ($widget);
…		…
2942		3111
2943	# popup given the event (must be a mouse button down event currently)	3112	# popup given the event (must be a mouse button down event currently)
2944	sub popup {	3113	sub popup {
2945	my ($self, $ev) = @_;	3114	my ($self, $ev) = @_;
2946		3115
2947	$self->_emit ("popdown");	3116	$self->emit ("popdown");
2948		3117
2949	# maybe save $GRAB? must be careful about events...	3118	# maybe save $GRAB? must be careful about events...
2950	$GRAB = $self;	3119	$GRAB = $self;
2951	$self->{button} = $ev->{button};	3120	$self->{button} = $ev->{button};
2952		3121
2953	$self->show;	3122	$self->show;
2954	$self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);	3123	$self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2955	}	3124	}
2956		3125
2957	sub mouse_motion {	3126	sub invoke_mouse_motion {
2958	my ($self, $ev, $x, $y) = @_;	3127	my ($self, $ev, $x, $y) = @_;
2959		3128
2960	# TODO: should use vbox->find_widget or so	3129	# TODO: should use vbox->find_widget or so
2961	$HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});	3130	$HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2962	$self->{hover} = $self->{item}{$HOVER};	3131	$self->{hover} = $self->{item}{$HOVER};
2963		3132
2964	0	3133	0
2965	}	3134	}
2966		3135
2967	sub button_up {	3136	sub invoke_button_up {
2968	my ($self, $ev, $x, $y) = @_;	3137	my ($self, $ev, $x, $y) = @_;
2969		3138
2970	if ($ev->{button} == $self->{button}) {	3139	if ($ev->{button} == $self->{button}) {
2971	undef $GRAB;	3140	undef $GRAB;
2972	$self->hide;	3141	$self->hide;
2973		3142
2974	$self->_emit ("popdown");	3143	$self->emit ("popdown");
2975	$self->{hover}[1]->() if $self->{hover};	3144	$self->{hover}[1]->() if $self->{hover};
2976	} else {	3145	} else {
2977	return 0	3146	return 0
2978	}	3147	}
2979		3148
…		…
3006		3175
3007	$self->{current} = $self->{children}[0]	3176	$self->{current} = $self->{children}[0]
3008	if @{ $self->{children} };	3177	if @{ $self->{children} };
3009	}	3178	}
3010		3179
		3180	sub get_current_page {
		3181	my ($self) = @_;
		3182
		3183	$self->{current}
		3184	}
		3185
3011	sub set_current_page {	3186	sub set_current_page {
3012	my ($self, $page_or_widget) = @_;	3187	my ($self, $page_or_widget) = @_;
3013		3188
3014	my $widget = ref $page_or_widget	3189	my $widget = ref $page_or_widget
3015	? $page_or_widget	3190	? $page_or_widget
3016	: $self->{children}[$page_or_widget];	3191	: $self->{children}[$page_or_widget];
3017		3192
3018	$self->{current} = $widget;	3193	$self->{current} = $widget;
3019	$self->{current}->configure (0, 0, $self->{w}, $self->{h});	3194	$self->{current}->configure (0, 0, $self->{w}, $self->{h});
3020		3195
3021	$self->_emit (page_changed => $self->{current});	3196	$self->emit (page_changed => $self->{current});
3022		3197
3023	$self->realloc;	3198	$self->realloc;
3024	}	3199	}
3025		3200
3026	sub visible_children {	3201	sub visible_children {
…		…
3031	my ($self) = @_;	3206	my ($self) = @_;
3032		3207
3033	$self->{current}->size_request	3208	$self->{current}->size_request
3034	}	3209	}
3035		3210
3036	sub size_allocate {	3211	sub invoke_size_allocate {
3037	my ($self, $w, $h) = @_;	3212	my ($self, $w, $h) = @_;
3038		3213
3039	$self->{current}->configure (0, 0, $w, $h);	3214	$self->{current}->configure (0, 0, $w, $h);
		3215
		3216	1
3040	}	3217	}
3041		3218
3042	sub _draw {	3219	sub _draw {
3043	my ($self) = @_;	3220	my ($self) = @_;
3044		3221
…		…
3079	);	3256	);
3080		3257
3081	$self->{multiplexer}->add ($widget);	3258	$self->{multiplexer}->add ($widget);
3082	}	3259	}
3083		3260
		3261	sub get_current_page {
		3262	my ($self) = @_;
		3263
		3264	$self->{multiplexer}->get_current_page
		3265	}
		3266
3084	sub set_current_page {	3267	sub set_current_page {
3085	my ($self, $page) = @_;	3268	my ($self, $page) = @_;
3086		3269
3087	$self->{multiplexer}->set_current_page ($page);	3270	$self->{multiplexer}->set_current_page ($page);
3088	$self->_emit (page_changed => $self->{multiplexer}{current});	3271	$self->emit (page_changed => $self->{multiplexer}{current});
		3272	}
		3273
		3274	#############################################################################
		3275
		3276	package CFClient::UI::Combobox;
		3277
		3278	use utf8;
		3279
		3280	our @ISA = CFClient::UI::Button::;
		3281
		3282	sub new {
		3283	my $class = shift;
		3284
		3285	my $self = $class->SUPER::new (
		3286	options => [], # [value, title, longdesc], ...
		3287	value => undef,
		3288	@_,
		3289	);
		3290
		3291	$self->_set_value ($self->{value});
		3292
		3293	$self
		3294	}
		3295
		3296	sub invoke_button_down {
		3297	my ($self, $ev) = @_;
		3298
		3299	my @menu_items;
		3300
		3301	for (@{ $self->{options} }) {
		3302	my ($value, $title, $tooltip) = @$_;
		3303
		3304	push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
		3305	}
		3306
		3307	CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
		3308	}
		3309
		3310	sub _set_value {
		3311	my ($self, $value) = @_;
		3312
		3313	my ($item) = grep $_->[0] eq $value, @{ $self->{options} }
		3314	or return;
		3315
		3316	$self->{value} = $item->[0];
		3317	$self->set_markup ("$item->[1] ⇓");
		3318	$self->set_tooltip ($item->[2]);
		3319	}
		3320
		3321	sub set_value {
		3322	my ($self, $value) = @_;
		3323
		3324	return unless $self->{value} ne $value;
		3325
		3326	$self->_set_value ($value);
		3327	$self->emit (changed => $value);
3089	}	3328	}
3090		3329
3091	#############################################################################	3330	#############################################################################
3092		3331
3093	package CFClient::UI::Statusbox;	3332	package CFClient::UI::Statusbox;
…		…
3192	$item->{count}++;	3431	$item->{count}++;
3193	} else {	3432	} else {
3194	$item->{count} = 1;	3433	$item->{count} = 1;
3195	$item->{text} = $item->{tooltip} = $text;	3434	$item->{text} = $item->{tooltip} = $text;
3196	}	3435	}
3197	$item->{id} = ++$self->{id};	3436	$item->{id} += 0.2;#d#
3198	$item->{timeout} = $timeout;	3437	$item->{timeout} = $timeout;
3199	delete $item->{label};	3438	delete $item->{label};
3200	} else {	3439	} else {
3201	$self->{item}{$group} = {	3440	$self->{item}{$group} = {
3202	id => ++$self->{id},	3441	id => ++$self->{id},
…		…
3208	count => 1,	3447	count => 1,
3209	%arg,	3448	%arg,
3210	};	3449	};
3211	}	3450	}
3212		3451
		3452	$ROOT->on_refresh (reorder => sub {
3213	$self->reorder;	3453	$self->reorder;
		3454	});
3214	}	3455	}
3215		3456
3216	sub reconfigure {	3457	sub reconfigure {
3217	my ($self) = @_;	3458	my ($self) = @_;
3218		3459
…		…
3221		3462
3222	$self->reorder;	3463	$self->reorder;
3223	$self->SUPER::reconfigure;	3464	$self->SUPER::reconfigure;
3224	}	3465	}
3225		3466
3226	sub DESTROY {	3467	sub destroy {
3227	my ($self) = @_;	3468	my ($self) = @_;
3228		3469
3229	$self->{timer}->cancel;	3470	$self->{timer}->cancel;
3230		3471
3231	$self->SUPER::DESTROY;	3472	$self->SUPER::destroy;
3232	}	3473	}
3233		3474
3234	#############################################################################	3475	#############################################################################
3235		3476
3236	package CFClient::UI::Inventory;	3477	package CFClient::UI::Inventory;
3237		3478
3238	our @ISA = CFClient::UI::ScrolledWindow::;	3479	our @ISA = CFClient::UI::Table::;
3239		3480
3240	sub new {	3481	sub new {
3241	my $class = shift;	3482	my $class = shift;
3242		3483
3243	my $self = $class->SUPER::new (	3484	my $self = $class->SUPER::new (
3244	child => (new CFClient::UI::Table col_expand => [0, 1, 0]),	3485	col_expand => [0, 1, 0],
3245	@_,	3486	@_,
3246	);	3487	);
3247		3488
3248	$self	3489	$self
3249	}	3490	}
3250		3491
3251	sub set_items {	3492	sub set_items {
3252	my ($self, $items) = @_;	3493	my ($self, $items) = @_;
3253		3494
3254	$self->{child}->clear;	3495	$self->clear;
3255	return unless $items;	3496	return unless $items;
3256		3497
3257	my @items = sort {	3498	my @items = sort {
3258	($a->{type} <=> $b->{type})	3499	($a->{type} <=> $b->{type})
3259	or ($a->{name} cmp $b->{name})	3500	or ($a->{name} cmp $b->{name})
3260	} @$items;	3501	} values %$items;
3261		3502
3262	$self->{real_items} = \@items;	3503	$self->{real_items} = \@items;
3263		3504
3264	my $row = 0;	3505	my $row = 0;
3265	for my $item (@items) {	3506	for my $item (@items) {
3266	CFClient::Item::update_widgets $item;	3507	CFClient::Item::update_widgets $item;
3267		3508
3268	$self->{child}->add (0, $row, $item->{face_widget});	3509	$self->add (0, $row, $item->{face_widget});
3269	$self->{child}->add (1, $row, $item->{desc_widget});	3510	$self->add (1, $row, $item->{desc_widget});
3270	$self->{child}->add (2, $row, $item->{weight_widget});	3511	$self->add (2, $row, $item->{weight_widget});
3271		3512
3272	$row++;	3513	$row++;
3273	}
3274	}
3275
3276	#############################################################################
3277
3278	package CFClient::UI::BindEditor;
3279
3280	our @ISA = CFClient::UI::FancyFrame::;
3281
3282	sub new {
3283	my $class = shift;
3284
3285	my $self = $class->SUPER::new (binding => [], commands => [], @_);
3286
3287	$self->add (my $vb = new CFClient::UI::VBox);
3288
3289
3290	$vb->add ($self->{rec_btn} = new CFClient::UI::Button
3291	text => "start recording",
3292	tooltip => "Start/Stops recording of actions."
3293	."All subsequent actions after the recording started will be captured."
3294	."The actions are displayed after the record was stopped."
3295	."To bind the action you have to click on the 'Bind' button",
3296	on_activate => sub {
3297	unless ($self->{recording}) {
3298	$self->start;
3299	} else {
3300	$self->stop;
3301	}
3302	});
3303
3304	$vb->add (new CFClient::UI::Label text => "Actions:");
3305	$vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3306
3307	$vb->add (new CFClient::UI::Label text => "Bound to: ");
3308	$vb->add (my $hb = new CFClient::UI::HBox);
3309	$hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3310	$hb->add (new CFClient::UI::Button
3311	text => "bind",
3312	tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3313	on_activate => sub {
3314	$self->ask_for_bind;
3315	});
3316
3317	$vb->add (my $hb = new CFClient::UI::HBox);
3318	$hb->add (new CFClient::UI::Button
3319	text => "ok",
3320	expand => 1,
3321	tooltip => "This closes the binding editor and saves the binding",
3322	on_activate => sub {
3323	$self->hide;
3324	$self->commit;
3325	});
3326
3327	$hb->add (new CFClient::UI::Button
3328	text => "cancel",
3329	expand => 1,
3330	tooltip => "This closes the binding editor without saving",
3331	on_activate => sub {
3332	$self->hide;
3333	$self->{binding_cancel}->()
3334	if $self->{binding_cancel};
3335	});
3336
3337	$self->update_binding_widgets;
3338
3339	$self
3340	}
3341
3342	sub commit {
3343	my ($self) = @_;
3344	my ($mod, $sym, $cmds) = $self->get_binding;
3345	if ($sym != 0 && @$cmds > 0) {
3346	$::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3347	."'. Don't forget 'Save Config'!");
3348	$self->{binding_change}->($mod, $sym, $cmds)
3349	if $self->{binding_change};
3350	} else {
3351	$::STATUSBOX->add ("No action bound, no key or action specified!");
3352	$self->{binding_cancel}->()
3353	if $self->{binding_cancel};
3354	}
3355	}
3356
3357	sub start {
3358	my ($self) = @_;
3359
3360	$self->{rec_btn}->set_text ("stop recording");
3361	$self->{recording} = 1;
3362	$self->clear_command_list;
3363	$::CONN->start_record if $::CONN;
3364	}
3365
3366	sub stop {
3367	my ($self) = @_;
3368
3369	$self->{rec_btn}->set_text ("start recording");
3370	$self->{recording} = 0;
3371
3372	my $rec;
3373	$rec = $::CONN->stop_record if $::CONN;
3374	return unless ref $rec eq 'ARRAY';
3375	$self->set_command_list ($rec);
3376	}
3377
3378
3379	sub ask_for_bind_and_commit {
3380	my ($self) = @_;
3381	$self->ask_for_bind (1);
3382	}
3383
3384	sub ask_for_bind {
3385	my ($self, $commit) = @_;
3386
3387	CFClient::Binder::open_binding_dialog (sub {
3388	my ($mod, $sym) = @_;
3389	$self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3390	$self->update_binding_widgets;
3391	$self->commit if $commit;
3392	});
3393	}
3394
3395	# $mod and $sym are the modifiers and key symbol
3396	# $cmds is a array ref of strings (the commands)
3397	# $cb is the callback that is executed on OK
3398	# $ccb is the callback that is executed on CANCEL and
3399	# when the binding was unsuccessful on OK
3400	sub set_binding {
3401	my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3402
3403	$self->clear_command_list;
3404	$self->{recording} = 0;
3405	$self->{rec_btn}->set_text ("start recording");
3406
3407	$self->{binding} = [$mod, $sym];
3408	$self->{commands} = $cmds;
3409
3410	$self->{binding_change} = $cb;
3411	$self->{binding_cancel} = $ccb;
3412
3413	$self->update_binding_widgets;
3414	}
3415
3416	# this is a shortcut method that asks for a binding
3417	# and then just binds it.
3418	sub do_quick_binding {
3419	my ($self, $cmds) = @_;
3420	$self->set_binding (undef, undef, $cmds, sub {
3421	$::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3422	});
3423	$self->ask_for_bind (1);
3424	}
3425
3426	sub update_binding_widgets {
3427	my ($self) = @_;
3428	my ($mod, $sym, $cmds) = $self->get_binding;
3429	$self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3430	$self->set_command_list ($cmds);
3431	}
3432
3433	sub get_binding {
3434	my ($self) = @_;
3435	return (
3436	$self->{binding}->[0],
3437	$self->{binding}->[1],
3438	[ grep { defined $_ } @{$self->{commands}} ]
3439	);
3440	}
3441
3442	sub clear_command_list {
3443	my ($self) = @_;
3444	$self->{cmdbox}->clear ();
3445	}
3446
3447	sub set_command_list {
3448	my ($self, $cmds) = @_;
3449
3450	$self->{cmdbox}->clear ();
3451	$self->{commands} = $cmds;
3452
3453	my $idx = 0;
3454
3455	for (@$cmds) {
3456	$self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3457
3458	my $i = $idx;
3459	$hb->add (new CFClient::UI::Label text => $_);
3460	$hb->add (new CFClient::UI::Button
3461	text => "delete",
3462	tooltip => "Deletes the action from the record",
3463	on_activate => sub {
3464	$self->{cmdbox}->remove ($hb);
3465	$cmds->[$i] = undef;
3466	});
3467
3468
3469	$idx++
3470	}	3514	}
3471	}	3515	}
3472		3516
3473	#############################################################################	3517	#############################################################################
3474		3518
…		…
3484	commands => [],	3528	commands => [],
3485	@_,	3529	@_,
3486	)	3530	)
3487	}	3531	}
3488		3532
		3533	my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
		3534
		3535	my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
		3536	"<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
		3537	my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
		3538	"<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3489	my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>	3539	my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3490	"<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.");	3540	"<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3491	my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>	3541	my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3492	"<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.");	3542	"<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3493	my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>	3543	my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3494	"<b>Damage</b>. The amount of damage the spell deals when it hits.");	3544	"<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3495		3545
3496	sub rebuild_spell_list {	3546	sub rebuild_spell_list {
3497	my ($self) = @_;	3547	my ($self) = @_;
3498		3548
3499	$CFClient::UI::ROOT->on_refresh ($self => sub {	3549	$CFClient::UI::ROOT->on_refresh ($self => sub {
3500	$self->clear;	3550	$self->clear;
3501		3551
		3552	return unless $::CONN;
		3553
3502	$self->add (1, 0, new CFClient::UI::Label text => "Spell Name");	3554	$self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);
		3555	$self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL);
3503	$self->add (2, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);	3556	$self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3504	$self->add (3, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);	3557	$self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3505	$self->add (4, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);	3558	$self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3506		3559
3507	my $row = 0;	3560	my $row = 0;
3508		3561
3509	for (sort { $a cmp $b } keys %{ $self->{spell} }) {	3562	for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3510	my $spell = $self->{spell}{$_};	3563	my $spell = $self->{spell}{$_};
3511		3564
3512	$row++;	3565	$row++;
		3566
		3567	my $spell_cb = sub {
		3568	my ($widget, $ev) = @_;
		3569
		3570	if ($ev->{button} == 1) {
		3571	$::CONN->user_send ("cast $spell->{name}");
		3572	} elsif ($ev->{button} == 2) {
		3573	$::CONN->user_send ("invoke $spell->{name}");
		3574	} elsif ($ev->{button} == 3) {
		3575	(new CFClient::UI::Menu
		3576	items => [
		3577	["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
		3578	["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
		3579	],
		3580	)->popup ($ev);
		3581	} else {
		3582	return 0;
		3583	}
		3584
		3585	1
		3586	};
		3587
		3588	my $tooltip = "$spell->{message}$TOOLTIP_ALL";
		3589
		3590	#TODO: add path info to tooltip
		3591	#$self->add (6, $row, new CFClient::UI::Label text => $spell->{path});
3513		3592
3514	$self->add (0, $row, new CFClient::UI::Face	3593	$self->add (0, $row, new CFClient::UI::Face
3515	face => $spell->{face},	3594	face => $spell->{face},
3516	can_hover => 1,	3595	can_hover => 1,
3517	can_events => 1,	3596	can_events => 1,
3518	tooltip => $spell->{message},	3597	tooltip => $tooltip,
		3598	on_button_down => $spell_cb,
3519	);	3599	);
3520		3600
3521	$self->add (1, $row, new CFClient::UI::Label	3601	$self->add (1, $row, new CFClient::UI::Label
3522	expand => 1,	3602	expand => 1,
3523	text => $spell->{name},	3603	text => $spell->{name},
3524	can_hover => 1,	3604	can_hover => 1,
3525	can_events => 1,	3605	can_events => 1,
3526	tooltip => $spell->{message},	3606	tooltip => $tooltip,
		3607	on_button_down => $spell_cb,
3527	);	3608	);
3528		3609
		3610	$self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3529	$self->add (2, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);	3611	$self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3530	$self->add (3, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);	3612	$self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3531	$self->add (4, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);	3613	$self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3532
3533	# TODO: should be done via popup
3534	$self->add (5, $row, new CFClient::UI::Button
3535	text => "bind",
3536	tooltip => "bind spell readying (cast command) to key",
3537	on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) },
3538	);
3539	}	3614	}
3540	});	3615	});
3541	}	3616	}
3542		3617
3543	sub add_spell {	3618	sub add_spell {
…		…
3549		3624
3550	sub remove_spell {	3625	sub remove_spell {
3551	my ($self, $spell) = @_;	3626	my ($self, $spell) = @_;
3552		3627
3553	delete $self->{spell}->{$spell->{name}};	3628	delete $self->{spell}->{$spell->{name}};
		3629	$self->rebuild_spell_list;
		3630	}
		3631
		3632	sub clear_spells {
		3633	my ($self) = @_;
		3634
		3635	$self->{spell} = {};
3554	$self->rebuild_spell_list;	3636	$self->rebuild_spell_list;
3555	}	3637	}
3556		3638
3557	#############################################################################	3639	#############################################################################
3558		3640
…		…
3595	$coord = $max - $size if $coord > $max - $size;	3677	$coord = $max - $size if $coord > $max - $size;
3596		3678
3597	int $coord + 0.5	3679	int $coord + 0.5
3598	}	3680	}
3599		3681
3600	sub size_allocate {	3682	sub invoke_size_allocate {
3601	my ($self, $w, $h) = @_;	3683	my ($self, $w, $h) = @_;
3602		3684
3603	for my $child ($self->children) {	3685	for my $child ($self->children) {
3604	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};	3686	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3605		3687
…		…
3609	$X = _to_pixel $X, $W, $self->{w};	3691	$X = _to_pixel $X, $W, $self->{w};
3610	$Y = _to_pixel $Y, $H, $self->{h};	3692	$Y = _to_pixel $Y, $H, $self->{h};
3611		3693
3612	$child->configure ($X, $Y, $W, $H);	3694	$child->configure ($X, $Y, $W, $H);
3613	}	3695	}
		3696
		3697	1
3614	}	3698	}
3615		3699
3616	sub coord2local {	3700	sub coord2local {
3617	my ($self, $x, $y) = @_;	3701	my ($self, $x, $y) = @_;
3618		3702
…		…
3744	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};	3828	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3745		3829
3746	$w = 0 if $w < 0;	3830	$w = 0 if $w < 0;
3747	$h = 0 if $h < 0;	3831	$h = 0 if $h < 0;
3748		3832
		3833	$w = max $widget->{min_w}, $w;
		3834	$h = max $widget->{min_h}, $h;
		3835
		3836	$w = min $widget->{max_w}, $w if exists $widget->{max_w};
		3837	$h = min $widget->{max_h}, $h if exists $widget->{max_h};
		3838
3749	$w = int $w + 0.5;	3839	$w = int $w + 0.5;
3750	$h = int $h + 0.5;	3840	$h = int $h + 0.5;
3751		3841
3752	if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {	3842	if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3753	$widget->{old_w} = $widget->{w};	3843	$widget->{old_w} = $widget->{w};

Diff Legend

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