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.243 by root, Sat May 27 20:46:54 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	# broken show/hide model
		259
		260	delete $self->{root};
		261	delete $self->{visible};
209		262
210	undef $GRAB if $GRAB == $self;	263	undef $GRAB if $GRAB == $self;
211	undef $HOVER if $HOVER == $self;	264	undef $HOVER if $HOVER == $self;
		265
		266	CFClient::UI::check_tooltip
		267	if $CFClient::UI::TOOLTIP->{owner} == $self;
		268
		269	$self->focus_out;
		270	}
		271
		272	sub hide {
		273	my ($self) = @_;
		274
		275	$self->set_invisible;
212		276
213	$self->{parent}->remove ($self)	277	$self->{parent}->remove ($self)
214	if $self->{parent};	278	if $self->{parent};
215	}	279	}
216		280
…		…
283		347
284	delete $self->{max_w}; $self->{max_w} = $w if $w;	348	delete $self->{max_w}; $self->{max_w} = $w if $w;
285	delete $self->{max_h}; $self->{max_h} = $h if $h;	349	delete $self->{max_h}; $self->{max_h} = $h if $h;
286	}	350	}
287		351
		352	sub set_tooltip {
		353	my ($self, $tooltip) = @_;
		354
		355	$tooltip =~ s/^\s+//;
		356	$tooltip =~ s/\s+$//;
		357
		358	return if $self->{tooltip} eq $tooltip;
		359
		360	$self->{tooltip} = $tooltip;
		361
		362	if ($CFClient::UI::TOOLTIP->{owner} == $self) {
		363	delete $CFClient::UI::TOOLTIP->{owner};
		364	CFClient::UI::check_tooltip;
		365	}
		366	}
		367
288	# translate global coordinates to local coordinate system	368	# translate global coordinates to local coordinate system
289	sub coord2local {	369	sub coord2local {
290	my ($self, $x, $y) = @_;	370	my ($self, $x, $y) = @_;
291		371
292	$self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})	372	$self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
…		…
305	return if $FOCUS == $self;	385	return if $FOCUS == $self;
306	return unless $self->{can_focus};	386	return unless $self->{can_focus};
307		387
308	my $focus = $FOCUS; $FOCUS = $self;	388	my $focus = $FOCUS; $FOCUS = $self;
309		389
310	$self->emit (focus_in => $focus);	390	$self->_emit (focus_in => $focus);
311		391
312	$focus->update if $focus;	392	$focus->update if $focus;
313	$FOCUS->update;	393	$FOCUS->update;
314	}	394	}
315		395
…		…
318		398
319	return unless $FOCUS == $self;	399	return unless $FOCUS == $self;
320		400
321	my $focus = $FOCUS; undef $FOCUS;	401	my $focus = $FOCUS; undef $FOCUS;
322		402
323	$self->emit (focus_out => $focus);	403	$self->_emit (focus_out => $focus);
324		404
325	$focus->update if $focus; #?	405	$focus->update if $focus; #?
		406
		407	$::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus
		408	unless $FOCUS;
326	}	409	}
327		410
328	sub mouse_motion { }	411	sub mouse_motion { }
329	sub button_up { }	412	sub button_up { }
330	sub key_down { }	413	sub key_down { }
331	sub key_up { }	414	sub key_up { }
332		415
333	sub button_down {	416	sub button_down {
334	my ($self, $ev, $x, $y) = @_;	417	my ($self, $ev, $x, $y) = @_;
335		418
336	$self->focus_in;	419	$self->focus_in;
…		…
370	if ($ENV{PCLIENT_DEBUG}) {	453	if ($ENV{PCLIENT_DEBUG}) {
371	glPushMatrix;	454	glPushMatrix;
372	glColor 1, 1, 0, 1;	455	glColor 1, 1, 0, 1;
373	glTranslate $self->{x} + 0.375, $self->{y} + 0.375;	456	glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
374	glBegin GL_LINE_LOOP;	457	glBegin GL_LINE_LOOP;
375	glVertex 0 , 0;	458	glVertex 0 , 0;
376	glVertex $self->{w}, 0;	459	glVertex $self->{w} - 1, 0;
377	glVertex $self->{w}, $self->{h};	460	glVertex $self->{w} - 1, $self->{h} - 1;
378	glVertex 0 , $self->{h};	461	glVertex 0 , $self->{h} - 1;
379	glEnd;	462	glEnd;
380	glPopMatrix;	463	glPopMatrix;
381	CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;	464	#CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
382	}	465	}
383	}	466	}
384		467
385	sub _draw {	468	sub _draw {
386	my ($self) = @_;	469	my ($self) = @_;
…		…
403	sub set_parent {	486	sub set_parent {
404	my ($self, $parent) = @_;	487	my ($self, $parent) = @_;
405		488
406	Scalar::Util::weaken ($self->{parent} = $parent);	489	Scalar::Util::weaken ($self->{parent} = $parent);
407		490
		491	$self->{root} = $parent->{root};
		492	$self->{visible} = $parent->{visible} + 1;
		493
408	# TODO: req_w _does_change after ->reconfigure	494	# TODO: req_w _does_change after ->reconfigure
409	$self->check_size	495	$self->check_size
410	unless exists $self->{req_w};	496	unless exists $self->{req_w};
		497
		498	$self->show;
411	}	499	}
412		500
413	sub check_size {	501	sub check_size {
414	my ($self, $forced) = @_;	502	my ($self, $forced) = @_;
415		503
…		…
428	my ($self, $signal, $cb) = @_;	516	my ($self, $signal, $cb) = @_;
429		517
430	push @{ $self->{signal_cb}{$signal} }, $cb;	518	push @{ $self->{signal_cb}{$signal} }, $cb;
431	}	519	}
432		520
		521	sub _emit {
		522	my ($self, $signal, @args) = @_;
		523
		524	List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
		525	}
		526
433	sub emit {	527	sub emit {
434	my ($self, $signal, @args) = @_;	528	my ($self, $signal, @args) = @_;
435		529
436	List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}	530	$self->_emit ($signal, @args)
		531	|| $self->$signal (@args);
437	}	532	}
438		533
439	sub DESTROY {	534	sub DESTROY {
440	my ($self) = @_;	535	my ($self) = @_;
441		536
…		…
456	my $class = shift;	551	my $class = shift;
457		552
458	# range [value, low, high, page]	553	# range [value, low, high, page]
459		554
460	$class->SUPER::new (	555	$class->SUPER::new (
461	bg => [0, 0, 0, 0.2],	556	#bg => [0, 0, 0, 0.2],
462	active_bg => [1, 1, 1, 0.5],	557	#active_bg => [1, 1, 1, 0.5],
463	@_	558	@_
464	)	559	)
465	}	560	}
466		561
467	sub _draw {	562	sub _draw {
468	my ($self) = @_;	563	my ($self) = @_;
469		564
		565	my $color = $FOCUS == $self && $self->{active_bg}
		566	? $self->{active_bg}
		567	: $self->{bg};
		568
		569	if ($color && (@$color < 4 || $color->[3])) {
470	my ($w, $h) = @$self{qw(w h)};	570	my ($w, $h) = @$self{qw(w h)};
471		571
472	glEnable GL_BLEND;	572	glEnable GL_BLEND;
473	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	573	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
474	glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} };	574	glColor @$color;
475		575
476	glBegin GL_QUADS;	576	glBegin GL_QUADS;
477	glVertex 0 , 0;	577	glVertex 0 , 0;
478	glVertex 0 , $h;	578	glVertex 0 , $h;
479	glVertex $w, $h;	579	glVertex $w, $h;
480	glVertex $w, 0;	580	glVertex $w, 0;
481	glEnd;	581	glEnd;
482		582
483	glDisable GL_BLEND;	583	glDisable GL_BLEND;
		584	}
484	}	585	}
485		586
486	#############################################################################	587	#############################################################################
487		588
488	package CFClient::UI::Empty;	589	package CFClient::UI::Empty;
…		…
548	delete $child->{parent};	649	delete $child->{parent};
549	$child->hide;	650	$child->hide;
550		651
551	$self->{children} = [ grep $_ != $child, @{ $self->{children} } ];	652	$self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
552		653
553	$self->check_size;	654	$self->check_size (1);
554	$self->update;	655	$self->update;
555	}	656	}
556		657
557	sub clear {	658	sub clear {
558	my ($self) = @_;	659	my ($self) = @_;
…		…
672	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {	773	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
673	glClearColor 0, 0, 0, 0;	774	glClearColor 0, 0, 0, 0;
674	glClear GL_COLOR_BUFFER_BIT;	775	glClear GL_COLOR_BUFFER_BIT;
675		776
676	$self->_render;	777	$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	};	778	};
685	}	779	}
686		780
687	sub _draw {	781	sub _draw {
688	my ($self) = @_;	782	my ($self) = @_;
…		…
692	my $tex = $self->{texture}	786	my $tex = $self->{texture}
693	or return;	787	or return;
694		788
695	glEnable GL_TEXTURE_2D;	789	glEnable GL_TEXTURE_2D;
696	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	790	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
697	glColor 0, 0, 0, 1;	791	glColor 1, 1, 1, 1;
698		792
699	$tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);	793	$tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
700		794
701	glDisable GL_TEXTURE_2D;	795	glDisable GL_TEXTURE_2D;
702	}	796	}
…		…
705		799
706	package CFClient::UI::ViewPort;	800	package CFClient::UI::ViewPort;
707		801
708	our @ISA = CFClient::UI::Window::;	802	our @ISA = CFClient::UI::Window::;
709		803
		804	sub new {
		805	my $class = shift;
		806
		807	$class->SUPER::new (
		808	scroll_x => 0,
		809	scroll_y => 1,
		810	@_,
		811	)
		812	}
		813
