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.285 by root, Mon Jun 5 03:07:01 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);
		1611
1559	delete $self->{req_h};	1612	delete $self->{size_req};
1560
1561	$self->realloc;	1613	$self->realloc;
1562	$self->update;	1614	$self->update;
1563	}	1615	}
1564		1616
1565	sub set_markup {	1617	sub set_markup {
…		…
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);
		1626
1575	delete $self->{req_h};	1627	delete $self->{size_req};
1576
1577	$self->realloc;	1628	$self->realloc;
1578	$self->update;	1629	$self->update;
1579	}	1630	}
1580		1631
1581	sub size_request {	1632	sub size_request {
1582	my ($self) = @_;	1633	my ($self) = @_;
1583		1634
1584	if (exists $self->{req_h}) {	1635	$self->{size_req} ||= do {
1585	@$self{qw(req_w req_h)}
1586	} else {
1587	$self->{layout}->set_font ($self->{font}) if $self->{font};	1636	$self->{layout}->set_font ($self->{font}) if $self->{font};
1588	$self->{layout}->set_width ($self->{max_w} || -1);	1637	$self->{layout}->set_width ($self->{max_w} || -1);
1589	$self->{layout}->set_ellipsise ($self->{ellipsise});	1638	$self->{layout}->set_ellipsise ($self->{ellipsise});
1590	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});	1639	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1591	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	1640	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1592		1641
1593	my ($w, $h) = $self->{layout}->size;	1642	my ($w, $h) = $self->{layout}->size;
1594		1643
1595	if (exists $self->{template}) {	1644	if (exists $self->{template}) {
1596	$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);
1597	$self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);	1647	$self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1598		1648
1599	my ($w2, $h2) = $self->{template}->size;	1649	my ($w2, $h2) = $self->{template}->size;
1600		1650
1601	$w = List::Util::max $w, $w2;	1651	$w = List::Util::max $w, $w2;
1602	$h = List::Util::max $h, $h2;	1652	$h = List::Util::max $h, $h2;
1603	}	1653	}
1604		1654
1605	($w, $h)	1655	[$w, $h]
1606	}	1656	};
1607	}
1608		1657
		1658	@{ $self->{size_req} }
		1659	}
		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
		1686	sub reconfigure {
		1687	my ($self) = @_;
		1688
		1689	delete $self->{size_req};
		1690	delete $self->{texture};
		1691
		1692	$self->SUPER::reconfigure;
		1693	}
		1694
1627	sub _draw {	1695	sub _draw {
1628	my ($self) = @_;	1696	my ($self) = @_;
1629		1697
1630	$self->SUPER::_draw; # draw background, if applicable	1698	$self->SUPER::_draw; # draw background, if applicable
1631		1699
1632	my $tex = $self->{texture} ||= do {	1700	my $size = $self->{texture} ||= do {
1633	$self->{layout}->set_foreground (@{$self->{fg}});	1701	$self->{layout}->set_foreground (@{$self->{fg}});
1634	$self->{layout}->set_font ($self->{font}) if $self->{font};	1702	$self->{layout}->set_font ($self->{font}) if $self->{font};
1635	$self->{layout}->set_width ($self->{w});	1703	$self->{layout}->set_width ($self->{w});
1636	$self->{layout}->set_ellipsise ($self->{ellipsise});	1704	$self->{layout}->set_ellipsise ($self->{ellipsise});
1637	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});	1705	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1638	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	1706	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1639		1707
1640	new_from_layout CFClient::Texture $self->{layout}	1708	[$self->{layout}->size]
1641	};	1709	};
1642		1710
1643	unless (exists $self->{ox}) {	1711	unless (exists $self->{ox}) {
1644	$self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}	1712	$self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1645	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}	1713	: $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
1646	: ($self->{w} - $tex->{w}) * 0.5);	1714	: ($self->{w} - $size->[0]) * 0.5);
1647		1715
1648	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}	1716	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1649	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}	1717	: $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1650	: ($self->{h} - $tex->{h}) * 0.5);	1718	: ($self->{h} - $size->[1]) * 0.5);
1651	};	1719	};
1652		1720
1653	glEnable GL_TEXTURE_2D;	1721	my $w = List::Util::min $self->{w} + 4, $size->[0];
1654	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	1722	my $h = List::Util::min $self->{h} + 2, $size->[1];
1655		1723
1656	glColor_premultiply @{$self->{fg}}	1724	$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	}	1725	}
1663		1726
1664	#############################################################################	1727	#############################################################################
1665		1728
1666	package CFClient::UI::EntryBase;	1729	package CFClient::UI::EntryBase;
…		…
1680	can_hover => 1,	1743	can_hover => 1,
1681	can_focus => 1,	1744	can_focus => 1,
1682	valign => 0,	1745	valign => 0,
1683	can_events => 1,	1746	can_events => 1,
1684	#text => ...	1747	#text => ...
		1748	#hidden => "*",
