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.206 by root, Mon May 15 17:45:29 2006 UTC vs.
Revision 1.245 by elmex, Sat May 27 21:15:57 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}) {
…		…
50	delete $TOOLTIP->{owner};	70	delete $TOOLTIP->{owner};
51	}	71	}
52		72
53	# class methods for events	73	# class methods for events
54	sub feed_sdl_key_down_event {	74	sub feed_sdl_key_down_event {
55	$FOCUS->emit (key_down => $_[0]) || $FOCUS->key_down ($_[0])	75	$FOCUS->emit (key_down => $_[0])
56	if $FOCUS;	76	if $FOCUS;
57	}	77	}
58		78
59	sub feed_sdl_key_up_event {	79	sub feed_sdl_key_up_event {
60	$FOCUS->emit (key_up => $_[0]) || $FOCUS->key_up ($_[0])	80	$FOCUS->emit (key_up => $_[0])
61	if $FOCUS;	81	if $FOCUS;
62	}	82	}
63		83
64	sub feed_sdl_button_down_event {	84	sub feed_sdl_button_down_event {
65	my ($ev) = @_;	85	my ($ev) = @_;
…		…
74	check_tooltip;	94	check_tooltip;
75	}	95	}
76		96
77	$BUTTON_STATE |= 1 << ($ev->{button} - 1);	97	$BUTTON_STATE |= 1 << ($ev->{button} - 1);
78		98
79	if ($GRAB) {	99	$GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))
80	($x, $y) = $GRAB->coord2local ($x, $y);	100	if $GRAB;
81	$GRAB->emit (button_down => $ev, $x, $y) || $GRAB->button_down ($ev, $x, $y);
82	}
83	}	101	}
84		102
85	sub feed_sdl_button_up_event {	103	sub feed_sdl_button_up_event {
86	my ($ev) = @_;	104	my ($ev) = @_;
87	my ($x, $y) = ($ev->{x}, $ev->{y});	105	my ($x, $y) = ($ev->{x}, $ev->{y});
88		106
89	my $widget = $GRAB || $ROOT->find_widget ($x, $y);	107	my $widget = $GRAB || $ROOT->find_widget ($x, $y);
90		108
91	$BUTTON_STATE &= ~(1 << ($ev->{button} - 1));	109	$BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
92		110
93	if ($GRAB) {	111	$GRAB->emit (button_up => $ev, $GRAB->coord2local ($x, $y))
94	($x, $y) = $GRAB->coord2local ($x, $y);	112	if $GRAB;
95	$GRAB->emit (button_up => $ev, $x, $y) || $GRAB->button_up ($ev, $x, $y);
96	}
97		113
98	if (!$BUTTON_STATE) {	114	if (!$BUTTON_STATE) {
99	my $grab = $GRAB; undef $GRAB;	115	my $grab = $GRAB; undef $GRAB;
100	$grab->update if $grab;	116	$grab->update if $grab;
101	$GRAB->update if $GRAB;	117	$GRAB->update if $GRAB;
…		…
117	$HOVER->update if $HOVER && $HOVER->{can_hover};	133	$HOVER->update if $HOVER && $HOVER->{can_hover};
118		134
119	check_tooltip;	135	check_tooltip;
120	}	136	}
121		137
122	if ($HOVER) {
123	($x, $y) = $HOVER->coord2local ($x, $y);
124	$HOVER->emit (mouse_motion => $ev, $x, $y) || $HOVER->mouse_motion ($ev, $x, $y);	138	$HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
125	}	139	if $HOVER;
126	}	140	}
127		141
128	# convert position array to integers	142	# convert position array to integers
129	sub harmonize {	143	sub harmonize {
130	my ($vals) = @_;	144	my ($vals) = @_;
…		…
136	$rem += $_ - $i;	150	$rem += $_ - $i;
137	$_ = $i;	151	$_ = $i;
138	}	152	}
139	}	153	}
140		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
141	# call when resolution changes etc.	171	# call when resolution changes etc.
142	sub rescale_widgets {	172	sub rescale_widgets {
143	my ($sx, $sy) = @_;	173	my ($sx, $sy) = @_;
144		174
145	for my $widget (values %WIDGET) {	175	for my $widget (values %WIDGET) {
146	if ($widget->{toplevel}) {	176	if ($widget->{is_toplevel}) {
147	$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};
148	$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};
149	$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};
150	$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};
151	$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};
152	$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};
153	$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};
154	$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};
155	}	185	}
156
157	$widget->reconfigure;
158	}	186	}
		187
		188	reconfigure_widgets;
159	}	189	}
160		190
161	#############################################################################	191	#############################################################################
162		192
163	package CFClient::UI::Base;	193	package CFClient::UI::Base;
…		…
176	can_events => 1,	206	can_events => 1,
177	@_	207	@_
178	}, $class;	208	}, $class;
179		209
180	for (keys %$self) {	210	for (keys %$self) {
181	if (/^connect_(.*)$/) {	211	if (/^on_(.*)$/) {
182	$self->connect ($1 => delete $self->{$_});	212	$self->connect ($1 => delete $self->{$_});
183	}	213	}
184	}	214	}
185		215
186	Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);	216	Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
187		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
188	$self	225	$self
		226	}
		227
		228	sub toggle_visibility {
		229	my ($self) = @_;
		230
		231	if ($self->{visible}) {
		232	$self->hide;
		233	} else {
		234	$self->show;
		235	}
189	}	236	}
190		237
191	sub destroy {	238	sub destroy {
192	my ($self) = @_;	239	my ($self) = @_;
193		240
…		…
195	%$self = ();	242	%$self = ();
196	}	243	}
197		244
198	sub show {	245	sub show {
199	my ($self) = @_;	246	my ($self) = @_;
200
201	return if $self->{parent};	247	return if $self->{parent};
202		248
203	$CFClient::UI::ROOT->add ($self);	249	$CFClient::UI::ROOT->add ($self);
204	}	250	}
205		251
206	sub hide {	252	sub show_centered {
207	my ($self) = @_;	253	my ($self) = @_;
		254	return if $self->{parent};
		255
		256	$self->show;
		257
		258	$CFClient::UI::ROOT->on_post_alloc (
		259	"centered $self" => sub {
		260	$self->move (($::WIDTH - $self->{w}) * 0.5, ($::HEIGHT - $self->{h}) * 0.5);
		261	},
		262	);
		263	}
		264
		265	sub set_invisible {
		266	my ($self) = @_;
		267
		268	return unless $self->{visible};
		269
		270	# broken show/hide model
		271
		272	delete $self->{root};
		273	delete $self->{visible};
208		274
209	undef $GRAB if $GRAB == $self;	275	undef $GRAB if $GRAB == $self;
210	undef $HOVER if $HOVER == $self;	276	undef $HOVER if $HOVER == $self;
		277
		278	CFClient::UI::check_tooltip
		279	if $CFClient::UI::TOOLTIP->{owner} == $self;
		280
		281	$self->focus_out;
		282
		283	$self->emit (visibility_change => 0);
		284	}
		285
		286	sub hide {
		287	my ($self) = @_;
		288
		289	$self->set_invisible;
211		290
212	$self->{parent}->remove ($self)	291	$self->{parent}->remove ($self)
213	if $self->{parent};	292	if $self->{parent};
214	}	293	}
215		294
…		…
282		361
283	delete $self->{max_w}; $self->{max_w} = $w if $w;	362	delete $self->{max_w}; $self->{max_w} = $w if $w;
284	delete $self->{max_h}; $self->{max_h} = $h if $h;	363	delete $self->{max_h}; $self->{max_h} = $h if $h;
285	}	364	}
286		365
		366	sub set_tooltip {
		367	my ($self, $tooltip) = @_;
		368
		369	$tooltip =~ s/^\s+//;
		370	$tooltip =~ s/\s+$//;
		371
		372	return if $self->{tooltip} eq $tooltip;
		373
		374	$self->{tooltip} = $tooltip;
		375
		376	if ($CFClient::UI::TOOLTIP->{owner} == $self) {
		377	delete $CFClient::UI::TOOLTIP->{owner};
		378	CFClient::UI::check_tooltip;
		379	}
		380	}
		381
287	# translate global coordinates to local coordinate system	382	# translate global coordinates to local coordinate system
288	sub coord2local {	383	sub coord2local {
289	my ($self, $x, $y) = @_;	384	my ($self, $x, $y) = @_;
290		385
291	$self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})	386	$self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
…		…
304	return if $FOCUS == $self;	399	return if $FOCUS == $self;
305	return unless $self->{can_focus};	400	return unless $self->{can_focus};
306		401
307	my $focus = $FOCUS; $FOCUS = $self;	402	my $focus = $FOCUS; $FOCUS = $self;
308		403
309	$self->emit (focus_in => $focus);	404	$self->_emit (focus_in => $focus);
310		405
311	$focus->update if $focus;	406	$focus->update if $focus;
312	$FOCUS->update;	407	$FOCUS->update;
313	}	408	}
314		409
…		…
317		412
318	return unless $FOCUS == $self;	413	return unless $FOCUS == $self;
319		414
320	my $focus = $FOCUS; undef $FOCUS;	415	my $focus = $FOCUS; undef $FOCUS;
321		416
322	$self->emit (focus_out => $focus);	417	$self->_emit (focus_out => $focus);
323		418
324	$focus->update if $focus; #?	419	$focus->update if $focus; #?
		420
		421	$::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus
		422	unless $FOCUS;
