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.210 by root, Wed May 17 10:14:52 2006 UTC vs.
Revision 1.246 by root, Sun May 28 00:40:51 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};
151	$widget->{y} = int 0.5 + $widget->{y} * $sy if exists $widget->{y};	180	$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};	181	$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};	182	$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};
155	}	183	}
156
157	$widget->reconfigure;
158	}	184	}
		185
		186	reconfigure_widgets;
159	}	187	}
160		188
161	#############################################################################	189	#############################################################################
162		190
163	package CFClient::UI::Base;	191	package CFClient::UI::Base;
…		…
176	can_events => 1,	204	can_events => 1,
177	@_	205	@_
178	}, $class;	206	}, $class;
179		207
180	for (keys %$self) {	208	for (keys %$self) {
181	if (/^connect_(.*)$/) {	209	if (/^on_(.*)$/) {
182	$self->connect ($1 => delete $self->{$_});	210	$self->connect ($1 => delete $self->{$_});
183	}	211	}
184	}	212	}
185		213
186	Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);	214	Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
187		215
		216	if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {
		217	$self->{req_x} = $layout->{x} * $::WIDTH;
		218	$self->{req_y} = $layout->{y} * $::HEIGHT;
		219	$self->{def_w} = ($layout->{w} != 0 ? $layout->{w} : 1) * $::WIDTH;
		220	$self->{def_h} = ($layout->{h} != 0 ? $layout->{h} : 1) * $::HEIGHT;
		221	}
		222
188	$self	223	$self
		224	}
		225
		226	sub toggle_visibility {
		227	my ($self) = @_;
		228
		229	if ($self->{visible}) {
		230	$self->hide;
		231	} else {
		232	$self->show;
		233	}
189	}	234	}
190		235
191	sub destroy {	236	sub destroy {
192	my ($self) = @_;	237	my ($self) = @_;
193		238
…		…
195	%$self = ();	240	%$self = ();
196	}	241	}
197		242
198	sub show {	243	sub show {
199	my ($self) = @_;	244	my ($self) = @_;
200
201	return if $self->{parent};	245	return if $self->{parent};
202		246
203	$CFClient::UI::ROOT->add ($self);	247	$CFClient::UI::ROOT->add ($self);
204	}	248	}
205		249
206	sub hide {	250	sub show_centered {
207	my ($self) = @_;	251	my ($self) = @_;
		252	return if $self->{parent};
		253
		254	$self->show;
		255
		256	$CFClient::UI::ROOT->on_post_alloc (
		257	"centered $self" => sub {
		258	$self->move (($::WIDTH - $self->{w}) * 0.5, ($::HEIGHT - $self->{h}) * 0.5);
		259	},
		260	);
		261	}
		262
		263	sub set_visible {
		264	my ($self) = @_;
		265
		266	return if $self->{visible};
		267
		268	$self->{root} = $self->{parent}{root};
		269	$self->{visible} = $self->{parent}{visible} + 1;
		270
		271	$self->emit (visibility_change => 1)
		272	}
		273
		274	sub set_invisible {
		275	my ($self) = @_;
		276
		277	return unless $self->{visible};
		278
		279	# broken show/hide model
		280
		281	delete $self->{root};
		282	delete $self->{visible};
208		283
209	undef $GRAB if $GRAB == $self;	284	undef $GRAB if $GRAB == $self;
210	undef $HOVER if $HOVER == $self;	285	undef $HOVER if $HOVER == $self;
		286
		287	CFClient::UI::check_tooltip
		288	if $CFClient::UI::TOOLTIP->{owner} == $self;
		289
		290	$self->focus_out;
		291
		292	$self->emit (visibility_change => 0);
		293	}
		294
		295	sub hide {
		296	my ($self) = @_;
		297
		298	$self->set_invisible;
211		299
212	$self->{parent}->remove ($self)	300	$self->{parent}->remove ($self)
213	if $self->{parent};	301	if $self->{parent};
214	}	302	}
215		303
…		…
224	}	312	}
225		313
226	sub set_size {	314	sub set_size {
227	my ($self, $w, $h) = @_;	315	my ($self, $w, $h) = @_;
228		316
229	$self->{user_w} = $w;	317	$self->{def_w} = $w;
230	$self->{user_h} = $h;	318	$self->{def_h} = $h;
231		319
232	$self->check_size;	320	$self->check_size;
233	}	321	}
234		322
235	sub size_request {	323	sub size_request {
…		…
285	}	373	}
286		374
287	sub set_tooltip {	375	sub set_tooltip {
288	my ($self, $tooltip) = @_;	376	my ($self, $tooltip) = @_;
289		377
		378	$tooltip =~ s/^\s+//;
		379	$tooltip =~ s/\s+$//;
		380
		381	return if $self->{tooltip} eq $tooltip;
		382
290	$self->{tooltip} = $tooltip;	383	$self->{tooltip} = $tooltip;
291		384
292	if ($CFClient::UI::TOOLTIP->{owner} == $self) {	385	if ($CFClient::UI::TOOLTIP->{owner} == $self) {
293	delete $CFClient::UI::TOOLTIP->{owner};	386	delete $CFClient::UI::TOOLTIP->{owner};
294	CFClient::UI::check_tooltip;	387	CFClient::UI::check_tooltip;
…		…
315	return if $FOCUS == $self;	408	return if $FOCUS == $self;
316	return unless $self->{can_focus};	409	return unless $self->{can_focus};
317		410
318	my $focus = $FOCUS; $FOCUS = $self;	411	my $focus = $FOCUS; $FOCUS = $self;
319		412
320	$self->emit (focus_in => $focus);	413	$self->_emit (focus_in => $focus);
321		414
322	$focus->update if $focus;	415	$focus->update if $focus;
323	$FOCUS->update;	416	$FOCUS->update;
324	}	417	}
325		418
…		…
328		421
329	return unless $FOCUS == $self;	422	return unless $FOCUS == $self;
330		423
331	my $focus = $FOCUS; undef $FOCUS;	424	my $focus = $FOCUS; undef $FOCUS;
332		425
333	$self->emit (focus_out => $focus);	426	$self->_emit (focus_out => $focus);
334		427
335	$focus->update if $focus; #?	428	$focus->update if $focus; #?
		429
		430	$::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus
		431	unless $FOCUS;
336	}	432	}
337		433
338	sub mouse_motion { }	434	sub mouse_motion { }
339	sub button_up { }	435	sub button_up { }
340	sub key_down { }	436	sub key_down { }
341	sub key_up { }	437	sub key_up { }
342		438
343	sub button_down {	439	sub button_down {
344	my ($self, $ev, $x, $y) = @_;	440	my ($self, $ev, $x, $y) = @_;
345		441
346	$self->focus_in;	442	$self->focus_in;
…		…
380	if ($ENV{PCLIENT_DEBUG}) {	476	if ($ENV{PCLIENT_DEBUG}) {
381	glPushMatrix;	477	glPushMatrix;
382	glColor 1, 1, 0, 1;	478	glColor 1, 1, 0, 1;
383	glTranslate $self->{x} + 0.375, $self->{y} + 0.375;	479	glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
384	glBegin GL_LINE_LOOP;	480	glBegin GL_LINE_LOOP;
385	glVertex 0 , 0;	481	glVertex 0 , 0;
386	glVertex $self->{w}, 0;	482	glVertex $self->{w} - 1, 0;
387	glVertex $self->{w}, $self->{h};	483	glVertex $self->{w} - 1, $self->{h} - 1;
388	glVertex 0 , $self->{h};	484	glVertex 0 , $self->{h} - 1;
389	glEnd;	485	glEnd;
390	glPopMatrix;	486	glPopMatrix;
391	#CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;	487	#CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
392	}	488	}
393	}	489	}
…		…
413	sub set_parent {	509	sub set_parent {
414	my ($self, $parent) = @_;	510	my ($self, $parent) = @_;
415		511
416	Scalar::Util::weaken ($self->{parent} = $parent);	512	Scalar::Util::weaken ($self->{parent} = $parent);
417		513
418	# TODO: req_w _does_change after ->reconfigure	514	$self->set_visible;
		515
419	$self->check_size	516	$self->check_size;
420	unless exists $self->{req_w};	517	$self->show;
421	}	518	}
422		519
423	sub check_size {	520	sub check_size {
424	my ($self, $forced) = @_;	521	my ($self, $forced) = @_;
425		522
…		…
438	my ($self, $signal, $cb) = @_;	535	my ($self, $signal, $cb) = @_;
439		536
440	push @{ $self->{signal_cb}{$signal} }, $cb;	537	push @{ $self->{signal_cb}{$signal} }, $cb;
441	}	538	}
442		539
		540	sub _emit {
		541	my ($self, $signal, @args) = @_;
		542
		543	List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
		544	}
		545