1685	@_	1749	@_
1686	)	1750	)
1687	}	1751	}
1688		1752
1689	sub _set_text {	1753	sub _set_text {
…		…
1696	$self->{last_activity} = $::NOW;	1760	$self->{last_activity} = $::NOW;
1697	$self->{text} = $text;	1761	$self->{text} = $text;
1698		1762
1699	$text =~ s/./*/g if $self->{hidden};	1763	$text =~ s/./*/g if $self->{hidden};
1700	$self->{layout}->set_text ("$text ");	1764	$self->{layout}->set_text ("$text ");
1701	delete $self->{req_h};	1765	delete $self->{size_req};
1702		1766
1703	$self->_emit (changed => $self->{text});	1767	$self->emit (changed => $self->{text});
1704		1768
1705	$self->realloc;	1769	$self->realloc;
1706	$self->update;	1770	$self->update;
1707	}	1771	}
1708		1772
…		…
1723	my ($w, $h) = $self->SUPER::size_request;	1787	my ($w, $h) = $self->SUPER::size_request;
1724		1788
1725	($w + 1, $h) # add 1 for cursor	1789	($w + 1, $h) # add 1 for cursor
1726	}	1790	}
1727		1791
1728	sub key_down {	1792	sub invoke_key_down {
1729	my ($self, $ev) = @_;	1793	my ($self, $ev) = @_;
1730		1794
1731	my $mod = $ev->{mod};	1795	my $mod = $ev->{mod};
1732	my $sym = $ev->{sym};	1796	my $sym = $ev->{sym};
1733	my $uni = $ev->{unicode};	1797	my $uni = $ev->{unicode};
…		…
1745	} elsif ($sym == CFClient::SDLK_HOME) {	1809	} elsif ($sym == CFClient::SDLK_HOME) {
1746	$self->{cursor} = 0;	1810	$self->{cursor} = 0;
1747	} elsif ($sym == CFClient::SDLK_END) {	1811	} elsif ($sym == CFClient::SDLK_END) {
1748	$self->{cursor} = length $text;	1812	$self->{cursor} = length $text;
1749	} elsif ($uni == 27) {	1813	} elsif ($uni == 27) {
1750	$self->_emit ('escape');	1814	$self->emit ('escape');
1751	} elsif ($uni) {	1815	} elsif ($uni) {
1752	substr $text, $self->{cursor}++, 0, chr $uni;	1816	substr $text, $self->{cursor}++, 0, chr $uni;
1753	} else {	1817	} else {
1754	return 0;	1818	return 0;
1755	}	1819	}
…		…
1759	$self->realloc;	1823	$self->realloc;
1760		1824
1761	1	1825	1
1762	}	1826	}
1763		1827
1764	sub focus_in {	1828	sub invoke_focus_in {
1765	my ($self) = @_;	1829	my ($self) = @_;
1766		1830
1767	$self->{last_activity} = $::NOW;	1831	$self->{last_activity} = $::NOW;
1768		1832
1769	$self->SUPER::focus_in;	1833	$self->SUPER::invoke_focus_in
1770	}	1834	}
1771		1835
1772	sub button_down {	1836	sub invoke_button_down {
1773	my ($self, $ev, $x, $y) = @_;	1837	my ($self, $ev, $x, $y) = @_;
1774		1838
1775	$self->SUPER::button_down ($ev, $x, $y);	1839	$self->SUPER::invoke_button_down ($ev, $x, $y);
1776		1840
1777	my $idx = $self->{layout}->xy_to_index ($x, $y);	1841	my $idx = $self->{layout}->xy_to_index ($x, $y);
1778		1842
1779	# byte-index to char-index	1843	# byte-index to char-index
1780	my $text = $self->{text};	1844	my $text = $self->{text};
1781	utf8::encode $text;	1845	utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1782	$self->{cursor} = length substr $text, 0, $idx;	1846	$self->{cursor} = length $text;
1783		1847
1784	$self->_set_text ($self->{text});	1848	$self->_set_text ($self->{text});
1785	$self->update;	1849	$self->update;
1786		1850
1787	1	1851	1
1788	}	1852	}
1789		1853
1790	sub mouse_motion {	1854	sub invoke_mouse_motion {
1791	my ($self, $ev, $x, $y) = @_;	1855	my ($self, $ev, $x, $y) = @_;
1792	# 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#
1793		1857
1794	0	1858	1
1795	}	1859	}
1796		1860
1797	sub _draw {	1861	sub _draw {
1798	my ($self) = @_;	1862	my ($self) = @_;
1799		1863
…		…
1840		1904
1841	our @ISA = CFClient::UI::EntryBase::;	1905	our @ISA = CFClient::UI::EntryBase::;
1842		1906
1843	use CFClient::OpenGL;	1907	use CFClient::OpenGL;
1844		1908
1845	sub key_down {	1909	sub invoke_key_down {
1846	my ($self, $ev) = @_;	1910	my ($self, $ev) = @_;
1847		1911
1848	my $sym = $ev->{sym};	1912	my $sym = $ev->{sym};
1849		1913
1850	if ($sym == 13) {	1914	if ($sym == 13) {
1851	unshift @{$self->{history}},	1915	unshift @{$self->{history}},
1852	my $txt = $self->get_text;	1916	my $txt = $self->get_text;
		1917
1853	$self->{history_pointer} = -1;	1918	$self->{history_pointer} = -1;
1854	$self->{history_saveback} = '';	1919	$self->{history_saveback} = '';
1855	$self->_emit (activate => $txt);	1920	$self->emit (activate => $txt);
1856	$self->update;	1921	$self->update;
1857		1922
1858	} elsif ($sym == CFClient::SDLK_UP) {	1923	} elsif ($sym == CFClient::SDLK_UP) {
1859	if ($self->{history_pointer} < 0) {	1924	if ($self->{history_pointer} < 0) {
1860	$self->{history_saveback} = $self->get_text;	1925	$self->{history_saveback} = $self->get_text;
…		…
1876	} else {	1941	} else {
1877	$self->set_text ($self->{history_saveback});	1942	$self->set_text ($self->{history_saveback});
1878	}	1943	}
1879		1944
1880	} else {	1945	} else {
1881	return $self->SUPER::key_down ($ev)	1946	return $self->SUPER::invoke_key_down ($ev)
1882	}	1947	}
1883		1948
1884	1	1949	1
1885	}	1950	}
1886		1951
…		…
1910	can_events => 1,	1975	can_events => 1,
1911	@_	1976	@_
1912	)	1977	)
1913	}	1978	}
1914		1979
1915	sub activate { }
1916
1917	sub button_up {	1980	sub invoke_button_up {
1918	my ($self, $ev, $x, $y) = @_;	1981	my ($self, $ev, $x, $y) = @_;
1919		1982
1920	$self->emit ("activate")	1983	$self->emit ("activate")
1921	if $x >= 0 && $x < $self->{w}	1984	if $x >= 0 && $x < $self->{w}
1922	&& $y >= 0 && $y < $self->{h};	1985	&& $y >= 0 && $y < $self->{h};
…		…
1936	$tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});	1999	$tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1937		2000
1938	glDisable GL_TEXTURE_2D;	2001	glDisable GL_TEXTURE_2D;
1939		2002
1940	$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
1941	}	2040	}
1942		2041
1943	#############################################################################	2042	#############################################################################
1944		2043
1945	package CFClient::UI::CheckBox;	2044	package CFClient::UI::CheckBox;
…		…
1972	my ($self) = @_;	2071	my ($self) = @_;
1973		2072
1974	(6) x 2	2073	(6) x 2
1975	}	2074	}
1976		2075
		2076	sub toggle {
		2077	my ($self) = @_;
		2078
		2079	$self->{state} = !$self->{state};
		2080	$self->emit (changed => $self->{state});
		2081	$self->update;
		2082	}
		2083