325	}	423	}
326		424
327	sub mouse_motion { }	425	sub mouse_motion { }
328	sub button_up { }	426	sub button_up { }
329	sub key_down { }	427	sub key_down { }
330	sub key_up { }	428	sub key_up { }
331		429
332	sub button_down {	430	sub button_down {
333	my ($self, $ev, $x, $y) = @_;	431	my ($self, $ev, $x, $y) = @_;
334		432
335	$self->focus_in;	433	$self->focus_in;
…		…
369	if ($ENV{PCLIENT_DEBUG}) {	467	if ($ENV{PCLIENT_DEBUG}) {
370	glPushMatrix;	468	glPushMatrix;
371	glColor 1, 1, 0, 1;	469	glColor 1, 1, 0, 1;
372	glTranslate $self->{x} + 0.375, $self->{y} + 0.375;	470	glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
373	glBegin GL_LINE_LOOP;	471	glBegin GL_LINE_LOOP;
374	glVertex 0 , 0;	472	glVertex 0 , 0;
375	glVertex $self->{w}, 0;	473	glVertex $self->{w} - 1, 0;
376	glVertex $self->{w}, $self->{h};	474	glVertex $self->{w} - 1, $self->{h} - 1;
377	glVertex 0 , $self->{h};	475	glVertex 0 , $self->{h} - 1;
378	glEnd;	476	glEnd;
379	glPopMatrix;	477	glPopMatrix;
380	#CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;	478	#CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
381	}	479	}
382	}	480	}
…		…
402	sub set_parent {	500	sub set_parent {
403	my ($self, $parent) = @_;	501	my ($self, $parent) = @_;
404		502
405	Scalar::Util::weaken ($self->{parent} = $parent);	503	Scalar::Util::weaken ($self->{parent} = $parent);
406		504
		505	if ($parent->{visible} || 1) {
		506	$self->{root} = $parent->{root};
		507	$self->{visible} = $parent->{visible} + 1;
		508
		509	$self->emit (visibility_change => 1)
		510	unless $self->{parent}{visible};
		511	}
		512
407	# TODO: req_w _does_change after ->reconfigure	513	# TODO: req_w _does_change after ->reconfigure
408	$self->check_size	514	$self->check_size
409	unless exists $self->{req_w};	515	unless exists $self->{req_w};
		516
		517	$self->show;
410	}	518	}
411		519
412	sub check_size {	520	sub check_size {
413	my ($self, $forced) = @_;	521	my ($self, $forced) = @_;
414		522
…		…
427	my ($self, $signal, $cb) = @_;	535	my ($self, $signal, $cb) = @_;
428		536
429	push @{ $self->{signal_cb}{$signal} }, $cb;	537	push @{ $self->{signal_cb}{$signal} }, $cb;
430	}	538	}
431		539
		540	sub _emit {
		541	my ($self, $signal, @args) = @_;
		542
		543	List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
		544	}
		545
432	sub emit {	546	sub emit {
433	my ($self, $signal, @args) = @_;	547	my ($self, $signal, @args) = @_;
434		548
435	List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}	549	$self->_emit ($signal, @args)
		550	|| $self->$signal (@args);
		551	}
		552
		553	sub visibility_change {
		554	#my ($self, $visible) = @_;
436	}	555	}
437		556
438	sub DESTROY {	557	sub DESTROY {
439	my ($self) = @_;	558	my ($self) = @_;
440		559
…		…
455	my $class = shift;	574	my $class = shift;
456		575
457	# range [value, low, high, page]	576	# range [value, low, high, page]
458		577
459	$class->SUPER::new (	578	$class->SUPER::new (
460	bg => [0, 0, 0, 0.2],	579	#bg => [0, 0, 0, 0.2],
461	active_bg => [1, 1, 1, 0.5],	580	#active_bg => [1, 1, 1, 0.5],
462	@_	581	@_
463	)	582	)
464	}	583	}
465		584
466	sub _draw {	585	sub _draw {
467	my ($self) = @_;	586	my ($self) = @_;
468		587
		588	my $color = $FOCUS == $self && $self->{active_bg}
		589	? $self->{active_bg}
		590	: $self->{bg};
		591
		592	if ($color && (@$color < 4 || $color->[3])) {
469	my ($w, $h) = @$self{qw(w h)};	593	my ($w, $h) = @$self{qw(w h)};
470		594
471	glEnable GL_BLEND;	595	glEnable GL_BLEND;
472	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	596	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
473	glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} };	597	glColor @$color;
474		598
475	glBegin GL_QUADS;	599	glBegin GL_QUADS;
476	glVertex 0 , 0;	600	glVertex 0 , 0;
477	glVertex 0 , $h;	601	glVertex 0 , $h;
478	glVertex $w, $h;	602	glVertex $w, $h;
479	glVertex $w, 0;	603	glVertex $w, 0;
480	glEnd;	604	glEnd;
481		605
482	glDisable GL_BLEND;	606	glDisable GL_BLEND;
		607	}
483	}	608	}
484		609
485	#############################################################################	610	#############################################################################
486		611
487	package CFClient::UI::Empty;	612	package CFClient::UI::Empty;
…		…
547	delete $child->{parent};	672	delete $child->{parent};
548	$child->hide;	673	$child->hide;
549		674
550	$self->{children} = [ grep $_ != $child, @{ $self->{children} } ];	675	$self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
551		676
552	$self->check_size;	677	$self->check_size (1);
553	$self->update;	678	$self->update;
554	}	679	}
555		680
556	sub clear {	681	sub clear {
557	my ($self) = @_;	682	my ($self) = @_;
…		…
671	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {	796	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
672	glClearColor 0, 0, 0, 0;	797	glClearColor 0, 0, 0, 0;
673	glClear GL_COLOR_BUFFER_BIT;	798	glClear GL_COLOR_BUFFER_BIT;
674		799
675	$self->_render;	800	$self->_render;
676	# glColorMask 1, 1, 1, 0;
677	# glEnable GL_BLEND;
678	# glBlendFunc GL_SRC_ALPHA, GL_ZERO;
679	# glRasterPos 0, 0;
680	# glCopyPixels 0, 0, $self->{w}, $self->{h};
681	# glDisable GL_BLEND;
682	# glColorMask 1, 1, 1, 1;
683	};	801	};
684	}	802	}
685		803
686	sub _draw {	804	sub _draw {
687	my ($self) = @_;	805	my ($self) = @_;
…		…
691	my $tex = $self->{texture}	809	my $tex = $self->{texture}
692	or return;	810	or return;
693		811
694	glEnable GL_TEXTURE_2D;	812	glEnable GL_TEXTURE_2D;
695	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	813	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
696	glColor 0, 0, 0, 1;	814	glColor 1, 1, 1, 1;
697		815
698	$tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);	816	$tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
699		817
700	glDisable GL_TEXTURE_2D;	818	glDisable GL_TEXTURE_2D;
701	}	819	}
…		…
704		822
705	package CFClient::UI::ViewPort;	823	package CFClient::UI::ViewPort;
706		824
707	our @ISA = CFClient::UI::Window::;	825	our @ISA = CFClient::UI::Window::;
708		826
		827	sub new {
		828	my $class = shift;
		829
		830	$class->SUPER::new (
		831	scroll_x => 0,
		832	scroll_y => 1,
		833	@_,
		834	)
		835	}
		836
