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.203 by root, Sun May 14 21:13:11 2006 UTC vs.
Revision 1.244 by root, Sat May 27 21:06:09 2006 UTC

…		…
5		5
6	use Scalar::Util ();	6	use Scalar::Util ();
7	use List::Util ();	7	use List::Util ();
8		8
9	use CFClient;	9	use CFClient;
		10	use CFClient::Texture;
10		11
11	our ($FOCUS, $HOVER, $GRAB); # various widgets	12	our ($FOCUS, $HOVER, $GRAB); # various widgets
12		13
		14	our $LAYOUT;
13	our $ROOT;	15	our $ROOT;
14	our $TOOLTIP;	16	our $TOOLTIP;
15	our $BUTTON_STATE;	17	our $BUTTON_STATE;
16		18
17	our %WIDGET; # all widgets, weak-referenced	19	our %WIDGET; # all widgets, weak-referenced
		20
		21	sub get_layout {
		22	for (grep { $_->{name} } values %WIDGET) {
		23	$LAYOUT->{$_->{name}} = {
		24	x => $_->{x} / $::WIDTH,
		25	y => $_->{y} / $::HEIGHT,
		26	w => $_->{w} / $::WIDTH,
		27	h => $_->{h} / $::HEIGHT
		28	};
		29	}
		30
		31	return $LAYOUT;
		32	}
		33
		34	sub set_layout {
		35	my ($layout) = @_;
		36	$LAYOUT = $layout;
		37	}
18		38
19	sub check_tooltip {	39	sub check_tooltip {
20	if (!$GRAB) {	40	if (!$GRAB) {
21	for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {	41	for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
22	if (length $widget->{tooltip}) {	42	if (length $widget->{tooltip}) {
…		…
31	$TOOLTIP->set_tooltip_from ($widget);	51	$TOOLTIP->set_tooltip_from ($widget);
32	$TOOLTIP->show;	52	$TOOLTIP->show;
33		53
34	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);	54	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
35		55
36	if ($x + $TOOLTIP->{w} > $::WIDTH) {
37	($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0);	56	($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0)
38	}	57	if $x + $TOOLTIP->{w} > $::WIDTH;
39		58
40	$TOOLTIP->move ($x, $y);	59	$TOOLTIP->move ($x, $y);
41	$TOOLTIP->check_size;	60	$TOOLTIP->check_size;
42	$TOOLTIP->update;	61	$TOOLTIP->update;
43	}	62	}
…		…
51	delete $TOOLTIP->{owner};	70	delete $TOOLTIP->{owner};
52	}	71	}
53		72
54	# class methods for events	73	# class methods for events
55	sub feed_sdl_key_down_event {	74	sub feed_sdl_key_down_event {
56	$FOCUS->emit (key_down => $_[0]) || $FOCUS->key_down ($_[0])	75	$FOCUS->emit (key_down => $_[0])
57	if $FOCUS;	76	if $FOCUS;
58	}	77	}
59		78
60	sub feed_sdl_key_up_event {	79	sub feed_sdl_key_up_event {
61	$FOCUS->emit (key_up => $_[0]) || $FOCUS->key_up ($_[0])	80	$FOCUS->emit (key_up => $_[0])
62	if $FOCUS;	81	if $FOCUS;
63	}	82	}
64		83
65	sub feed_sdl_button_down_event {	84	sub feed_sdl_button_down_event {
66	my ($ev) = @_;	85	my ($ev) = @_;
…		…
75	check_tooltip;	94	check_tooltip;
76	}	95	}
77		96
78	$BUTTON_STATE |= 1 << ($ev->{button} - 1);	97	$BUTTON_STATE |= 1 << ($ev->{button} - 1);
79		98
80	if ($GRAB) {	99	$GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))
81	($x, $y) = $GRAB->coord2local ($x, $y);	100	if $GRAB;
82	$GRAB->emit (button_down => $ev, $x, $y) || $GRAB->button_down ($ev, $x, $y);
83	}
84	}	101	}
85		102
86	sub feed_sdl_button_up_event {	103	sub feed_sdl_button_up_event {
87	my ($ev) = @_;	104	my ($ev) = @_;
88	my ($x, $y) = ($ev->{x}, $ev->{y});	105	my ($x, $y) = ($ev->{x}, $ev->{y});
89		106
90	my $widget = $GRAB || $ROOT->find_widget ($x, $y);	107	my $widget = $GRAB || $ROOT->find_widget ($x, $y);
91		108
92	$BUTTON_STATE &= ~(1 << ($ev->{button} - 1));	109	$BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
93		110
94	if ($GRAB) {	111	$GRAB->emit (button_up => $ev, $GRAB->coord2local ($x, $y))
95	($x, $y) = $GRAB->coord2local ($x, $y);	112	if $GRAB;
96	$GRAB->emit (button_up => $ev, $x, $y) || $GRAB->button_up ($ev, $x, $y);
97	}
98		113
99	if (!$BUTTON_STATE) {	114	if (!$BUTTON_STATE) {
100	my $grab = $GRAB; undef $GRAB;	115	my $grab = $GRAB; undef $GRAB;
101	$grab->update if $grab;	116	$grab->update if $grab;
102	$GRAB->update if $GRAB;	117	$GRAB->update if $GRAB;
…		…
118	$HOVER->update if $HOVER && $HOVER->{can_hover};	133	$HOVER->update if $HOVER && $HOVER->{can_hover};
119		134
120	check_tooltip;	135	check_tooltip;
121	}	136	}
122		137
123	if ($HOVER) {
124	($x, $y) = $HOVER->coord2local ($x, $y);
125	$HOVER->emit (mouse_motion => $ev, $x, $y) || $HOVER->mouse_motion ($ev, $x, $y);	138	$HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
126	}	139	if $HOVER;
127	}	140	}
128		141
129	# convert position array to integers	142	# convert position array to integers
130	sub harmonize {	143	sub harmonize {
131	my ($vals) = @_;	144	my ($vals) = @_;
…		…
137	$rem += $_ - $i;	150	$rem += $_ - $i;
138	$_ = $i;	151	$_ = $i;
139	}	152	}
140	}	153	}
141		154
		155	sub full_refresh {
		156	# make a copy, otherwise for complains about freed values.
		157	my @widgets = values %WIDGET;
		158
		159	$_->update
		160	for @widgets;
		161	}
		162
		163	sub reconfigure_widgets {
		164	# make a copy, otherwise C<for> complains about freed values.
		165	my @widgets = values %WIDGET;
		166
		167	$_->reconfigure
		168	for @widgets;
		169	}
		170
142	# call when resolution changes etc.	171	# call when resolution changes etc.
143	sub rescale_widgets {	172	sub rescale_widgets {
144	my ($sx, $sy) = @_;	173	my ($sx, $sy) = @_;
145		174
146	for my $widget (values %WIDGET) {	175	for my $widget (values %WIDGET) {
147	if ($widget->{toplevel}) {	176	if ($widget->{is_toplevel}) {
148	$widget->{x} = int 0.5 + $widget->{x} * $sx if exists $widget->{x};	177	$widget->{x} = int 0.5 + $widget->{x} * $sx if exists $widget->{x};
149	$widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};	178	$widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};
150	$widget->{req_w} = int 0.5 + $widget->{req_w} * $sx if exists $widget->{req_w};	179	$widget->{req_w} = int 0.5 + $widget->{req_w} * $sx if exists $widget->{req_w};
151	$widget->{user_w} = int 0.5 + $widget->{user_w} * $sx if exists $widget->{user_w};	180	$widget->{user_w} = int 0.5 + $widget->{user_w} * $sx if exists $widget->{user_w};
152	$widget->{y} = int 0.5 + $widget->{y} * $sy if exists $widget->{y};	181	$widget->{y} = int 0.5 + $widget->{y} * $sy if exists $widget->{y};
153	$widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};	182	$widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};
154	$widget->{req_h} = int 0.5 + $widget->{req_h} * $sy if exists $widget->{req_h};	183	$widget->{req_h} = int 0.5 + $widget->{req_h} * $sy if exists $widget->{req_h};
155	$widget->{user_h} = int 0.5 + $widget->{user_h} * $sy if exists $widget->{user_h};	184	$widget->{user_h} = int 0.5 + $widget->{user_h} * $sy if exists $widget->{user_h};
156	}	185	}
157
158	$widget->reconfigure;
159	}	186	}
		187
		188	reconfigure_widgets;
160	}	189	}
161		190
162	#############################################################################	191	#############################################################################
163		192
164	package CFClient::UI::Base;	193	package CFClient::UI::Base;
…		…
177	can_events => 1,	206	can_events => 1,
178	@_	207	@_
179	}, $class;	208	}, $class;
180		209
181	for (keys %$self) {	210	for (keys %$self) {
182	if (/^connect_(.*)$/) {	211	if (/^on_(.*)$/) {
183	$self->connect ($1 => delete $self->{$_});	212	$self->connect ($1 => delete $self->{$_});
184	}	213	}
185	}	214	}
186		215
187	Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);	216	Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
188		217
		218	if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {
		219	$self->{user_x} = $layout->{x} * $::WIDTH;
		220	$self->{user_y} = $layout->{y} * $::HEIGHT;
		221	$self->{user_w} = ($layout->{w} != 0 ? $layout->{w} : 1) * $::WIDTH;
		222	$self->{user_h} = ($layout->{h} != 0 ? $layout->{h} : 1) * $::HEIGHT;
		223	}
		224