1977	sub button_down {	2084	sub invoke_button_down {
1978	my ($self, $ev, $x, $y) = @_;	2085	my ($self, $ev, $x, $y) = @_;
1979		2086
1980	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}	2087	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1981	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {	2088	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1982	$self->{state} = !$self->{state};	2089	$self->toggle;
1983	$self->_emit (changed => $self->{state});
1984	} else {	2090	} else {
1985	return 0	2091	return 0
1986	}	2092	}
1987		2093
1988	1	2094	1
…		…
2013	package CFClient::UI::Image;	2119	package CFClient::UI::Image;
2014		2120
2015	our @ISA = CFClient::UI::Base::;	2121	our @ISA = CFClient::UI::Base::;
2016		2122
2017	use CFClient::OpenGL;	2123	use CFClient::OpenGL;
2018	use Carp qw/confess/;
2019		2124
2020	our %loaded_images;	2125	our %texture_cache;
2021		2126
2022	sub new {	2127	sub new {
2023	my $class = shift;	2128	my $class = shift;
2024		2129
2025	my $self = $class->SUPER::new (can_events => 0, @_);	2130	my $self = $class->SUPER::new (
		2131	can_events => 0,
		2132	@_,
		2133	);
2026		2134
2027	$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";
2028		2137
2029	$loaded_images{$self->{image}} ||=	2138	$self->{tex} ||= $texture_cache{$self->{path}} ||=
2030	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;
2031		2140
2032	my $tex = $self->{tex} = $loaded_images{$self->{image}};	2141	Scalar::Util::weaken $texture_cache{$self->{path}};
2033		2142
2034	Scalar::Util::weaken $loaded_images{$self->{image}};	2143	$self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2035
2036	$self->{aspect} = $tex->{w} / $tex->{h};
2037		2144
2038	$self	2145	$self
2039	}	2146	}
2040		2147
2041	sub size_request {	2148	sub size_request {
2042	my ($self) = @_;	2149	my ($self) = @_;
2043		2150
2044	($self->{tex}->{w}, $self->{tex}->{h})	2151	($self->{tex}{w}, $self->{tex}{h})
2045	}	2152	}
2046		2153
2047	sub _draw {	2154	sub _draw {
2048	my ($self) = @_;	2155	my ($self) = @_;
2049		2156
…		…
2158	my $ycut1 = max 0, min 1, $ycut;	2265	my $ycut1 = max 0, min 1, $ycut;
2159	my $ycut2 = max 0, min 1, $ycut - 1;	2266	my $ycut2 = max 0, min 1, $ycut - 1;
2160		2267
2161	my $h1 = $self->{h} * (1 - $ycut1);	2268	my $h1 = $self->{h} * (1 - $ycut1);
2162	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);
2163		2273
2164	glEnable GL_BLEND;	2274	glEnable GL_BLEND;
2165	glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,	2275	glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2166	GL_ONE, GL_ONE_MINUS_SRC_ALPHA;	2276	GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2167	glEnable GL_TEXTURE_2D;	2277	glEnable GL_TEXTURE_2D;
…		…
2186		2296
2187	if ($t3) {	2297	if ($t3) {
2188	glBindTexture GL_TEXTURE_2D, $t3->{name};	2298	glBindTexture GL_TEXTURE_2D, $t3->{name};
2189	glBegin GL_QUADS;	2299	glBegin GL_QUADS;
2190	glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;	2300	glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2191	glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h};	2301	glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2192	glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h};	2302	glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2193	glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;	2303	glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2194	glEnd;	2304	glEnd;
2195	}	2305	}
2196		2306
2197	glDisable GL_BLEND;	2307	glDisable GL_BLEND;
…		…
2285	$self->update;	2395	$self->update;
2286		2396
2287	$self	2397	$self
2288	}	2398	}
2289		2399
2290	sub changed { }
2291
2292	sub set_range {	2400	sub set_range {
2293	my ($self, $range) = @_;	2401	my ($self, $range) = @_;
2294		2402
2295	($range, $self->{range}) = ($self->{range}, $range);	2403	($range, $self->{range}) = ($self->{range}, $range);
2296		2404
2297	$self->update
2298	if "@$range" ne "@{$self->{range}}";	2405	if ("@$range" ne "@{$self->{range}}") {
		2406	$self->update;
		2407	$self->set_value ($self->{range}[0]);
		2408	}
2299	}	2409	}
2300		2410
2301	sub set_value {	2411	sub set_value {
2302	my ($self, $value) = @_;	2412	my ($self, $value) = @_;
2303		2413
…		…
2314	if $unit;	2424	if $unit;
2315		2425
2316	@{$self->{range}} = ($value, $lo, $hi, $page, $unit);	2426	@{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2317		2427
2318	if ($value != $old_value) {	2428	if ($value != $old_value) {
2319	$self->_emit (changed => $value);	2429	$self->emit (changed => $value);
2320	$self->update;	2430	$self->update;
2321	}	2431	}
2322	}	2432	}
2323		2433
2324	sub size_request {	2434	sub size_request {
2325	my ($self) = @_;	2435	my ($self) = @_;
2326		2436
2327	($self->{req_w}, $self->{req_h})	2437	($self->{req_w}, $self->{req_h})
2328	}	2438	}
2329		2439
2330	sub button_down {	2440	sub invoke_button_down {
2331	my ($self, $ev, $x, $y) = @_;	2441	my ($self, $ev, $x, $y) = @_;
2332		2442
2333	$self->SUPER::button_down ($ev, $x, $y);	2443	$self->SUPER::invoke_button_down ($ev, $x, $y);
2334		2444
2335	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];	2445	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2336		2446
2337	$self->mouse_motion ($ev, $x, $y)	2447	$self->invoke_mouse_motion ($ev, $x, $y)
2338	}	2448	}
2339		2449
2340	sub mouse_motion {	2450	sub invoke_mouse_motion {
2341	my ($self, $ev, $x, $y) = @_;	2451	my ($self, $ev, $x, $y) = @_;
2342		2452
2343	if ($GRAB == $self) {	2453	if ($GRAB == $self) {
2344	my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});	2454	my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2345		2455
…		…
2450	sub set_range { shift->{slider}->set_range (@_) }	2560	sub set_range { shift->{slider}->set_range (@_) }
2451	sub set_value { shift->{slider}->set_value (@_) }	2561	sub set_value { shift->{slider}->set_value (@_) }
2452		2562
2453	#############################################################################	2563	#############################################################################
2454		2564
2455	package CFClient::UI::TextView;	2565	package CFClient::UI::TextScroller;
2456		2566
2457	our @ISA = CFClient::UI::HBox::;	2567	our @ISA = CFClient::UI::HBox::;
2458		2568
2459	use CFClient::OpenGL;	2569	use CFClient::OpenGL;
2460		2570
…		…
2462	my $class = shift;	2572	my $class = shift;
2463		2573
2464	my $self = $class->SUPER::new (	2574	my $self = $class->SUPER::new (
2465	fontsize => 1,	2575	fontsize => 1,
2466	can_events => 0,	2576	can_events => 0,
		2577	indent => 0,
2467	#font => default_font	2578	#font => default_font
2468	@_,	2579	@_,
2469		2580
2470	layout => (new CFClient::Layout 1),	2581	layout => (new CFClient::Layout),
2471	par => [],	2582	par => [],
2472	height => 0,	2583	height => 0,
2473	children => [	2584	children => [
2474	(new CFClient::UI::Empty expand => 1),	2585	(new CFClient::UI::Empty expand => 1),
2475	(new CFClient::UI::Slider vertical => 1),	2586	(new CFClient::UI::Slider vertical => 1),
…		…
2486		2597
2487	$self->{fontsize} = $fontsize;	2598	$self->{fontsize} = $fontsize;
2488	$self->reflow;	2599	$self->reflow;
2489	}	2600	}
2490		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
2491	sub size_allocate {	2611	sub invoke_size_allocate {
2492	my ($self, $w, $h) = @_;	2612	my ($self, $w, $h) = @_;
2493		2613
2494	$self->SUPER::size_allocate ($w, $h);	2614	my ($empty, $slider, @other) = @{ $self->{children} };
		2615	$_->configure (@$_{qw(x y req_w req_h)}) for @other;
2495		2616
2496	$self->{layout}->set_font ($self->{font}) if $self->{font};	2617	$self->{layout}->set_font ($self->{font}) if $self->{font};
2497	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	2618	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2498	$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});
2499		2621
2500	$self->reflow;	2622	$self->reflow;
2501	}
2502		2623
2503	sub text_size {	2624	local $self->{children} = [$empty, $slider];
2504	my ($self, $text, $indent) = @_;	2625	$self->SUPER::invoke_size_allocate ($w, $h)
		2626	}
		2627
		2628	sub get_layout {
		2629	my ($self, $para) = @_;
2505		2630
2506	my $layout = $self->{layout};	2631	my $layout = $self->{layout};
2507		2632
		2633	$layout->set_font ($self->{font}) if $self->{font};
		2634	$layout->set_foreground (@{$para->{fg}});
2508	$layout->set_height ($self->{fontsize} * $::FONTSIZE);	2635	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
2509	$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});
2510	$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}}
2511		2644	);
		2645