710	sub size_request {	814	sub size_request {
711	my ($self) = @_;	815	my ($self) = @_;
712		816
713	@$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};	817	@$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		818
716	@$self{qw(child_w child_h)}	819	@$self{qw(child_w child_h)}
717	}	820	}
718		821
719	sub size_allocate {	822	sub size_allocate {
720	my ($self, $w, $h) = @_;	823	my ($self, $w, $h) = @_;
721		824
		825	$w = $self->{child_w} if $self->{scroll_x} && $self->{child_w};
		826	$h = $self->{child_h} if $self->{scroll_y} && $self->{child_h};
		827
		828	$self->child->configure (0, 0, $w, $h);
722	$self->update;	829	$self->update;
723	}	830	}
724		831
725	sub set_offset {	832	sub set_offset {
726	my ($self, $x, $y) = @_;	833	my ($self, $x, $y) = @_;
…		…
777	my $class = shift;	884	my $class = shift;
778		885
779	my $self;	886	my $self;
780		887
781	my $slider = new CFClient::UI::Slider	888	my $slider = new CFClient::UI::Slider
782	vertical => 1,	889	vertical => 1,
783	range => [0, 0, 1, 0.01], # HACK fix	890	range => [0, 0, 1, 0.01], # HACK fix
784	connect_changed => sub {	891	on_changed => sub {
785	$self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h}));	892	$self->{vp}->set_offset (0, $_[1]);
786	},	893	},
787	;	894	;
788		895
789	$self = $class->SUPER::new (	896	$self = $class->SUPER::new (
790	vp => (new CFClient::UI::ViewPort),	897	vp => (new CFClient::UI::ViewPort expand => 1),
791	slider => $slider,	898	slider => $slider,
792	@_,	899	@_,
793	);	900	);
794		901
795	$self->{vp}->add ($self->{scrolled});	902	$self->{vp}->add ($self->{scrolled});
796	$self->add ($self->{vp});	903	$self->add ($self->{vp});
797	$self->add ($self->{slider});	904	$self->add ($self->{slider});
798		905
799	$self	906	$self
		907	}
		908
		909	sub update {
		910	my ($self) = @_;
		911
		912	$self->SUPER::update;
		913
		914	# todo: overwrite size_allocate of child
		915	my $child = $self->{vp}->child;
		916	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
		917	}
		918
		919	sub size_allocate {
		920	my ($self, $w, $h) = @_;
		921
		922	$self->SUPER::size_allocate ($w, $h);
		923
		924	my $child = $self->{vp}->child;
		925	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
800	}	926	}
801		927
802	#TODO# update range on size_allocate depending on child	928	#TODO# update range on size_allocate depending on child
803	# update viewport offset on scroll	929	# update viewport offset on scroll
804		930
…		…
858	my $class = shift;	984	my $class = shift;
859		985
860	# TODO: user_x, user_y, overwrite moveto?	986	# TODO: user_x, user_y, overwrite moveto?
861		987
862	my $self = $class->SUPER::new (	988	my $self = $class->SUPER::new (
863	bg => [1, 1, 1, 1],	989	bg => [1, 1, 1, 1],
864	border_bg => [1, 1, 1, 1],	990	border_bg => [1, 1, 1, 1],
865	border => 0.6,	991	border => 0.6,
866	toplevel => 1,	992	is_toplevel => 1,
867	can_events => 1,	993	can_events => 1,
868	@_	994	@_
869	);	995	);
870		996
871	$self->{title} &&= new CFClient::UI::Label	997	$self->{title} &&= new CFClient::UI::Label
872	align => 0,	998	align => 0,
…		…
896	my ($self, $w, $h) = @_;	1022	my ($self, $w, $h) = @_;
897		1023
898	$h -= List::Util::max 0, $self->border * 2;	1024	$h -= List::Util::max 0, $self->border * 2;
899	$w -= List::Util::max 0, $self->border * 2;	1025	$w -= List::Util::max 0, $self->border * 2;
900		1026
901	$self->{title}->configure ($self->border, $self->border - $::FONTSIZE * 2, $w, $::FONTSIZE * 2)	1027	$self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
902	if $self->{title};	1028	if $self->{title};
903		1029
904	$self->child->configure ($self->border, $self->border, $w, $h);	1030	$self->child->configure ($self->border, $self->border, $w, $h);
905	}	1031	}
906		1032
…		…
925	my ($ev, $x, $y) = @_;	1051	my ($ev, $x, $y) = @_;
926		1052
927	my $dx = $ev->{x} - $ox;	1053	my $dx = $ev->{x} - $ox;
928	my $dy = $ev->{y} - $oy;	1054	my $dy = $ev->{y} - $oy;
929		1055
		1056	$self->{user_x} = $wx + $dx * $mx;
		1057	$self->{user_y} = $wy + $dy * $my;