189	$self	225	$self
190	}	226	}
191		227
192	sub destroy {	228	sub destroy {
193	my ($self) = @_;	229	my ($self) = @_;
…		…
196	%$self = ();	232	%$self = ();
197	}	233	}
198		234
199	sub show {	235	sub show {
200	my ($self) = @_;	236	my ($self) = @_;
201
202	return if $self->{parent};	237	return if $self->{parent};
203		238
204	$CFClient::UI::ROOT->add ($self);	239	$CFClient::UI::ROOT->add ($self);
205	}	240	}
206		241
207	sub hide {	242	sub show_centered {
208	my ($self) = @_;	243	my ($self) = @_;
		244	return if $self->{parent};
		245
		246	$self->show;
		247
		248	$CFClient::UI::ROOT->on_post_alloc (
		249	"centered $self" => sub {
		250	$self->move (($::WIDTH - $self->{w}) * 0.5, ($::HEIGHT - $self->{h}) * 0.5);
		251	},
		252	);
		253	}
		254
		255	sub set_invisible {
		256	my ($self) = @_;
		257
		258	return unless $self->{visible};
		259
		260	# broken show/hide model
		261
		262	delete $self->{root};
		263	delete $self->{visible};
209		264
210	undef $GRAB if $GRAB == $self;	265	undef $GRAB if $GRAB == $self;
211	undef $HOVER if $HOVER == $self;	266	undef $HOVER if $HOVER == $self;
		267
		268	CFClient::UI::check_tooltip
		269	if $CFClient::UI::TOOLTIP->{owner} == $self;
		270
		271	$self->focus_out;
		272
		273	$self->emit (visibility_change => 0);
		274	}
		275
		276	sub hide {
		277	my ($self) = @_;
		278
		279	$self->set_invisible;
212		280
213	$self->{parent}->remove ($self)	281	$self->{parent}->remove ($self)
214	if $self->{parent};	282	if $self->{parent};
215	}	283	}
216		284
…		…
283		351
284	delete $self->{max_w}; $self->{max_w} = $w if $w;	352	delete $self->{max_w}; $self->{max_w} = $w if $w;
285	delete $self->{max_h}; $self->{max_h} = $h if $h;	353	delete $self->{max_h}; $self->{max_h} = $h if $h;
286	}	354	}
287		355
		356	sub set_tooltip {
		357	my ($self, $tooltip) = @_;
		358
		359	$tooltip =~ s/^\s+//;
		360	$tooltip =~ s/\s+$//;
		361
		362	return if $self->{tooltip} eq $tooltip;
		363
		364	$self->{tooltip} = $tooltip;
		365
		366	if ($CFClient::UI::TOOLTIP->{owner} == $self) {
		367	delete $CFClient::UI::TOOLTIP->{owner};
		368	CFClient::UI::check_tooltip;
		369	}
		370	}
		371
288	# translate global coordinates to local coordinate system	372	# translate global coordinates to local coordinate system
289	sub coord2local {	373	sub coord2local {
290	my ($self, $x, $y) = @_;	374	my ($self, $x, $y) = @_;
291		375
292	$self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})	376	$self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
…		…
305	return if $FOCUS == $self;	389	return if $FOCUS == $self;
306	return unless $self->{can_focus};	390	return unless $self->{can_focus};
307		391
308	my $focus = $FOCUS; $FOCUS = $self;	392	my $focus = $FOCUS; $FOCUS = $self;
309		393
310	$self->emit (focus_in => $focus);	394	$self->_emit (focus_in => $focus);
311		395
312	$focus->update if $focus;	396	$focus->update if $focus;
313	$FOCUS->update;	397	$FOCUS->update;
314	}	398	}
315		399
…		…
318		402
319	return unless $FOCUS == $self;	403	return unless $FOCUS == $self;
320		404
321	my $focus = $FOCUS; undef $FOCUS;	405	my $focus = $FOCUS; undef $FOCUS;
322		406
323	$self->emit (focus_out => $focus);	407	$self->_emit (focus_out => $focus);
324		408
325	$focus->update if $focus; #?	409	$focus->update if $focus; #?
		410
		411	$::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus
		412	unless $FOCUS;
326	}	413	}
327		414
328	sub mouse_motion { }	415	sub mouse_motion { }
329	sub button_up { }	416	sub button_up { }
330	sub key_down { }	417	sub key_down { }
331	sub key_up { }	418	sub key_up { }
332		419
333	sub button_down {	420	sub button_down {
334	my ($self, $ev, $x, $y) = @_;	421	my ($self, $ev, $x, $y) = @_;
335		422
336	$self->focus_in;	423	$self->focus_in;
…		…
370	if ($ENV{PCLIENT_DEBUG}) {	457	if ($ENV{PCLIENT_DEBUG}) {
371	glPushMatrix;	458	glPushMatrix;
372	glColor 1, 1, 0, 1;	459	glColor 1, 1, 0, 1;
373	glTranslate $self->{x} + 0.375, $self->{y} + 0.375;	460	glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
374	glBegin GL_LINE_LOOP;	461	glBegin GL_LINE_LOOP;
375	glVertex 0 , 0;	462	glVertex 0 , 0;
376	glVertex $self->{w}, 0;	463	glVertex $self->{w} - 1, 0;
377	glVertex $self->{w}, $self->{h};	464	glVertex $self->{w} - 1, $self->{h} - 1;
378	glVertex 0 , $self->{h};	465	glVertex 0 , $self->{h} - 1;
379	glEnd;	466	glEnd;
380	glPopMatrix;	467	glPopMatrix;
381	CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;	468	#CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
382	}	469	}
383	}	470	}
384		471
385	sub _draw {	472	sub _draw {
386	my ($self) = @_;	473	my ($self) = @_;
…		…
403	sub set_parent {	490	sub set_parent {
404	my ($self, $parent) = @_;	491	my ($self, $parent) = @_;
405		492
406	Scalar::Util::weaken ($self->{parent} = $parent);	493	Scalar::Util::weaken ($self->{parent} = $parent);
407		494
		495	if ($parent->{visible} || 1) {
		496	$self->{root} = $parent->{root};
		497	$self->{visible} = $parent->{visible} + 1;
		498
		499	$self->emit (visibility_change => 1)
		500	unless $self->{parent}{visible};
		501	}
		502
408	# TODO: req_w _does_change after ->reconfigure	503	# TODO: req_w _does_change after ->reconfigure
409	$self->check_size	504	$self->check_size
410	unless exists $self->{req_w};	505	unless exists $self->{req_w};
		506
		507	$self->show;
411	}	508	}
412		509
413	sub check_size {	510	sub check_size {
414	my ($self, $forced) = @_;	511	my ($self, $forced) = @_;
415		512
…		…
428	my ($self, $signal, $cb) = @_;	525	my ($self, $signal, $cb) = @_;
429		526
430	push @{ $self->{signal_cb}{$signal} }, $cb;	527	push @{ $self->{signal_cb}{$signal} }, $cb;
431	}	528	}
432		529
		530	sub _emit {
		531	my ($self, $signal, @args) = @_;
		532
		533	List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
		534	}
		535
433	sub emit {	536	sub emit {
434	my ($self, $signal, @args) = @_;	537	my ($self, $signal, @args) = @_;
435		538
436	List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}	539	$self->_emit ($signal, @args)
		540	|| $self->$signal (@args);
		541	}
		542
		543	sub visibility_change {
		544	#my ($self, $visible) = @_;
437	}	545	}
438		546
439	sub DESTROY {	547	sub DESTROY {
440	my ($self) = @_;	548	my ($self) = @_;
441		549
…		…
456	my $class = shift;	564	my $class = shift;
457		565
458	# range [value, low, high, page]	566	# range [value, low, high, page]
459		567
460	$class->SUPER::new (	568	$class->SUPER::new (
461	bg => [0, 0, 0, 0.2],	569	#bg => [0, 0, 0, 0.2],
462	active_bg => [1, 1, 1, 0.5],	570	#active_bg => [1, 1, 1, 0.5],
463	@_	571	@_
464	)	572	)
465	}	573	}
466		574
467	sub _draw {	575	sub _draw {
468	my ($self) = @_;	576	my ($self) = @_;
469		577
		578	my $color = $FOCUS == $self && $self->{active_bg}
		579	? $self->{active_bg}
		580	: $self->{bg};
		581
		582	if ($color && (@$color < 4 || $color->[3])) {
470	my ($w, $h) = @$self{qw(w h)};	583	my ($w, $h) = @$self{qw(w h)};
471		584
472	glEnable GL_BLEND;	585	glEnable GL_BLEND;
473	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	586	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
474	glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} };	587	glColor @$color;
475		588
476	glBegin GL_QUADS;	589	glBegin GL_QUADS;
477	glVertex 0 , 0;	590	glVertex 0 , 0;
478	glVertex 0 , $h;	591	glVertex 0 , $h;
479	glVertex $w, $h;	592	glVertex $w, $h;
480	glVertex $w, 0;	593	glVertex $w, 0;
481	glEnd;	594	glEnd;
482		595
483	glDisable GL_BLEND;	596	glDisable GL_BLEND;
		597	}
484	}	598	}
485		599
486	#############################################################################	600	#############################################################################
487		601
488	package CFClient::UI::Empty;	602	package CFClient::UI::Empty;
…		…
548	delete $child->{parent};	662	delete $child->{parent};
549	$child->hide;	663	$child->hide;
550		664
551	$self->{children} = [ grep $_ != $child, @{ $self->{children} } ];	665	$self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
552		666
553	$self->check_size;	667	$self->check_size (1);
554	$self->update;	668	$self->update;
555	}	669	}
556		670
557	sub clear {	671	sub clear {
558	my ($self) = @_;	672	my ($self) = @_;
…		…
672	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {	786	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
673	glClearColor 0, 0, 0, 0;	787	glClearColor 0, 0, 0, 0;
674	glClear GL_COLOR_BUFFER_BIT;	788	glClear GL_COLOR_BUFFER_BIT;
675		789
676	$self->_render;	790	$self->_render;
677	# glColorMask 1, 1, 1, 0;
678	# glEnable GL_BLEND;
679	# glBlendFunc GL_SRC_ALPHA, GL_ZERO;
680	# glRasterPos 0, 0;
681	# glCopyPixels 0, 0, $self->{w}, $self->{h};
682	# glDisable GL_BLEND;
683	# glColorMask 1, 1, 1, 1;
684	};	791	};
685	}	792	}
686		793
687	sub _draw {	794	sub _draw {
688	my ($self) = @_;	795	my ($self) = @_;
…		…
692	my $tex = $self->{texture}	799	my $tex = $self->{texture}
693	or return;	800	or return;
694		801
695	glEnable GL_TEXTURE_2D;	802	glEnable GL_TEXTURE_2D;
696	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	803	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
697	glColor 0, 0, 0, 1;	804	glColor 1, 1, 1, 1;
698		805
699	$tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);	806	$tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
700		807
701	glDisable GL_TEXTURE_2D;	808	glDisable GL_TEXTURE_2D;
702	}	809	}
…		…
705		812
706	package CFClient::UI::ViewPort;	813	package CFClient::UI::ViewPort;
707		814
708	our @ISA = CFClient::UI::Window::;	815	our @ISA = CFClient::UI::Window::;
709		816
		817	sub new {
		818	my $class = shift;
		819
		820	$class->SUPER::new (
		821	scroll_x => 0,
		822	scroll_y => 1,
		823	@_,
		824	)
		825	}
		826