443	sub emit {	546	sub emit {
444	my ($self, $signal, @args) = @_;	547	my ($self, $signal, @args) = @_;
445		548
446	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) = @_;
447	}	555	}
448		556
449	sub DESTROY {	557	sub DESTROY {
450	my ($self) = @_;	558	my ($self) = @_;
451		559
…		…
564	delete $child->{parent};	672	delete $child->{parent};
565	$child->hide;	673	$child->hide;
566		674
567	$self->{children} = [ grep $_ != $child, @{ $self->{children} } ];	675	$self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
568		676
569	$self->check_size;	677	$self->check_size (1);
570	$self->update;	678	$self->update;
571	}	679	}
572		680
573	sub clear {	681	sub clear {
574	my ($self) = @_;	682	my ($self) = @_;
…		…
688	$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 {
689	glClearColor 0, 0, 0, 0;	797	glClearColor 0, 0, 0, 0;
690	glClear GL_COLOR_BUFFER_BIT;	798	glClear GL_COLOR_BUFFER_BIT;
691		799
692	$self->_render;	800	$self->_render;
693	# glColorMask 1, 1, 1, 0;
694	# glEnable GL_BLEND;
695	# glBlendFunc GL_SRC_ALPHA, GL_ZERO;
696	# glRasterPos 0, 0;
697	# glCopyPixels 0, 0, $self->{w}, $self->{h};
698	# glDisable GL_BLEND;
699	# glColorMask 1, 1, 1, 1;
700	};	801	};
701	}	802	}
702		803
703	sub _draw {	804	sub _draw {
704	my ($self) = @_;	805	my ($self) = @_;
…		…
708	my $tex = $self->{texture}	809	my $tex = $self->{texture}
709	or return;	810	or return;
710		811
711	glEnable GL_TEXTURE_2D;	812	glEnable GL_TEXTURE_2D;
712	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	813	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
713	glColor 0, 0, 0, 1;	814	glColor 1, 1, 1, 1;
714		815
715	$tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);	816	$tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
716		817
717	glDisable GL_TEXTURE_2D;	818	glDisable GL_TEXTURE_2D;
718	}	819	}
…		…
721		822
722	package CFClient::UI::ViewPort;	823	package CFClient::UI::ViewPort;
723		824
724	our @ISA = CFClient::UI::Window::;	825	our @ISA = CFClient::UI::Window::;
725		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
726	sub size_request {	837	sub size_request {
727	my ($self) = @_;	838	my ($self) = @_;
728		839
729	@$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)};
730	$self->child->configure (0, 0, @$self{qw(child_w child_h)});
731		841
732	@$self{qw(child_w child_h)}	842	@$self{qw(child_w child_h)}
733	}	843	}
734		844
735	sub size_allocate {	845	sub size_allocate {
736	my ($self, $w, $h) = @_;	846	my ($self, $w, $h) = @_;
737		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);
738	$self->update;	852	$self->update;
739	}	853	}
740		854
741	sub set_offset {	855	sub set_offset {
742	my ($self, $x, $y) = @_;	856	my ($self, $x, $y) = @_;
…		…
793	my $class = shift;	907	my $class = shift;
794		908
795	my $self;	909	my $self;
796		910
797	my $slider = new CFClient::UI::Slider	911	my $slider = new CFClient::UI::Slider
798	vertical => 1,	912	vertical => 1,
799	range => [0, 0, 1, 0.01], # HACK fix	913	range => [0, 0, 1, 0.01], # HACK fix
800	connect_changed => sub {	914	on_changed => sub {
801	$self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h}));	915	$self->{vp}->set_offset (0, $_[1]);
802	},	916	},
803	;	917	;
804		918
805	$self = $class->SUPER::new (	919	$self = $class->SUPER::new (
806	vp => (new CFClient::UI::ViewPort),	920	vp => (new CFClient::UI::ViewPort expand => 1),
807	slider => $slider,	921	slider => $slider,
808	@_,	922	@_,
809	);	923	);
810		924
811	$self->{vp}->add ($self->{scrolled});	925	$self->{vp}->add ($self->{scrolled});
812	$self->add ($self->{vp});	926	$self->add ($self->{vp});
813	$self->add ($self->{slider});	927	$self->add ($self->{slider});
814		928
815	$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]);
816	}	949	}
817		950
818	#TODO# update range on size_allocate depending on child	951	#TODO# update range on size_allocate depending on child
819	# update viewport offset on scroll	952	# update viewport offset on scroll
820		953
…		…
871	qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);	1004	qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
872		1005
873	sub new {	1006	sub new {
874	my $class = shift;	1007	my $class = shift;
875		1008
876	# TODO: user_x, user_y, overwrite moveto?
877
878	my $self = $class->SUPER::new (	1009	my $self = $class->SUPER::new (
879	bg => [1, 1, 1, 1],	1010	bg => [1, 1, 1, 1],
880	border_bg => [1, 1, 1, 1],	1011	border_bg => [1, 1, 1, 1],
881	border => 0.6,	1012	border => 0.6,
882	toplevel => 1,	1013	is_toplevel => 1,
883	can_events => 1,	1014	can_events => 1,
884	@_	1015	@_
885	);	1016	);
886		1017
887	$self->{title} &&= new CFClient::UI::Label	1018	$self->{title} &&= new CFClient::UI::Label
888	align => 0,	1019	align => 0,
…		…
941	my ($ev, $x, $y) = @_;	1072	my ($ev, $x, $y) = @_;
942		1073
943	my $dx = $ev->{x} - $ox;	1074	my $dx = $ev->{x} - $ox;
944	my $dy = $ev->{y} - $oy;	1075	my $dy = $ev->{y} - $oy;
945		1076
		1077	$self->{user_x} = $wx + $dx * $mx;
		1078	$self->{user_y} = $wy + $dy * $my;
946	$self->{user_w} = $bw + $dx * ($mx ? -1 : 1);	1079	$self->{def_w} = $bw + $dx * ($mx ? -1 : 1);
947	$self->{user_h} = $bh + $dy * ($my ? -1 : 1);	1080	$self->{def_h} = $bh + $dy * ($my ? -1 : 1);
948	$self->move ($wx + $dx * $mx, $wy + $dy * $my);	1081	$self->move ($self->{user_x}, $self->{user_y});
949	$self->check_size;	1082	$self->check_size;
950	};	1083	};
951		1084
952	} elsif ($lr ^ $td) {	1085	} elsif ($lr ^ $td) {
953	my ($ox, $oy) = ($ev->{x}, $ev->{y});	1086	my ($ox, $oy) = ($ev->{x}, $ev->{y});
…		…
956	$self->{motion} = sub {	1089	$self->{motion} = sub {
957	my ($ev, $x, $y) = @_;	1090	my ($ev, $x, $y) = @_;
958		1091
959	($x, $y) = ($ev->{x}, $ev->{y});	1092	($x, $y) = ($ev->{x}, $ev->{y});
960		1093
961	$self->move ($bx + $x - $ox, $by + $y - $oy);	1094	$self->{user_x} = $bx + $x - $ox;
		1095	$self->{user_y} = $by + $y - $oy;
		1096
		1097	$self->move ($self->{user_x}, $self->{user_y});
962	$self->update;	1098	$self->update;
963	};	1099	};
964	}	1100	}
965	}	1101	}
966		1102
…		…
1028	sub new {	1164	sub new {
1029	my $class = shift;	1165	my $class = shift;
1030		1166
1031	$class->SUPER::new (	1167	$class->SUPER::new (
1032	col_expand => [],	1168	col_expand => [],
1033	@_	1169	@_,
1034	)	1170	)
		1171	}
		1172
		1173	sub children {
		1174	grep $_, map @$_, grep $_, @{ $_[0]{children} }
1035	}	1175	}
1036		1176
1037	sub add {	1177	sub add {
1038	my ($self, $x, $y, $child) = @_;	1178	my ($self, $x, $y, $child) = @_;
1039		1179
1040	$child->set_parent ($self);	1180	$child->set_parent ($self);
1041	$self->{children}[$y][$x] = $child;	1181	$self->{children}[$y][$x] = $child;
1042		1182
1043	$child->check_size;	1183	$self->check_size (1);
1044	}	1184	}
1045		1185
1046	sub children {
1047	grep $_, map @$_, grep $_, @{ $_[0]{children} }
1048	}
1049
1050	# TODO: move to container class maybe? send childs a signal on removal?	1186	# TODO: move to container class maybe? send children a signal on removal?
1051	sub clear {	1187	sub clear {
1052	my ($self) = @_;	1188	my ($self) = @_;
1053		1189
1054	my @children = $self->children;	1190	my @children = $self->children;
1055	delete $self->{children};	1191	delete $self->{children};
…		…
1057	for (@children) {	1193	for (@children) {
1058	delete $_->{parent};	1194	delete $_->{parent};
1059	$_->hide;	1195	$_->hide;
1060	}	1196	}
1061		1197
		1198	$self->check_size (1);
1062	$self->update;	1199	$self->update;
1063	}	1200	}
1064		1201
1065	sub get_wh {	1202	sub get_wh {
1066	my ($self) = @_;	1203	my ($self) = @_;
…		…
1098	sub size_allocate {	1235	sub size_allocate {
1099	my ($self, $w, $h) = @_;	1236	my ($self, $w, $h) = @_;
1100		1237
1101	my ($ws, $hs) = $self->get_wh;	1238	my ($ws, $hs) = $self->get_wh;
1102		1239
1103	my $req_w = sum @$ws;	1240	my $req_w = (sum @$ws) || 1;
1104	my $req_h = sum @$hs;	1241	my $req_h = (sum @$hs) || 1;
1105		1242
1106	# TODO: nicer code && do row_expand	1243	# TODO: nicer code && do row_expand
1107	my @col_expand = @{$self->{col_expand}};	1244	my @col_expand = @{$self->{col_expand}};
1108	@col_expand = (1) x @$ws unless @col_expand;	1245	@col_expand = (1) x @$ws unless @col_expand;
1109	my $col_expand = (sum @col_expand) || 1;	1246	my $col_expand = (sum @col_expand) || 1;
…		…
1163	}	1300	}
1164	}	1301	}
1165		1302
1166	#############################################################################	1303	#############################################################################
1167		1304
1168	package CFClient::UI::HBox;	1305	package CFClient::UI::Box;
1169
1170	# TODO: wrap into common Box base class
1171		1306
1172	our @ISA = CFClient::UI::Container::;	1307	our @ISA = CFClient::UI::Container::;
1173		1308
1174	sub size_request {	1309	sub size_request {
1175	my ($self) = @_;	1310	my ($self) = @_;
1176		1311
1177	my @alloc = map [$_->size_request], @{$self->{children}};	1312	$self->{vertical}
1178		1313	? (
1179	(	1314	(List::Util::max map $_->{req_w}, @{$self->{children}}),
1180	(List::Util::sum map $_->[0], @alloc),	1315	(List::Util::sum map $_->{req_h}, @{$self->{children}}),
1181	(List::Util::max map $_->[1], @alloc),	1316	)
1182	)	1317	: (
		1318	(List::Util::sum map $_->{req_w}, @{$self->{children}}),
		1319	(List::Util::max map $_->{req_h}, @{$self->{children}}),
		1320	)
1183	}	1321	}
1184		1322
1185	sub size_allocate {	1323	sub size_allocate {
1186	my ($self, $w, $h) = @_;	1324	my ($self, $w, $h) = @_;
1187		1325
1188	($h, $w) = ($w, $h);	1326	my $space = $self->{vertical} ? $h : $w;
1189
1190	my $children = $self->{children};	1327	my $children = $self->{children};
1191		1328
1192	my @h = map $_->{req_w}, @$children;	1329	my @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children;
1193
1194	my $req_h = List::Util::sum @h;	1330	my $req = List::Util::sum @req;
1195		1331
1196	if ($req_h > $h) {	1332	if ($req > $space) {
1197	# ah well, not enough space	1333	# ah well, not enough space
1198	$_ *= $h / $req_h for @h;	1334	$_ *= $space / $req for @req;
1199	} else {	1335	} else {
1200	my $exp = List::Util::sum map $_->{expand}, @$children;	1336	my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;
1201	$exp ||= 1;
1202		1337
		1338	$req[$_] += ($space - $req) * $children->[$_]{expand} / $expand
1203	for (0 .. $#$children) {	1339	for 0 .. $#$children;
1204	my $child = $children->[$_];
1205
1206	my $alloc_h = $h[$_];
1207	$alloc_h += ($h - $req_h) * $child->{expand} / $exp;
1208	$h[$_] = $alloc_h;
1209	}
1210	}	1340	}
1211		1341
1212	CFClient::UI::harmonize \@h;	1342	CFClient::UI::harmonize \@req;
1213		1343
1214	my $y = 0;	1344	my $pos = 0;
1215	for (0 .. $#$children) {	1345	for (0 .. $#$children) {
1216	my $child = $children->[$_];
1217	my $h = $h[$_];	1346	my $alloc = $req[$_];
1218	$child->configure ($y, 0, $h, $w);	1347	$children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1219		1348
1220	$y += $h;	1349	$pos += $alloc;
1221	}	1350	}
1222		1351
1223	1	1352	1
1224	}	1353	}
1225		1354
1226	#############################################################################	1355	#############################################################################
1227		1356
		1357	package CFClient::UI::HBox;
		1358
		1359	our @ISA = CFClient::UI::Box::;
		1360
		1361	sub new {
		1362	my $class = shift;
		1363
		1364	$class->SUPER::new (
		1365	vertical => 0,
		1366	@_,
		1367	)
		1368	}
		1369
		1370	#############################################################################
		1371