709	sub size_request {	837	sub size_request {
710	my ($self) = @_;	838	my ($self) = @_;
711		839
712	@$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};	840	@$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};
713	$self->child->configure (0, 0, @$self{qw(child_w child_h)});
714		841
715	@$self{qw(child_w child_h)}	842	@$self{qw(child_w child_h)}
716	}	843	}
717		844
718	sub size_allocate {	845	sub size_allocate {
719	my ($self, $w, $h) = @_;	846	my ($self, $w, $h) = @_;
720		847
		848	$w = $self->{child_w} if $self->{scroll_x} && $self->{child_w};
		849	$h = $self->{child_h} if $self->{scroll_y} && $self->{child_h};
		850
		851	$self->child->configure (0, 0, $w, $h);
721	$self->update;	852	$self->update;
722	}	853	}
723		854
724	sub set_offset {	855	sub set_offset {
725	my ($self, $x, $y) = @_;	856	my ($self, $x, $y) = @_;
…		…
776	my $class = shift;	907	my $class = shift;
777		908
778	my $self;	909	my $self;
779		910
780	my $slider = new CFClient::UI::Slider	911	my $slider = new CFClient::UI::Slider
781	vertical => 1,	912	vertical => 1,
782	range => [0, 0, 1, 0.01], # HACK fix	913	range => [0, 0, 1, 0.01], # HACK fix
783	connect_changed => sub {	914	on_changed => sub {
784	$self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h}));	915	$self->{vp}->set_offset (0, $_[1]);
785	},	916	},
786	;	917	;
787		918
788	$self = $class->SUPER::new (	919	$self = $class->SUPER::new (
789	vp => (new CFClient::UI::ViewPort),	920	vp => (new CFClient::UI::ViewPort expand => 1),
790	slider => $slider,	921	slider => $slider,
791	@_,	922	@_,
792	);	923	);
793		924
794	$self->{vp}->add ($self->{scrolled});	925	$self->{vp}->add ($self->{scrolled});
795	$self->add ($self->{vp});	926	$self->add ($self->{vp});
796	$self->add ($self->{slider});	927	$self->add ($self->{slider});
797		928
798	$self	929	$self
		930	}
		931
		932	sub update {
		933	my ($self) = @_;
		934
		935	$self->SUPER::update;
		936
		937	# todo: overwrite size_allocate of child
		938	my $child = $self->{vp}->child;
		939	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
		940	}
		941
		942	sub size_allocate {
		943	my ($self, $w, $h) = @_;
		944
		945	$self->SUPER::size_allocate ($w, $h);
		946
		947	my $child = $self->{vp}->child;
		948	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
799	}	949	}
800		950
801	#TODO# update range on size_allocate depending on child	951	#TODO# update range on size_allocate depending on child
802	# update viewport offset on scroll	952	# update viewport offset on scroll
803		953
…		…
857	my $class = shift;	1007	my $class = shift;
858		1008
859	# TODO: user_x, user_y, overwrite moveto?	1009	# TODO: user_x, user_y, overwrite moveto?
860		1010
861	my $self = $class->SUPER::new (	1011	my $self = $class->SUPER::new (
862	bg => [1, 1, 1, 1],	1012	bg => [1, 1, 1, 1],
863	border_bg => [1, 1, 1, 1],	1013	border_bg => [1, 1, 1, 1],
864	border => 0.6,	1014	border => 0.6,
865	toplevel => 1,	1015	is_toplevel => 1,
866	can_events => 1,	1016	can_events => 1,
867	@_	1017	@_
868	);	1018	);
869		1019
870	$self->{title} &&= new CFClient::UI::Label	1020	$self->{title} &&= new CFClient::UI::Label
871	align => 0,	1021	align => 0,
…		…
895	my ($self, $w, $h) = @_;	1045	my ($self, $w, $h) = @_;
896		1046
897	$h -= List::Util::max 0, $self->border * 2;	1047	$h -= List::Util::max 0, $self->border * 2;
898	$w -= List::Util::max 0, $self->border * 2;	1048	$w -= List::Util::max 0, $self->border * 2;
899		1049
900	$self->{title}->configure ($self->border, $self->border - $::FONTSIZE * 2, $w, $::FONTSIZE * 2)	1050	$self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
901	if $self->{title};	1051	if $self->{title};
902		1052
903	$self->child->configure ($self->border, $self->border, $w, $h);	1053	$self->child->configure ($self->border, $self->border, $w, $h);
904	}	1054	}
905		1055
…		…
924	my ($ev, $x, $y) = @_;	1074	my ($ev, $x, $y) = @_;
925		1075
926	my $dx = $ev->{x} - $ox;	1076	my $dx = $ev->{x} - $ox;
927	my $dy = $ev->{y} - $oy;	1077	my $dy = $ev->{y} - $oy;
928		1078
		1079	$self->{user_x} = $wx + $dx * $mx;
		1080	$self->{user_y} = $wy + $dy * $my;