710	sub size_request {	827	sub size_request {
711	my ($self) = @_;	828	my ($self) = @_;
712		829
713	@$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};	830	@$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};
714	$self->child->configure (0, 0, @$self{qw(child_w child_h)});
715		831
716	@$self{qw(child_w child_h)}	832	@$self{qw(child_w child_h)}
717	}	833	}
718		834
719	sub size_allocate {	835	sub size_allocate {
720	my ($self, $w, $h) = @_;	836	my ($self, $w, $h) = @_;
721		837
		838	$w = $self->{child_w} if $self->{scroll_x} && $self->{child_w};
		839	$h = $self->{child_h} if $self->{scroll_y} && $self->{child_h};
		840
		841	$self->child->configure (0, 0, $w, $h);
722	$self->update;	842	$self->update;
723	}	843	}
724		844
725	sub set_offset {	845	sub set_offset {
726	my ($self, $x, $y) = @_;	846	my ($self, $x, $y) = @_;
…		…
777	my $class = shift;	897	my $class = shift;
778		898
779	my $self;	899	my $self;
780		900
781	my $slider = new CFClient::UI::Slider	901	my $slider = new CFClient::UI::Slider
782	vertical => 1,	902	vertical => 1,
783	range => [0, 0, 1, 0.01], # HACK fix	903	range => [0, 0, 1, 0.01], # HACK fix
784	connect_changed => sub {	904	on_changed => sub {
785	$self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h}));	905	$self->{vp}->set_offset (0, $_[1]);
786	},	906	},
787	;	907	;
788		908
789	$self = $class->SUPER::new (	909	$self = $class->SUPER::new (
790	vp => (new CFClient::UI::ViewPort),	910	vp => (new CFClient::UI::ViewPort expand => 1),
791	slider => $slider,	911	slider => $slider,
792	@_,	912	@_,
793	);	913	);
794		914
795	$self->{vp}->add ($self->{scrolled});	915	$self->{vp}->add ($self->{scrolled});
796	$self->add ($self->{vp});	916	$self->add ($self->{vp});
797	$self->add ($self->{slider});	917	$self->add ($self->{slider});
798		918
799	$self	919	$self
		920	}
		921
		922	sub update {
		923	my ($self) = @_;
		924
		925	$self->SUPER::update;
		926
		927	# todo: overwrite size_allocate of child
		928	my $child = $self->{vp}->child;
		929	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
		930	}
		931
		932	sub size_allocate {
		933	my ($self, $w, $h) = @_;
		934
		935	$self->SUPER::size_allocate ($w, $h);
		936
		937	my $child = $self->{vp}->child;
		938	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
800	}	939	}
801		940
802	#TODO# update range on size_allocate depending on child	941	#TODO# update range on size_allocate depending on child
803	# update viewport offset on scroll	942	# update viewport offset on scroll
804		943
…		…
858	my $class = shift;	997	my $class = shift;
859		998
860	# TODO: user_x, user_y, overwrite moveto?	999	# TODO: user_x, user_y, overwrite moveto?
861		1000
862	my $self = $class->SUPER::new (	1001	my $self = $class->SUPER::new (
863	bg => [1, 1, 1, 1],	1002	bg => [1, 1, 1, 1],
864	border_bg => [1, 1, 1, 1],	1003	border_bg => [1, 1, 1, 1],
865	border => 0.6,	1004	border => 0.6,
866	toplevel => 1,	1005	is_toplevel => 1,
867	can_events => 1,	1006	can_events => 1,
868	@_	1007	@_
869	);	1008	);
870		1009
871	$self->{title} &&= new CFClient::UI::Label	1010	$self->{title} &&= new CFClient::UI::Label
872	align => 0,	1011	align => 0,
…		…
896	my ($self, $w, $h) = @_;	1035	my ($self, $w, $h) = @_;
897		1036
898	$h -= List::Util::max 0, $self->border * 2;	1037	$h -= List::Util::max 0, $self->border * 2;
899	$w -= List::Util::max 0, $self->border * 2;	1038	$w -= List::Util::max 0, $self->border * 2;
900		1039
901	$self->{title}->configure ($self->border, $self->border - $::FONTSIZE * 2, $w, $::FONTSIZE * 2)	1040	$self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
902	if $self->{title};	1041	if $self->{title};
903		1042
904	$self->child->configure ($self->border, $self->border, $w, $h);	1043	$self->child->configure ($self->border, $self->border, $w, $h);
905	}	1044	}
906		1045
…		…
925	my ($ev, $x, $y) = @_;	1064	my ($ev, $x, $y) = @_;
926		1065
927	my $dx = $ev->{x} - $ox;	1066	my $dx = $ev->{x} - $ox;
928	my $dy = $ev->{y} - $oy;	1067	my $dy = $ev->{y} - $oy;
929		1068
		1069	$self->{user_x} = $wx + $dx * $mx;
		1070	$self->{user_y} = $wy + $dy * $my;