1228	package CFClient::UI::VBox;	1372	package CFClient::UI::VBox;
1229		1373
1230	# TODO: wrap into common Box base class
1231
1232	our @ISA = CFClient::UI::Container::;	1374	our @ISA = CFClient::UI::Box::;
1233		1375
1234	sub size_request {	1376	sub new {
1235	my ($self) = @_;	1377	my $class = shift;
1236		1378
1237	my @alloc = map [$_->size_request], @{$self->{children}};	1379	$class->SUPER::new (
1238		1380	vertical => 1,
1239	(	1381	@_,
1240	(List::Util::max map $_->[0], @alloc),
1241	(List::Util::sum map $_->[1], @alloc),
1242	)	1382	)
1243	}
1244
1245	sub size_allocate {
1246	my ($self, $w, $h) = @_;
1247
1248	Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1249
1250	my $children = $self->{children};
1251
1252	my @h = map $_->{req_h}, @$children;
1253
1254	my $req_h = List::Util::sum @h;
1255
1256	if ($req_h > $h) {
1257	# ah well, not enough space
1258	$_ *= $h / $req_h for @h;
1259	} else {
1260	my $exp = List::Util::sum map $_->{expand}, @$children;
1261	$exp ||= 1;
1262
1263	for (0 .. $#$children) {
1264	my $child = $children->[$_];
1265
1266	$h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1267	}
1268	}
1269
1270	CFClient::UI::harmonize \@h;
1271
1272	my $y = 0;
1273	for (0 .. $#$children) {
1274	my $child = $children->[$_];
1275	my $h = $h[$_];
1276	$child->configure (0, $y, $w, $h);
1277
1278	$y += $h;
1279	}
1280
1281	1
1282	}	1383	}
1283		1384
1284	#############################################################################	1385	#############################################################################
1285		1386
1286	package CFClient::UI::Label;	1387	package CFClient::UI::Label;
…		…
1297	#bg => none	1398	#bg => none
1298	#active_bg => none	1399	#active_bg => none
1299	#font => default_font	1400	#font => default_font
1300	#text => initial text	1401	#text => initial text
1301	#markup => initial narkup	1402	#markup => initial narkup
		1403	#max_w => maximum pixel width
		1404	ellipsise => 3, # end