2512	$layout->size	2646	$layout
2513	}	2647	}
2514		2648
2515	sub reflow {	2649	sub reflow {
2516	my ($self) = @_;	2650	my ($self) = @_;
2517		2651
…		…
2526	$self->{children}[1]->set_value ($offset);	2660	$self->{children}[1]->set_value ($offset);
2527	}	2661	}
2528		2662
2529	sub clear {	2663	sub clear {
2530	my ($self) = @_;	2664	my ($self) = @_;
		2665
		2666	my (undef, undef, @other) = @{ $self->{children} };
		2667	$self->remove ($_) for @other;
2531		2668
2532	$self->{par} = [];	2669	$self->{par} = [];
2533	$self->{height} = 0;	2670	$self->{height} = 0;
2534	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);	2671	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2535	}	2672	}
2536		2673
2537	sub add_paragraph {	2674	sub add_paragraph {
2538	my ($self, $color, $text, $indent) = @_;	2675	my ($self, $color, $para, $indent) = @_;
2539		2676
2540	for my $line (split /\n/, $text) {	2677	my ($text, @w) = ref $para ? @$para : $para;
2541	my ($w, $h) = $self->text_size ($line);	2678
2542	$self->{height} += $h;	2679	$para = {
2543	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,
2544	}	2686	};
2545		2687
2546	$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;
2547	}	2700	}
2548		2701
2549	sub update {	2702	sub update {
2550	my ($self) = @_;	2703	my ($self) = @_;
2551		2704
…		…
2553		2706
2554	return unless $self->{h} > 0;	2707	return unless $self->{h} > 0;
2555		2708
2556	delete $self->{texture};	2709	delete $self->{texture};
2557		2710
2558	$ROOT->on_post_alloc ($self, sub {	2711	$ROOT->on_post_alloc ($self => sub {
2559	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};	2712	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2560		2713
2561	if (delete $self->{need_reflow}) {	2714	if (delete $self->{need_reflow}) {
2562	my $height = 0;	2715	my $height = 0;
2563		2716
2564	my $layout = $self->{layout};
2565
2566	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
2567
2568	for (@{$self->{par}}) {	2717	for my $para (@{$self->{par}}) {
2569	if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support	2718	if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2570	$layout->set_width ($W - $_->[3]);	2719	my $layout = $self->get_layout ($para);
2571	$layout->set_markup ($_->[4]);
2572	my ($w, $h) = $layout->size;	2720	my ($w, $h) = $layout->size;
2573	$_->[0] = $w + $_->[3];	2721
2574	$_->[1] = $h;	2722	$para->{w} = $w + $para->{indent};
		2723	$para->{h} = $h;
		2724	$para->{wrapped} = $layout->has_wrapped;
2575	}	2725	}
2576		2726
2577	$height += $_->[1];	2727	$height += $para->{h};
2578	}	2728	}
2579		2729
2580	$self->{height} = $height;	2730	$self->{height} = $height;
2581		2731
2582	$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]);
2583		2733
2584	delete $self->{texture};	2734	delete $self->{texture};
		2735	}
		2736
		2737	if (delete $self->{scroll_to_bottom}) {
		2738	$self->{children}[1]->set_value (1e10);
2585	}	2739	}
2586		2740
2587	$self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {	2741	$self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2588	glClearColor 0, 0, 0, 0;	2742	glClearColor 0, 0, 0, 0;
2589	glClear GL_COLOR_BUFFER_BIT;	2743	glClear GL_COLOR_BUFFER_BIT;
…		…
2593	my $y0 = $top;	2747	my $y0 = $top;
2594	my $y1 = $top + $H;	2748	my $y1 = $top + $H;
2595		2749
2596	my $y = 0;	2750	my $y = 0;
2597		2751
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}}) {	2752	for my $para (@{$self->{par}}) {
2607	my $h = $par->[1];	2753	my $h = $para->{h};
2608		2754
2609	if ($y0 < $y + $h && $y < $y1) {	2755	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		2756
2614	my ($w, $h, $data, $format, $internalformat) = $layout->render;	2757	my $layout = $self->get_layout ($para);
2615		2758
2616	glRasterPos $par->[3], $y - $y0;	2759	$layout->render ($para->{indent}, $y - $y0);
2617	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	}
2618	}	2773	}
2619		2774
2620	$y += $h;	2775	$y += $h;
2621	}	2776	}
2622
2623	glDisable GL_BLEND;
2624	};	2777	};
2625	});	2778	});
		2779	}
		2780
		2781	sub reconfigure {
		2782	my ($self) = @_;
		2783
		2784	$self->SUPER::reconfigure;
		2785
		2786	$_->{w} = 1e10 for @{ $self->{par} };
		2787	$self->reflow;
2626	}	2788	}
2627		2789
2628	sub _draw {	2790	sub _draw {
2629	my ($self) = @_;	2791	my ($self) = @_;
2630		2792
…		…
2633	glColor 0, 0, 0, 1;	2795	glColor 0, 0, 0, 1;
2634	$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});
2635	glDisable GL_TEXTURE_2D;	2797	glDisable GL_TEXTURE_2D;
2636		2798
2637	$self->{children}[1]->draw;	2799	$self->{children}[1]->draw;
2638
2639	}	2800	}
2640		2801
2641	#############################################################################	2802	#############################################################################
2642		2803
2643	package CFClient::UI::Animator;	2804	package CFClient::UI::Animator;
…		…
2730	$tooltip .= "\n\n" . (ref $widget) . "\n"	2891	$tooltip .= "\n\n" . (ref $widget) . "\n"
2731	. "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"	2892	. "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2732	. "req $widget->{req_w} $widget->{req_h}\n"	2893	. "req $widget->{req_w} $widget->{req_h}\n"
2733	. "visible $widget->{visible}";	2894	. "visible $widget->{visible}";
2734	}	2895	}
		2896
		2897	$tooltip =~ s/^\n+//;
		2898	$tooltip =~ s/\n+$//;