930	$self->{user_w} = $bw + $dx * ($mx ? -1 : 1);	1071	$self->{user_w} = $bw + $dx * ($mx ? -1 : 1);
931	$self->{user_h} = $bh + $dy * ($my ? -1 : 1);	1072	$self->{user_h} = $bh + $dy * ($my ? -1 : 1);
932	$self->move ($wx + $dx * $mx, $wy + $dy * $my);	1073	$self->move ($self->{user_x}, $self->{user_y});
933	$self->check_size;	1074	$self->check_size;
934	};	1075	};
935		1076
936	} elsif ($lr ^ $td) {	1077	} elsif ($lr ^ $td) {
937	my ($ox, $oy) = ($ev->{x}, $ev->{y});	1078	my ($ox, $oy) = ($ev->{x}, $ev->{y});
…		…
940	$self->{motion} = sub {	1081	$self->{motion} = sub {
941	my ($ev, $x, $y) = @_;	1082	my ($ev, $x, $y) = @_;
942		1083
943	($x, $y) = ($ev->{x}, $ev->{y});	1084	($x, $y) = ($ev->{x}, $ev->{y});
944		1085
945	$self->move ($bx + $x - $ox, $by + $y - $oy);	1086	$self->{user_x} = $bx + $x - $ox;
		1087	$self->{user_y} = $by + $y - $oy;
		1088	$self->move ($self->{user_x}, $self->{user_y});
946	$self->update;	1089	$self->update;
947	};	1090	};
948	}	1091	}
949	}	1092	}
950		1093
…		…
1012	sub new {	1155	sub new {
1013	my $class = shift;	1156	my $class = shift;
1014		1157
1015	$class->SUPER::new (	1158	$class->SUPER::new (
1016	col_expand => [],	1159	col_expand => [],
1017	@_	1160	@_,
1018	)	1161	)
		1162	}
		1163
		1164	sub children {
		1165	grep $_, map @$_, grep $_, @{ $_[0]{children} }
1019	}	1166	}
1020		1167
1021	sub add {	1168	sub add {
1022	my ($self, $x, $y, $child) = @_;	1169	my ($self, $x, $y, $child) = @_;
1023		1170
1024	$child->set_parent ($self);	1171	$child->set_parent ($self);
1025	$self->{children}[$y][$x] = $child;	1172	$self->{children}[$y][$x] = $child;
1026		1173
1027	$child->check_size;	1174	$self->check_size (1);
1028	}	1175	}
1029		1176
1030	sub children {
1031	grep $_, map @$_, grep $_, @{ $_[0]{children} }
1032	}
1033
1034	# TODO: move to container class maybe? send childs a signal on removal?	1177	# TODO: move to container class maybe? send children a signal on removal?
1035	sub clear {	1178	sub clear {
1036	my ($self) = @_;	1179	my ($self) = @_;
1037		1180
1038	my @children = $self->children;	1181	my @children = $self->children;
1039	delete $self->{children};	1182	delete $self->{children};
…		…
1041	for (@children) {	1184	for (@children) {
1042	delete $_->{parent};	1185	delete $_->{parent};
1043	$_->hide;	1186	$_->hide;
1044	}	1187	}
1045		1188
		1189	$self->check_size (1);
1046	$self->update;	1190	$self->update;
1047	}	1191	}
1048		1192
1049	sub get_wh {	1193	sub get_wh {
1050	my ($self) = @_;	1194	my ($self) = @_;
…		…
1082	sub size_allocate {	1226	sub size_allocate {
1083	my ($self, $w, $h) = @_;	1227	my ($self, $w, $h) = @_;
1084		1228
1085	my ($ws, $hs) = $self->get_wh;	1229	my ($ws, $hs) = $self->get_wh;
1086		1230
1087	my $req_w = sum @$ws;	1231	my $req_w = (sum @$ws) || 1;
1088	my $req_h = sum @$hs;	1232	my $req_h = (sum @$hs) || 1;
1089		1233
1090	# TODO: nicer code && do row_expand	1234	# TODO: nicer code && do row_expand
1091	my @col_expand = @{$self->{col_expand}};	1235	my @col_expand = @{$self->{col_expand}};
1092	@col_expand = (1) x @$ws unless @col_expand;	1236	@col_expand = (1) x @$ws unless @col_expand;
1093	my $col_expand = (sum @col_expand) || 1;	1237	my $col_expand = (sum @col_expand) || 1;
…		…
1267		1411
1268	#############################################################################	1412	#############################################################################
1269		1413
1270	package CFClient::UI::Label;	1414	package CFClient::UI::Label;
1271		1415
1272	our @ISA = CFClient::UI::Base::;	1416	our @ISA = CFClient::UI::DrawBG::;
1273		1417
1274	use CFClient::OpenGL;	1418	use CFClient::OpenGL;
1275		1419
1276	sub new {	1420	sub new {
1277	my ($class, %arg) = @_;	1421	my ($class, %arg) = @_;
1278		1422
1279	my $self = $class->SUPER::new (	1423	my $self = $class->SUPER::new (
1280	fg => [1, 1, 1],	1424	fg => [1, 1, 1],
		1425	#bg => none
		1426	#active_bg => none
1281	#font => default_font	1427	#font => default_font
1282	#text => initial text	1428	#text => initial text
1283	#markup => initial narkup	1429	#markup => initial narkup
		1430	#max_w => maximum pixel width
		1431	ellipsise => 3, # end
1284	layout => (new CFClient::Layout),	1432	layout => (new CFClient::Layout),
1285	fontsize => 1,	1433	fontsize => 1,
1286	align => -1,	1434	align => -1,
1287	valign => -1,	1435	valign => -1,
1288	padding => 2,	1436	padding => 2,
…		…
1303	}	1451	}
1304		1452
1305	$self	1453	$self
1306	}	1454	}
1307		1455
1308	sub escape {	1456	sub escape($) {
1309	local $_ = $_[1];	1457	local $_ = $_[0];
1310		1458
1311	s/&/&amp;/g;	1459	s/&/&amp;/g;
1312	s/>/&gt;/g;	1460	s/>/&gt;/g;
1313	s/</&lt;/g;	1461	s/</&lt;/g;
1314		1462
1315	$_[1]	1463	$_
1316	}	1464	}
1317		1465
1318	sub update {	1466	sub update {
1319	my ($self) = @_;	1467	my ($self) = @_;
1320		1468
…		…
1353	sub size_request {	1501	sub size_request {
1354	my ($self) = @_;	1502	my ($self) = @_;
1355		1503
1356	$self->{layout}->set_font ($self->{font}) if $self->{font};	1504	$self->{layout}->set_font ($self->{font}) if $self->{font};
1357	$self->{layout}->set_width ($self->{max_w} || -1);	1505	$self->{layout}->set_width ($self->{max_w} || -1);
		1506	$self->{layout}->set_ellipsise ($self->{ellipsise});
		1507	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1358	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	1508	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1359		1509
1360	my ($w, $h) = $self->{layout}->size;	1510	my ($w, $h) = $self->{layout}->size;
1361		1511
1362	if (exists $self->{template}) {	1512	if (exists $self->{template}) {
…		…
1392	}	1542	}
1393		1543
1394	sub _draw {	1544	sub _draw {
1395	my ($self) = @_;	1545	my ($self) = @_;
1396		1546
		1547	$self->SUPER::_draw; # draw background, if applicable
		1548
1397	my $tex = $self->{texture} ||= do {	1549	my $tex = $self->{texture} ||= do {
1398	$self->{layout}->set_foreground (@{$self->{fg}});	1550	$self->{layout}->set_foreground (@{$self->{fg}});
1399	$self->{layout}->set_font ($self->{font}) if $self->{font};	1551	$self->{layout}->set_font ($self->{font}) if $self->{font};
1400	$self->{layout}->set_width ($self->{w});	1552	$self->{layout}->set_width ($self->{w});
		1553	$self->{layout}->set_ellipsise ($self->{ellipsise});
		1554	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1401	$self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE);	1555	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1402		1556
1403	my $tex = new_from_layout CFClient::Texture $self->{layout};	1557	my $tex = new_from_layout CFClient::Texture $self->{layout};
1404		1558
1405	$self->{ox} = int $self->{align} < 0 ? $self->{padding}	1559	$self->{ox} = int ($self->{align} < 0 ? $self->{padding}
1406	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}	1560	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1407	: ($self->{w} - $tex->{w}) * 0.5;	1561	: ($self->{w} - $tex->{w}) * 0.5);
1408		1562
1409	$self->{oy} = int $self->{valign} < 0 ? $self->{padding}	1563	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding}
1410	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}	1564	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1411	: ($self->{h} - $tex->{h}) * 0.5;	1565	: ($self->{h} - $tex->{h}) * 0.5);
1412		1566
1413	$tex	1567	$tex
1414	};	1568	};
1415		1569
1416	glEnable GL_TEXTURE_2D;	1570	glEnable GL_TEXTURE_2D;
…		…
1444	active_fg => [0, 0, 0],	1598	active_fg => [0, 0, 0],
1445	can_hover => 1,	1599	can_hover => 1,
1446	can_focus => 1,	1600	can_focus => 1,
1447	valign => 0,	1601	valign => 0,
1448	can_events => 1,	1602	can_events => 1,
		1603	#text => ...
1449	@_	1604	@_
1450	)	1605	)
1451	}	1606	}
1452		1607
1453	sub _set_text {	1608	sub _set_text {
…		…
1463	$self->{text} = $text;	1618	$self->{text} = $text;
1464		1619
1465	$text =~ s/./*/g if $self->{hidden};	1620	$text =~ s/./*/g if $self->{hidden};
1466	$self->{layout}->set_text ("$text ");	1621	$self->{layout}->set_text ("$text ");
1467		1622
1468	$self->emit (changed => $self->{text});	1623	$self->_emit (changed => $self->{text});
1469	}	1624	}
1470		1625
1471	sub set_text {	1626	sub set_text {
1472	my ($self, $text) = @_;	1627	my ($self, $text) = @_;
1473		1628
1474	$self->{cursor} = length $text;	1629	$self->{cursor} = length $text;
1475	$self->_set_text ($text);	1630	$self->_set_text ($text);
		1631	$self->update;
1476	$self->check_size;	1632	$self->check_size;
1477	$self->update;
1478	}	1633	}
1479		1634
1480	sub get_text {	1635	sub get_text {
1481	$_[0]{text}	1636	$_[0]{text}
1482	}	1637	}
…		…
1485	my ($self) = @_;	1640	my ($self) = @_;
1486		1641
1487	my ($w, $h) = $self->SUPER::size_request;	1642	my ($w, $h) = $self->SUPER::size_request;
1488		1643
1489	($w + 1, $h) # add 1 for cursor	1644	($w + 1, $h) # add 1 for cursor
1490	}
1491
1492	sub size_allocate {
1493	my ($self, $w, $h) = @_;
1494
1495	$self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1496	}	1645	}
1497		1646
1498	sub key_down {	1647	sub key_down {
1499	my ($self, $ev) = @_;	1648	my ($self, $ev) = @_;
1500		1649
…		…
1515	} elsif ($sym == CFClient::SDLK_HOME) {	1664	} elsif ($sym == CFClient::SDLK_HOME) {
1516	$self->{cursor} = 0;	1665	$self->{cursor} = 0;
1517	} elsif ($sym == CFClient::SDLK_END) {	1666	} elsif ($sym == CFClient::SDLK_END) {
1518	$self->{cursor} = length $text;	1667	$self->{cursor} = length $text;
1519	} elsif ($uni == 27) {	1668	} elsif ($uni == 27) {
1520	$self->emit ('escape');	1669	$self->_emit ('escape');
1521	} elsif ($uni) {	1670	} elsif ($uni) {
1522	substr $text, $self->{cursor}++, 0, chr $uni;	1671	substr $text, $self->{cursor}++, 0, chr $uni;
1523	}	1672	}
1524		1673
1525	$self->_set_text ($text);	1674	$self->_set_text ($text);
1526	$self->update;	1675	$self->update;
		1676	$self->check_size;