1302	layout => (new CFClient::Layout),	1405	layout => (new CFClient::Layout),
1303	fontsize => 1,	1406	fontsize => 1,
1304	align => -1,	1407	align => -1,
1305	valign => -1,	1408	valign => -1,
1306	padding => 2,	1409	padding => 2,
…		…
1371	sub size_request {	1474	sub size_request {
1372	my ($self) = @_;	1475	my ($self) = @_;
1373		1476
1374	$self->{layout}->set_font ($self->{font}) if $self->{font};	1477	$self->{layout}->set_font ($self->{font}) if $self->{font};
1375	$self->{layout}->set_width ($self->{max_w} || -1);	1478	$self->{layout}->set_width ($self->{max_w} || -1);
		1479	$self->{layout}->set_ellipsise ($self->{ellipsise});
		1480	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1376	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	1481	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1377		1482
1378	my ($w, $h) = $self->{layout}->size;	1483	my ($w, $h) = $self->{layout}->size;
1379		1484
1380	if (exists $self->{template}) {	1485	if (exists $self->{template}) {
…		…
1416		1521
1417	my $tex = $self->{texture} ||= do {	1522	my $tex = $self->{texture} ||= do {
1418	$self->{layout}->set_foreground (@{$self->{fg}});	1523	$self->{layout}->set_foreground (@{$self->{fg}});
1419	$self->{layout}->set_font ($self->{font}) if $self->{font};	1524	$self->{layout}->set_font ($self->{font}) if $self->{font};
1420	$self->{layout}->set_width ($self->{w});	1525	$self->{layout}->set_width ($self->{w});
		1526	$self->{layout}->set_ellipsise ($self->{ellipsise});
		1527	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1421	$self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE);	1528	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1422		1529
1423	my $tex = new_from_layout CFClient::Texture $self->{layout};	1530	my $tex = new_from_layout CFClient::Texture $self->{layout};
1424		1531
1425	$self->{ox} = int ($self->{align} < 0 ? $self->{padding}	1532	$self->{ox} = int ($self->{align} < 0 ? $self->{padding}
1426	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}	1533	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
…		…
1464	active_fg => [0, 0, 0],	1571	active_fg => [0, 0, 0],
1465	can_hover => 1,	1572	can_hover => 1,
1466	can_focus => 1,	1573	can_focus => 1,
1467	valign => 0,	1574	valign => 0,
1468	can_events => 1,	1575	can_events => 1,
		1576	#text => ...
1469	@_	1577	@_
1470	)	1578	)
1471	}	1579	}
1472		1580
1473	sub _set_text {	1581	sub _set_text {
…		…
1483	$self->{text} = $text;	1591	$self->{text} = $text;
1484		1592
1485	$text =~ s/./*/g if $self->{hidden};	1593	$text =~ s/./*/g if $self->{hidden};
1486	$self->{layout}->set_text ("$text ");	1594	$self->{layout}->set_text ("$text ");
1487		1595
1488	$self->emit (changed => $self->{text});	1596	$self->_emit (changed => $self->{text});
1489	}	1597	}
1490		1598
1491	sub set_text {	1599	sub set_text {
1492	my ($self, $text) = @_;	1600	my ($self, $text) = @_;
1493		1601
…		…
1505	my ($self) = @_;	1613	my ($self) = @_;
1506		1614
1507	my ($w, $h) = $self->SUPER::size_request;	1615	my ($w, $h) = $self->SUPER::size_request;
1508		1616
1509	($w + 1, $h) # add 1 for cursor	1617	($w + 1, $h) # add 1 for cursor
1510	}
1511
1512	sub size_allocate {
1513	my ($self, $w, $h) = @_;
1514
1515	$self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1516	}	1618	}
1517		1619
1518	sub key_down {	1620	sub key_down {
1519	my ($self, $ev) = @_;	1621	my ($self, $ev) = @_;
1520		1622
…		…
1535	} elsif ($sym == CFClient::SDLK_HOME) {	1637	} elsif ($sym == CFClient::SDLK_HOME) {
1536	$self->{cursor} = 0;	1638	$self->{cursor} = 0;
1537	} elsif ($sym == CFClient::SDLK_END) {	1639	} elsif ($sym == CFClient::SDLK_END) {
1538	$self->{cursor} = length $text;	1640	$self->{cursor} = length $text;
1539	} elsif ($uni == 27) {	1641	} elsif ($uni == 27) {
1540	$self->emit ('escape');	1642	$self->_emit ('escape');
1541	} elsif ($uni) {	1643	} elsif ($uni) {
1542	substr $text, $self->{cursor}++, 0, chr $uni;	1644	substr $text, $self->{cursor}++, 0, chr $uni;
1543	}	1645	}
1544		1646
1545	$self->_set_text ($text);	1647	$self->_set_text ($text);
…		…
1632	if ($sym == 13) {	1734	if ($sym == 13) {
1633	unshift @{$self->{history}},	1735	unshift @{$self->{history}},
1634	my $txt = $self->get_text;	1736	my $txt = $self->get_text;
1635	$self->{history_pointer} = -1;	1737	$self->{history_pointer} = -1;
1636	$self->{history_saveback} = '';	1738	$self->{history_saveback} = '';
1637	$self->emit (activate => $txt);	1739	$self->_emit (activate => $txt);
1638	$self->update;	1740	$self->update;
1639		1741
1640	} elsif ($sym == CFClient::SDLK_UP) {	1742	} elsif ($sym == CFClient::SDLK_UP) {
1641	if ($self->{history_pointer} < 0) {	1743	if ($self->{history_pointer} < 0) {
1642	$self->{history_saveback} = $self->get_text;	1744	$self->{history_saveback} = $self->get_text;
…		…
1690	can_events => 1,	1792	can_events => 1,
1691	@_	1793	@_
1692	)	1794	)
1693	}	1795	}
1694		1796
		1797	sub activate { }
		1798
1695	sub button_up {	1799	sub button_up {
1696	my ($self, $ev, $x, $y) = @_;	1800	my ($self, $ev, $x, $y) = @_;
1697		1801
		1802	$self->emit ("activate")
1698	if ($x >= 0 && $x < $self->{w}	1803	if $x >= 0 && $x < $self->{w}
1699	&& $y >= 0 && $y < $self->{h}) {	1804	&& $y >= 0 && $y < $self->{h};
1700	$self->emit ("activate");
1701	}
1702	}	1805	}
1703		1806
1704	sub _draw {	1807	sub _draw {
1705	my ($self) = @_;	1808	my ($self) = @_;
1706		1809
…		…
1758	my ($self, $ev, $x, $y) = @_;	1861	my ($self, $ev, $x, $y) = @_;
1759		1862
1760	if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}	1863	if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}
1761	&& $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {	1864	&& $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {
1762	$self->{state} = !$self->{state};	1865	$self->{state} = !$self->{state};
1763	$self->emit (changed => $self->{state});	1866	$self->_emit (changed => $self->{state});
1764	}	1867	}
1765	}	1868	}
1766		1869
1767	sub _draw {	1870	sub _draw {
1768	my ($self) = @_;	1871	my ($self) = @_;
…		…
2043	my $self = $class->SUPER::new (	2146	my $self = $class->SUPER::new (
2044	fg => [1, 1, 1],	2147	fg => [1, 1, 1],
2045	active_fg => [0, 0, 0],	2148	active_fg => [0, 0, 0],
2046	bg => [0, 0, 0, 0.2],	2149	bg => [0, 0, 0, 0.2],
2047	active_bg => [1, 1, 1, 0.5],	2150	active_bg => [1, 1, 1, 0.5],
2048	range => [0, 0, 100, 10],	2151	range => [0, 0, 100, 10, 0],
2049	req_w => $::WIDTH / 80,	2152	req_w => $::WIDTH / 80,
2050	req_h => $::WIDTH / 80,	2153	req_h => $::WIDTH / 80,
2051	vertical => 0,	2154	vertical => 0,
2052	can_hover => 1,	2155	can_hover => 1,
2053	inner_pad => .05,	2156	inner_pad => 0.02,
2054	@_	2157	@_
2055	);	2158	);
2056		2159
2057	$self->set_value ($self->{range}[0]);	2160	$self->set_value ($self->{range}[0]);
2058	$self->update;	2161	$self->update;
2059		2162
2060	$self	2163	$self
2061	}	2164	}
2062		2165
		2166	sub set_range {
		2167	my ($self, $range) = @_;
		2168
		2169	($range, $self->{range}) = ($self->{range}, $range);
		2170
		2171	$self->update
		2172	if "@$range" ne "@{$self->{range}}";
		2173	}
		2174