930	$self->{user_w} = $bw + $dx * ($mx ? -1 : 1);	1058	$self->{user_w} = $bw + $dx * ($mx ? -1 : 1);
931	$self->{user_h} = $bh + $dy * ($my ? -1 : 1);	1059	$self->{user_h} = $bh + $dy * ($my ? -1 : 1);
932	$self->move ($wx + $dx * $mx, $wy + $dy * $my);	1060	$self->move ($self->{user_x}, $self->{user_y});
933	$self->check_size;	1061	$self->check_size;
934	};	1062	};
935		1063
936	} elsif ($lr ^ $td) {	1064	} elsif ($lr ^ $td) {
937	my ($ox, $oy) = ($ev->{x}, $ev->{y});	1065	my ($ox, $oy) = ($ev->{x}, $ev->{y});
…		…
940	$self->{motion} = sub {	1068	$self->{motion} = sub {
941	my ($ev, $x, $y) = @_;	1069	my ($ev, $x, $y) = @_;
942		1070
943	($x, $y) = ($ev->{x}, $ev->{y});	1071	($x, $y) = ($ev->{x}, $ev->{y});
944		1072
945	$self->move ($bx + $x - $ox, $by + $y - $oy);	1073	$self->{user_x} = $bx + $x - $ox;
		1074	$self->{user_y} = $by + $y - $oy;
		1075	$self->move ($self->{user_x}, $self->{user_y});
946	$self->update;	1076	$self->update;
947	};	1077	};
948	}	1078	}
949	}	1079	}
950		1080
…		…
1012	sub new {	1142	sub new {
1013	my $class = shift;	1143	my $class = shift;
1014		1144
1015	$class->SUPER::new (	1145	$class->SUPER::new (
1016	col_expand => [],	1146	col_expand => [],
1017	@_	1147	@_,
1018	)	1148	)
		1149	}
		1150
		1151	sub children {
		1152	grep $_, map @$_, grep $_, @{ $_[0]{children} }
1019	}	1153	}
1020		1154
1021	sub add {	1155	sub add {
1022	my ($self, $x, $y, $child) = @_;	1156	my ($self, $x, $y, $child) = @_;
1023		1157
1024	$child->set_parent ($self);	1158	$child->set_parent ($self);
1025	$self->{children}[$y][$x] = $child;	1159	$self->{children}[$y][$x] = $child;
1026		1160
1027	$child->check_size;	1161	$self->check_size (1);
1028	}	1162	}
1029		1163
1030	sub children {
1031	grep $_, map @$_, grep $_, @{ $_[0]{children} }
1032	}
1033
1034	# TODO: move to container class maybe? send childs a signal on removal?	1164	# TODO: move to container class maybe? send children a signal on removal?
1035	sub clear {	1165	sub clear {
1036	my ($self) = @_;	1166	my ($self) = @_;
1037		1167
1038	my @children = $self->children;	1168	my @children = $self->children;
1039	delete $self->{children};	1169	delete $self->{children};
…		…
1041	for (@children) {	1171	for (@children) {
1042	delete $_->{parent};	1172	delete $_->{parent};
1043	$_->hide;	1173	$_->hide;
1044	}	1174	}
1045		1175
		1176	$self->check_size (1);
1046	$self->update;	1177	$self->update;
1047	}	1178	}
1048		1179
1049	sub get_wh {	1180	sub get_wh {
1050	my ($self) = @_;	1181	my ($self) = @_;
…		…
1082	sub size_allocate {	1213	sub size_allocate {
1083	my ($self, $w, $h) = @_;	1214	my ($self, $w, $h) = @_;
1084		1215
1085	my ($ws, $hs) = $self->get_wh;	1216	my ($ws, $hs) = $self->get_wh;
1086		1217
1087	my $req_w = sum @$ws;	1218	my $req_w = (sum @$ws) || 1;
1088	my $req_h = sum @$hs;	1219	my $req_h = (sum @$hs) || 1;
1089		1220
1090	# TODO: nicer code && do row_expand	1221	# TODO: nicer code && do row_expand
1091	my @col_expand = @{$self->{col_expand}};	1222	my @col_expand = @{$self->{col_expand}};
1092	@col_expand = (1) x @$ws unless @col_expand;	1223	@col_expand = (1) x @$ws unless @col_expand;
1093	my $col_expand = (sum @col_expand) || 1;	1224	my $col_expand = (sum @col_expand) || 1;
…		…
1267		1398
1268	#############################################################################	1399	#############################################################################
1269		1400
1270	package CFClient::UI::Label;	1401	package CFClient::UI::Label;
1271		1402
1272	our @ISA = CFClient::UI::Base::;	1403	our @ISA = CFClient::UI::DrawBG::;
1273		1404
1274	use CFClient::OpenGL;	1405	use CFClient::OpenGL;
1275		1406
1276	sub new {	1407	sub new {
1277	my ($class, %arg) = @_;	1408	my ($class, %arg) = @_;
1278		1409
1279	my $self = $class->SUPER::new (	1410	my $self = $class->SUPER::new (
1280	fg => [1, 1, 1],	1411	fg => [1, 1, 1],
		1412	#bg => none
		1413	#active_bg => none
1281	#font => default_font	1414	#font => default_font
1282	#text => initial text	1415	#text => initial text
1283	#markup => initial narkup	1416	#markup => initial narkup
		1417	#max_w => maximum pixel width
		1418	ellipsise => 3, # end
1284	layout => (new CFClient::Layout),	1419	layout => (new CFClient::Layout),
1285	fontsize => 1,	1420	fontsize => 1,
1286	align => -1,	1421	align => -1,
1287	valign => -1,	1422	valign => -1,
1288	padding => 2,	1423	padding => 2,
…		…
1303	}	1438	}
1304		1439
1305	$self	1440	$self
1306	}	1441	}
1307		1442
1308	sub escape {	1443	sub escape($) {
1309	local $_ = $_[1];	1444	local $_ = $_[0];
1310		1445
1311	s/&/&amp;/g;	1446	s/&/&amp;/g;
1312	s/>/&gt;/g;	1447	s/>/&gt;/g;
1313	s/</&lt;/g;	1448	s/</&lt;/g;
1314		1449
1315	$_[1]	1450	$_
1316	}	1451	}
1317		1452
1318	sub update {	1453	sub update {
1319	my ($self) = @_;	1454	my ($self) = @_;
1320		1455
…		…
1353	sub size_request {	1488	sub size_request {
1354	my ($self) = @_;	1489	my ($self) = @_;
1355		1490
1356	$self->{layout}->set_font ($self->{font}) if $self->{font};	1491	$self->{layout}->set_font ($self->{font}) if $self->{font};
1357	$self->{layout}->set_width ($self->{max_w} || -1);	1492	$self->{layout}->set_width ($self->{max_w} || -1);
		1493	$self->{layout}->set_ellipsise ($self->{ellipsise});
		1494	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1358	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	1495	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1359		1496
1360	my ($w, $h) = $self->{layout}->size;	1497	my ($w, $h) = $self->{layout}->size;
1361		1498
1362	if (exists $self->{template}) {	1499	if (exists $self->{template}) {
…		…
1392	}	1529	}
1393		1530
1394	sub _draw {	1531	sub _draw {
1395	my ($self) = @_;	1532	my ($self) = @_;
1396		1533
		1534	$self->SUPER::_draw; # draw background, if applicable
		1535
1397	my $tex = $self->{texture} ||= do {	1536	my $tex = $self->{texture} ||= do {
1398	$self->{layout}->set_foreground (@{$self->{fg}});	1537	$self->{layout}->set_foreground (@{$self->{fg}});
1399	$self->{layout}->set_font ($self->{font}) if $self->{font};	1538	$self->{layout}->set_font ($self->{font}) if $self->{font};
1400	$self->{layout}->set_width ($self->{w});	1539	$self->{layout}->set_width ($self->{w});
		1540	$self->{layout}->set_ellipsise ($self->{ellipsise});
		1541	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1401	$self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE);	1542	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1402		1543
1403	my $tex = new_from_layout CFClient::Texture $self->{layout};	1544	my $tex = new_from_layout CFClient::Texture $self->{layout};
1404		1545
1405	$self->{ox} = int $self->{align} < 0 ? $self->{padding}	1546	$self->{ox} = int ($self->{align} < 0 ? $self->{padding}
1406	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}	1547	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1407	: ($self->{w} - $tex->{w}) * 0.5;	1548	: ($self->{w} - $tex->{w}) * 0.5);
1408		1549
1409	$self->{oy} = int $self->{valign} < 0 ? $self->{padding}	1550	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding}
1410	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}	1551	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1411	: ($self->{h} - $tex->{h}) * 0.5;	1552	: ($self->{h} - $tex->{h}) * 0.5);
1412		1553
1413	$tex	1554	$tex
1414	};	1555	};
1415		1556
1416	glEnable GL_TEXTURE_2D;	1557	glEnable GL_TEXTURE_2D;
…		…
1444	active_fg => [0, 0, 0],	1585	active_fg => [0, 0, 0],
1445	can_hover => 1,	1586	can_hover => 1,
1446	can_focus => 1,	1587	can_focus => 1,
1447	valign => 0,	1588	valign => 0,
1448	can_events => 1,	1589	can_events => 1,
		1590	#text => ...
1449	@_	1591	@_
1450	)	1592	)
1451	}	1593	}
1452		1594
1453	sub _set_text {	1595	sub _set_text {
…		…
1463	$self->{text} = $text;	1605	$self->{text} = $text;
1464		1606
1465	$text =~ s/./*/g if $self->{hidden};	1607	$text =~ s/./*/g if $self->{hidden};
1466	$self->{layout}->set_text ("$text ");	1608	$self->{layout}->set_text ("$text ");
1467		1609
1468	$self->emit (changed => $self->{text});	1610	$self->_emit (changed => $self->{text});
1469	}	1611	}
1470		1612
1471	sub set_text {	1613	sub set_text {
1472	my ($self, $text) = @_;	1614	my ($self, $text) = @_;
1473		1615
1474	$self->{cursor} = length $text;	1616	$self->{cursor} = length $text;
1475	$self->_set_text ($text);	1617	$self->_set_text ($text);
		1618	$self->update;
1476	$self->check_size;	1619	$self->check_size;
1477	$self->update;
1478	}	1620	}
1479		1621
1480	sub get_text {	1622	sub get_text {
1481	$_[0]{text}	1623	$_[0]{text}
1482	}	1624	}
…		…
1485	my ($self) = @_;	1627	my ($self) = @_;
1486		1628
1487	my ($w, $h) = $self->SUPER::size_request;	1629	my ($w, $h) = $self->SUPER::size_request;
1488		1630
1489	($w + 1, $h) # add 1 for cursor	1631	($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	}	1632	}
1497		1633
1498	sub key_down {	1634	sub key_down {
1499	my ($self, $ev) = @_;	1635	my ($self, $ev) = @_;
1500		1636
…		…
1515	} elsif ($sym == CFClient::SDLK_HOME) {	1651	} elsif ($sym == CFClient::SDLK_HOME) {
1516	$self->{cursor} = 0;	1652	$self->{cursor} = 0;
1517	} elsif ($sym == CFClient::SDLK_END) {	1653	} elsif ($sym == CFClient::SDLK_END) {
1518	$self->{cursor} = length $text;	1654	$self->{cursor} = length $text;
1519	} elsif ($uni == 27) {	1655	} elsif ($uni == 27) {
1520	$self->emit ('escape');	1656	$self->_emit ('escape');
1521	} elsif ($uni) {	1657	} elsif ($uni) {
1522	substr $text, $self->{cursor}++, 0, chr $uni;	1658	substr $text, $self->{cursor}++, 0, chr $uni;
1523	}	1659	}
1524		1660
1525	$self->_set_text ($text);	1661	$self->_set_text ($text);
1526	$self->update;	1662	$self->update;
		1663	$self->check_size;
1527	}	1664	}
1528		1665
1529	sub focus_in {	1666	sub focus_in {
1530	my ($self) = @_;	1667	my ($self) = @_;
1531		1668
…		…
1611	if ($sym == 13) {	1748	if ($sym == 13) {
1612	unshift @{$self->{history}},	1749	unshift @{$self->{history}},
1613	my $txt = $self->get_text;	1750	my $txt = $self->get_text;
1614	$self->{history_pointer} = -1;	1751	$self->{history_pointer} = -1;
1615	$self->{history_saveback} = '';	1752	$self->{history_saveback} = '';
1616	$self->emit (activate => $txt);	1753	$self->_emit (activate => $txt);
1617	$self->update;	1754	$self->update;
1618		1755
1619	} elsif ($sym == CFClient::SDLK_UP) {	1756	} elsif ($sym == CFClient::SDLK_UP) {
1620	if ($self->{history_pointer} < 0) {	1757	if ($self->{history_pointer} < 0) {
1621	$self->{history_saveback} = $self->get_text;	1758	$self->{history_saveback} = $self->get_text;
…		…
1660	my $class = shift;	1797	my $class = shift;
1661		1798
1662	$class->SUPER::new (	1799	$class->SUPER::new (
1663	padding => 4,	1800	padding => 4,
1664	fg => [1, 1, 1],	1801	fg => [1, 1, 1],
1665	bg => [1, 1, 1, 0.2],
1666	active_fg => [0, 0, 1],	1802	active_fg => [0, 0, 1],
1667	can_hover => 1,	1803	can_hover => 1,
1668	align => 0,	1804	align => 0,
1669	valign => 0,	1805	valign => 0,
1670	can_events => 1,	1806	can_events => 1,
1671	@_	1807	@_
1672	)	1808	)
1673	}	1809	}
1674		1810
		1811	sub activate { }
		1812
1675	sub button_up {	1813	sub button_up {
1676	my ($self, $ev, $x, $y) = @_;	1814	my ($self, $ev, $x, $y) = @_;
1677		1815
		1816	$self->emit ("activate")
1678	if ($x >= 0 && $x < $self->{w}	1817	if $x >= 0 && $x < $self->{w}
1679	&& $y >= 0 && $y < $self->{h}) {	1818	&& $y >= 0 && $y < $self->{h};
1680	$self->emit ("activate");
1681	}
1682	}	1819	}
1683		1820
1684	sub _draw {	1821	sub _draw {
1685	my ($self) = @_;	1822	my ($self) = @_;
1686		1823
…		…
1718		1855
1719	$class->SUPER::new (	1856	$class->SUPER::new (
1720	padding => 2,	1857	padding => 2,
1721	fg => [1, 1, 1],	1858	fg => [1, 1, 1],
1722	active_fg => [1, 1, 0],	1859	active_fg => [1, 1, 0],
		1860	bg => [0, 0, 0, 0.2],
		1861	active_bg => [1, 1, 1, 0.5],
1723	state => 0,	1862	state => 0,
1724	can_hover => 1,	1863	can_hover => 1,
1725	@_	1864	@_
1726	)	1865	)
1727	}	1866	}
…		…
1736	my ($self, $ev, $x, $y) = @_;	1875	my ($self, $ev, $x, $y) = @_;
1737		1876
1738	if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}	1877	if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}
1739	&& $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {	1878	&& $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {
1740	$self->{state} = !$self->{state};	1879	$self->{state} = !$self->{state};
1741	$self->emit (changed => $self->{state});	1880	$self->_emit (changed => $self->{state});
1742	}	1881	}
1743	}	1882	}
1744		1883
1745	sub _draw {	1884	sub _draw {
1746	my ($self) = @_;	1885	my ($self) = @_;
…		…
2011	qw(s1_slider.png s1_slider_bg.png);	2150	qw(s1_slider.png s1_slider_bg.png);
2012		2151
2013	sub new {	2152	sub new {
2014	my $class = shift;	2153	my $class = shift;
2015		2154
2016	# range [value, low, high, page]	2155	# range [value, low, high, page, unit]
2017		2156
2018	# TODO: 0-width page	2157	# TODO: 0-width page
2019	# TODO: req_w/h are wrong with vertical	2158	# TODO: req_w/h are wrong with vertical
2020	# TODO: calculations are off	2159	# TODO: calculations are off
2021	my $self = $class->SUPER::new (	2160	my $self = $class->SUPER::new (
2022	fg => [1, 1, 1],	2161	fg => [1, 1, 1],
2023	active_fg => [0, 0, 0],	2162	active_fg => [0, 0, 0],
		2163	bg => [0, 0, 0, 0.2],
		2164	active_bg => [1, 1, 1, 0.5],
2024	range => [0, 0, 100, 10],	2165	range => [0, 0, 100, 10, 0],
2025	req_w => $::WIDTH / 80,	2166	req_w => $::WIDTH / 80,
2026	req_h => $::WIDTH / 80,	2167	req_h => $::WIDTH / 80,
2027	vertical => 0,	2168	vertical => 0,
2028	can_hover => 1,	2169	can_hover => 1,
2029	inner_pad => 5,	2170	inner_pad => 0.02,
2030	@_	2171	@_
2031	);	2172	);
2032		2173
		2174	$self->set_value ($self->{range}[0]);
		2175	$self->update;
		2176
2033	$self	2177	$self
		2178	}
		2179
		2180	sub set_range {
		2181	my ($self, $range) = @_;
		2182
		2183	($range, $self->{range}) = ($self->{range}, $range);
		2184
		2185	$self->update
		2186	if "@$range" ne "@{$self->{range}}";
		2187	}
		2188
		2189	sub set_value {
		2190	my ($self, $value) = @_;
		2191
		2192	my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
		2193
		2194	$hi = $lo + 1 if $hi <= $lo;
		2195
		2196	$page = $hi - $lo if $page > $hi - $lo;
		2197
		2198	$value = $lo if $value < $lo;
		2199	$value = $hi - $page if $value > $hi - $page;
		2200
		2201	$value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
		2202	if $unit;
		2203
		2204	@{$self->{range}} = ($value, $lo, $hi, $page, $unit);
		2205
		2206	if ($value != $old_value) {
		2207	$self->_emit (changed => $value);
		2208	$self->update;
		2209	}
2034	}	2210	}
2035		2211
2036	sub size_request {	2212	sub size_request {
2037	my ($self) = @_;	2213	my ($self) = @_;
2038		2214
…		…
2044		2220
2045	sub button_down {	2221	sub button_down {
2046	my ($self, $ev, $x, $y) = @_;	2222	my ($self, $ev, $x, $y) = @_;
2047		2223
2048	$self->SUPER::button_down ($ev, $x, $y);	2224	$self->SUPER::button_down ($ev, $x, $y);
		2225
		2226	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
		2227
2049	$self->mouse_motion ($ev, $x, $y);	2228	$self->mouse_motion ($ev, $x, $y);
2050	}	2229	}
2051		2230
2052	sub mouse_motion {	2231	sub mouse_motion {
2053	my ($self, $ev, $x, $y) = @_;	2232	my ($self, $ev, $x, $y) = @_;
2054		2233
2055	if ($GRAB == $self) {	2234	if ($GRAB == $self) {
		2235	my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
		2236
		2237	my (undef, $lo, $hi, $page) = @{$self->{range}};
		2238
		2239	$x = ($x - $self->{click}[1]) / ($w * $self->{scale});
		2240
		2241	$self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
		2242	}
		2243	}
		2244
		2245	sub update {
		2246	my ($self) = @_;
		2247
		2248	$CFClient::UI::ROOT->on_post_alloc ($self => sub {
		2249	$self->set_value ($self->{range}[0]);
		2250
2056	my ($value, $lo, $hi, $page) = @{$self->{range}};	2251	my ($value, $lo, $hi, $page) = @{$self->{range}};
		2252	my $range = ($hi - $page - $lo) || 1e-100;
2057		2253
2058	my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});	2254	my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
2059		2255
2060	my $inner_pad_px = $self->_calc_inner_pad_px ($w);	2256	$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	2257	$self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
2062		2258
2063	$x -= $inner_pad_px; # substract the padding	2259	$value = ($value - $lo) / $range;
2064	$x = $x * ($hi - $lo) / $inner_w + $lo;	2260	$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		2261
2069	$self->emit (changed => $x);	2262	$self->{knob_x} = $value - $knob_w * 0.5;
2070	$self->update;	2263	$self->{knob_w} = $knob_w;
2071	}	2264	});
2072	}
2073		2265
2074	# the inner_* stuff is for generating a padding for the slider handle,	2266	$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	}	2267	}
2081		2268
2082	sub _draw {	2269	sub _draw {
2083	my ($self) = @_;	2270	my ($self) = @_;
2084		2271
2085	$self->SUPER::_draw ();	2272	$self->SUPER::_draw ();
2086		2273
2087	my ($w, $h) = @$self{qw(w h)};	2274	glScale $self->{w}, $self->{h};
2088		2275
2089	if ($self->{vertical}) {	2276	if ($self->{vertical}) {
2090	# draw a vertical slider like a rotated horizontal slider	2277	# draw a vertical slider like a rotated horizontal slider
2091		2278
		2279	glTranslate 1, 0, 0;
2092	glRotate 90, 0, 0, 1;	2280	glRotate 90, 0, 0, 1;
2093	glTranslate 0, -$self->{w}, 0;
2094
2095	($w, $h) = ($h, $w);
2096	}	2281	}
2097		2282
2098	my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};	2283	my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
2099	my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};	2284	my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
2100		2285
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;	2286	glEnable GL_TEXTURE_2D;
2120	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2287	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2121		2288
2122	# draw background	2289	# draw background
2123	$tex[1]->draw_quad_alpha (0, 0, $w, $h);	2290	$tex[1]->draw_quad_alpha (0, 0, 1, 1);
2124		2291
2125	# draw handle	2292	# draw handle
2126	$tex[0]->draw_quad_alpha ($knob_a, 0, $knob_b - $knob_a, $h);	2293	$tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1);
2127		2294
2128	glDisable GL_TEXTURE_2D;	2295	glDisable GL_TEXTURE_2D;
2129	}	2296	}
		2297
		2298	#############################################################################
		2299
		2300	package CFClient::UI::ValSlider;
		2301
		2302	our @ISA = CFClient::UI::HBox::;
		2303
		2304	sub new {
		2305	my ($class, %arg) = @_;
		2306
		2307	my $range = delete $arg{range};
		2308
		2309	my $self = $class->SUPER::new (
		2310	slider => (new CFClient::UI::Slider expand => 1, range => $range),
		2311	entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),
		2312	to_value => sub { shift },
		2313	from_value => sub { shift },
		2314	%arg,
		2315	);
		2316
		2317	$self->{slider}->connect (changed => sub {
		2318	my ($self, $value) = @_;
		2319	$self->{parent}{entry}->set_text ($self->{parent}{to_value}->($value));
		2320	$self->{parent}->emit (changed => $value);
		2321	});
		2322
		2323	# $self->{entry}->connect (changed => sub {
		2324	# my ($self, $value) = @_;
		2325	# $self->{parent}{slider}->set_value ($self->{parent}{from_value}->($value));
		2326	# $self->{parent}->emit (changed => $value);
		2327	# });
		2328
		2329	$self->add ($self->{slider}, $self->{entry});
		2330
		2331	$self->{slider}->emit (changed => $self->{slider}{range}[0]);
		2332
		2333	$self
		2334	}
		2335
		2336	sub set_range { shift->{slider}->set_range (@_) }
		2337	sub set_value { shift->{slider}->set_value (@_) }