2735		2899
2736	$self->add (new CFClient::UI::Label	2900	$self->add (new CFClient::UI::Label
2737	markup => $tooltip,	2901	markup => $tooltip,
2738	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,	2902	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2739	fontsize => 0.8,	2903	fontsize => 0.8,
…		…
2749	my ($w, $h) = @{$self->child}{qw(req_w req_h)};	2913	my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2750		2914
2751	($w + 4, $h + 4)	2915	($w + 4, $h + 4)
2752	}	2916	}
2753		2917
2754	sub size_allocate {	2918	sub invoke_size_allocate {
2755	my ($self, $w, $h) = @_;	2919	my ($self, $w, $h) = @_;
2756		2920
2757	$self->SUPER::size_allocate ($w - 4, $h - 4);	2921	$self->SUPER::invoke_size_allocate ($w - 4, $h - 4)
2758	}	2922	}
2759		2923
2760	sub visibility_change {	2924	sub invoke_visibility_change {
2761	my ($self, $visible) = @_;	2925	my ($self, $visible) = @_;
2762		2926
2763	return unless $visible;	2927	return unless $visible;
2764		2928
2765	$self->{root}->on_post_alloc ("move_$self" => sub {	2929	$self->{root}->on_post_alloc ("move_$self" => sub {
…		…
2767	or return;	2931	or return;
2768		2932
2769	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);	2933	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2770		2934
2771	($x, $y) = $widget->coord2global (-$self->{w}, 0)	2935	($x, $y) = $widget->coord2global (-$self->{w}, 0)
2772	if $x + $self->{w} > $::WIDTH;	2936	if $x + $self->{w} > $self->{root}{w};
2773		2937
2774	$self->move_abs ($x, $y);	2938	$self->move_abs ($x, $y);
2775	});	2939	});
2776	}	2940	}
2777		2941
…		…
2872	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});	3036	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2873	glDisable GL_TEXTURE_2D;	3037	glDisable GL_TEXTURE_2D;
2874	}	3038	}
2875	}	3039	}
2876		3040
2877	sub DESTROY {	3041	sub destroy {
2878	my ($self) = @_;	3042	my ($self) = @_;
2879		3043
2880	$self->{timer}->cancel	3044	$self->{timer}->cancel
2881	if $self->{timer};	3045	if $self->{timer};
2882		3046
2883	$self->SUPER::DESTROY;	3047	$self->SUPER::destroy;
2884	}	3048	}
2885		3049
2886	#############################################################################	3050	#############################################################################
2887		3051
2888	package CFClient::UI::Buttonbar;	3052	package CFClient::UI::Buttonbar;
…		…
2909	);	3073	);
2910		3074
2911	$self->add ($self->{vbox} = new CFClient::UI::VBox);	3075	$self->add ($self->{vbox} = new CFClient::UI::VBox);
2912		3076
2913	for my $item (@{ $self->{items} }) {	3077	for my $item (@{ $self->{items} }) {
2914	my ($widget, $cb) = @$item;	3078	my ($widget, $cb, $tooltip) = @$item;
2915		3079
2916	# handle various types of items, only text for now	3080	# handle various types of items, only text for now
2917	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 {
2918	$widget = new CFClient::UI::Label	3096	$widget = new CFClient::UI::Label
2919	can_hover => 1,	3097	can_hover => 1,
2920	can_events => 1,	3098	can_events => 1,
2921	text => $widget;	3099	markup => $widget,
		3100	tooltip => $tooltip;
		3101	}
2922	}	3102	}
2923		3103
2924	$self->{item}{$widget} = $item;	3104	$self->{item}{$widget} = $item;
2925		3105
2926	$self->{vbox}->add ($widget);	3106	$self->{vbox}->add ($widget);
…		…
2931		3111
2932	# 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)
2933	sub popup {	3113	sub popup {
2934	my ($self, $ev) = @_;	3114	my ($self, $ev) = @_;
2935		3115
2936	$self->_emit ("popdown");	3116	$self->emit ("popdown");
2937		3117
2938	# maybe save $GRAB? must be careful about events...	3118	# maybe save $GRAB? must be careful about events...
2939	$GRAB = $self;	3119	$GRAB = $self;
2940	$self->{button} = $ev->{button};	3120	$self->{button} = $ev->{button};
2941		3121
2942	$self->show;	3122	$self->show;
2943	$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);
2944	}	3124	}
2945		3125
2946	sub mouse_motion {	3126	sub invoke_mouse_motion {
2947	my ($self, $ev, $x, $y) = @_;	3127	my ($self, $ev, $x, $y) = @_;
2948		3128
2949	# TODO: should use vbox->find_widget or so	3129	# TODO: should use vbox->find_widget or so
2950	$HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});	3130	$HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2951	$self->{hover} = $self->{item}{$HOVER};	3131	$self->{hover} = $self->{item}{$HOVER};
2952		3132
2953	0	3133	0
2954	}	3134	}
2955		3135
2956	sub button_up {	3136	sub invoke_button_up {
2957	my ($self, $ev, $x, $y) = @_;	3137	my ($self, $ev, $x, $y) = @_;
2958		3138
2959	if ($ev->{button} == $self->{button}) {	3139	if ($ev->{button} == $self->{button}) {
2960	undef $GRAB;	3140	undef $GRAB;
2961	$self->hide;	3141	$self->hide;
2962		3142
2963	$self->_emit ("popdown");	3143	$self->emit ("popdown");
2964	$self->{hover}[1]->() if $self->{hover};	3144	$self->{hover}[1]->() if $self->{hover};
2965	} else {	3145	} else {
2966	return 0	3146	return 0
2967	}	3147	}
2968		3148
…		…
2995		3175
2996	$self->{current} = $self->{children}[0]	3176	$self->{current} = $self->{children}[0]
2997	if @{ $self->{children} };	3177	if @{ $self->{children} };
2998	}	3178	}
2999		3179
		3180	sub get_current_page {
		3181	my ($self) = @_;
		3182
		3183	$self->{current}
		3184	}
		3185