2063	sub set_value {	2175	sub set_value {
2064	my ($self, $value) = @_;	2176	my ($self, $value) = @_;
2065		2177
2066	my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};	2178	my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
2067		2179
2068	$hi = $lo + 1 if $hi <= $lo;	2180	$hi = $lo + 1 if $hi <= $lo;
2069		2181
		2182	$page = $hi - $lo if $page > $hi - $lo;
		2183
2070	$value = $lo if $value < $lo;	2184	$value = $lo if $value < $lo;
2071	$value = $hi if $value > $hi;	2185	$value = $hi - $page if $value > $hi - $page;
2072		2186
2073	$value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit	2187	$value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
2074	if $unit;	2188	if $unit;
2075		2189
2076	$page = $hi - $lo if $page > $hi - $lo;
2077
2078	@{$self->{range}} = ($value, $lo, $hi, $page, $unit);	2190	@{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2079		2191
2080	if ($value != $old_value) {	2192	if ($value != $old_value) {
2081	$self->emit (changed => $value);	2193	$self->_emit (changed => $value);
2082	$self->update;	2194	$self->update;
2083	}	2195	}
2084	}	2196	}
2085		2197
2086	sub size_request {	2198	sub size_request {
…		…
2094		2206
2095	sub button_down {	2207	sub button_down {
2096	my ($self, $ev, $x, $y) = @_;	2208	my ($self, $ev, $x, $y) = @_;
2097		2209
2098	$self->SUPER::button_down ($ev, $x, $y);	2210	$self->SUPER::button_down ($ev, $x, $y);
		2211
		2212	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
		2213
2099	$self->mouse_motion ($ev, $x, $y);	2214	$self->mouse_motion ($ev, $x, $y);
2100	}	2215	}
2101		2216
2102	sub mouse_motion {	2217	sub mouse_motion {
2103	my ($self, $ev, $x, $y) = @_;	2218	my ($self, $ev, $x, $y) = @_;
…		…
2105	if ($GRAB == $self) {	2220	if ($GRAB == $self) {
2106	my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});	2221	my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2107		2222
2108	my (undef, $lo, $hi, $page) = @{$self->{range}};	2223	my (undef, $lo, $hi, $page) = @{$self->{range}};
2109		2224
2110	$x = $x / ($w * (1 - 2 * $self->{inner_pad})) - $self->{inner_pad};	2225	$x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2111		2226
2112	$self->set_value ($x * ($hi - $lo) + $lo);	2227	$self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2113	}	2228	}
2114	}	2229	}
2115		2230
2116	sub update {	2231	sub update {
2117	my ($self) = @_;	2232	my ($self) = @_;
2118		2233
2119	$CFClient::UI::ROOT->on_post_alloc ($self => sub {	2234	$CFClient::UI::ROOT->on_post_alloc ($self => sub {
2120	$self->set_value ($self->{range}[0]);	2235	$self->set_value ($self->{range}[0]);
2121		2236
2122	my ($value, $lo, $hi, $page) = @{$self->{range}};	2237	my ($value, $lo, $hi, $page) = @{$self->{range}};
		2238	my $range = ($hi - $page - $lo) || 1e-100;
2123		2239
2124	my $inner_w = 1 - 2 * $self->{inner_pad};	2240	my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
2125		2241
2126	$self->{scale} = ($inner_w / ($hi - $lo)) || 1;	2242	$self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
		2243	$self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
2127		2244
2128	$page = $self->{scale} * $page || 10 / ($self->{w} || 1);	2245	$value = ($value - $lo) / $range;
2129	$value = $self->{scale} * ($value - $lo);	2246	$value = $value * $self->{scale} + $self->{offset};
2130		2247
2131	$value = $self->{inner_pad} + ($value - $page * 0.5);
2132
2133	$value = 0 if $value < 0;
2134	$page = 1 - $value if $value + $page > 1;
2135
2136	$self->{knob_x} = $value;	2248	$self->{knob_x} = $value - $knob_w * 0.5;
2137	$self->{knob_w} = $page;	2249	$self->{knob_w} = $knob_w;
2138	});	2250	});
2139		2251
2140	$self->SUPER::update;	2252	$self->SUPER::update;
2141	}	2253	}
2142		2254
…		…
2148	glScale $self->{w}, $self->{h};	2260	glScale $self->{w}, $self->{h};
2149		2261
2150	if ($self->{vertical}) {	2262	if ($self->{vertical}) {
2151	# draw a vertical slider like a rotated horizontal slider	2263	# draw a vertical slider like a rotated horizontal slider
2152		2264
		2265	glTranslate 1, 0, 0;
2153	glRotate 90, 0, 0, 1;	2266	glRotate 90, 0, 0, 1;
2154	glTranslate 0, 1, 0;
2155	}	2267	}
2156		2268
2157	my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};	2269	my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
2158	my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};	2270	my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
2159		2271
…		…
2166	# draw handle	2278	# draw handle
2167	$tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1);	2279	$tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1);
2168		2280
2169	glDisable GL_TEXTURE_2D;	2281	glDisable GL_TEXTURE_2D;
2170	}	2282	}
		2283
		2284	#############################################################################
		2285
		2286	package CFClient::UI::ValSlider;
		2287
		2288	our @ISA = CFClient::UI::HBox::;
		2289
		2290	sub new {
		2291	my ($class, %arg) = @_;
		2292
		2293	my $range = delete $arg{range};
		2294
		2295	my $self = $class->SUPER::new (
		2296	slider => (new CFClient::UI::Slider expand => 1, range => $range),
		2297	entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),
		2298	to_value => sub { shift },
		2299	from_value => sub { shift },
		2300	%arg,
		2301	);
		2302
		2303	$self->{slider}->connect (changed => sub {
		2304	my ($self, $value) = @_;
		2305	$self->{parent}{entry}->set_text ($self->{parent}{to_value}->($value));
		2306	$self->{parent}->emit (changed => $value);
		2307	});
		2308
		2309	# $self->{entry}->connect (changed => sub {
		2310	# my ($self, $value) = @_;
		2311	# $self->{parent}{slider}->set_value ($self->{parent}{from_value}->($value));
		2312	# $self->{parent}->emit (changed => $value);
		2313	# });
		2314
		2315	$self->add ($self->{slider}, $self->{entry});
		2316
		2317	$self->{slider}->emit (changed => $self->{slider}{range}[0]);
		2318
		2319	$self
		2320	}
		2321
		2322	sub set_range { shift->{slider}->set_range (@_) }
		2323	sub set_value { shift->{slider}->set_value (@_) }
2171		2324
2172	#############################################################################	2325	#############################################################################
2173		2326
2174	package CFClient::UI::TextView;	2327	package CFClient::UI::TextView;
2175		2328
…		…
2205		2358
2206	$self->{fontsize} = $fontsize;	2359	$self->{fontsize} = $fontsize;
2207	$self->reflow;	2360	$self->reflow;
2208	}	2361	}
2209		2362
2210	sub text_height {
2211	my ($self, $text) = @_;
2212
2213	my $layout = $self->{layout};
2214
2215	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
2216	$layout->set_width ($self->{children}[0]{w});
2217	$layout->set_markup ($text);
2218
2219	($layout->size)[1]
2220	}
2221
2222	sub reflow {
2223	my ($self) = @_;
2224
2225	$self->{need_reflow}++;
2226	$self->update;
2227	}
2228
2229	sub size_allocate {	2363	sub size_allocate {
2230	my ($self, $w, $h) = @_;	2364	my ($self, $w, $h) = @_;
2231		2365
2232	$self->SUPER::size_allocate ($w, $h);	2366	$self->SUPER::size_allocate ($w, $h);
2233		2367
…		…
2236	$self->{layout}->set_width ($self->{children}[0]{w});	2370	$self->{layout}->set_width ($self->{children}[0]{w});
2237		2371
2238	$self->reflow;	2372	$self->reflow;
2239	}	2373	}
2240		2374
		2375	sub text_size {
		2376	my ($self, $text, $indent) = @_;
		2377
		2378	my $layout = $self->{layout};
		2379
		2380	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
		2381	$layout->set_width ($self->{children}[0]{w} - $indent);
		2382	$layout->set_markup ($text);
		2383
		2384	$layout->size
		2385	}
		2386
		2387	sub reflow {
		2388	my ($self) = @_;
		2389
		2390	$self->{need_reflow}++;
		2391	$self->update;
		2392	}
		2393
		2394	sub set_offset {
		2395	my ($self, $offset) = @_;
		2396
		2397	# todo: base offset on lines or so, not on pixels
		2398	$self->{children}[1]->set_value ($offset);
		2399	}
		2400
		2401	sub clear {
		2402	my ($self) = @_;
		2403
		2404	$self->{par} = [];
		2405	$self->{height} = 0;
		2406	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
		2407	}
		2408