1527	}	1677	}
1528		1678
1529	sub focus_in {	1679	sub focus_in {
1530	my ($self) = @_;	1680	my ($self) = @_;
1531		1681
…		…
1611	if ($sym == 13) {	1761	if ($sym == 13) {
1612	unshift @{$self->{history}},	1762	unshift @{$self->{history}},
1613	my $txt = $self->get_text;	1763	my $txt = $self->get_text;
1614	$self->{history_pointer} = -1;	1764	$self->{history_pointer} = -1;
1615	$self->{history_saveback} = '';	1765	$self->{history_saveback} = '';
1616	$self->emit (activate => $txt);	1766	$self->_emit (activate => $txt);
1617	$self->update;	1767	$self->update;
1618		1768
1619	} elsif ($sym == CFClient::SDLK_UP) {	1769	} elsif ($sym == CFClient::SDLK_UP) {
1620	if ($self->{history_pointer} < 0) {	1770	if ($self->{history_pointer} < 0) {
1621	$self->{history_saveback} = $self->get_text;	1771	$self->{history_saveback} = $self->get_text;
…		…
1660	my $class = shift;	1810	my $class = shift;
1661		1811
1662	$class->SUPER::new (	1812	$class->SUPER::new (
1663	padding => 4,	1813	padding => 4,
1664	fg => [1, 1, 1],	1814	fg => [1, 1, 1],
1665	bg => [1, 1, 1, 0.2],
1666	active_fg => [0, 0, 1],	1815	active_fg => [0, 0, 1],
1667	can_hover => 1,	1816	can_hover => 1,
1668	align => 0,	1817	align => 0,
1669	valign => 0,	1818	valign => 0,
1670	can_events => 1,	1819	can_events => 1,
1671	@_	1820	@_
1672	)	1821	)
1673	}	1822	}
1674		1823
		1824	sub activate { }
		1825
1675	sub button_up {	1826	sub button_up {
1676	my ($self, $ev, $x, $y) = @_;	1827	my ($self, $ev, $x, $y) = @_;
1677		1828
		1829	$self->emit ("activate")
1678	if ($x >= 0 && $x < $self->{w}	1830	if $x >= 0 && $x < $self->{w}
1679	&& $y >= 0 && $y < $self->{h}) {	1831	&& $y >= 0 && $y < $self->{h};
1680	$self->emit ("activate");
1681	}
1682	}	1832	}
1683		1833
1684	sub _draw {	1834	sub _draw {
1685	my ($self) = @_;	1835	my ($self) = @_;
1686		1836
…		…
1718		1868
1719	$class->SUPER::new (	1869	$class->SUPER::new (
1720	padding => 2,	1870	padding => 2,
1721	fg => [1, 1, 1],	1871	fg => [1, 1, 1],
1722	active_fg => [1, 1, 0],	1872	active_fg => [1, 1, 0],
		1873	bg => [0, 0, 0, 0.2],
		1874	active_bg => [1, 1, 1, 0.5],
1723	state => 0,	1875	state => 0,
1724	can_hover => 1,	1876	can_hover => 1,
1725	@_	1877	@_
1726	)	1878	)
1727	}	1879	}
…		…
1736	my ($self, $ev, $x, $y) = @_;	1888	my ($self, $ev, $x, $y) = @_;
1737		1889
1738	if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}	1890	if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}
1739	&& $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {	1891	&& $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {
1740	$self->{state} = !$self->{state};	1892	$self->{state} = !$self->{state};
1741	$self->emit (changed => $self->{state});	1893	$self->_emit (changed => $self->{state});
1742	}	1894	}
1743	}	1895	}
1744		1896
1745	sub _draw {	1897	sub _draw {
1746	my ($self) = @_;	1898	my ($self) = @_;
…		…
2011	qw(s1_slider.png s1_slider_bg.png);	2163	qw(s1_slider.png s1_slider_bg.png);
2012		2164
2013	sub new {	2165	sub new {
2014	my $class = shift;	2166	my $class = shift;
2015		2167
2016	# range [value, low, high, page]	2168	# range [value, low, high, page, unit]
2017		2169
2018	# TODO: 0-width page	2170	# TODO: 0-width page
2019	# TODO: req_w/h are wrong with vertical	2171	# TODO: req_w/h are wrong with vertical
2020	# TODO: calculations are off	2172	# TODO: calculations are off
2021	my $self = $class->SUPER::new (	2173	my $self = $class->SUPER::new (
2022	fg => [1, 1, 1],	2174	fg => [1, 1, 1],
2023	active_fg => [0, 0, 0],	2175	active_fg => [0, 0, 0],
		2176	bg => [0, 0, 0, 0.2],
		2177	active_bg => [1, 1, 1, 0.5],
2024	range => [0, 0, 100, 10],	2178	range => [0, 0, 100, 10, 0],
2025	req_w => $::WIDTH / 80,	2179	req_w => $::WIDTH / 80,
2026	req_h => $::WIDTH / 80,	2180	req_h => $::WIDTH / 80,
2027	vertical => 0,	2181	vertical => 0,
2028	can_hover => 1,	2182	can_hover => 1,
2029	inner_pad => 5,	2183	inner_pad => 0.02,
2030	@_	2184	@_
2031	);	2185	);
2032		2186
		2187	$self->set_value ($self->{range}[0]);
		2188	$self->update;
		2189
2033	$self	2190	$self
		2191	}
		2192
		2193	sub set_range {
		2194	my ($self, $range) = @_;
		2195
		2196	($range, $self->{range}) = ($self->{range}, $range);
		2197
		2198	$self->update
		2199	if "@$range" ne "@{$self->{range}}";
		2200	}
		2201
		2202	sub set_value {
		2203	my ($self, $value) = @_;
		2204
		2205	my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
		2206
		2207	$hi = $lo + 1 if $hi <= $lo;
		2208
		2209	$page = $hi - $lo if $page > $hi - $lo;
		2210
		2211	$value = $lo if $value < $lo;
		2212	$value = $hi - $page if $value > $hi - $page;
		2213
		2214	$value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
		2215	if $unit;
		2216
		2217	@{$self->{range}} = ($value, $lo, $hi, $page, $unit);
		2218
		2219	if ($value != $old_value) {
		2220	$self->_emit (changed => $value);
		2221	$self->update;
		2222	}
2034	}	2223	}
2035		2224
2036	sub size_request {	2225	sub size_request {
2037	my ($self) = @_;	2226	my ($self) = @_;
2038		2227
…		…
2044		2233
2045	sub button_down {	2234	sub button_down {
2046	my ($self, $ev, $x, $y) = @_;	2235	my ($self, $ev, $x, $y) = @_;
2047		2236
2048	$self->SUPER::button_down ($ev, $x, $y);	2237	$self->SUPER::button_down ($ev, $x, $y);
		2238
		2239	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
		2240
2049	$self->mouse_motion ($ev, $x, $y);	2241	$self->mouse_motion ($ev, $x, $y);
2050	}	2242	}
2051		2243
2052	sub mouse_motion {	2244	sub mouse_motion {
2053	my ($self, $ev, $x, $y) = @_;	2245	my ($self, $ev, $x, $y) = @_;
2054		2246
2055	if ($GRAB == $self) {	2247	if ($GRAB == $self) {
		2248	my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
		2249
		2250	my (undef, $lo, $hi, $page) = @{$self->{range}};
		2251
		2252	$x = ($x - $self->{click}[1]) / ($w * $self->{scale});
		2253
		2254	$self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
		2255	}
		2256	}
		2257
		2258	sub update {
		2259	my ($self) = @_;
		2260
		2261	$CFClient::UI::ROOT->on_post_alloc ($self => sub {
		2262	$self->set_value ($self->{range}[0]);
		2263
2056	my ($value, $lo, $hi, $page) = @{$self->{range}};	2264	my ($value, $lo, $hi, $page) = @{$self->{range}};
		2265	my $range = ($hi - $page - $lo) || 1e-100;
2057		2266
2058	my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});	2267	my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
2059		2268
2060	my $inner_pad_px = $self->_calc_inner_pad_px ($w);	2269	$self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
2061	my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right	2270	$self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
2062		2271
2063	$x -= $inner_pad_px; # substract the padding	2272	$value = ($value - $lo) / $range;
2064	$x = $x * ($hi - $lo) / $inner_w + $lo;	2273	$value = $value * $self->{scale} + $self->{offset};
2065	$x = $lo if $x < $lo;
2066	$x = $hi - $page if $x > $hi - $page;
2067	$self->{range}[0] = $x;
2068		2274
2069	$self->emit (changed => $x);	2275	$self->{knob_x} = $value - $knob_w * 0.5;
2070	$self->update;	2276	$self->{knob_w} = $knob_w;
2071	}	2277	});
2072	}
2073		2278
2074	# the inner_* stuff is for generating a padding for the slider handle,	2279	$self->SUPER::update;
2075	# so that the handle doesn't leave the texture. This calculation isn't 100%
2076	# correct propably, but it does the job for now
2077	sub _calc_inner_pad_px {
2078	my ($self, $w) = @_;
2079	($w / 100) * $self->{inner_pad} # % to pixels
2080	}	2280	}
2081		2281
2082	sub _draw {	2282	sub _draw {
2083	my ($self) = @_;	2283	my ($self) = @_;
2084		2284
2085	$self->SUPER::_draw ();	2285	$self->SUPER::_draw ();
2086		2286
2087	my ($w, $h) = @$self{qw(w h)};	2287	glScale $self->{w}, $self->{h};
2088		2288
2089	if ($self->{vertical}) {	2289	if ($self->{vertical}) {
2090	# draw a vertical slider like a rotated horizontal slider	2290	# draw a vertical slider like a rotated horizontal slider
2091		2291
		2292	glTranslate 1, 0, 0;
2092	glRotate 90, 0, 0, 1;	2293	glRotate 90, 0, 0, 1;
2093	glTranslate 0, -$self->{w}, 0;
2094
2095	($w, $h) = ($h, $w);
2096	}	2294	}
2097		2295
2098	my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};	2296	my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
2099	my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};	2297	my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
2100		2298
2101	my ($value, $lo, $hi, $page) = @{$self->{range}};
2102
2103	$hi = $value + 1 if $lo == $hi;
2104
2105	my $inner_pad_px = $self->_calc_inner_pad_px ($w);
2106	my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
2107
2108	$page = int $page * $inner_w / ($hi - $lo);
2109	$value = int +($value - $lo) * $inner_w / ($hi - $lo);
2110
2111	$w -= $page;
2112	$page &= ~1;
2113	glTranslate $page * 0.5, 0, 0;
2114	$page ||= 2;
2115
2116	my $knob_a = $inner_pad_px + ($value - $page * 0.5);
2117	my $knob_b = $inner_pad_px + ($value + $page * 0.5);
2118
2119	glEnable GL_TEXTURE_2D;	2299	glEnable GL_TEXTURE_2D;
2120	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2300	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2121		2301
2122	# draw background	2302	# draw background
2123	$tex[1]->draw_quad_alpha (0, 0, $w, $h);	2303	$tex[1]->draw_quad_alpha (0, 0, 1, 1);
2124		2304
2125	# draw handle	2305	# draw handle
2126	$tex[0]->draw_quad_alpha ($knob_a, 0, $knob_b - $knob_a, $h);	2306	$tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1);
2127		2307
2128	glDisable GL_TEXTURE_2D;	2308	glDisable GL_TEXTURE_2D;
2129	}	2309	}
		2310
		2311	#############################################################################
		2312
		2313	package CFClient::UI::ValSlider;
		2314
		2315	our @ISA = CFClient::UI::HBox::;
		2316
		2317	sub new {
		2318	my ($class, %arg) = @_;
		2319
		2320	my $range = delete $arg{range};
		2321
		2322	my $self = $class->SUPER::new (
		2323	slider => (new CFClient::UI::Slider expand => 1, range => $range),
		2324	entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),
		2325	to_value => sub { shift },
		2326	from_value => sub { shift },
		2327	%arg,
		2328	);
		2329
		2330	$self->{slider}->connect (changed => sub {
		2331	my ($self, $value) = @_;
		2332	$self->{parent}{entry}->set_text ($self->{parent}{to_value}->($value));
		2333	$self->{parent}->emit (changed => $value);
		2334	});
		2335
		2336	# $self->{entry}->connect (changed => sub {
		2337	# my ($self, $value) = @_;
		2338	# $self->{parent}{slider}->set_value ($self->{parent}{from_value}->($value));
		2339	# $self->{parent}->emit (changed => $value);
		2340	# });
		2341
		2342	$self->add ($self->{slider}, $self->{entry});
		2343
		2344	$self->{slider}->emit (changed => $self->{slider}{range}[0]);
		2345
		2346	$self
		2347	}
		2348
		2349	sub set_range { shift->{slider}->set_range (@_) }
		2350	sub set_value { shift->{slider}->set_value (@_) }