2130		2338
2131	#############################################################################	2339	#############################################################################
2132		2340
2133	package CFClient::UI::TextView;	2341	package CFClient::UI::TextView;
2134		2342
…		…
2164		2372
2165	$self->{fontsize} = $fontsize;	2373	$self->{fontsize} = $fontsize;
2166	$self->reflow;	2374	$self->reflow;
2167	}	2375	}
2168		2376
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 {	2377	sub size_allocate {
2189	my ($self, $w, $h) = @_;	2378	my ($self, $w, $h) = @_;
2190		2379
2191	$self->SUPER::size_allocate ($w, $h);	2380	$self->SUPER::size_allocate ($w, $h);
2192		2381
…		…
2195	$self->{layout}->set_width ($self->{children}[0]{w});	2384	$self->{layout}->set_width ($self->{children}[0]{w});
2196		2385
2197	$self->reflow;	2386	$self->reflow;
2198	}	2387	}
2199		2388
		2389	sub text_size {
		2390	my ($self, $text, $indent) = @_;
		2391
		2392	my $layout = $self->{layout};
		2393
		2394	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
		2395	$layout->set_width ($self->{children}[0]{w} - $indent);
		2396	$layout->set_markup ($text);
		2397
		2398	$layout->size
		2399	}
		2400
		2401	sub reflow {
		2402	my ($self) = @_;
		2403
		2404	$self->{need_reflow}++;
		2405	$self->update;
		2406	}
		2407
		2408	sub set_offset {
		2409	my ($self, $offset) = @_;
		2410
		2411	# todo: base offset on lines or so, not on pixels
		2412	$self->{children}[1]->set_value ($offset);
		2413	}
		2414
		2415	sub clear {
		2416	my ($self) = @_;
		2417
		2418	$self->{par} = [];
		2419	$self->{height} = 0;
		2420	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
		2421	}
		2422