2241	sub add_paragraph {	2409	sub add_paragraph {
2242	my ($self, $color, $text) = @_;	2410	my ($self, $color, $text, $indent) = @_;
2243		2411
2244	#TODO: intelligently "reformat" paragraph	2412	for my $line (split /\n/, $text) {
2245		2413	my ($w, $h) = $self->text_size ($line);
2246	my $height = $self->text_height ($text);
2247
2248	$self->{height} += $height;	2414	$self->{height} += $h;
		2415	push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];
		2416	}
2249		2417
2250	push @{$self->{par}}, [$height, $color, $text];
2251
2252	$self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}];	2418	$self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]);
2253	$self->{children}[1]->update;
2254	}	2419	}
2255		2420
2256	sub update {	2421	sub update {
2257	my ($self) = @_;	2422	my ($self) = @_;
2258		2423
…		…
2261	return unless $self->{h} > 0;	2426	return unless $self->{h} > 0;
2262		2427
2263	delete $self->{texture};	2428	delete $self->{texture};
2264		2429
2265	$ROOT->on_post_alloc ($self, sub {	2430	$ROOT->on_post_alloc ($self, sub {
		2431	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
		2432
2266	if (delete $self->{need_reflow}) {	2433	if (delete $self->{need_reflow}) {
2267	my $height = 0;	2434	my $height = 0;
2268		2435
2269	$height += $_->[0] = $self->text_height ($_->[2])	2436	my $layout = $self->{layout};
		2437
		2438	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
		2439
2270	for @{$self->{par}};	2440	for (@{$self->{par}}) {
		2441	if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
		2442	$layout->set_width ($W - $_->[3]);
		2443	$layout->set_markup ($_->[4]);
		2444	my ($w, $h) = $layout->size;
		2445	$_->[0] = $w + $_->[3];
		2446	$_->[1] = $h;
		2447	}
		2448
		2449	$height += $_->[1];
		2450	}
2271		2451
2272	$self->{height} = $height;	2452	$self->{height} = $height;
2273		2453
2274	$self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];	2454	$self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2275		2455
2276	delete $self->{texture};	2456	delete $self->{texture};
2277	}	2457	}
2278		2458
2279	$self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub {	2459	$self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2280	glClearColor 0, 0, 0, 0;	2460	glClearColor 0.5, 0.5, 0.5, 0;
2281	glClear GL_COLOR_BUFFER_BIT;	2461	glClear GL_COLOR_BUFFER_BIT;
2282		2462
2283	glEnable GL_TEXTURE_2D;
2284	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2285
2286	my $top = int $self->{children}[1]{range}[0];	2463	my $top = int $self->{children}[1]{range}[0];
2287		2464
2288	my $y0 = $top;	2465	my $y0 = $top;
2289	my $y1 = $top + $self->{h};	2466	my $y1 = $top + $H;
2290		2467
2291	my $y = 0;	2468	my $y = 0;
2292		2469
2293	my $layout = $self->{layout};	2470	my $layout = $self->{layout};
2294		2471
2295	$layout->set_font ($self->{font}) if $self->{font};	2472	$layout->set_font ($self->{font}) if $self->{font};
2296		2473
		2474	glEnable GL_BLEND;
		2475	#TODO# not correct in windows where rgba is forced off
		2476	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
		2477
2297	for my $par (@{$self->{par}}) {	2478	for my $par (@{$self->{par}}) {
2298	my $h = $par->[0];	2479	my $h = $par->[1];
2299		2480
2300	if ($y0 < $y + $h && $y < $y1) {	2481	if ($y0 < $y + $h && $y < $y1) {
2301	$layout->set_foreground (@{ $par->[1] });	2482	$layout->set_foreground (@{ $par->[2] });
		2483	$layout->set_width ($W - $par->[3]);
2302	$layout->set_markup ($par->[2]);	2484	$layout->set_markup ($par->[4]);
2303		2485
2304	my ($W, $H) = $layout->size;	2486	my ($w, $h, $data, $format, $internalformat) = $layout->render;
2305	CFClient::Texture->new_from_layout ($layout)->draw_quad_alpha_premultiplied (0, $y - $y0);	2487
		2488	glRasterPos $par->[3], $y - $y0;
		2489	glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2306	}	2490	}
2307		2491
2308	$y += $h;	2492	$y += $h;
2309	}	2493	}
2310		2494
2311	glDisable GL_TEXTURE_2D;	2495	glDisable GL_BLEND;
2312	};	2496	};
2313	});	2497	});
2314	}	2498	}
2315		2499
2316	sub _draw {	2500	sub _draw {
2317	my ($self) = @_;	2501	my ($self) = @_;
2318		2502
2319	glEnable GL_TEXTURE_2D;	2503	glEnable GL_TEXTURE_2D;
2320	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2504	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2321	glColor 1, 1, 1, 1;	2505	glColor 1, 1, 1, 1;
2322	$self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});	2506	$self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2323	glDisable GL_TEXTURE_2D;	2507	glDisable GL_TEXTURE_2D;
2324		2508
2325	$self->{children}[1]->draw;	2509	$self->{children}[1]->draw;
2326		2510
2327	}	2511	}
…		…
2376		2560
2377	sub new {	2561	sub new {
2378	my $class = shift;	2562	my $class = shift;
2379		2563
2380	my $self = $class->SUPER::new (	2564	my $self = $class->SUPER::new (
2381	state => 0,	2565	state => 0,
2382	connect_activate => \&toggle_flopper,	2566	on_activate => \&toggle_flopper,
2383	@_	2567	@_
2384	);	2568	);
2385		2569
2386	if ($self->{state}) {
2387	$self->{state} = 0;
2388	$self->toggle_flopper;
2389	}
2390
2391	$self	2570	$self
2392	}	2571	}
2393		2572
2394	sub toggle_flopper {	2573	sub toggle_flopper {
2395	my ($self) = @_;	2574	my ($self) = @_;
2396		2575
2397	# TODO: use animation	2576	$self->{other}->toggle_visibility;
2398	if ($self->{state} = !$self->{state}) {
2399	$CFClient::UI::ROOT->add ($self->{other});
2400	$self->{other}->move ($self->coord2global (0, $self->{h}));
2401	$self->emit ("open");
2402	} else {
2403	$CFClient::UI::ROOT->remove ($self->{other});
2404	$self->emit ("close");
2405	}
2406
2407	$self->emit (changed => $self->{state});
2408	}	2577	}
2409		2578
2410	#############################################################################	2579	#############################################################################
2411		2580
2412	package CFClient::UI::Tooltip;	2581	package CFClient::UI::Tooltip;
…		…
2426		2595
2427	sub set_tooltip_from {	2596	sub set_tooltip_from {
2428	my ($self, $widget) = @_;	2597	my ($self, $widget) = @_;
2429		2598
2430	$self->add (new CFClient::UI::Label	2599	$self->add (new CFClient::UI::Label
2431	markup => $widget->{tooltip},	2600	markup => $widget->{tooltip},
2432	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,	2601	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2433	fontsize => 0.8,	2602	fontsize => 0.8,
2434	fg => [0, 0, 0, 1],	2603	fg => [0, 0, 0, 1],
		2604	ellipsise => 0,
2435	font => ($widget->{tooltip_font} || $::FONT_PROP),	2605	font => ($widget->{tooltip_font} || $::FONT_PROP),
2436	);	2606	);
2437	}	2607	}
2438		2608
2439	sub size_request {	2609	sub size_request {
2440	my ($self) = @_;	2610	my ($self) = @_;
…		…
2486	use CFClient::OpenGL;	2656	use CFClient::OpenGL;
2487		2657
2488	sub new {	2658	sub new {
2489	my $class = shift;	2659	my $class = shift;
2490		2660
2491	$class->SUPER::new (	2661	my $self = $class->SUPER::new (
2492	aspect => 1,	2662	aspect => 1,
		2663	can_events => 0,
2493	@_,	2664	@_,
2494	)	2665	);
		2666
		2667	if ($self->{anim} && $self->{animspeed}) {
		2668	Scalar::Util::weaken (my $widget = $self);
		2669
		2670	$self->{timer} = Event->timer (
		2671	at => $self->{animspeed} * int $::NOW / $self->{animspeed},
		2672	hard => 1,
		2673	interval => $self->{animspeed},
		2674	cb => sub {
		2675	++$widget->{frame};
		2676	$widget->update;
		2677	},
		2678	);
		2679	}
		2680
		2681	$self
2495	}	2682	}
2496		2683
2497	sub size_request {	2684	sub size_request {
2498	(32, 8)	2685	(32, 8)
2499	}	2686	}
2500		2687
		2688	sub update {
		2689	my ($self) = @_;
		2690
		2691	return unless $self->{visible};
		2692
		2693	$self->SUPER::update;
		2694	}
		2695
2501	sub _draw {	2696	sub _draw {
2502	my ($self) = @_;	2697	my ($self) = @_;
2503		2698
2504	return unless $::CONN;#d# manage and cache textures differently	2699	return unless $::CONN;
		2700
		2701	my $face;
		2702
		2703	if ($self->{frame}) {
		2704	my $anim = $::CONN->{anim}[$self->{anim}];
		2705
		2706	$face = $anim->[ $self->{frame} % @$anim ]
		2707	if $anim && @$anim;
		2708	}
		2709
2505	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]];	2710	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2506		2711
2507	# TODO animation
2508	if ($tex) {	2712	if ($tex) {
2509	glEnable GL_TEXTURE_2D;	2713	glEnable GL_TEXTURE_2D;
2510	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2714	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2511	glColor 1, 1, 1, 1;	2715	glColor 1, 1, 1, 1;
2512	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});	2716	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2513	glDisable GL_TEXTURE_2D;	2717	glDisable GL_TEXTURE_2D;
2514	}	2718	}
2515	}	2719	}
2516		2720
2517	#############################################################################	2721	sub DESTROY {
		2722	my ($self) = @_;