2130		2351
2131	#############################################################################	2352	#############################################################################
2132		2353
2133	package CFClient::UI::TextView;	2354	package CFClient::UI::TextView;
2134		2355
…		…
2164		2385
2165	$self->{fontsize} = $fontsize;	2386	$self->{fontsize} = $fontsize;
2166	$self->reflow;	2387	$self->reflow;
2167	}	2388	}
2168		2389
2169	sub text_height {
2170	my ($self, $text) = @_;
2171
2172	my $layout = $self->{layout};
2173
2174	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
2175	$layout->set_width ($self->{children}[0]{w});
2176	$layout->set_markup ($text);
2177
2178	($layout->size)[1]
2179	}
2180
2181	sub reflow {
2182	my ($self) = @_;
2183
2184	$self->{need_reflow}++;
2185	$self->update;
2186	}
2187
2188	sub size_allocate {	2390	sub size_allocate {
2189	my ($self, $w, $h) = @_;	2391	my ($self, $w, $h) = @_;
2190		2392
2191	$self->SUPER::size_allocate ($w, $h);	2393	$self->SUPER::size_allocate ($w, $h);
2192		2394
…		…
2195	$self->{layout}->set_width ($self->{children}[0]{w});	2397	$self->{layout}->set_width ($self->{children}[0]{w});
2196		2398
2197	$self->reflow;	2399	$self->reflow;
2198	}	2400	}
2199		2401
		2402	sub text_size {
		2403	my ($self, $text, $indent) = @_;
		2404
		2405	my $layout = $self->{layout};
		2406
		2407	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
		2408	$layout->set_width ($self->{children}[0]{w} - $indent);
		2409	$layout->set_markup ($text);
		2410
		2411	$layout->size
		2412	}
		2413
		2414	sub reflow {
		2415	my ($self) = @_;
		2416
		2417	$self->{need_reflow}++;
		2418	$self->update;
		2419	}
		2420
		2421	sub set_offset {
		2422	my ($self, $offset) = @_;
		2423
		2424	# todo: base offset on lines or so, not on pixels
		2425	$self->{children}[1]->set_value ($offset);
		2426	}
		2427
		2428	sub clear {
		2429	my ($self) = @_;
		2430
		2431	$self->{par} = [];
		2432	$self->{height} = 0;
		2433	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
		2434	}
		2435
2200	sub add_paragraph {	2436	sub add_paragraph {
2201	my ($self, $color, $text) = @_;	2437	my ($self, $color, $text, $indent) = @_;
2202		2438
2203	#TODO: intelligently "reformat" paragraph	2439	for my $line (split /\n/, $text) {
2204		2440	my ($w, $h) = $self->text_size ($line);
2205	my $height = $self->text_height ($text);
2206
2207	$self->{height} += $height;	2441	$self->{height} += $h;
		2442	push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];
		2443	}
2208		2444
2209	push @{$self->{par}}, [$height, $color, $text];
2210
2211	$self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}];	2445	$self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]);
2212	$self->{children}[1]->update;
2213	}	2446	}
2214		2447
2215	sub update {	2448	sub update {
2216	my ($self) = @_;	2449	my ($self) = @_;
2217		2450
…		…
2220	return unless $self->{h} > 0;	2453	return unless $self->{h} > 0;
2221		2454
2222	delete $self->{texture};	2455	delete $self->{texture};
2223		2456
2224	$ROOT->on_post_alloc ($self, sub {	2457	$ROOT->on_post_alloc ($self, sub {
		2458	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
		2459
2225	if (delete $self->{need_reflow}) {	2460	if (delete $self->{need_reflow}) {
2226	my $height = 0;	2461	my $height = 0;
2227		2462
2228	$height += $_->[0] = $self->text_height ($_->[2])	2463	my $layout = $self->{layout};
		2464
		2465	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
		2466
2229	for @{$self->{par}};	2467	for (@{$self->{par}}) {
		2468	if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
		2469	$layout->set_width ($W - $_->[3]);
		2470	$layout->set_markup ($_->[4]);
		2471	my ($w, $h) = $layout->size;
		2472	$_->[0] = $w + $_->[3];
		2473	$_->[1] = $h;
		2474	}
		2475
		2476	$height += $_->[1];
		2477	}
2230		2478
2231	$self->{height} = $height;	2479	$self->{height} = $height;
2232		2480
2233	$self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];	2481	$self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2234		2482
2235	delete $self->{texture};	2483	delete $self->{texture};
2236	}	2484	}
2237		2485
2238	$self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub {	2486	$self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2239	glClearColor 0, 0, 0, 0;	2487	glClearColor 0.5, 0.5, 0.5, 0;
2240	glClear GL_COLOR_BUFFER_BIT;	2488	glClear GL_COLOR_BUFFER_BIT;
2241		2489
2242	glEnable GL_TEXTURE_2D;
2243	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2244
2245	my $top = int $self->{children}[1]{range}[0];	2490	my $top = int $self->{children}[1]{range}[0];
2246		2491
2247	my $y0 = $top;	2492	my $y0 = $top;
2248	my $y1 = $top + $self->{h};	2493	my $y1 = $top + $H;
2249		2494
2250	my $y = 0;	2495	my $y = 0;
2251		2496
2252	my $layout = $self->{layout};	2497	my $layout = $self->{layout};
2253		2498
2254	$layout->set_font ($self->{font}) if $self->{font};	2499	$layout->set_font ($self->{font}) if $self->{font};
2255		2500
		2501	glEnable GL_BLEND;
		2502	#TODO# not correct in windows where rgba is forced off
		2503	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
		2504
2256	for my $par (@{$self->{par}}) {	2505	for my $par (@{$self->{par}}) {
2257	my $h = $par->[0];	2506	my $h = $par->[1];
2258		2507
2259	if ($y0 < $y + $h && $y < $y1) {	2508	if ($y0 < $y + $h && $y < $y1) {
2260	$layout->set_foreground (@{ $par->[1] });	2509	$layout->set_foreground (@{ $par->[2] });
		2510	$layout->set_width ($W - $par->[3]);
2261	$layout->set_markup ($par->[2]);	2511	$layout->set_markup ($par->[4]);
2262		2512
2263	my ($W, $H) = $layout->size;	2513	my ($w, $h, $data, $format, $internalformat) = $layout->render;
2264	CFClient::Texture->new_from_layout ($layout)->draw_quad_alpha_premultiplied (0, $y - $y0);	2514
		2515	glRasterPos $par->[3], $y - $y0;
		2516	glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2265	}	2517	}
2266		2518
2267	$y += $h;	2519	$y += $h;
2268	}	2520	}
2269		2521
2270	glDisable GL_TEXTURE_2D;	2522	glDisable GL_BLEND;
2271	};	2523	};
2272	});	2524	});
2273	}	2525	}
2274		2526
2275	sub _draw {	2527	sub _draw {
2276	my ($self) = @_;	2528	my ($self) = @_;
2277		2529
2278	glEnable GL_TEXTURE_2D;	2530	glEnable GL_TEXTURE_2D;
2279	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2531	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2280	glColor 1, 1, 1, 1;	2532	glColor 1, 1, 1, 1;
2281	$self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});	2533	$self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2282	glDisable GL_TEXTURE_2D;	2534	glDisable GL_TEXTURE_2D;
2283		2535
2284	$self->{children}[1]->draw;	2536	$self->{children}[1]->draw;
2285		2537
2286	}	2538	}
…		…
2335		2587
2336	sub new {	2588	sub new {
2337	my $class = shift;	2589	my $class = shift;
2338		2590
2339	my $self = $class->SUPER::new (	2591	my $self = $class->SUPER::new (
2340	state => 0,	2592	state => 0,
2341	connect_activate => \&toggle_flopper,	2593	on_activate => \&toggle_flopper,
2342	@_	2594	@_
2343	);	2595	);
2344		2596
2345	if ($self->{state}) {	2597	if ($self->{state}) {
2346	$self->{state} = 0;	2598	$self->{state} = 0;
…		…
2355		2607
2356	# TODO: use animation	2608	# TODO: use animation
2357	if ($self->{state} = !$self->{state}) {	2609	if ($self->{state} = !$self->{state}) {
2358	$CFClient::UI::ROOT->add ($self->{other});	2610	$CFClient::UI::ROOT->add ($self->{other});
2359	$self->{other}->move ($self->coord2global (0, $self->{h}));	2611	$self->{other}->move ($self->coord2global (0, $self->{h}));
2360	$self->emit ("open");	2612	$self->_emit ("open");
2361	} else {	2613	} else {
2362	$CFClient::UI::ROOT->remove ($self->{other});	2614	$CFClient::UI::ROOT->remove ($self->{other});
2363	$self->emit ("close");	2615	$self->_emit ("close");
2364	}	2616	}
2365		2617
2366	$self->emit (changed => $self->{state});	2618	$self->_emit (changed => $self->{state});
2367	}	2619	}
2368		2620
2369	#############################################################################	2621	#############################################################################
2370		2622
2371	package CFClient::UI::Tooltip;	2623	package CFClient::UI::Tooltip;
…		…
2385		2637
2386	sub set_tooltip_from {	2638	sub set_tooltip_from {
2387	my ($self, $widget) = @_;	2639	my ($self, $widget) = @_;
2388		2640
2389	$self->add (new CFClient::UI::Label	2641	$self->add (new CFClient::UI::Label
2390	markup => $widget->{tooltip},	2642	markup => $widget->{tooltip},
2391	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,	2643	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2392	fontsize => 0.8,	2644	fontsize => 0.8,
2393	fg => [0, 0, 0, 1],	2645	fg => [0, 0, 0, 1],
		2646	ellipsise => 0,
2394	font => ($widget->{tooltip_font} || $::FONT_PROP),	2647	font => ($widget->{tooltip_font} || $::FONT_PROP),
2395	);	2648	);
2396	}	2649	}
2397		2650
2398	sub size_request {	2651	sub size_request {
2399	my ($self) = @_;	2652	my ($self) = @_;
…		…
2445	use CFClient::OpenGL;	2698	use CFClient::OpenGL;
2446		2699
2447	sub new {	2700	sub new {
2448	my $class = shift;	2701	my $class = shift;
2449		2702
2450	$class->SUPER::new (	2703	my $self = $class->SUPER::new (
2451	aspect => 1,	2704	aspect => 1,
		2705	can_events => 0,
2452	@_,	2706	@_,
2453	)	2707	);
		2708
		2709	if ($self->{anim} && $self->{animspeed}) {
		2710	Scalar::Util::weaken (my $widget = $self);
		2711
		2712	$self->{timer} = Event->timer (
		2713	at => $self->{animspeed} * int $::NOW / $self->{animspeed},
		2714	hard => 1,
		2715	interval => $self->{animspeed},
		2716	cb => sub {
		2717	++$widget->{frame};
		2718	$widget->update;
		2719	},
		2720	);
		2721	}
		2722
		2723	$self
2454	}	2724	}
2455		2725
2456	sub size_request {	2726	sub size_request {
2457	(32, 8)	2727	(32, 8)
2458	}	2728	}
2459		2729
		2730	sub update {
		2731	my ($self) = @_;
		2732
		2733	return unless $self->{visible};
		2734
		2735	$self->SUPER::update;
		2736	}
		2737
2460	sub _draw {	2738	sub _draw {
2461	my ($self) = @_;	2739	my ($self) = @_;
2462		2740
2463	return unless $::CONN;#d# manage and cache textures differently	2741	return unless $::CONN;
		2742
		2743	my $face;
		2744
		2745	if ($self->{frame}) {
		2746	my $anim = $::CONN->{anim}[$self->{anim}];
		2747
		2748	$face = $anim->[ $self->{frame} % @$anim ]
		2749	if $anim && @$anim;
		2750	}
		2751
2464	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]];	2752	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2465		2753
2466	# TODO animation
2467	if ($tex) {	2754	if ($tex) {
2468	glEnable GL_TEXTURE_2D;	2755	glEnable GL_TEXTURE_2D;
2469	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2756	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2470	glColor 1, 1, 1, 1;	2757	glColor 1, 1, 1, 1;
2471	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});	2758	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2472	glDisable GL_TEXTURE_2D;	2759	glDisable GL_TEXTURE_2D;
2473	}	2760	}
2474	}	2761	}
2475		2762
		2763	sub DESTROY {
		2764	my ($self) = @_;
		2765
		2766	$self->{timer}->cancel
		2767	if $self->{timer};
		2768
		2769	$self->SUPER::DESTROY;
		2770	}
		2771