2200	sub add_paragraph {	2423	sub add_paragraph {
2201	my ($self, $color, $text) = @_;	2424	my ($self, $color, $text, $indent) = @_;
2202		2425
2203	#TODO: intelligently "reformat" paragraph	2426	for my $line (split /\n/, $text) {
2204		2427	my ($w, $h) = $self->text_size ($line);
2205	my $height = $self->text_height ($text);
2206
2207	$self->{height} += $height;	2428	$self->{height} += $h;
		2429	push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];
		2430	}
2208		2431
2209	push @{$self->{par}}, [$height, $color, $text];
2210
2211	$self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}];	2432	$self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]);
2212	$self->{children}[1]->update;
2213	}	2433	}
2214		2434
2215	sub update {	2435	sub update {
2216	my ($self) = @_;	2436	my ($self) = @_;
2217		2437
…		…
2220	return unless $self->{h} > 0;	2440	return unless $self->{h} > 0;
2221		2441
2222	delete $self->{texture};	2442	delete $self->{texture};
2223		2443
2224	$ROOT->on_post_alloc ($self, sub {	2444	$ROOT->on_post_alloc ($self, sub {
		2445	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
		2446
2225	if (delete $self->{need_reflow}) {	2447	if (delete $self->{need_reflow}) {
2226	my $height = 0;	2448	my $height = 0;
2227		2449
2228	$height += $_->[0] = $self->text_height ($_->[2])	2450	my $layout = $self->{layout};
		2451
		2452	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
		2453
2229	for @{$self->{par}};	2454	for (@{$self->{par}}) {
		2455	if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
		2456	$layout->set_width ($W - $_->[3]);
		2457	$layout->set_markup ($_->[4]);
		2458	my ($w, $h) = $layout->size;
		2459	$_->[0] = $w + $_->[3];
		2460	$_->[1] = $h;
		2461	}
		2462
		2463	$height += $_->[1];
		2464	}
2230		2465
2231	$self->{height} = $height;	2466	$self->{height} = $height;
2232		2467
2233	$self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];	2468	$self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2234		2469
2235	delete $self->{texture};	2470	delete $self->{texture};
2236	}	2471	}
2237		2472
2238	$self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub {	2473	$self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2239	glClearColor 0, 0, 0, 0;	2474	glClearColor 0.5, 0.5, 0.5, 0;
2240	glClear GL_COLOR_BUFFER_BIT;	2475	glClear GL_COLOR_BUFFER_BIT;
2241		2476
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];	2477	my $top = int $self->{children}[1]{range}[0];
2246		2478
2247	my $y0 = $top;	2479	my $y0 = $top;
2248	my $y1 = $top + $self->{h};	2480	my $y1 = $top + $H;
2249		2481
2250	my $y = 0;	2482	my $y = 0;
2251		2483
2252	my $layout = $self->{layout};	2484	my $layout = $self->{layout};
2253		2485
2254	$layout->set_font ($self->{font}) if $self->{font};	2486	$layout->set_font ($self->{font}) if $self->{font};
2255		2487
		2488	glEnable GL_BLEND;
		2489	#TODO# not correct in windows where rgba is forced off
		2490	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
		2491
2256	for my $par (@{$self->{par}}) {	2492	for my $par (@{$self->{par}}) {
2257	my $h = $par->[0];	2493	my $h = $par->[1];
2258		2494
2259	if ($y0 < $y + $h && $y < $y1) {	2495	if ($y0 < $y + $h && $y < $y1) {
2260	$layout->set_foreground (@{ $par->[1] });	2496	$layout->set_foreground (@{ $par->[2] });
		2497	$layout->set_width ($W - $par->[3]);
2261	$layout->set_markup ($par->[2]);	2498	$layout->set_markup ($par->[4]);
2262		2499
2263	my ($W, $H) = $layout->size;	2500	my ($w, $h, $data, $format, $internalformat) = $layout->render;
2264	CFClient::Texture->new_from_layout ($layout)->draw_quad_alpha_premultiplied (0, $y - $y0);	2501
		2502	glRasterPos $par->[3], $y - $y0;
		2503	glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2265	}	2504	}
2266		2505
2267	$y += $h;	2506	$y += $h;
2268	}	2507	}
2269		2508
2270	glDisable GL_TEXTURE_2D;	2509	glDisable GL_BLEND;
2271	};	2510	};
2272	});	2511	});
2273	}	2512	}
2274		2513
2275	sub _draw {	2514	sub _draw {
2276	my ($self) = @_;	2515	my ($self) = @_;
2277		2516
2278	glEnable GL_TEXTURE_2D;	2517	glEnable GL_TEXTURE_2D;
2279	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2518	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2280	glColor 1, 1, 1, 1;	2519	glColor 1, 1, 1, 1;
2281	$self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});	2520	$self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2282	glDisable GL_TEXTURE_2D;	2521	glDisable GL_TEXTURE_2D;
2283		2522
2284	$self->{children}[1]->draw;	2523	$self->{children}[1]->draw;
2285		2524
2286	}	2525	}
…		…
2335		2574
2336	sub new {	2575	sub new {
2337	my $class = shift;	2576	my $class = shift;
2338		2577
2339	my $self = $class->SUPER::new (	2578	my $self = $class->SUPER::new (
2340	state => 0,	2579	state => 0,
2341	connect_activate => \&toggle_flopper,	2580	on_activate => \&toggle_flopper,
2342	@_	2581	@_
2343	);	2582	);
2344		2583
2345	if ($self->{state}) {	2584	if ($self->{state}) {
2346	$self->{state} = 0;	2585	$self->{state} = 0;
…		…
2355		2594
2356	# TODO: use animation	2595	# TODO: use animation
2357	if ($self->{state} = !$self->{state}) {	2596	if ($self->{state} = !$self->{state}) {
2358	$CFClient::UI::ROOT->add ($self->{other});	2597	$CFClient::UI::ROOT->add ($self->{other});
2359	$self->{other}->move ($self->coord2global (0, $self->{h}));	2598	$self->{other}->move ($self->coord2global (0, $self->{h}));
2360	$self->emit ("open");	2599	$self->_emit ("open");
2361	} else {	2600	} else {
2362	$CFClient::UI::ROOT->remove ($self->{other});	2601	$CFClient::UI::ROOT->remove ($self->{other});
2363	$self->emit ("close");	2602	$self->_emit ("close");
2364	}	2603	}
2365		2604
2366	$self->emit (changed => $self->{state});	2605	$self->_emit (changed => $self->{state});
2367	}	2606	}
2368		2607
2369	#############################################################################	2608	#############################################################################
2370		2609
2371	package CFClient::UI::Tooltip;	2610	package CFClient::UI::Tooltip;
…		…
2385		2624
2386	sub set_tooltip_from {	2625	sub set_tooltip_from {
2387	my ($self, $widget) = @_;	2626	my ($self, $widget) = @_;
2388		2627
2389	$self->add (new CFClient::UI::Label	2628	$self->add (new CFClient::UI::Label
2390	markup => $widget->{tooltip},	2629	markup => $widget->{tooltip},
2391	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,	2630	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2392	fontsize => 0.8,	2631	fontsize => 0.8,
2393	fg => [0, 0, 0, 1],	2632	fg => [0, 0, 0, 1],
		2633	ellipsise => 0,
2394	font => ($widget->{tooltip_font} || $::FONT_PROP),	2634	font => ($widget->{tooltip_font} || $::FONT_PROP),
2395	);	2635	);
2396	}	2636	}
2397		2637
2398	sub size_request {	2638	sub size_request {
2399	my ($self) = @_;	2639	my ($self) = @_;
…		…
2445	use CFClient::OpenGL;	2685	use CFClient::OpenGL;
2446		2686
2447	sub new {	2687	sub new {
2448	my $class = shift;	2688	my $class = shift;
2449		2689
2450	$class->SUPER::new (	2690	my $self = $class->SUPER::new (
2451	aspect => 1,	2691	aspect => 1,
		2692	can_events => 0,
2452	@_,	2693	@_,
2453	)	2694	);
		2695
		2696	if ($self->{anim} && $self->{animspeed}) {
		2697	Scalar::Util::weaken (my $widget = $self);
		2698
		2699	$self->{timer} = Event->timer (
		2700	at => $self->{animspeed} * int $::NOW / $self->{animspeed},
		2701	hard => 1,
		2702	interval => $self->{animspeed},
		2703	cb => sub {
		2704	++$widget->{frame};
		2705	$widget->update;
		2706	},
		2707	);
		2708	}
		2709
		2710	$self
2454	}	2711	}
2455		2712
2456	sub size_request {	2713	sub size_request {
2457	(32, 8)	2714	(32, 8)
2458	}	2715	}
2459		2716
		2717	sub update {
		2718	my ($self) = @_;
		2719
		2720	return unless $self->{visible};
		2721
		2722	$self->SUPER::update;
		2723	}
		2724
2460	sub _draw {	2725	sub _draw {
2461	my ($self) = @_;	2726	my ($self) = @_;
2462		2727
2463	return unless $::CONN;#d# manage and cache textures differently	2728	return unless $::CONN;
		2729
		2730	my $face;
		2731
		2732	if ($self->{frame}) {
		2733	my $anim = $::CONN->{anim}[$self->{anim}];
		2734
		2735	$face = $anim->[ $self->{frame} % @$anim ]
		2736	if $anim && @$anim;
		2737	}
		2738
2464	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]];	2739	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2465		2740
2466	# TODO animation
2467	if ($tex) {	2741	if ($tex) {
2468	glEnable GL_TEXTURE_2D;	2742	glEnable GL_TEXTURE_2D;
2469	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2743	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2470	glColor 1, 1, 1, 1;	2744	glColor 1, 1, 1, 1;
2471	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});	2745	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2472	glDisable GL_TEXTURE_2D;	2746	glDisable GL_TEXTURE_2D;
2473	}	2747	}
2474	}	2748	}
2475		2749
		2750	sub DESTROY {
		2751	my ($self) = @_;
		2752
		2753	$self->{timer}->cancel
		2754	if $self->{timer};
		2755
		2756	$self->SUPER::DESTROY;
		2757	}
		2758