929	$self->{user_w} = $bw + $dx * ($mx ? -1 : 1);	1081	$self->{user_w} = $bw + $dx * ($mx ? -1 : 1);
930	$self->{user_h} = $bh + $dy * ($my ? -1 : 1);	1082	$self->{user_h} = $bh + $dy * ($my ? -1 : 1);
931	$self->move ($wx + $dx * $mx, $wy + $dy * $my);	1083	$self->move ($self->{user_x}, $self->{user_y});
932	$self->check_size;	1084	$self->check_size;
933	};	1085	};
934		1086
935	} elsif ($lr ^ $td) {	1087	} elsif ($lr ^ $td) {
936	my ($ox, $oy) = ($ev->{x}, $ev->{y});	1088	my ($ox, $oy) = ($ev->{x}, $ev->{y});
…		…
939	$self->{motion} = sub {	1091	$self->{motion} = sub {
940	my ($ev, $x, $y) = @_;	1092	my ($ev, $x, $y) = @_;
941		1093
942	($x, $y) = ($ev->{x}, $ev->{y});	1094	($x, $y) = ($ev->{x}, $ev->{y});
943		1095
944	$self->move ($bx + $x - $ox, $by + $y - $oy);	1096	$self->{user_x} = $bx + $x - $ox;
		1097	$self->{user_y} = $by + $y - $oy;
		1098	$self->move ($self->{user_x}, $self->{user_y});
945	$self->update;	1099	$self->update;
946	};	1100	};
947	}	1101	}
948	}	1102	}
949		1103
…		…
1011	sub new {	1165	sub new {
1012	my $class = shift;	1166	my $class = shift;
1013		1167
1014	$class->SUPER::new (	1168	$class->SUPER::new (
1015	col_expand => [],	1169	col_expand => [],
1016	@_	1170	@_,
1017	)	1171	)
		1172	}
		1173
		1174	sub children {
		1175	grep $_, map @$_, grep $_, @{ $_[0]{children} }
1018	}	1176	}
1019		1177
1020	sub add {	1178	sub add {
1021	my ($self, $x, $y, $child) = @_;	1179	my ($self, $x, $y, $child) = @_;
1022		1180
1023	$child->set_parent ($self);	1181	$child->set_parent ($self);
1024	$self->{children}[$y][$x] = $child;	1182	$self->{children}[$y][$x] = $child;
1025		1183
1026	$child->check_size;	1184	$self->check_size (1);
1027	}	1185	}
1028		1186
1029	sub children {
1030	grep $_, map @$_, grep $_, @{ $_[0]{children} }
1031	}
1032
1033	# TODO: move to container class maybe? send childs a signal on removal?	1187	# TODO: move to container class maybe? send children a signal on removal?
1034	sub clear {	1188	sub clear {
1035	my ($self) = @_;	1189	my ($self) = @_;
1036		1190
1037	my @children = $self->children;	1191	my @children = $self->children;
1038	delete $self->{children};	1192	delete $self->{children};
…		…
1040	for (@children) {	1194	for (@children) {
1041	delete $_->{parent};	1195	delete $_->{parent};
1042	$_->hide;	1196	$_->hide;
1043	}	1197	}
1044		1198
		1199	$self->check_size (1);
1045	$self->update;	1200	$self->update;
1046	}	1201	}
1047		1202
1048	sub get_wh {	1203	sub get_wh {
1049	my ($self) = @_;	1204	my ($self) = @_;
…		…
1081	sub size_allocate {	1236	sub size_allocate {
1082	my ($self, $w, $h) = @_;	1237	my ($self, $w, $h) = @_;
1083		1238
1084	my ($ws, $hs) = $self->get_wh;	1239	my ($ws, $hs) = $self->get_wh;
1085		1240
1086	my $req_w = sum @$ws;	1241	my $req_w = (sum @$ws) || 1;
1087	my $req_h = sum @$hs;	1242	my $req_h = (sum @$hs) || 1;
1088		1243
1089	# TODO: nicer code && do row_expand	1244	# TODO: nicer code && do row_expand
1090	my @col_expand = @{$self->{col_expand}};	1245	my @col_expand = @{$self->{col_expand}};
1091	@col_expand = (1) x @$ws unless @col_expand;	1246	@col_expand = (1) x @$ws unless @col_expand;
1092	my $col_expand = (sum @col_expand) || 1;	1247	my $col_expand = (sum @col_expand) || 1;
…		…
1266		1421
1267	#############################################################################	1422	#############################################################################
1268		1423
1269	package CFClient::UI::Label;	1424	package CFClient::UI::Label;
1270		1425
1271	our @ISA = CFClient::UI::Base::;	1426	our @ISA = CFClient::UI::DrawBG::;
1272		1427
1273	use CFClient::OpenGL;	1428	use CFClient::OpenGL;
1274		1429
1275	sub new {	1430	sub new {
1276	my ($class, %arg) = @_;	1431	my ($class, %arg) = @_;
1277		1432
1278	my $self = $class->SUPER::new (	1433	my $self = $class->SUPER::new (
1279	fg => [1, 1, 1],	1434	fg => [1, 1, 1],
		1435	#bg => none
		1436	#active_bg => none
1280	#font => default_font	1437	#font => default_font
1281	#text => initial text	1438	#text => initial text
1282	#markup => initial narkup	1439	#markup => initial narkup
		1440	#max_w => maximum pixel width
		1441	ellipsise => 3, # end
1283	layout => (new CFClient::Layout),	1442	layout => (new CFClient::Layout),
1284	fontsize => 1,	1443	fontsize => 1,
1285	align => -1,	1444	align => -1,
1286	valign => -1,	1445	valign => -1,
1287	padding => 2,	1446	padding => 2,
…		…
1302	}	1461	}
1303		1462
1304	$self	1463	$self
1305	}	1464	}
1306		1465
1307	sub escape {	1466	sub escape($) {
1308	local $_ = $_[1];	1467	local $_ = $_[0];
1309		1468
1310	s/&/&amp;/g;	1469	s/&/&amp;/g;
1311	s/>/&gt;/g;	1470	s/>/&gt;/g;
1312	s/</&lt;/g;	1471	s/</&lt;/g;
1313		1472
1314	$_[1]	1473	$_
1315	}	1474	}
1316		1475
1317	sub update {	1476	sub update {
1318	my ($self) = @_;	1477	my ($self) = @_;
1319		1478
…		…
1352	sub size_request {	1511	sub size_request {
1353	my ($self) = @_;	1512	my ($self) = @_;
1354		1513
1355	$self->{layout}->set_font ($self->{font}) if $self->{font};	1514	$self->{layout}->set_font ($self->{font}) if $self->{font};
1356	$self->{layout}->set_width ($self->{max_w} || -1);	1515	$self->{layout}->set_width ($self->{max_w} || -1);
		1516	$self->{layout}->set_ellipsise ($self->{ellipsise});
		1517	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1357	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	1518	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1358		1519
1359	my ($w, $h) = $self->{layout}->size;	1520	my ($w, $h) = $self->{layout}->size;
1360		1521
1361	if (exists $self->{template}) {	1522	if (exists $self->{template}) {
…		…
1391	}	1552	}
1392		1553
1393	sub _draw {	1554	sub _draw {
1394	my ($self) = @_;	1555	my ($self) = @_;
1395		1556
		1557	$self->SUPER::_draw; # draw background, if applicable
		1558
1396	my $tex = $self->{texture} ||= do {	1559	my $tex = $self->{texture} ||= do {
1397	$self->{layout}->set_foreground (@{$self->{fg}});	1560	$self->{layout}->set_foreground (@{$self->{fg}});
1398	$self->{layout}->set_font ($self->{font}) if $self->{font};	1561	$self->{layout}->set_font ($self->{font}) if $self->{font};
1399	$self->{layout}->set_width ($self->{w});	1562	$self->{layout}->set_width ($self->{w});
		1563	$self->{layout}->set_ellipsise ($self->{ellipsise});
		1564	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1400	$self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE);	1565	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1401		1566
1402	my $tex = new_from_layout CFClient::Texture $self->{layout};	1567	my $tex = new_from_layout CFClient::Texture $self->{layout};
1403		1568
1404	$self->{ox} = int $self->{align} < 0 ? $self->{padding}	1569	$self->{ox} = int ($self->{align} < 0 ? $self->{padding}
1405	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}	1570	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1406	: ($self->{w} - $tex->{w}) * 0.5;	1571	: ($self->{w} - $tex->{w}) * 0.5);
1407		1572
1408	$self->{oy} = int $self->{valign} < 0 ? $self->{padding}	1573	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding}
1409	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}	1574	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1410	: ($self->{h} - $tex->{h}) * 0.5;	1575	: ($self->{h} - $tex->{h}) * 0.5);
1411		1576
1412	$tex	1577	$tex
1413	};	1578	};
1414		1579
1415	glEnable GL_TEXTURE_2D;	1580	glEnable GL_TEXTURE_2D;
…		…
1443	active_fg => [0, 0, 0],	1608	active_fg => [0, 0, 0],
1444	can_hover => 1,	1609	can_hover => 1,
1445	can_focus => 1,	1610	can_focus => 1,
1446	valign => 0,	1611	valign => 0,
1447	can_events => 1,	1612	can_events => 1,
		1613	#text => ...
1448	@_	1614	@_
1449	)	1615	)
1450	}	1616	}
1451		1617
1452	sub _set_text {	1618	sub _set_text {
…		…
1462	$self->{text} = $text;	1628	$self->{text} = $text;
1463		1629
1464	$text =~ s/./*/g if $self->{hidden};	1630	$text =~ s/./*/g if $self->{hidden};
1465	$self->{layout}->set_text ("$text ");	1631	$self->{layout}->set_text ("$text ");
1466		1632
1467	$self->emit (changed => $self->{text});	1633	$self->_emit (changed => $self->{text});
1468	}	1634	}
1469		1635
1470	sub set_text {	1636	sub set_text {
1471	my ($self, $text) = @_;	1637	my ($self, $text) = @_;
1472		1638
1473	$self->{cursor} = length $text;	1639	$self->{cursor} = length $text;
1474	$self->_set_text ($text);	1640	$self->_set_text ($text);
		1641	$self->update;
1475	$self->check_size;	1642	$self->check_size;
1476	$self->update;
1477	}	1643	}
1478		1644
1479	sub get_text {	1645	sub get_text {
1480	$_[0]{text}	1646	$_[0]{text}
1481	}	1647	}
…		…
1484	my ($self) = @_;	1650	my ($self) = @_;
1485		1651
1486	my ($w, $h) = $self->SUPER::size_request;	1652	my ($w, $h) = $self->SUPER::size_request;
1487		1653
1488	($w + 1, $h) # add 1 for cursor	1654	($w + 1, $h) # add 1 for cursor
1489	}
1490
1491	sub size_allocate {
1492	my ($self, $w, $h) = @_;
1493
1494	$self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1495	}	1655	}
1496		1656
1497	sub key_down {	1657	sub key_down {
1498	my ($self, $ev) = @_;	1658	my ($self, $ev) = @_;
1499		1659
…		…
1514	} elsif ($sym == CFClient::SDLK_HOME) {	1674	} elsif ($sym == CFClient::SDLK_HOME) {
1515	$self->{cursor} = 0;	1675	$self->{cursor} = 0;
1516	} elsif ($sym == CFClient::SDLK_END) {	1676	} elsif ($sym == CFClient::SDLK_END) {
1517	$self->{cursor} = length $text;	1677	$self->{cursor} = length $text;
1518	} elsif ($uni == 27) {	1678	} elsif ($uni == 27) {
1519	$self->emit ('escape');	1679	$self->_emit ('escape');
1520	} elsif ($uni) {	1680	} elsif ($uni) {
1521	substr $text, $self->{cursor}++, 0, chr $uni;	1681	substr $text, $self->{cursor}++, 0, chr $uni;
1522	}	1682	}
1523		1683
1524	$self->_set_text ($text);	1684	$self->_set_text ($text);
1525	$self->update;	1685	$self->update;
		1686	$self->check_size;
1526	}	1687	}
1527		1688
1528	sub focus_in {	1689	sub focus_in {
1529	my ($self) = @_;	1690	my ($self) = @_;
1530		1691
…		…
1610	if ($sym == 13) {	1771	if ($sym == 13) {
1611	unshift @{$self->{history}},	1772	unshift @{$self->{history}},
1612	my $txt = $self->get_text;	1773	my $txt = $self->get_text;
1613	$self->{history_pointer} = -1;	1774	$self->{history_pointer} = -1;
1614	$self->{history_saveback} = '';	1775	$self->{history_saveback} = '';
1615	$self->emit (activate => $txt);	1776	$self->_emit (activate => $txt);
1616	$self->update;	1777	$self->update;
1617		1778
1618	} elsif ($sym == CFClient::SDLK_UP) {	1779	} elsif ($sym == CFClient::SDLK_UP) {
1619	if ($self->{history_pointer} < 0) {	1780	if ($self->{history_pointer} < 0) {
1620	$self->{history_saveback} = $self->get_text;	1781	$self->{history_saveback} = $self->get_text;
…		…
1659	my $class = shift;	1820	my $class = shift;
1660		1821
1661	$class->SUPER::new (	1822	$class->SUPER::new (
1662	padding => 4,	1823	padding => 4,
1663	fg => [1, 1, 1],	1824	fg => [1, 1, 1],
1664	bg => [1, 1, 1, 0.2],
1665	active_fg => [0, 0, 1],	1825	active_fg => [0, 0, 1],
1666	can_hover => 1,	1826	can_hover => 1,
1667	align => 0,	1827	align => 0,
1668	valign => 0,	1828	valign => 0,
1669	can_events => 1,	1829	can_events => 1,
1670	@_	1830	@_
1671	)	1831	)
1672	}	1832	}
1673		1833
		1834	sub activate { }
		1835
1674	sub button_up {	1836	sub button_up {
1675	my ($self, $ev, $x, $y) = @_;	1837	my ($self, $ev, $x, $y) = @_;
1676		1838
		1839	$self->emit ("activate")
1677	if ($x >= 0 && $x < $self->{w}	1840	if $x >= 0 && $x < $self->{w}
1678	&& $y >= 0 && $y < $self->{h}) {	1841	&& $y >= 0 && $y < $self->{h};
1679	$self->emit ("activate");
1680	}
1681	}	1842	}
1682		1843
1683	sub _draw {	1844	sub _draw {
1684	my ($self) = @_;	1845	my ($self) = @_;
1685		1846
…		…
1717		1878
1718	$class->SUPER::new (	1879	$class->SUPER::new (
1719	padding => 2,	1880	padding => 2,
1720	fg => [1, 1, 1],	1881	fg => [1, 1, 1],
1721	active_fg => [1, 1, 0],	1882	active_fg => [1, 1, 0],
		1883	bg => [0, 0, 0, 0.2],
		1884	active_bg => [1, 1, 1, 0.5],
1722	state => 0,	1885	state => 0,
1723	can_hover => 1,	1886	can_hover => 1,
1724	@_	1887	@_
1725	)	1888	)
1726	}	1889	}
…		…
1735	my ($self, $ev, $x, $y) = @_;	1898	my ($self, $ev, $x, $y) = @_;
1736		1899
1737	if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}	1900	if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}
1738	&& $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {	1901	&& $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {
1739	$self->{state} = !$self->{state};	1902	$self->{state} = !$self->{state};
1740	$self->emit (changed => $self->{state});	1903	$self->_emit (changed => $self->{state});
1741	}	1904	}
1742	}	1905	}
1743		1906
1744	sub _draw {	1907	sub _draw {
1745	my ($self) = @_;	1908	my ($self) = @_;
…		…
2018	# TODO: req_w/h are wrong with vertical	2181	# TODO: req_w/h are wrong with vertical
2019	# TODO: calculations are off	2182	# TODO: calculations are off
2020	my $self = $class->SUPER::new (	2183	my $self = $class->SUPER::new (
2021	fg => [1, 1, 1],	2184	fg => [1, 1, 1],
2022	active_fg => [0, 0, 0],	2185	active_fg => [0, 0, 0],
		2186	bg => [0, 0, 0, 0.2],
		2187	active_bg => [1, 1, 1, 0.5],
2023	range => [0, 0, 100, 10],	2188	range => [0, 0, 100, 10, 0],
2024	req_w => $::WIDTH / 80,	2189	req_w => $::WIDTH / 80,
2025	req_h => $::WIDTH / 80,	2190	req_h => $::WIDTH / 80,
2026	vertical => 0,	2191	vertical => 0,
2027	can_hover => 1,	2192	can_hover => 1,
2028	inner_pad => .05,	2193	inner_pad => 0.02,
2029	@_	2194	@_
2030	);	2195	);
2031		2196
2032	$self->set_value ($self->{range}[0]);	2197	$self->set_value ($self->{range}[0]);
2033	$self->update;	2198	$self->update;
2034		2199
2035	$self	2200	$self
2036	}	2201	}
2037		2202
		2203	sub set_range {
		2204	my ($self, $range) = @_;
		2205
		2206	($range, $self->{range}) = ($self->{range}, $range);
		2207
		2208	$self->update
		2209	if "@$range" ne "@{$self->{range}}";
		2210	}
		2211
