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.208 by root, Mon May 15 22:52:17 2006 UTC vs.
Revision 1.244 by root, Sat May 27 21:06:09 2006 UTC

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

Diff Legend

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