2476	#############################################################################	2759	#############################################################################
2477		2760
2478	package CFClient::UI::InventoryItem;	2761	package CFClient::UI::Inventory;
2479		2762
2480	our @ISA = CFClient::UI::HBox::;	2763	our @ISA = CFClient::UI::ScrolledWindow::;
2481		2764
2482	sub new {	2765	sub new {
2483	my $class = shift;	2766	my $class = shift;
2484		2767
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 (	2768	my $self = $class->SUPER::new (
2495	can_hover => 1,	2769	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	@_,	2770	@_,
2554	);	2771	);
2555		2772
2556	$self	2773	$self
2557	}	2774	}
…		…
2567	or ($a->{name} cmp $b->{name})	2784	or ($a->{name} cmp $b->{name})
2568	} @$items;	2785	} @$items;
2569		2786
2570	$self->{real_items} = \@items;	2787	$self->{real_items} = \@items;
2571		2788
		2789	my $row = 0;
2572	for my $item (@items) {	2790	for my $item (@items) {
2573	my $desc = $item->{nrof} < 2	2791	CFClient::Item::update_widgets $item;
2574	? $item->{name}
2575	: "$item->{nrof} $item->{name_pl}";
2576		2792
2577	$item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item;	2793	$self->{scrolled}->add (0, $row, $item->{face_widget});
2578	}	2794	$self->{scrolled}->add (1, $row, $item->{desc_widget});
		2795	$self->{scrolled}->add (2, $row, $item->{weight_widget});
2579		2796
2580	$self->{scrolled}->add (@items);	2797	$row++;
2581		2798	}
2582	# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2583	}	2799	}
2584		2800
2585	sub size_request {	2801	sub size_request {
2586	my ($self) = @_;	2802	my ($self) = @_;
2587	($self->{req_w}, $self->{req_h});	2803	($self->{req_w}, $self->{req_h});
…		…
2627		2843
2628	# popup given the event (must be a mouse button down event currently)	2844	# popup given the event (must be a mouse button down event currently)
2629	sub popup {	2845	sub popup {
2630	my ($self, $ev) = @_;	2846	my ($self, $ev) = @_;
2631		2847
2632	$self->emit ("popdown");	2848	$self->_emit ("popdown");
2633		2849
2634	# maybe save $GRAB? must be careful about events...	2850	# maybe save $GRAB? must be careful about events...
2635	$GRAB = $self;	2851	$GRAB = $self;
2636	$self->{button} = $ev->{button};	2852	$self->{button} = $ev->{button};
2637		2853
…		…
2652		2868
2653	if ($ev->{button} == $self->{button}) {	2869	if ($ev->{button} == $self->{button}) {
2654	undef $GRAB;	2870	undef $GRAB;
2655	$self->hide;	2871	$self->hide;
2656		2872
2657	$self->emit ("popdown");	2873	$self->_emit ("popdown");
2658	$self->{hover}[1]->() if $self->{hover};	2874	$self->{hover}[1]->() if $self->{hover};
2659	}	2875	}
2660	}	2876	}
2661		2877
2662	#############################################################################	2878	#############################################################################
2663		2879
2664	package CFClient::UI::Statusbox;	2880	package CFClient::UI::Statusbox;
2665		2881
2666	our @ISA = CFClient::UI::VBox::;	2882	our @ISA = CFClient::UI::VBox::;
		2883
		2884	sub new {
		2885	my $class = shift;
		2886
		2887	$class->SUPER::new (
		2888	fontsize => 0.8,
		2889	@_,
		2890	)
		2891	}
2667		2892
2668	sub reorder {	2893	sub reorder {
2669	my ($self) = @_;	2894	my ($self) = @_;
2670	my $NOW = time;	2895	my $NOW = time;
2671		2896
…		…
2690	? "<b>$item->{count} ×</b> $item->{text}"	2915	? "<b>$item->{count} ×</b> $item->{text}"
2691	: $item->{text};	2916	: $item->{text};
2692		2917
2693	for ($short) {	2918	for ($short) {
2694	s/^\s+//;	2919	s/^\s+//;
2695	s/\012.*/…/s;	2920	s/\s+/ /g;
2696	my $len = int 40 / $item->{fontsize};
2697	substr $_, $len, length, "…" if $len < length;
2698	}	2921	}
2699		2922
2700	new CFClient::UI::Label	2923	new CFClient::UI::Label
2701	markup => $short,	2924	markup => $short,
2702	tooltip => $item->{tooltip},	2925	tooltip => $item->{tooltip},
2703	tooltip_font => $::FONT_PROP,	2926	tooltip_font => $::FONT_PROP,
2704	tooltip_width => 0.67,	2927	tooltip_width => 0.67,
2705	fontsize => $item->{fontsize},	2928	fontsize => $item->{fontsize} || $self->{fontsize},
		2929	max_w => $::WIDTH * 0.44,
2706	color => $item->{color},	2930	fg => $item->{fg},
2707	can_events => 1,	2931	can_events => 1,
2708	can_hover => 1	2932	can_hover => 1
2709	};	2933	};
2710	}	2934	}
2711		2935
…		…
2716	sub add {	2940	sub add {
2717	my ($self, $text, %arg) = @_;	2941	my ($self, $text, %arg) = @_;
2718		2942
2719	$text =~ s/^\s+//;	2943	$text =~ s/^\s+//;
2720	$text =~ s/\s+$//;	2944	$text =~ s/\s+$//;
		2945
		2946	return unless $text;
2721		2947
2722	my $timeout = time + ((delete $arg{timeout}) || 60);	2948	my $timeout = time + ((delete $arg{timeout}) || 60);
2723		2949
2724	my $group = exists $arg{group} ? $arg{group} : ++$self->{id};	2950	my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2725		2951
…		…
2737	$self->{item}{$group} = {	2963	$self->{item}{$group} = {
2738	id => ++$self->{id},	2964	id => ++$self->{id},
2739	text => $text,	2965	text => $text,
2740	timeout => $timeout,	2966	timeout => $timeout,
2741	tooltip => $text,	2967	tooltip => $text,
2742	fontsize => 0.8,
2743	color => [0.8, 0.8, 0.8, 0.8],	2968	fg => [0.8, 0.8, 0.8, 0.8],
2744	pri => 0,	2969	pri => 0,
2745	count => 1,	2970	count => 1,
2746	%arg,	2971	%arg,
2747	};	2972	};
2748	}	2973	}
2749		2974
2750	$self->reorder;	2975	$self->reorder;
2751	}	2976	}
2752		2977
		2978	sub reconfigure {
		2979	my ($self) = @_;
		2980
		2981	delete $_->{label}
		2982	for values %{ $self->{item} || {} };
		2983
		2984	$self->reorder;
		2985	$self->SUPER::reconfigure;
		2986	}
		2987