2038	sub set_value {	2212	sub set_value {
2039	my ($self, $value) = @_;	2213	my ($self, $value) = @_;
2040		2214
2041	my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};	2215	my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
2042		2216
2043	$hi = $lo + 1 if $hi <= $lo;	2217	$hi = $lo + 1 if $hi <= $lo;
2044		2218
		2219	$page = $hi - $lo if $page > $hi - $lo;
		2220
2045	$value = $lo if $value < $lo;	2221	$value = $lo if $value < $lo;
2046	$value = $hi if $value > $hi;	2222	$value = $hi - $page if $value > $hi - $page;
2047		2223
2048	$value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit	2224	$value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
2049	if $unit;	2225	if $unit;
2050		2226
2051	$page = $hi - $lo if $page > $hi - $lo;
2052
2053	@{$self->{range}} = ($value, $lo, $hi, $page, $unit);	2227	@{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2054		2228
2055	if ($value != $old_value) {	2229	if ($value != $old_value) {
2056	$self->emit (changed => $value);	2230	$self->_emit (changed => $value);
2057	$self->update;	2231	$self->update;
2058	}	2232	}
2059	}	2233	}
2060		2234
2061	sub size_request {	2235	sub size_request {
…		…
2069		2243
2070	sub button_down {	2244	sub button_down {
2071	my ($self, $ev, $x, $y) = @_;	2245	my ($self, $ev, $x, $y) = @_;
2072		2246
2073	$self->SUPER::button_down ($ev, $x, $y);	2247	$self->SUPER::button_down ($ev, $x, $y);
		2248
		2249	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
		2250
2074	$self->mouse_motion ($ev, $x, $y);	2251	$self->mouse_motion ($ev, $x, $y);
2075	}	2252	}
2076		2253
2077	sub mouse_motion {	2254	sub mouse_motion {
2078	my ($self, $ev, $x, $y) = @_;	2255	my ($self, $ev, $x, $y) = @_;
…		…
2080	if ($GRAB == $self) {	2257	if ($GRAB == $self) {
2081	my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});	2258	my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2082		2259
2083	my (undef, $lo, $hi, $page) = @{$self->{range}};	2260	my (undef, $lo, $hi, $page) = @{$self->{range}};
2084		2261
2085	$x = $x / ($w * (1 - 2 * $self->{inner_pad})) - $self->{inner_pad};	2262	$x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2086		2263
2087	$self->set_value ($x * ($hi - $lo) + $lo);	2264	$self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2088	}	2265	}
2089	}	2266	}
2090		2267
2091	sub update {	2268	sub update {
2092	my ($self) = @_;	2269	my ($self) = @_;
2093		2270
2094	$CFClient::UI::ROOT->on_post_alloc ($self => sub {	2271	$CFClient::UI::ROOT->on_post_alloc ($self => sub {
2095	$self->set_value ($self->{range}[0]);	2272	$self->set_value ($self->{range}[0]);
2096		2273
2097	my ($value, $lo, $hi, $page) = @{$self->{range}};	2274	my ($value, $lo, $hi, $page) = @{$self->{range}};
		2275	my $range = ($hi - $page - $lo) || 1e-100;
2098		2276
2099	my $inner_w = 1 - 2 * $self->{inner_pad};	2277	my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
2100		2278
2101	$self->{scale} = ($inner_w / ($hi - $lo)) || 1;	2279	$self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
		2280	$self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
2102		2281
2103	$page = $self->{scale} * $page || 10 / ($self->{w} || 1);	2282	$value = ($value - $lo) / $range;
2104	$value = $self->{scale} * ($value - $lo);	2283	$value = $value * $self->{scale} + $self->{offset};
2105		2284
2106	$value = $self->{inner_pad} + ($value - $page * 0.5);
2107
2108	$value = 0 if $value < 0;
2109	$page = 1 - $value if $value + $page > 1;
2110
2111	$self->{knob_x} = $value;	2285	$self->{knob_x} = $value - $knob_w * 0.5;
2112	$self->{knob_w} = $page;	2286	$self->{knob_w} = $knob_w;
2113	});	2287	});
2114		2288
2115	$self->SUPER::update;	2289	$self->SUPER::update;
2116	}	2290	}
2117		2291
…		…
2123	glScale $self->{w}, $self->{h};	2297	glScale $self->{w}, $self->{h};
2124		2298
2125	if ($self->{vertical}) {	2299	if ($self->{vertical}) {
2126	# draw a vertical slider like a rotated horizontal slider	2300	# draw a vertical slider like a rotated horizontal slider
2127		2301
		2302	glTranslate 1, 0, 0;
2128	glRotate 90, 0, 0, 1;	2303	glRotate 90, 0, 0, 1;
2129	glTranslate 0, 1, 0;
2130	}	2304	}
2131		2305
2132	my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};	2306	my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
2133	my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};	2307	my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
2134		2308
…		…
2141	# draw handle	2315	# draw handle
2142	$tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1);	2316	$tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1);
2143		2317
2144	glDisable GL_TEXTURE_2D;	2318	glDisable GL_TEXTURE_2D;
2145	}	2319	}
		2320
		2321	#############################################################################
		2322
		2323	package CFClient::UI::ValSlider;
		2324
		2325	our @ISA = CFClient::UI::HBox::;
		2326
		2327	sub new {
		2328	my ($class, %arg) = @_;
		2329
		2330	my $range = delete $arg{range};
		2331
		2332	my $self = $class->SUPER::new (
		2333	slider => (new CFClient::UI::Slider expand => 1, range => $range),
		2334	entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),
		2335	to_value => sub { shift },
		2336	from_value => sub { shift },
		2337	%arg,
		2338	);
		2339
		2340	$self->{slider}->connect (changed => sub {
		2341	my ($self, $value) = @_;
		2342	$self->{parent}{entry}->set_text ($self->{parent}{to_value}->($value));
		2343	$self->{parent}->emit (changed => $value);
		2344	});
		2345
		2346	# $self->{entry}->connect (changed => sub {
		2347	# my ($self, $value) = @_;
		2348	# $self->{parent}{slider}->set_value ($self->{parent}{from_value}->($value));
		2349	# $self->{parent}->emit (changed => $value);
		2350	# });
		2351
		2352	$self->add ($self->{slider}, $self->{entry});
		2353
		2354	$self->{slider}->emit (changed => $self->{slider}{range}[0]);
		2355
		2356	$self
		2357	}
		2358
		2359	sub set_range { shift->{slider}->set_range (@_) }
		2360	sub set_value { shift->{slider}->set_value (@_) }