3000	sub set_current_page {	3186	sub set_current_page {
3001	my ($self, $page_or_widget) = @_;	3187	my ($self, $page_or_widget) = @_;
3002		3188
3003	my $widget = ref $page_or_widget	3189	my $widget = ref $page_or_widget
3004	? $page_or_widget	3190	? $page_or_widget
3005	: $self->{children}[$page_or_widget];	3191	: $self->{children}[$page_or_widget];
3006		3192
3007	$self->{current} = $widget;	3193	$self->{current} = $widget;
3008	$self->{current}->configure (0, 0, $self->{w}, $self->{h});	3194	$self->{current}->configure (0, 0, $self->{w}, $self->{h});
3009		3195
3010	$self->_emit (page_changed => $self->{current});	3196	$self->emit (page_changed => $self->{current});
3011		3197
3012	$self->realloc;	3198	$self->realloc;
3013	}	3199	}
3014		3200
3015	sub visible_children {	3201	sub visible_children {
…		…
3020	my ($self) = @_;	3206	my ($self) = @_;
3021		3207
3022	$self->{current}->size_request	3208	$self->{current}->size_request
3023	}	3209	}
3024		3210
3025	sub size_allocate {	3211	sub invoke_size_allocate {
3026	my ($self, $w, $h) = @_;	3212	my ($self, $w, $h) = @_;
3027		3213
3028	$self->{current}->configure (0, 0, $w, $h);	3214	$self->{current}->configure (0, 0, $w, $h);
		3215
		3216	1
3029	}	3217	}
3030		3218
3031	sub _draw {	3219	sub _draw {
3032	my ($self) = @_;	3220	my ($self) = @_;
3033		3221
…		…
3068	);	3256	);
3069		3257
3070	$self->{multiplexer}->add ($widget);	3258	$self->{multiplexer}->add ($widget);
3071	}	3259	}
3072		3260
		3261	sub get_current_page {
		3262	my ($self) = @_;
		3263
		3264	$self->{multiplexer}->get_current_page
		3265	}
		3266