2753	#############################################################################	2988	#############################################################################
2754		2989
2755	package CFClient::UI::Root;	2990	package CFClient::UI::Root;
2756		2991
2757	our @ISA = CFClient::UI::Container::;	2992	our @ISA = CFClient::UI::Container::;
…		…
2760		2995
2761	sub new {	2996	sub new {
2762	my $class = shift;	2997	my $class = shift;
2763		2998
2764	$class->SUPER::new (	2999	$class->SUPER::new (
		3000	visible => 1,
2765	@_,	3001	@_,
2766	)	3002	)
2767	}	3003	}
2768		3004
2769	sub configure {	3005	sub configure {
…		…
2787	}	3023	}
2788		3024
2789	sub size_allocate {	3025	sub size_allocate {
2790	my ($self, $w, $h) = @_;	3026	my ($self, $w, $h) = @_;
2791		3027
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) {	3028	for my $child ($self->children) {
2799	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};	3029	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2800		3030
		3031	$X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1
		3032	if exists $child->{req_x};
		3033
		3034	$Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1
		3035	if exists $child->{req_y};
		3036
2801	$X = List::Util::max 0, List::Util::min $w - $W, $X;	3037	$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;	3038	$Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
		3039
2803	$child->configure ($X, $Y, $W, $H);	3040	$child->configure ($X, $Y, $W, $H);
2804	}	3041	}
2805	}	3042	}
2806		3043
2807	sub coord2local {	3044	sub coord2local {
…		…
2824	}	3061	}
2825		3062
2826	sub add {	3063	sub add {
2827	my ($self, @children) = @_;	3064	my ($self, @children) = @_;
2828		3065
		3066	for (my @widgets = @children; my $w = pop @widgets; ) {
		3067	push @widgets, $w->children;
		3068	$w->{root} = $self;
		3069	$w->{visible} = $self->{visible} + 1;
		3070	}
		3071
2829	for my $child (@children) {	3072	for my $child (@children) {
2830	$child->{toplevel} = 1;	3073	$child->{is_toplevel} = 1;
2831		3074
2832	# integerise window positions	3075	# integerise window positions
2833	$child->{x} = int $child->{x};	3076	$child->{x} = int $child->{x};
2834	$child->{y} = int $child->{y};	3077	$child->{y} = int $child->{y};
2835	}	3078	}
2836		3079
2837	$self->SUPER::add (@children);	3080	$self->SUPER::add (@children);
2838	}	3081	}
2839		3082
		3083	sub remove {
		3084	my ($self, @children) = @_;
		3085
		3086	$self->SUPER::remove (@children);
		3087
		3088	while (@children) {
		3089	my $w = pop @children;
		3090	push @children, $w->children;
		3091	$w->set_invisible;
		3092	}
		3093	}
		3094