2146		2361
2147	#############################################################################	2362	#############################################################################
2148		2363
2149	package CFClient::UI::TextView;	2364	package CFClient::UI::TextView;
2150		2365
…		…
2180		2395
2181	$self->{fontsize} = $fontsize;	2396	$self->{fontsize} = $fontsize;
2182	$self->reflow;	2397	$self->reflow;
2183	}	2398	}
2184		2399
2185	sub text_height {
2186	my ($self, $text) = @_;
2187
2188	my $layout = $self->{layout};
2189
2190	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
2191	$layout->set_width ($self->{children}[0]{w});
2192	$layout->set_markup ($text);
2193
2194	($layout->size)[1]
2195	}
2196
2197	sub reflow {
2198	my ($self) = @_;
2199
2200	$self->{need_reflow}++;
2201	$self->update;
2202	}
2203
2204	sub size_allocate {	2400	sub size_allocate {
2205	my ($self, $w, $h) = @_;	2401	my ($self, $w, $h) = @_;
2206		2402
2207	$self->SUPER::size_allocate ($w, $h);	2403	$self->SUPER::size_allocate ($w, $h);
2208		2404
…		…
2211	$self->{layout}->set_width ($self->{children}[0]{w});	2407	$self->{layout}->set_width ($self->{children}[0]{w});
2212		2408
2213	$self->reflow;	2409	$self->reflow;
2214	}	2410	}
2215		2411
		2412	sub text_size {
		2413	my ($self, $text, $indent) = @_;
		2414
		2415	my $layout = $self->{layout};
		2416
		2417	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
		2418	$layout->set_width ($self->{children}[0]{w} - $indent);
		2419	$layout->set_markup ($text);
		2420
		2421	$layout->size
		2422	}
		2423
		2424	sub reflow {
		2425	my ($self) = @_;
		2426
		2427	$self->{need_reflow}++;
		2428	$self->update;
		2429	}
		2430
		2431	sub set_offset {
		2432	my ($self, $offset) = @_;
		2433
		2434	# todo: base offset on lines or so, not on pixels
		2435	$self->{children}[1]->set_value ($offset);
		2436	}
		2437
		2438	sub clear {
		2439	my ($self) = @_;
		2440
		2441	$self->{par} = [];
		2442	$self->{height} = 0;
		2443	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
		2444	}
		2445
2216	sub add_paragraph {	2446	sub add_paragraph {
2217	my ($self, $color, $text) = @_;	2447	my ($self, $color, $text, $indent) = @_;
2218		2448
2219	#TODO: intelligently "reformat" paragraph	2449	for my $line (split /\n/, $text) {
2220		2450	my ($w, $h) = $self->text_size ($line);
2221	my $height = $self->text_height ($text);
2222
2223	$self->{height} += $height;	2451	$self->{height} += $h;
		2452	push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];
		2453	}
2224		2454
2225	push @{$self->{par}}, [$height, $color, $text];
2226
2227	$self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}];	2455	$self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]);
2228	$self->{children}[1]->update;
2229	}	2456	}
2230		2457
2231	sub update {	2458	sub update {
2232	my ($self) = @_;	2459	my ($self) = @_;
2233		2460
…		…
2236	return unless $self->{h} > 0;	2463	return unless $self->{h} > 0;
2237		2464
2238	delete $self->{texture};	2465	delete $self->{texture};
2239		2466
2240	$ROOT->on_post_alloc ($self, sub {	2467	$ROOT->on_post_alloc ($self, sub {
		2468	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
		2469
2241	if (delete $self->{need_reflow}) {	2470	if (delete $self->{need_reflow}) {
2242	my $height = 0;	2471	my $height = 0;
2243		2472
2244	$height += $_->[0] = $self->text_height ($_->[2])	2473	my $layout = $self->{layout};
		2474
		2475	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
		2476
2245	for @{$self->{par}};	2477	for (@{$self->{par}}) {
		2478	if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
		2479	$layout->set_width ($W - $_->[3]);
		2480	$layout->set_markup ($_->[4]);
		2481	my ($w, $h) = $layout->size;
		2482	$_->[0] = $w + $_->[3];
		2483	$_->[1] = $h;
		2484	}
		2485
		2486	$height += $_->[1];
		2487	}
2246		2488
2247	$self->{height} = $height;	2489	$self->{height} = $height;
2248		2490
2249	$self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];	2491	$self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2250		2492
2251	delete $self->{texture};	2493	delete $self->{texture};
2252	}	2494	}
2253		2495
2254	$self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub {	2496	$self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2255	glClearColor 0, 0, 0, 0;	2497	glClearColor 0.5, 0.5, 0.5, 0;
2256	glClear GL_COLOR_BUFFER_BIT;	2498	glClear GL_COLOR_BUFFER_BIT;
2257		2499
2258	glEnable GL_TEXTURE_2D;
2259	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2260
2261	my $top = int $self->{children}[1]{range}[0];	2500	my $top = int $self->{children}[1]{range}[0];
2262		2501
2263	my $y0 = $top;	2502	my $y0 = $top;
2264	my $y1 = $top + $self->{h};	2503	my $y1 = $top + $H;
2265		2504
2266	my $y = 0;	2505	my $y = 0;
2267		2506
2268	my $layout = $self->{layout};	2507	my $layout = $self->{layout};
2269		2508
2270	$layout->set_font ($self->{font}) if $self->{font};	2509	$layout->set_font ($self->{font}) if $self->{font};
2271		2510
		2511	glEnable GL_BLEND;
		2512	#TODO# not correct in windows where rgba is forced off
		2513	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
		2514
2272	for my $par (@{$self->{par}}) {	2515	for my $par (@{$self->{par}}) {
2273	my $h = $par->[0];	2516	my $h = $par->[1];
2274		2517
2275	if ($y0 < $y + $h && $y < $y1) {	2518	if ($y0 < $y + $h && $y < $y1) {
2276	$layout->set_foreground (@{ $par->[1] });	2519	$layout->set_foreground (@{ $par->[2] });
		2520	$layout->set_width ($W - $par->[3]);
2277	$layout->set_markup ($par->[2]);	2521	$layout->set_markup ($par->[4]);
2278		2522
2279	my ($W, $H) = $layout->size;	2523	my ($w, $h, $data, $format, $internalformat) = $layout->render;
2280	CFClient::Texture->new_from_layout ($layout)->draw_quad_alpha_premultiplied (0, $y - $y0);	2524
		2525	glRasterPos $par->[3], $y - $y0;
		2526	glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2281	}	2527	}
2282		2528
2283	$y += $h;	2529	$y += $h;
2284	}	2530	}
2285		2531
2286	glDisable GL_TEXTURE_2D;	2532	glDisable GL_BLEND;
2287	};	2533	};
2288	});	2534	});
2289	}	2535	}
2290		2536
2291	sub _draw {	2537	sub _draw {
2292	my ($self) = @_;	2538	my ($self) = @_;
2293		2539
2294	glEnable GL_TEXTURE_2D;	2540	glEnable GL_TEXTURE_2D;
2295	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2541	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2296	glColor 1, 1, 1, 1;	2542	glColor 1, 1, 1, 1;
2297	$self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});	2543	$self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2298	glDisable GL_TEXTURE_2D;	2544	glDisable GL_TEXTURE_2D;
2299		2545
2300	$self->{children}[1]->draw;	2546	$self->{children}[1]->draw;
2301		2547
2302	}	2548	}
…		…
2351		2597
2352	sub new {	2598	sub new {
2353	my $class = shift;	2599	my $class = shift;
2354		2600
2355	my $self = $class->SUPER::new (	2601	my $self = $class->SUPER::new (
2356	state => 0,	2602	state => 0,
2357	connect_activate => \&toggle_flopper,	2603	on_activate => \&toggle_flopper,
2358	@_	2604	@_
2359	);	2605	);
2360		2606
2361	if ($self->{state}) {
2362	$self->{state} = 0;
2363	$self->toggle_flopper;
2364	}
2365
2366	$self	2607	$self
2367	}	2608	}
2368		2609
2369	sub toggle_flopper {	2610	sub toggle_flopper {
2370	my ($self) = @_;	2611	my ($self) = @_;
2371		2612
2372	# TODO: use animation	2613	$self->{other}->toggle_visibility;
2373	if ($self->{state} = !$self->{state}) {
2374	$CFClient::UI::ROOT->add ($self->{other});
2375	$self->{other}->move ($self->coord2global (0, $self->{h}));
2376	$self->emit ("open");
2377	} else {
2378	$CFClient::UI::ROOT->remove ($self->{other});
2379	$self->emit ("close");
2380	}
2381
2382	$self->emit (changed => $self->{state});
2383	}	2614	}
2384		2615
2385	#############################################################################	2616	#############################################################################
2386		2617
2387	package CFClient::UI::Tooltip;	2618	package CFClient::UI::Tooltip;
…		…
2401		2632
2402	sub set_tooltip_from {	2633	sub set_tooltip_from {
2403	my ($self, $widget) = @_;	2634	my ($self, $widget) = @_;
2404		2635
2405	$self->add (new CFClient::UI::Label	2636	$self->add (new CFClient::UI::Label
2406	markup => $widget->{tooltip},	2637	markup => $widget->{tooltip},
2407	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,	2638	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2408	fontsize => 0.8,	2639	fontsize => 0.8,
2409	fg => [0, 0, 0, 1],	2640	fg => [0, 0, 0, 1],
		2641	ellipsise => 0,
2410	font => ($widget->{tooltip_font} || $::FONT_PROP),	2642	font => ($widget->{tooltip_font} || $::FONT_PROP),
2411	);	2643	);
2412	}	2644	}
2413		2645
2414	sub size_request {	2646	sub size_request {
2415	my ($self) = @_;	2647	my ($self) = @_;
…		…
2461	use CFClient::OpenGL;	2693	use CFClient::OpenGL;
2462		2694
2463	sub new {	2695	sub new {
2464	my $class = shift;	2696	my $class = shift;
2465		2697
2466	$class->SUPER::new (	2698	my $self = $class->SUPER::new (
2467	aspect => 1,	2699	aspect => 1,
		2700	can_events => 0,
2468	@_,	2701	@_,
2469	)	2702	);
		2703
		2704	if ($self->{anim} && $self->{animspeed}) {
		2705	Scalar::Util::weaken (my $widget = $self);
		2706
		2707	$self->{timer} = Event->timer (
		2708	at => $self->{animspeed} * int $::NOW / $self->{animspeed},
		2709	hard => 1,
		2710	interval => $self->{animspeed},
		2711	cb => sub {
		2712	++$widget->{frame};
		2713	$widget->update;
		2714	},
		2715	);
		2716	}
		2717
		2718	$self
2470	}	2719	}
2471		2720
2472	sub size_request {	2721	sub size_request {
2473	(32, 8)	2722	(32, 8)
2474	}	2723	}
2475		2724
		2725	sub update {
		2726	my ($self) = @_;
		2727
		2728	return unless $self->{visible};
		2729
		2730	$self->SUPER::update;
		2731	}
		2732
2476	sub _draw {	2733	sub _draw {
2477	my ($self) = @_;	2734	my ($self) = @_;
2478		2735
2479	return unless $::CONN;#d# manage and cache textures differently	2736	return unless $::CONN;
		2737
		2738	my $face;
		2739
		2740	if ($self->{frame}) {
		2741	my $anim = $::CONN->{anim}[$self->{anim}];
		2742
		2743	$face = $anim->[ $self->{frame} % @$anim ]
		2744	if $anim && @$anim;
		2745	}
		2746
2480	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]];	2747	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2481		2748
2482	# TODO animation
2483	if ($tex) {	2749	if ($tex) {
2484	glEnable GL_TEXTURE_2D;	2750	glEnable GL_TEXTURE_2D;
2485	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2751	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2486	glColor 1, 1, 1, 1;	2752	glColor 1, 1, 1, 1;
2487	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});	2753	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2488	glDisable GL_TEXTURE_2D;	2754	glDisable GL_TEXTURE_2D;
2489	}	2755	}
2490	}	2756	}
2491		2757
		2758	sub DESTROY {
		2759	my ($self) = @_;
		2760
		2761	$self->{timer}->cancel
		2762	if $self->{timer};
		2763
		2764	$self->SUPER::DESTROY;
		2765	}
		2766