2476	#############################################################################	2772	#############################################################################
2477		2773
2478	package CFClient::UI::InventoryItem;	2774	package CFClient::UI::Inventory;
2479		2775
2480	our @ISA = CFClient::UI::HBox::;	2776	our @ISA = CFClient::UI::ScrolledWindow::;
2481		2777
2482	sub new {	2778	sub new {
2483	my $class = shift;	2779	my $class = shift;
2484		2780
2485	my %args = @_;
2486
2487	my $item = delete $args{item};
2488
2489	my $desc = $item->{nrof} < 2
2490	? $item->{name}
2491	: "$item->{nrof} $item->{name_pl}";
2492
2493
2494	my $self = $class->SUPER::new (	2781	my $self = $class->SUPER::new (
2495	can_hover => 1,	2782	scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2496	can_events => 1,
2497	tooltip => (CFClient::UI::Label->escape ($desc)
2498	. "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),
2499	connect_button_down => sub {
2500	my ($self, $ev, $x, $y) = @_;
2501
2502	# todo: maybe put examine on 1? but should just be a tooltip :(
2503	if ($ev->{button} == 1) {
2504	$::CONN->send ("move $::CONN->{player}{tag} $item->{tag} 0");
2505	} elsif ($ev->{button} == 2) {
2506	$::CONN->send ("apply $item->{tag}");
2507	} elsif ($ev->{button} == 3) {
2508	CFClient::UI::Menu->new (
2509	items => [
2510	["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2511	[
2512	$item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock",
2513	sub { $::CONN->send ("lock $item->{tag}") },
2514	],
2515	["mark", sub { $::CONN->send ("mark $item->{tag}") }],
2516	["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2517	["drop", sub { $::CONN->send ("move 0 $item->{tag} 0") }],
2518	],
2519	)->popup ($ev);
2520	}
2521
2522	1
2523	},
2524	%args
2525	);
2526
2527	$self->add (new CFClient::UI::Face
2528	can_events => 0,
2529	face => $item->{face},
2530	anim => $item->{anim},
2531	animspeed => $item->{animspeed},
2532	);
2533
2534	$self->add (new CFClient::UI::Label
2535	can_events => 0,
2536	text => $desc,
2537	);
2538
2539	$self
2540	}
2541
2542	#############################################################################
2543
2544	package CFClient::UI::Inventory;
2545
2546	our @ISA = CFClient::UI::ScrolledWindow::;
2547
2548	sub new {
2549	my $class = shift;
2550
2551	my $self = $class->SUPER::new (
2552	scrolled => (new CFClient::UI::VBox),
2553	@_,	2783	@_,
2554	);	2784	);
2555		2785
2556	$self	2786	$self
2557	}	2787	}
…		…
2567	or ($a->{name} cmp $b->{name})	2797	or ($a->{name} cmp $b->{name})
2568	} @$items;	2798	} @$items;
2569		2799
2570	$self->{real_items} = \@items;	2800	$self->{real_items} = \@items;
2571		2801
		2802	my $row = 0;