2840	sub on_refresh {	3095	sub on_refresh {
2841	my ($self, $id, $cb) = @_;	3096	my ($self, $id, $cb) = @_;
2842		3097
2843	$self->{refresh_hook}{$id} = $cb;	3098	$self->{refresh_hook}{$id} = $cb;
2844	}	3099	}
…		…
2856	$_->()	3111	$_->()
2857	for values %{delete $self->{refresh_hook}};	3112	for values %{delete $self->{refresh_hook}};
2858	}	3113	}
2859		3114
2860	if ($self->{check_size}) {	3115	if ($self->{check_size}) {
2861	my @queue = ([], []);	3116	my @queue;
2862		3117
2863	for (;;) {	3118	for (;;) {
2864	if ($self->{check_size}) {	3119	if ($self->{check_size}) {
2865	# heuristic: check containers last	3120	#TODO use array-of-depth approach
2866	push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_	3121
		3122	@queue = sort { $a->{visible} <=> $b->{visible} }
2867	for values %{delete $self->{check_size}}	3123	@queue, values %{delete $self->{check_size}};
2868	}	3124	}
2869		3125
2870	my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last;	3126	my $widget = pop @queue || last;
		3127
		3128	defined $widget->{visible} or last; # do not resize invisible widgets
2871		3129
2872	my ($w, $h) = $widget->{user_w} && $widget->{user_h}	3130	my ($w, $h) = $widget->{user_w} && $widget->{user_h}
2873	? @$widget{qw(user_w user_h)}	3131	? @$widget{qw(user_w user_h)}
2874	: $widget->size_request;	3132	: $widget->size_request;
2875		3133
…		…
2895	$w = 0 if $w < 0;	3153	$w = 0 if $w < 0;
2896	$h = 0 if $h < 0;	3154	$h = 0 if $h < 0;
2897		3155
2898	$widget->{w} = $w;	3156	$widget->{w} = $w;
2899	$widget->{h} = $h;	3157	$widget->{h} = $h;
2900	$widget->size_allocate ($w, $h);
2901	$widget->emit (size_allocate => $w, $h);	3158	$widget->emit (size_allocate => $w, $h);
2902	}	3159	}
2903	}	3160	}
2904		3161
2905	while ($self->{post_alloc_hook}) {	3162	while ($self->{post_alloc_hook}) {
…		…
2911	glClearColor +($::CFG->{fow_intensity}) x 3, 1;	3168	glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2912	glClear GL_COLOR_BUFFER_BIT;	3169	glClear GL_COLOR_BUFFER_BIT;
2913		3170
2914	glMatrixMode GL_PROJECTION;	3171	glMatrixMode GL_PROJECTION;
2915	glLoadIdentity;	3172	glLoadIdentity;
2916	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000;	3173	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
2917	glMatrixMode GL_MODELVIEW;	3174	glMatrixMode GL_MODELVIEW;
2918	glLoadIdentity;	3175	glLoadIdentity;
2919		3176
2920	$self->_draw;	3177	$self->_draw;
2921	}	3178	}
…		…
2923	#############################################################################	3180	#############################################################################
2924		3181
2925	package CFClient::UI;	3182	package CFClient::UI;
2926		3183
2927	$ROOT = new CFClient::UI::Root;	3184	$ROOT = new CFClient::UI::Root;
2928	$TOOLTIP = new CFClient::UI::Tooltip;	3185	$TOOLTIP = new CFClient::UI::Tooltip z => 900;
2929		3186
2930	1	3187	1
2931		3188

Diff Legend

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