3073	sub set_current_page {	3267	sub set_current_page {
3074	my ($self, $page) = @_;	3268	my ($self, $page) = @_;
3075		3269
3076	$self->{multiplexer}->set_current_page ($page);	3270	$self->{multiplexer}->set_current_page ($page);
3077	$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);
3078	}	3328	}
3079		3329
3080	#############################################################################	3330	#############################################################################
3081		3331
3082	package CFClient::UI::Statusbox;	3332	package CFClient::UI::Statusbox;
…		…
3181	$item->{count}++;	3431	$item->{count}++;
3182	} else {	3432	} else {
3183	$item->{count} = 1;	3433	$item->{count} = 1;
3184	$item->{text} = $item->{tooltip} = $text;	3434	$item->{text} = $item->{tooltip} = $text;
3185	}	3435	}
3186	$item->{id} = ++$self->{id};	3436	$item->{id} += 0.2;#d#
3187	$item->{timeout} = $timeout;	3437	$item->{timeout} = $timeout;
3188	delete $item->{label};	3438	delete $item->{label};
3189	} else {	3439	} else {
3190	$self->{item}{$group} = {	3440	$self->{item}{$group} = {
3191	id => ++$self->{id},	3441	id => ++$self->{id},
…		…
3197	count => 1,	3447	count => 1,
3198	%arg,	3448	%arg,
3199	};	3449	};
3200	}	3450	}
3201		3451
		3452	$ROOT->on_refresh (reorder => sub {
3202	$self->reorder;	3453	$self->reorder;
		3454	});