2518		2723
		2724	$self->{timer}->cancel
		2725	if $self->{timer};
		2726
		2727	$self->SUPER::DESTROY;
		2728	}
		2729
		2730	#############################################################################
		2731
2519	package CFClient::UI::InventoryItem;	2732	package CFClient::UI::Inventory;
2520		2733
2521	our @ISA = CFClient::UI::HBox::;	2734	our @ISA = CFClient::UI::ScrolledWindow::;
2522		2735
2523	sub new {	2736	sub new {
2524	my $class = shift;	2737	my $class = shift;
2525		2738
2526	my %args = @_;
2527
2528	my $item = delete $args{item};
2529
2530	my $desc = $item->{nrof} < 2
2531	? $item->{name}
2532	: "$item->{nrof} $item->{name_pl}";
2533
2534	$item->{flags} & Crossfire::Protocol::F_OPEN
2535	and $desc .= " (open)";
2536	$item->{flags} & Crossfire::Protocol::F_APPLIED
2537	and $desc .= " (applied)";
2538	$item->{flags} & Crossfire::Protocol::F_UNPAID
2539	and $desc .= " (unpaid)";
2540	$item->{flags} & Crossfire::Protocol::F_MAGIC
2541	and $desc .= " (magic)";
2542	$item->{flags} & Crossfire::Protocol::F_CURSED
2543	and $desc .= " (cursed)";
2544	$item->{flags} & Crossfire::Protocol::F_DAMNED
2545	and $desc .= " (damned)";
2546	$item->{flags} & Crossfire::Protocol::F_LOCKED
2547	and $desc .= " *";
2548
2549	my $self = $class->SUPER::new (	2739	my $self = $class->SUPER::new (
2550	can_hover => 1,	2740	scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2551	can_events => 1,
2552	tooltip => ((CFClient::UI::Label::escape $desc)
2553	. "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),
2554	connect_button_down => sub {
2555	my ($self, $ev, $x, $y) = @_;
2556
2557	# todo: maybe put examine on 1? but should just be a tooltip :(
2558	if ($ev->{button} == 1) {
2559	$::CONN->send ("move $::CONN->{player}{tag} $item->{tag} 0");
2560	} elsif ($ev->{button} == 2) {
2561	$::CONN->send ("apply $item->{tag}");
2562	} elsif ($ev->{button} == 3) {
2563	my @menu_items = (
2564	["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2565	["mark", sub { $::CONN->send ("mark $item->{tag}") }],
2566	["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2567	["drop", sub { $::CONN->send ("move $main::OPENCONT $item->{tag} 0") }],
2568	[
2569	$item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock",
2570	sub { $::CONN->send ("lock ". () ."$item->{tag}") },
2571	],
2572	);
2573
2574	CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
2575	}
2576
2577	1
2578	},
2579	%args
2580	);
2581
2582	$self->add (new CFClient::UI::Face
2583	can_events => 0,
2584	face => $item->{face},
2585	anim => $item->{anim},
2586	animspeed => $item->{animspeed},
2587	);
2588
2589	$self->add (new CFClient::UI::Label
2590	can_events => 0,
2591	text => $desc,
2592	);
2593
2594	$self
2595	}
2596
2597	#############################################################################
2598
2599	package CFClient::UI::Inventory;
2600
2601	our @ISA = CFClient::UI::ScrolledWindow::;
2602
2603	sub new {
2604	my $class = shift;
2605
2606	my $self = $class->SUPER::new (
2607	scrolled => (new CFClient::UI::VBox),
2608	@_,	2741	@_,
2609	);	2742	);
2610		2743
2611	$self	2744	$self
2612	}	2745	}
…		…
2622	or ($a->{name} cmp $b->{name})	2755	or ($a->{name} cmp $b->{name})
2623	} @$items;	2756	} @$items;
2624		2757
2625	$self->{real_items} = \@items;	2758	$self->{real_items} = \@items;
2626		2759
		2760	my $row = 0;
2627	for my $item (@items) {	2761	for my $item (@items) {
2628	my $desc = $item->{nrof} < 2	2762	CFClient::Item::update_widgets $item;
2629	? $item->{name}
2630	: "$item->{nrof} $item->{name_pl}";
2631		2763
2632	$item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item;	2764	$self->{scrolled}->add (0, $row, $item->{face_widget});
2633	}	2765	$self->{scrolled}->add (1, $row, $item->{desc_widget});
		2766	$self->{scrolled}->add (2, $row, $item->{weight_widget});
2634		2767
2635	$self->{scrolled}->add (@items);	2768	$row++;
2636		2769	}
2637	# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2638	}
2639
2640	sub size_request {
2641	my ($self) = @_;
2642	($self->{req_w}, $self->{req_h});
2643	}	2770	}
2644		2771
2645	#############################################################################	2772	#############################################################################
2646		2773
2647	package CFClient::UI::Menu;	2774	package CFClient::UI::Menu;
…		…
2682		2809
2683	# popup given the event (must be a mouse button down event currently)	2810	# popup given the event (must be a mouse button down event currently)
2684	sub popup {	2811	sub popup {
2685	my ($self, $ev) = @_;	2812	my ($self, $ev) = @_;
2686		2813
2687	$self->emit ("popdown");	2814	$self->_emit ("popdown");
2688		2815
2689	# maybe save $GRAB? must be careful about events...	2816	# maybe save $GRAB? must be careful about events...
2690	$GRAB = $self;	2817	$GRAB = $self;
2691	$self->{button} = $ev->{button};	2818	$self->{button} = $ev->{button};
2692		2819
…		…
2707		2834
2708	if ($ev->{button} == $self->{button}) {	2835	if ($ev->{button} == $self->{button}) {
2709	undef $GRAB;	2836	undef $GRAB;
2710	$self->hide;	2837	$self->hide;
2711		2838
2712	$self->emit ("popdown");	2839	$self->_emit ("popdown");
2713	$self->{hover}[1]->() if $self->{hover};	2840	$self->{hover}[1]->() if $self->{hover};
2714	}	2841	}
2715	}	2842	}
2716		2843
2717	#############################################################################	2844	#############################################################################
…		…
2752	# TODO: doesn't handle markup well (read as: at all)	2879	# TODO: doesn't handle markup well (read as: at all)
2753	my $short = $item->{count} > 1	2880	my $short = $item->{count} > 1
2754	? "<b>$item->{count} ×</b> $item->{text}"	2881	? "<b>$item->{count} ×</b> $item->{text}"
2755	: $item->{text};	2882	: $item->{text};
2756		2883
2757	my $fontsize = $item->{fontsize} || $self->{fontsize};
2758
2759	for ($short) {	2884	for ($short) {
2760	s/^\s+//;	2885	s/^\s+//;
2761	s/\s+/ /g;	2886	s/\s+/ /g;
2762	my $len = int 40 / $fontsize;
2763	substr $_, $len, length, "…" if $len < length;
2764	}	2887	}
2765		2888
2766	new CFClient::UI::Label	2889	new CFClient::UI::Label
2767	markup => $short,	2890	markup => $short,
2768	tooltip => $item->{tooltip},	2891	tooltip => $item->{tooltip},
2769	tooltip_font => $::FONT_PROP,	2892	tooltip_font => $::FONT_PROP,
2770	tooltip_width => 0.67,	2893	tooltip_width => 0.67,
2771	fontsize => $fontsize,	2894	fontsize => $item->{fontsize} || $self->{fontsize},
		2895	max_w => $::WIDTH * 0.44,