2492	#############################################################################	2767	#############################################################################
2493		2768
2494	package CFClient::UI::InventoryItem;	2769	package CFClient::UI::Inventory;
2495		2770
2496	our @ISA = CFClient::UI::HBox::;	2771	our @ISA = CFClient::UI::ScrolledWindow::;
2497		2772
2498	sub new {	2773	sub new {
2499	my $class = shift;	2774	my $class = shift;
2500		2775
2501	my %args = @_;
2502
2503	my $item = delete $args{item};
2504
2505	my $desc = $item->{nrof} < 2
2506	? $item->{name}
2507	: "$item->{nrof} $item->{name_pl}";
2508
2509
2510	my $self = $class->SUPER::new (	2776	my $self = $class->SUPER::new (
2511	can_hover => 1,	2777	scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2512	can_events => 1,
2513	tooltip => (CFClient::UI::Label->escape ($desc)
2514	. "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),
2515	connect_button_down => sub {
2516	my ($self, $ev, $x, $y) = @_;
2517
2518	# todo: maybe put examine on 1? but should just be a tooltip :(
2519	if ($ev->{button} == 1) {
2520	$::CONN->send ("move $::CONN->{player}{tag} $item->{tag} 0");
2521	} elsif ($ev->{button} == 2) {
2522	$::CONN->send ("apply $item->{tag}");
2523	} elsif ($ev->{button} == 3) {
2524	CFClient::UI::Menu->new (
2525	items => [
2526	["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2527	[
2528	$item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock",
2529	sub { $::CONN->send ("lock $item->{tag}") },
2530	],
2531	["mark", sub { $::CONN->send ("mark $item->{tag}") }],
2532	["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2533	["drop", sub { $::CONN->send ("move 0 $item->{tag} 0") }],
2534	],
2535	)->popup ($ev);
2536	}
2537
2538	1
2539	},
2540	%args
2541	);
2542
2543	$self->add (new CFClient::UI::Face
2544	can_events => 0,
2545	face => $item->{face},
2546	anim => $item->{anim},
2547	animspeed => $item->{animspeed},
2548	);
2549
2550	$self->add (new CFClient::UI::Label
2551	can_events => 0,
2552	text => $desc,
2553	);
2554
2555	$self
2556	}
2557
2558	#############################################################################
2559
2560	package CFClient::UI::Inventory;
2561
2562	our @ISA = CFClient::UI::ScrolledWindow::;
2563
2564	sub new {
2565	my $class = shift;
2566
2567	my $self = $class->SUPER::new (
2568	scrolled => (new CFClient::UI::VBox),
2569	@_,	2778	@_,
2570	);	2779	);
2571		2780
2572	$self	2781	$self
2573	}	2782	}
…		…
2583	or ($a->{name} cmp $b->{name})	2792	or ($a->{name} cmp $b->{name})
2584	} @$items;	2793	} @$items;
2585		2794
2586	$self->{real_items} = \@items;	2795	$self->{real_items} = \@items;
2587		2796
		2797	my $row = 0;
2588	for my $item (@items) {	2798	for my $item (@items) {
2589	my $desc = $item->{nrof} < 2	2799	CFClient::Item::update_widgets $item;
2590	? $item->{name}
2591	: "$item->{nrof} $item->{name_pl}";
2592		2800
2593	$item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item;	2801	$self->{scrolled}->add (0, $row, $item->{face_widget});
2594	}	2802	$self->{scrolled}->add (1, $row, $item->{desc_widget});
		2803	$self->{scrolled}->add (2, $row, $item->{weight_widget});
2595		2804
2596	$self->{scrolled}->add (@items);	2805	$row++;
2597		2806	}
2598	# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2599	}	2807	}
2600		2808
2601	sub size_request {	2809	sub size_request {
2602	my ($self) = @_;	2810	my ($self) = @_;
2603	($self->{req_w}, $self->{req_h});	2811	($self->{req_w}, $self->{req_h});
…		…
2643		2851
2644	# popup given the event (must be a mouse button down event currently)	2852	# popup given the event (must be a mouse button down event currently)
2645	sub popup {	2853	sub popup {
2646	my ($self, $ev) = @_;	2854	my ($self, $ev) = @_;
2647		2855
2648	$self->emit ("popdown");	2856	$self->_emit ("popdown");
2649		2857
2650	# maybe save $GRAB? must be careful about events...	2858	# maybe save $GRAB? must be careful about events...
2651	$GRAB = $self;	2859	$GRAB = $self;
2652	$self->{button} = $ev->{button};	2860	$self->{button} = $ev->{button};
2653		2861
…		…
2668		2876
2669	if ($ev->{button} == $self->{button}) {	2877	if ($ev->{button} == $self->{button}) {
2670	undef $GRAB;	2878	undef $GRAB;
2671	$self->hide;	2879	$self->hide;
2672		2880
2673	$self->emit ("popdown");	2881	$self->_emit ("popdown");
2674	$self->{hover}[1]->() if $self->{hover};	2882	$self->{hover}[1]->() if $self->{hover};
2675	}	2883	}
2676	}	2884	}
2677		2885
2678	#############################################################################	2886	#############################################################################
2679		2887
2680	package CFClient::UI::Statusbox;	2888	package CFClient::UI::Statusbox;
2681		2889
2682	our @ISA = CFClient::UI::VBox::;	2890	our @ISA = CFClient::UI::VBox::;
		2891
		2892	sub new {
		2893	my $class = shift;
		2894
		2895	$class->SUPER::new (
		2896	fontsize => 0.8,
		2897	@_,
		2898	)
		2899	}
2683		2900
2684	sub reorder {	2901	sub reorder {
2685	my ($self) = @_;	2902	my ($self) = @_;
2686	my $NOW = time;	2903	my $NOW = time;
2687		2904
…		…
2707	: $item->{text};	2924	: $item->{text};
2708		2925
2709	for ($short) {	2926	for ($short) {
2710	s/^\s+//;	2927	s/^\s+//;
2711	s/\s+/ /g;	2928	s/\s+/ /g;
2712	my $len = int 40 / $item->{fontsize};
2713	substr $_, $len, length, "…" if $len < length;
2714	}	2929	}
2715		2930
2716	new CFClient::UI::Label	2931	new CFClient::UI::Label
2717	markup => $short,	2932	markup => $short,
2718	tooltip => $item->{tooltip},	2933	tooltip => $item->{tooltip},
2719	tooltip_font => $::FONT_PROP,	2934	tooltip_font => $::FONT_PROP,
2720	tooltip_width => 0.67,	2935	tooltip_width => 0.67,
2721	fontsize => $item->{fontsize},	2936	fontsize => $item->{fontsize} || $self->{fontsize},
		2937	max_w => $::WIDTH * 0.44,
2722	fg => $item->{fg},	2938	fg => $item->{fg},
2723	can_events => 1,	2939	can_events => 1,
2724	can_hover => 1	2940	can_hover => 1
2725	};	2941	};
2726	}	2942	}
…		…
2732	sub add {	2948	sub add {
2733	my ($self, $text, %arg) = @_;	2949	my ($self, $text, %arg) = @_;
2734		2950
2735	$text =~ s/^\s+//;	2951	$text =~ s/^\s+//;
2736	$text =~ s/\s+$//;	2952	$text =~ s/\s+$//;
		2953
		2954	return unless $text;
2737		2955
2738	my $timeout = time + ((delete $arg{timeout}) || 60);	2956	my $timeout = time + ((delete $arg{timeout}) || 60);
2739		2957
2740	my $group = exists $arg{group} ? $arg{group} : ++$self->{id};	2958	my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2741		2959
…		…
2753	$self->{item}{$group} = {	2971	$self->{item}{$group} = {
2754	id => ++$self->{id},	2972	id => ++$self->{id},
2755	text => $text,	2973	text => $text,
2756	timeout => $timeout,	2974	timeout => $timeout,
2757	tooltip => $text,	2975	tooltip => $text,
2758	fontsize => 0.8,
2759	fg => [0.8, 0.8, 0.8, 0.8],	2976	fg => [0.8, 0.8, 0.8, 0.8],
2760	pri => 0,	2977	pri => 0,
2761	count => 1,	2978	count => 1,
2762	%arg,	2979	%arg,
2763	};	2980	};
2764	}	2981	}
2765		2982
2766	$self->reorder;	2983	$self->reorder;
2767	}	2984	}
2768		2985
		2986	sub reconfigure {
		2987	my ($self) = @_;
		2988
		2989	delete $_->{label}
		2990	for values %{ $self->{item} || {} };
		2991
		2992	$self->reorder;
		2993	$self->SUPER::reconfigure;
		2994	}
		2995