3203	}	3455	}
3204		3456
3205	sub reconfigure {	3457	sub reconfigure {
3206	my ($self) = @_;	3458	my ($self) = @_;
3207		3459
…		…
3210		3462
3211	$self->reorder;	3463	$self->reorder;
3212	$self->SUPER::reconfigure;	3464	$self->SUPER::reconfigure;
3213	}	3465	}
3214		3466
3215	sub DESTROY {	3467	sub destroy {
3216	my ($self) = @_;	3468	my ($self) = @_;
3217		3469
3218	$self->{timer}->cancel;	3470	$self->{timer}->cancel;
3219		3471
3220	$self->SUPER::DESTROY;	3472	$self->SUPER::destroy;
3221	}	3473	}
3222		3474
3223	#############################################################################	3475	#############################################################################
3224		3476
3225	package CFClient::UI::Inventory;	3477	package CFClient::UI::Inventory;
3226		3478
3227	our @ISA = CFClient::UI::ScrolledWindow::;	3479	our @ISA = CFClient::UI::Table::;
3228		3480
3229	sub new {	3481	sub new {
3230	my $class = shift;	3482	my $class = shift;
3231		3483
3232	my $self = $class->SUPER::new (	3484	my $self = $class->SUPER::new (
3233	child => (new CFClient::UI::Table col_expand => [0, 1, 0]),	3485	col_expand => [0, 1, 0],
3234	@_,	3486	@_,
3235	);	3487	);
3236		3488
3237	$self	3489	$self
3238	}	3490	}
3239		3491
3240	sub set_items {	3492	sub set_items {
3241	my ($self, $items) = @_;	3493	my ($self, $items) = @_;
3242		3494
3243	$self->{child}->clear;	3495	$self->clear;
3244	return unless $items;	3496	return unless $items;
3245		3497
3246	my @items = sort {	3498	my @items = sort {
3247	($a->{type} <=> $b->{type})	3499	($a->{type} <=> $b->{type})
3248	or ($a->{name} cmp $b->{name})	3500	or ($a->{name} cmp $b->{name})
3249	} @$items;	3501	} values %$items;
3250		3502
3251	$self->{real_items} = \@items;	3503	$self->{real_items} = \@items;
3252		3504
3253	my $row = 0;	3505	my $row = 0;
3254	for my $item (@items) {	3506	for my $item (@items) {
3255	CFClient::Item::update_widgets $item;	3507	CFClient::Item::update_widgets $item;
3256		3508
3257	$self->{child}->add (0, $row, $item->{face_widget});	3509	$self->add (0, $row, $item->{face_widget});
3258	$self->{child}->add (1, $row, $item->{desc_widget});	3510	$self->add (1, $row, $item->{desc_widget});
3259	$self->{child}->add (2, $row, $item->{weight_widget});	3511	$self->add (2, $row, $item->{weight_widget});
3260		3512
3261	$row++;	3513	$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	}	3514	}
3460	}	3515	}
3461		3516
3462	#############################################################################	3517	#############################################################################
3463		3518
…		…
3473	commands => [],	3528	commands => [],
3474	@_,	3529	@_,
3475	)	3530	)
3476	}	3531	}
3477		3532
3478	# XXX: Do sorting? Argl...	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");
		3539	my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
		3540	"<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
		3541	my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
		3542	"<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
		3543	my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
		3544	"<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
		3545
		3546	sub rebuild_spell_list {
		3547	my ($self) = @_;
		3548
		3549	$CFClient::UI::ROOT->on_refresh ($self => sub {
		3550	$self->clear;
		3551
		3552	return unless $::CONN;
		3553
		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);
		3556	$self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
		3557	$self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
		3558	$self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
		3559
		3560	my $row = 0;
		3561
		3562	for (sort { $a cmp $b } keys %{ $self->{spell} }) {
		3563	my $spell = $self->{spell}{$_};
		3564
		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});
		3592
		3593	$self->add (0, $row, new CFClient::UI::Face
		3594	face => $spell->{face},
		3595	can_hover => 1,
		3596	can_events => 1,
		3597	tooltip => $tooltip,
		3598	on_button_down => $spell_cb,
		3599	);
		3600
		3601	$self->add (1, $row, new CFClient::UI::Label
		3602	expand => 1,
		3603	text => $spell->{name},
		3604	can_hover => 1,
		3605	can_events => 1,
		3606	tooltip => $tooltip,
		3607	on_button_down => $spell_cb,
		3608	);
		3609
		3610	$self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
		3611	$self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
		3612	$self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
		3613	$self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
		3614	}
		3615	});
		3616	}
		3617
3479	sub add_spell {	3618	sub add_spell {
3480	my ($self, $spell) = @_;	3619	my ($self, $spell) = @_;
		3620
3481	$self->{spells}->{$spell->{name}} = $spell;	3621	$self->{spell}->{$spell->{name}} = $spell;
3482		3622	$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	}	3623	}
3511		3624
3512	sub remove_spell {	3625	sub remove_spell {
3513	my ($self, $spell) = @_;	3626	my ($self, $spell) = @_;
		3627
3514	delete $self->{spells}->{$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} = {};
3515	$self->rebuild_spell_list;	3636	$self->rebuild_spell_list;
3516	}	3637	}
3517		3638
3518	#############################################################################	3639	#############################################################################
3519		3640
…		…
3556	$coord = $max - $size if $coord > $max - $size;	3677	$coord = $max - $size if $coord > $max - $size;
3557		3678
3558	int $coord + 0.5	3679	int $coord + 0.5
3559	}	3680	}
3560		3681
3561	sub size_allocate {	3682	sub invoke_size_allocate {
3562	my ($self, $w, $h) = @_;	3683	my ($self, $w, $h) = @_;
3563		3684
3564	for my $child ($self->children) {	3685	for my $child ($self->children) {
3565	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)};
3566		3687
…		…
3570	$X = _to_pixel $X, $W, $self->{w};	3691	$X = _to_pixel $X, $W, $self->{w};
3571	$Y = _to_pixel $Y, $H, $self->{h};	3692	$Y = _to_pixel $Y, $H, $self->{h};
3572		3693
3573	$child->configure ($X, $Y, $W, $H);	3694	$child->configure ($X, $Y, $W, $H);
3574	}	3695	}
		3696
		3697	1
3575	}	3698	}
3576		3699
3577	sub coord2local {	3700	sub coord2local {
3578	my ($self, $x, $y) = @_;	3701	my ($self, $x, $y) = @_;
3579		3702
…		…
3705	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};	3828	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3706		3829
3707	$w = 0 if $w < 0;	3830	$w = 0 if $w < 0;
3708	$h = 0 if $h < 0;	3831	$h = 0 if $h < 0;
3709		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
3710	$w = int $w + 0.5;	3839	$w = int $w + 0.5;
3711	$h = int $h + 0.5;	3840	$h = int $h + 0.5;
3712		3841
3713	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}) {
3714	$widget->{old_w} = $widget->{w};	3843	$widget->{old_w} = $widget->{w};

Diff Legend

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