2572	for my $item (@items) {	2803	for my $item (@items) {
2573	my $desc = $item->{nrof} < 2	2804	CFClient::Item::update_widgets $item;
2574	? $item->{name}
2575	: "$item->{nrof} $item->{name_pl}";
2576		2805
2577	$item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item;	2806	$self->{scrolled}->add (0, $row, $item->{face_widget});
2578	}	2807	$self->{scrolled}->add (1, $row, $item->{desc_widget});
		2808	$self->{scrolled}->add (2, $row, $item->{weight_widget});
2579		2809
2580	$self->{scrolled}->add (@items);	2810	$row++;
2581		2811	}
2582	# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2583	}	2812	}
2584		2813
2585	sub size_request {	2814	sub size_request {
2586	my ($self) = @_;	2815	my ($self) = @_;
2587	($self->{req_w}, $self->{req_h});	2816	($self->{req_w}, $self->{req_h});
…		…
2627		2856
2628	# popup given the event (must be a mouse button down event currently)	2857	# popup given the event (must be a mouse button down event currently)
2629	sub popup {	2858	sub popup {
2630	my ($self, $ev) = @_;	2859	my ($self, $ev) = @_;
2631		2860
2632	$self->emit ("popdown");	2861	$self->_emit ("popdown");
2633		2862
2634	# maybe save $GRAB? must be careful about events...	2863	# maybe save $GRAB? must be careful about events...
2635	$GRAB = $self;	2864	$GRAB = $self;
2636	$self->{button} = $ev->{button};	2865	$self->{button} = $ev->{button};
2637		2866
…		…
2652		2881
2653	if ($ev->{button} == $self->{button}) {	2882	if ($ev->{button} == $self->{button}) {
2654	undef $GRAB;	2883	undef $GRAB;
2655	$self->hide;	2884	$self->hide;
2656		2885
2657	$self->emit ("popdown");	2886	$self->_emit ("popdown");
2658	$self->{hover}[1]->() if $self->{hover};	2887	$self->{hover}[1]->() if $self->{hover};
2659	}	2888	}
2660	}	2889	}
2661		2890
2662	#############################################################################	2891	#############################################################################
2663		2892
2664	package CFClient::UI::Statusbox;	2893	package CFClient::UI::Statusbox;
2665		2894
2666	our @ISA = CFClient::UI::VBox::;	2895	our @ISA = CFClient::UI::VBox::;
		2896
		2897	sub new {
		2898	my $class = shift;
		2899
		2900	$class->SUPER::new (
		2901	fontsize => 0.8,
		2902	@_,
		2903	)
		2904	}
2667		2905
2668	sub reorder {	2906	sub reorder {
2669	my ($self) = @_;	2907	my ($self) = @_;
2670	my $NOW = time;	2908	my $NOW = time;
2671		2909
…		…
2690	? "<b>$item->{count} ×</b> $item->{text}"	2928	? "<b>$item->{count} ×</b> $item->{text}"
2691	: $item->{text};	2929	: $item->{text};
2692		2930
2693	for ($short) {	2931	for ($short) {
2694	s/^\s+//;	2932	s/^\s+//;
2695	s/\012.*/…/s;	2933	s/\s+/ /g;
2696	my $len = int 40 / $item->{fontsize};
2697	substr $_, $len, length, "…" if $len < length;
2698	}	2934	}
2699		2935
2700	new CFClient::UI::Label	2936	new CFClient::UI::Label
2701	markup => $short,	2937	markup => $short,
2702	tooltip => $item->{tooltip},	2938	tooltip => $item->{tooltip},
2703	tooltip_font => $::FONT_PROP,	2939	tooltip_font => $::FONT_PROP,
2704	tooltip_width => 0.67,	2940	tooltip_width => 0.67,
2705	fontsize => $item->{fontsize},	2941	fontsize => $item->{fontsize} || $self->{fontsize},
		2942	max_w => $::WIDTH * 0.44,
2706	color => $item->{color},	2943	fg => $item->{fg},
2707	can_events => 1,	2944	can_events => 1,
2708	can_hover => 1	2945	can_hover => 1
2709	};	2946	};
2710	}	2947	}
2711		2948
…		…
2716	sub add {	2953	sub add {
2717	my ($self, $text, %arg) = @_;	2954	my ($self, $text, %arg) = @_;
2718		2955
2719	$text =~ s/^\s+//;	2956	$text =~ s/^\s+//;
2720	$text =~ s/\s+$//;	2957	$text =~ s/\s+$//;
		2958
		2959	return unless $text;
2721		2960
2722	my $timeout = time + ((delete $arg{timeout}) || 60);	2961	my $timeout = time + ((delete $arg{timeout}) || 60);
2723		2962
2724	my $group = exists $arg{group} ? $arg{group} : ++$self->{id};	2963	my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2725		2964
…		…
2737	$self->{item}{$group} = {	2976	$self->{item}{$group} = {
2738	id => ++$self->{id},	2977	id => ++$self->{id},
2739	text => $text,	2978	text => $text,
2740	timeout => $timeout,	2979	timeout => $timeout,
2741	tooltip => $text,	2980	tooltip => $text,
2742	fontsize => 0.8,
2743	color => [0.8, 0.8, 0.8, 0.8],	2981	fg => [0.8, 0.8, 0.8, 0.8],
2744	pri => 0,	2982	pri => 0,
2745	count => 1,	2983	count => 1,
2746	%arg,	2984	%arg,
2747	};	2985	};
2748	}	2986	}
2749		2987
2750	$self->reorder;	2988	$self->reorder;
2751	}	2989	}
2752		2990
		2991	sub reconfigure {
		2992	my ($self) = @_;
		2993
		2994	delete $_->{label}
		2995	for values %{ $self->{item} || {} };
		2996
		2997	$self->reorder;
		2998	$self->SUPER::reconfigure;
		2999	}
		3000
2753	#############################################################################	3001	#############################################################################
2754		3002
2755	package CFClient::UI::Root;	3003	package CFClient::UI::Root;
2756		3004
2757	our @ISA = CFClient::UI::Container::;	3005	our @ISA = CFClient::UI::Container::;
…		…
2760		3008
2761	sub new {	3009	sub new {
2762	my $class = shift;	3010	my $class = shift;
2763		3011
2764	$class->SUPER::new (	3012	$class->SUPER::new (
		3013	visible => 1,
2765	@_,	3014	@_,
2766	)	3015	)
2767	}	3016	}
2768		3017
2769	sub configure {	3018	sub configure {
…		…
2787	}	3036	}
2788		3037
2789	sub size_allocate {	3038	sub size_allocate {
2790	my ($self, $w, $h) = @_;	3039	my ($self, $w, $h) = @_;
2791		3040
2792	my $old_w = $self->{old_w}; $self->{old_w} = $w;
2793	my $old_h = $self->{old_h}; $self->{old_h} = $h;
2794
2795	CFClient::UI::rescale_widgets $w / $old_w, $h / $old_h
2796	if $old_w && $old_h && ($old_w != $w || $old_h != $h);
2797
2798	for my $child ($self->children) {	3041	for my $child ($self->children) {
2799	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};	3042	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2800		3043
		3044	$X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1
		3045	if exists $child->{req_x};
		3046
		3047	$Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1
		3048	if exists $child->{req_y};
		3049
		3050	$X = $self->{user_x} if exists $self->{user_x};
		3051	$Y = $self->{user_y} if exists $self->{user_y};
		3052
2801	$X = List::Util::max 0, List::Util::min $w - $W, $X;	3053	$X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
2802	$Y = List::Util::max 0, List::Util::min $h - $H, $Y;	3054	$Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
		3055
2803	$child->configure ($X, $Y, $W, $H);	3056	$child->configure ($X, $Y, $W, $H);
2804	}	3057	}
2805	}	3058	}
2806		3059
2807	sub coord2local {	3060	sub coord2local {
…		…
2824	}	3077	}
2825		3078
2826	sub add {	3079	sub add {
2827	my ($self, @children) = @_;	3080	my ($self, @children) = @_;
2828		3081
		3082	for (my @widgets = @children; my $w = pop @widgets; ) {
		3083	push @widgets, $w->children;
		3084	$w->{root} = $self;
		3085	$w->{visible} = $self->{visible} + 1;
		3086	}
		3087
2829	for my $child (@children) {	3088	for my $child (@children) {
2830	$child->{toplevel} = 1;	3089	$child->{is_toplevel} = 1;
2831		3090
2832	# integerise window positions	3091	# integerise window positions
2833	$child->{x} = int $child->{x};	3092	$child->{x} = int $child->{x};
2834	$child->{y} = int $child->{y};	3093	$child->{y} = int $child->{y};
2835	}	3094	}
2836		3095
2837	$self->SUPER::add (@children);	3096	$self->SUPER::add (@children);
2838	}	3097	}
2839		3098
		3099	sub remove {
		3100	my ($self, @children) = @_;
		3101
		3102	$self->SUPER::remove (@children);
		3103
		3104	while (@children) {
		3105	my $w = pop @children;
		3106	push @children, $w->children;
		3107	$w->set_invisible;
		3108	}
		3109	}
		3110
2840	sub on_refresh {	3111	sub on_refresh {
2841	my ($self, $id, $cb) = @_;	3112	my ($self, $id, $cb) = @_;
2842		3113
2843	$self->{refresh_hook}{$id} = $cb;	3114	$self->{refresh_hook}{$id} = $cb;
2844	}	3115	}
…		…
2856	$_->()	3127	$_->()
2857	for values %{delete $self->{refresh_hook}};	3128	for values %{delete $self->{refresh_hook}};
2858	}	3129	}
2859		3130
2860	if ($self->{check_size}) {	3131	if ($self->{check_size}) {
2861	my @queue = ([], []);	3132	my @queue;
2862		3133
2863	for (;;) {	3134	for (;;) {
2864	if ($self->{check_size}) {	3135	if ($self->{check_size}) {
2865	# heuristic: check containers last	3136	#TODO use array-of-depth approach
2866	push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_	3137
		3138	@queue = sort { $a->{visible} <=> $b->{visible} }
2867	for values %{delete $self->{check_size}}	3139	@queue, values %{delete $self->{check_size}};
2868	}	3140	}
2869		3141
2870	my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last;	3142	my $widget = pop @queue || last;
		3143
		3144	defined $widget->{visible} or last; # do not resize invisible widgets
2871		3145
2872	my ($w, $h) = $widget->{user_w} && $widget->{user_h}	3146	my ($w, $h) = $widget->{user_w} && $widget->{user_h}
2873	? @$widget{qw(user_w user_h)}	3147	? @$widget{qw(user_w user_h)}
2874	: $widget->size_request;	3148	: $widget->size_request;
2875		3149
…		…
2895	$w = 0 if $w < 0;	3169	$w = 0 if $w < 0;
2896	$h = 0 if $h < 0;	3170	$h = 0 if $h < 0;
2897		3171
2898	$widget->{w} = $w;	3172	$widget->{w} = $w;
2899	$widget->{h} = $h;	3173	$widget->{h} = $h;
2900	$widget->size_allocate ($w, $h);
2901	$widget->emit (size_allocate => $w, $h);	3174	$widget->emit (size_allocate => $w, $h);
2902	}	3175	}
2903	}	3176	}
2904		3177
2905	while ($self->{post_alloc_hook}) {	3178	while ($self->{post_alloc_hook}) {
…		…
2911	glClearColor +($::CFG->{fow_intensity}) x 3, 1;	3184	glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2912	glClear GL_COLOR_BUFFER_BIT;	3185	glClear GL_COLOR_BUFFER_BIT;
2913		3186
2914	glMatrixMode GL_PROJECTION;	3187	glMatrixMode GL_PROJECTION;
2915	glLoadIdentity;	3188	glLoadIdentity;
2916	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000;	3189	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
2917	glMatrixMode GL_MODELVIEW;	3190	glMatrixMode GL_MODELVIEW;
2918	glLoadIdentity;	3191	glLoadIdentity;
2919		3192
2920	$self->_draw;	3193	$self->_draw;
2921	}	3194	}
…		…
2923	#############################################################################	3196	#############################################################################
2924		3197
2925	package CFClient::UI;	3198	package CFClient::UI;
2926		3199
2927	$ROOT = new CFClient::UI::Root;	3200	$ROOT = new CFClient::UI::Root;
2928	$TOOLTIP = new CFClient::UI::Tooltip;	3201	$TOOLTIP = new CFClient::UI::Tooltip z => 900;
2929		3202
2930	1	3203	1
2931		3204

Diff Legend

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