2769	#############################################################################	2996	#############################################################################
2770		2997
2771	package CFClient::UI::Root;	2998	package CFClient::UI::Root;
2772		2999
2773	our @ISA = CFClient::UI::Container::;	3000	our @ISA = CFClient::UI::Container::;
…		…
2776		3003
2777	sub new {	3004	sub new {
2778	my $class = shift;	3005	my $class = shift;
2779		3006
2780	$class->SUPER::new (	3007	$class->SUPER::new (
		3008	visible => 1,
2781	@_,	3009	@_,
2782	)	3010	)
2783	}	3011	}
2784		3012
2785	sub configure {	3013	sub configure {
…		…
2803	}	3031	}
2804		3032
2805	sub size_allocate {	3033	sub size_allocate {
2806	my ($self, $w, $h) = @_;	3034	my ($self, $w, $h) = @_;
2807		3035
2808	my $old_w = $self->{old_w}; $self->{old_w} = $w;
2809	my $old_h = $self->{old_h}; $self->{old_h} = $h;
2810
2811	CFClient::UI::rescale_widgets $w / $old_w, $h / $old_h
2812	if $old_w && $old_h && ($old_w != $w || $old_h != $h);
2813
2814	for my $child ($self->children) {	3036	for my $child ($self->children) {
2815	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};	3037	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2816		3038
2817	$X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1	3039	$X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1
2818	if exists $child->{req_x};	3040	if exists $child->{req_x};
2819		3041
2820	$Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1	3042	$Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1
2821	if exists $child->{req_y};	3043	if exists $child->{req_y};
2822		3044
		3045	$X = $self->{user_x} if exists $self->{user_x};
		3046	$Y = $self->{user_y} if exists $self->{user_y};
		3047
2823	$X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;	3048	$X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
2824	$Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;	3049	$Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
2825		3050
2826	$child->configure ($X, $Y, $W, $H);	3051	$child->configure ($X, $Y, $W, $H);
2827	}	3052	}
…		…
2847	}	3072	}
2848		3073
2849	sub add {	3074	sub add {
2850	my ($self, @children) = @_;	3075	my ($self, @children) = @_;
2851		3076
		3077	for (my @widgets = @children; my $w = pop @widgets; ) {
		3078	push @widgets, $w->children;
		3079	$w->{root} = $self;
		3080	$w->{visible} = $self->{visible} + 1;
		3081	}
		3082
2852	for my $child (@children) {	3083	for my $child (@children) {
2853	$child->{toplevel} = 1;	3084	$child->{is_toplevel} = 1;
2854		3085
2855	# integerise window positions	3086	# integerise window positions
2856	$child->{x} = int $child->{x};	3087	$child->{x} = int $child->{x};
2857	$child->{y} = int $child->{y};	3088	$child->{y} = int $child->{y};
2858	}	3089	}
2859		3090
2860	$self->SUPER::add (@children);	3091	$self->SUPER::add (@children);
2861	}	3092	}
2862		3093
		3094	sub remove {
		3095	my ($self, @children) = @_;
		3096
		3097	$self->SUPER::remove (@children);
		3098
		3099	while (@children) {
		3100	my $w = pop @children;
		3101	push @children, $w->children;
		3102	$w->set_invisible;
		3103	}
		3104	}
		3105
2863	sub on_refresh {	3106	sub on_refresh {
2864	my ($self, $id, $cb) = @_;	3107	my ($self, $id, $cb) = @_;
2865		3108
2866	$self->{refresh_hook}{$id} = $cb;	3109	$self->{refresh_hook}{$id} = $cb;
2867	}	3110	}
…		…
2879	$_->()	3122	$_->()
2880	for values %{delete $self->{refresh_hook}};	3123	for values %{delete $self->{refresh_hook}};
2881	}	3124	}
2882		3125
2883	if ($self->{check_size}) {	3126	if ($self->{check_size}) {
2884	my @queue = ([], []);	3127	my @queue;
2885		3128
2886	for (;;) {	3129	for (;;) {
2887	if ($self->{check_size}) {	3130	if ($self->{check_size}) {
2888	# heuristic: check containers last	3131	#TODO use array-of-depth approach
2889	push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_	3132
		3133	@queue = sort { $a->{visible} <=> $b->{visible} }
2890	for values %{delete $self->{check_size}}	3134	@queue, values %{delete $self->{check_size}};
2891	}	3135	}
2892		3136
2893	my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last;	3137	my $widget = pop @queue || last;
		3138
		3139	defined $widget->{visible} or last; # do not resize invisible widgets
2894		3140
2895	my ($w, $h) = $widget->{user_w} && $widget->{user_h}	3141	my ($w, $h) = $widget->{user_w} && $widget->{user_h}
2896	? @$widget{qw(user_w user_h)}	3142	? @$widget{qw(user_w user_h)}
2897	: $widget->size_request;	3143	: $widget->size_request;
2898		3144
…		…
2918	$w = 0 if $w < 0;	3164	$w = 0 if $w < 0;
2919	$h = 0 if $h < 0;	3165	$h = 0 if $h < 0;
2920		3166
2921	$widget->{w} = $w;	3167	$widget->{w} = $w;
2922	$widget->{h} = $h;	3168	$widget->{h} = $h;
2923	$widget->size_allocate ($w, $h);
2924	$widget->emit (size_allocate => $w, $h);	3169	$widget->emit (size_allocate => $w, $h);
2925	}	3170	}
2926	}	3171	}
2927		3172
2928	while ($self->{post_alloc_hook}) {	3173	while ($self->{post_alloc_hook}) {
…		…
2934	glClearColor +($::CFG->{fow_intensity}) x 3, 1;	3179	glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2935	glClear GL_COLOR_BUFFER_BIT;	3180	glClear GL_COLOR_BUFFER_BIT;
2936		3181
2937	glMatrixMode GL_PROJECTION;	3182	glMatrixMode GL_PROJECTION;
2938	glLoadIdentity;	3183	glLoadIdentity;
2939	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000;	3184	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
2940	glMatrixMode GL_MODELVIEW;	3185	glMatrixMode GL_MODELVIEW;
2941	glLoadIdentity;	3186	glLoadIdentity;
2942		3187
2943	$self->_draw;	3188	$self->_draw;
2944	}	3189	}
…		…
2946	#############################################################################	3191	#############################################################################
2947		3192
2948	package CFClient::UI;	3193	package CFClient::UI;
2949		3194
2950	$ROOT = new CFClient::UI::Root;	3195	$ROOT = new CFClient::UI::Root;
2951	$TOOLTIP = new CFClient::UI::Tooltip;	3196	$TOOLTIP = new CFClient::UI::Tooltip z => 900;
2952		3197
2953	1	3198	1
2954		3199

Diff Legend

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