2772	fg => $item->{fg},	2896	fg => $item->{fg},
2773	can_events => 1,	2897	can_events => 1,
2774	can_hover => 1	2898	can_hover => 1
2775	};	2899	};
2776	}	2900	}
…		…
2782	sub add {	2906	sub add {
2783	my ($self, $text, %arg) = @_;	2907	my ($self, $text, %arg) = @_;
2784		2908
2785	$text =~ s/^\s+//;	2909	$text =~ s/^\s+//;
2786	$text =~ s/\s+$//;	2910	$text =~ s/\s+$//;
		2911
		2912	return unless $text;
2787		2913
2788	my $timeout = time + ((delete $arg{timeout}) || 60);	2914	my $timeout = time + ((delete $arg{timeout}) || 60);
2789		2915
2790	my $group = exists $arg{group} ? $arg{group} : ++$self->{id};	2916	my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2791		2917
…		…
2813	}	2939	}
2814		2940
2815	$self->reorder;	2941	$self->reorder;
2816	}	2942	}
2817		2943
		2944	sub reconfigure {
		2945	my ($self) = @_;
		2946
		2947	delete $_->{label}
		2948	for values %{ $self->{item} || {} };
		2949
		2950	$self->reorder;
		2951	$self->SUPER::reconfigure;
		2952	}
		2953
2818	#############################################################################	2954	#############################################################################
2819		2955
2820	package CFClient::UI::Root;	2956	package CFClient::UI::Root;
2821		2957
2822	our @ISA = CFClient::UI::Container::;	2958	our @ISA = CFClient::UI::Container::;
…		…
2825		2961
2826	sub new {	2962	sub new {
2827	my $class = shift;	2963	my $class = shift;
2828		2964
2829	$class->SUPER::new (	2965	$class->SUPER::new (
		2966	visible => 1,
2830	@_,	2967	@_,
2831	)	2968	)
2832	}	2969	}
2833		2970
2834	sub configure {	2971	sub configure {
…		…
2852	}	2989	}
2853		2990
2854	sub size_allocate {	2991	sub size_allocate {
2855	my ($self, $w, $h) = @_;	2992	my ($self, $w, $h) = @_;
2856		2993
2857	my $old_w = $self->{old_w}; $self->{old_w} = $w;
2858	my $old_h = $self->{old_h}; $self->{old_h} = $h;
2859
2860	CFClient::UI::rescale_widgets $w / $old_w, $h / $old_h
2861	if $old_w && $old_h && ($old_w != $w || $old_h != $h);
2862
2863	for my $child ($self->children) {	2994	for my $child ($self->children) {
2864	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};	2995	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2865		2996
2866	$X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1	2997	$X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1
2867	if exists $child->{req_x};	2998	if exists $child->{req_x};
2868		2999
2869	$Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1	3000	$Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1
2870	if exists $child->{req_y};	3001	if exists $child->{req_y};
2871		3002
		3003	delete @$child{qw(req_x req_y)};
		3004
2872	$X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;	3005	$X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
2873	$Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;	3006	$Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
2874		3007
2875	$child->configure ($X, $Y, $W, $H);	3008	$child->configure ($X, $Y, $W, $H);
2876	}	3009	}
…		…
2897		3030
2898	sub add {	3031	sub add {
2899	my ($self, @children) = @_;	3032	my ($self, @children) = @_;
2900		3033
2901	for my $child (@children) {	3034	for my $child (@children) {
2902	$child->{toplevel} = 1;	3035	$child->{is_toplevel} = 1;
2903		3036
2904	# integerise window positions	3037	# integerise window positions
2905	$child->{x} = int $child->{x};	3038	$child->{x} = int $child->{x};
2906	$child->{y} = int $child->{y};	3039	$child->{y} = int $child->{y};
2907	}	3040	}
2908		3041
2909	$self->SUPER::add (@children);	3042	$self->SUPER::add (@children);
		3043
		3044	for (my @widgets = @children; my $w = pop @widgets; ) {
		3045	push @widgets, $w->children;
		3046	$w->set_visible;
		3047	}
		3048
		3049	}
		3050
		3051	sub remove {
		3052	my ($self, @children) = @_;
		3053
		3054	$self->SUPER::remove (@children);
		3055
		3056	while (@children) {
		3057	my $w = pop @children;
		3058	push @children, $w->children;
		3059	$w->set_invisible;
		3060	}
2910	}	3061	}
2911		3062
2912	sub on_refresh {	3063	sub on_refresh {
2913	my ($self, $id, $cb) = @_;	3064	my ($self, $id, $cb) = @_;
2914		3065
…		…
2928	$_->()	3079	$_->()
2929	for values %{delete $self->{refresh_hook}};	3080	for values %{delete $self->{refresh_hook}};
2930	}	3081	}
2931		3082
2932	if ($self->{check_size}) {	3083	if ($self->{check_size}) {
2933	my @queue = ([], []);	3084	my @queue;
2934		3085
2935	for (;;) {	3086	for (;;) {
2936	if ($self->{check_size}) {	3087	if ($self->{check_size}) {
2937	# heuristic: check containers last	3088	#TODO use array-of-depth approach
2938	push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_	3089
		3090	@queue = sort { $a->{visible} <=> $b->{visible} }
2939	for values %{delete $self->{check_size}}	3091	@queue, values %{delete $self->{check_size}};
2940	}	3092	}
2941		3093
2942	my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last;	3094	my $widget = pop @queue || last;
2943		3095
		3096	defined $widget->{visible} or last; # do not resize invisible widgets
		3097
2944	my ($w, $h) = $widget->{user_w} && $widget->{user_h}	3098	my ($w, $h) = $widget->{def_w} && $widget->{def_h}
2945	? @$widget{qw(user_w user_h)}	3099	? @$widget{qw(def_w def_h)}
2946	: $widget->size_request;	3100	: $widget->size_request;
2947		3101
2948	if (delete $widget->{force_alloc}	3102	if (delete $widget->{force_alloc}
2949	or $w != $widget->{req_w} or $h != $widget->{req_h}) {	3103	or $w != $widget->{req_w} or $h != $widget->{req_h}) {
2950	Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#	3104	Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
…		…
2967	$w = 0 if $w < 0;	3121	$w = 0 if $w < 0;
2968	$h = 0 if $h < 0;	3122	$h = 0 if $h < 0;
2969		3123
2970	$widget->{w} = $w;	3124	$widget->{w} = $w;
2971	$widget->{h} = $h;	3125	$widget->{h} = $h;
2972	$widget->size_allocate ($w, $h);
2973	$widget->emit (size_allocate => $w, $h);	3126	$widget->emit (size_allocate => $w, $h);
2974	}	3127	}
2975	}	3128	}
2976		3129
2977	while ($self->{post_alloc_hook}) {	3130	while ($self->{post_alloc_hook}) {
…		…
2983	glClearColor +($::CFG->{fow_intensity}) x 3, 1;	3136	glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2984	glClear GL_COLOR_BUFFER_BIT;	3137	glClear GL_COLOR_BUFFER_BIT;
2985		3138
2986	glMatrixMode GL_PROJECTION;	3139	glMatrixMode GL_PROJECTION;
2987	glLoadIdentity;	3140	glLoadIdentity;
2988	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000;	3141	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
2989	glMatrixMode GL_MODELVIEW;	3142	glMatrixMode GL_MODELVIEW;
2990	glLoadIdentity;	3143	glLoadIdentity;
2991		3144
2992	$self->_draw;	3145	$self->_draw;
2993	}	3146	}
…		…
2995	#############################################################################	3148	#############################################################################
2996		3149
2997	package CFClient::UI;	3150	package CFClient::UI;
2998		3151
2999	$ROOT = new CFClient::UI::Root;	3152	$ROOT = new CFClient::UI::Root;
3000	$TOOLTIP = new CFClient::UI::Tooltip;	3153	$TOOLTIP = new CFClient::UI::Tooltip z => 900;
3001		3154
3002	1	3155	1
3003		3156

Diff Legend

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