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.207 by elmex, Mon May 15 18:23:33 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 {
…		…
282		370
283	delete $self->{max_w}; $self->{max_w} = $w if $w;	371	delete $self->{max_w}; $self->{max_w} = $w if $w;
284	delete $self->{max_h}; $self->{max_h} = $h if $h;	372	delete $self->{max_h}; $self->{max_h} = $h if $h;
285	}	373	}
286		374
		375	sub set_tooltip {
		376	my ($self, $tooltip) = @_;
		377
		378	$tooltip =~ s/^\s+//;
		379	$tooltip =~ s/\s+$//;
		380
		381	return if $self->{tooltip} eq $tooltip;
		382
		383	$self->{tooltip} = $tooltip;
		384
		385	if ($CFClient::UI::TOOLTIP->{owner} == $self) {
		386	delete $CFClient::UI::TOOLTIP->{owner};
		387	CFClient::UI::check_tooltip;
		388	}
		389	}
		390
287	# translate global coordinates to local coordinate system	391	# translate global coordinates to local coordinate system
288	sub coord2local {	392	sub coord2local {
289	my ($self, $x, $y) = @_;	393	my ($self, $x, $y) = @_;
290		394
291	$self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})	395	$self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
…		…
304	return if $FOCUS == $self;	408	return if $FOCUS == $self;
305	return unless $self->{can_focus};	409	return unless $self->{can_focus};
306		410
307	my $focus = $FOCUS; $FOCUS = $self;	411	my $focus = $FOCUS; $FOCUS = $self;
308		412
309	$self->emit (focus_in => $focus);	413	$self->_emit (focus_in => $focus);
310		414
311	$focus->update if $focus;	415	$focus->update if $focus;
312	$FOCUS->update;	416	$FOCUS->update;
313	}	417	}
314		418
…		…
317		421
318	return unless $FOCUS == $self;	422	return unless $FOCUS == $self;
319		423
320	my $focus = $FOCUS; undef $FOCUS;	424	my $focus = $FOCUS; undef $FOCUS;
321		425
322	$self->emit (focus_out => $focus);	426	$self->_emit (focus_out => $focus);
323		427
324	$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;
325	}	432	}
326		433
327	sub mouse_motion { }	434	sub mouse_motion { }
328	sub button_up { }	435	sub button_up { }
329	sub key_down { }	436	sub key_down { }
330	sub key_up { }	437	sub key_up { }
331		438
332	sub button_down {	439	sub button_down {
333	my ($self, $ev, $x, $y) = @_;	440	my ($self, $ev, $x, $y) = @_;
334		441
335	$self->focus_in;	442	$self->focus_in;
…		…
369	if ($ENV{PCLIENT_DEBUG}) {	476	if ($ENV{PCLIENT_DEBUG}) {
370	glPushMatrix;	477	glPushMatrix;
371	glColor 1, 1, 0, 1;	478	glColor 1, 1, 0, 1;
372	glTranslate $self->{x} + 0.375, $self->{y} + 0.375;	479	glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
373	glBegin GL_LINE_LOOP;	480	glBegin GL_LINE_LOOP;
374	glVertex 0 , 0;	481	glVertex 0 , 0;
375	glVertex $self->{w}, 0;	482	glVertex $self->{w} - 1, 0;
376	glVertex $self->{w}, $self->{h};	483	glVertex $self->{w} - 1, $self->{h} - 1;
377	glVertex 0 , $self->{h};	484	glVertex 0 , $self->{h} - 1;
378	glEnd;	485	glEnd;
379	glPopMatrix;	486	glPopMatrix;
380	#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;
381	}	488	}
382	}	489	}
…		…
402	sub set_parent {	509	sub set_parent {
403	my ($self, $parent) = @_;	510	my ($self, $parent) = @_;
404		511
405	Scalar::Util::weaken ($self->{parent} = $parent);	512	Scalar::Util::weaken ($self->{parent} = $parent);
406		513
407	# TODO: req_w _does_change after ->reconfigure	514	$self->set_visible;
		515
408	$self->check_size	516	$self->check_size;
409	unless exists $self->{req_w};	517	$self->show;
410	}	518	}
411		519
412	sub check_size {	520	sub check_size {
413	my ($self, $forced) = @_;	521	my ($self, $forced) = @_;
414		522
…		…
427	my ($self, $signal, $cb) = @_;	535	my ($self, $signal, $cb) = @_;
428		536
429	push @{ $self->{signal_cb}{$signal} }, $cb;	537	push @{ $self->{signal_cb}{$signal} }, $cb;
430	}	538	}
431		539
		540	sub _emit {
		541	my ($self, $signal, @args) = @_;
		542
		543	List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
		544	}
		545
432	sub emit {	546	sub emit {
433	my ($self, $signal, @args) = @_;	547	my ($self, $signal, @args) = @_;
434		548
435	List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}	549	$self->_emit ($signal, @args)
		550	|| $self->$signal (@args);
		551	}
		552
		553	sub visibility_change {
		554	#my ($self, $visible) = @_;
436	}	555	}
437		556
438	sub DESTROY {	557	sub DESTROY {
439	my ($self) = @_;	558	my ($self) = @_;
440		559
…		…
455	my $class = shift;	574	my $class = shift;
456		575
457	# range [value, low, high, page]	576	# range [value, low, high, page]
458		577
459	$class->SUPER::new (	578	$class->SUPER::new (
460	bg => [0, 0, 0, 0.2],	579	#bg => [0, 0, 0, 0.2],
461	active_bg => [1, 1, 1, 0.5],	580	#active_bg => [1, 1, 1, 0.5],
462	@_	581	@_
463	)	582	)
464	}	583	}
465		584
466	sub _draw {	585	sub _draw {
467	my ($self) = @_;	586	my ($self) = @_;
468		587
		588	my $color = $FOCUS == $self && $self->{active_bg}
		589	? $self->{active_bg}
		590	: $self->{bg};
		591
		592	if ($color && (@$color < 4 || $color->[3])) {
469	my ($w, $h) = @$self{qw(w h)};	593	my ($w, $h) = @$self{qw(w h)};
470		594
471	glEnable GL_BLEND;	595	glEnable GL_BLEND;
472	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	596	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
473	glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} };	597	glColor @$color;
474		598
475	glBegin GL_QUADS;	599	glBegin GL_QUADS;
476	glVertex 0 , 0;	600	glVertex 0 , 0;
477	glVertex 0 , $h;	601	glVertex 0 , $h;
478	glVertex $w, $h;	602	glVertex $w, $h;
479	glVertex $w, 0;	603	glVertex $w, 0;
480	glEnd;	604	glEnd;
481		605
482	glDisable GL_BLEND;	606	glDisable GL_BLEND;
		607	}
483	}	608	}
484		609
485	#############################################################################	610	#############################################################################
486		611
487	package CFClient::UI::Empty;	612	package CFClient::UI::Empty;
…		…
547	delete $child->{parent};	672	delete $child->{parent};
548	$child->hide;	673	$child->hide;
549		674
550	$self->{children} = [ grep $_ != $child, @{ $self->{children} } ];	675	$self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
551		676
552	$self->check_size;	677	$self->check_size (1);
553	$self->update;	678	$self->update;
554	}	679	}
555		680
556	sub clear {	681	sub clear {
557	my ($self) = @_;	682	my ($self) = @_;
…		…
671	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {	796	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
672	glClearColor 0, 0, 0, 0;	797	glClearColor 0, 0, 0, 0;
673	glClear GL_COLOR_BUFFER_BIT;	798	glClear GL_COLOR_BUFFER_BIT;
674		799
675	$self->_render;	800	$self->_render;
676	# glColorMask 1, 1, 1, 0;
677	# glEnable GL_BLEND;
678	# glBlendFunc GL_SRC_ALPHA, GL_ZERO;
679	# glRasterPos 0, 0;
680	# glCopyPixels 0, 0, $self->{w}, $self->{h};
681	# glDisable GL_BLEND;
682	# glColorMask 1, 1, 1, 1;
683	};	801	};
684	}	802	}
685		803
686	sub _draw {	804	sub _draw {
687	my ($self) = @_;	805	my ($self) = @_;
…		…
691	my $tex = $self->{texture}	809	my $tex = $self->{texture}
692	or return;	810	or return;
693		811
694	glEnable GL_TEXTURE_2D;	812	glEnable GL_TEXTURE_2D;
695	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	813	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
696	glColor 0, 0, 0, 1;	814	glColor 1, 1, 1, 1;
697		815
698	$tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);	816	$tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
699		817
700	glDisable GL_TEXTURE_2D;	818	glDisable GL_TEXTURE_2D;
701	}	819	}
…		…
704		822
705	package CFClient::UI::ViewPort;	823	package CFClient::UI::ViewPort;
706		824
707	our @ISA = CFClient::UI::Window::;	825	our @ISA = CFClient::UI::Window::;
708		826
		827	sub new {
		828	my $class = shift;
		829
		830	$class->SUPER::new (
		831	scroll_x => 0,
		832	scroll_y => 1,
		833	@_,
		834	)
		835	}
		836
709	sub size_request {	837	sub size_request {
710	my ($self) = @_;	838	my ($self) = @_;
711		839
712	@$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};	840	@$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};
713	$self->child->configure (0, 0, @$self{qw(child_w child_h)});
714		841
715	@$self{qw(child_w child_h)}	842	@$self{qw(child_w child_h)}
716	}	843	}
717		844
718	sub size_allocate {	845	sub size_allocate {
719	my ($self, $w, $h) = @_;	846	my ($self, $w, $h) = @_;
720		847
		848	$w = $self->{child_w} if $self->{scroll_x} && $self->{child_w};
		849	$h = $self->{child_h} if $self->{scroll_y} && $self->{child_h};
		850
		851	$self->child->configure (0, 0, $w, $h);
721	$self->update;	852	$self->update;
722	}	853	}
723		854
724	sub set_offset {	855	sub set_offset {
725	my ($self, $x, $y) = @_;	856	my ($self, $x, $y) = @_;
…		…
776	my $class = shift;	907	my $class = shift;
777		908
778	my $self;	909	my $self;
779		910
780	my $slider = new CFClient::UI::Slider	911	my $slider = new CFClient::UI::Slider
781	vertical => 1,	912	vertical => 1,
782	range => [0, 0, 1, 0.01], # HACK fix	913	range => [0, 0, 1, 0.01], # HACK fix
783	connect_changed => sub {	914	on_changed => sub {
784	$self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h}));	915	$self->{vp}->set_offset (0, $_[1]);
785	},	916	},
786	;	917	;
787		918
788	$self = $class->SUPER::new (	919	$self = $class->SUPER::new (
789	vp => (new CFClient::UI::ViewPort),	920	vp => (new CFClient::UI::ViewPort expand => 1),
790	slider => $slider,	921	slider => $slider,
791	@_,	922	@_,
792	);	923	);
793		924
794	$self->{vp}->add ($self->{scrolled});	925	$self->{vp}->add ($self->{scrolled});
795	$self->add ($self->{vp});	926	$self->add ($self->{vp});
796	$self->add ($self->{slider});	927	$self->add ($self->{slider});
797		928
798	$self	929	$self
		930	}
		931
		932	sub update {
		933	my ($self) = @_;
		934
		935	$self->SUPER::update;
		936
		937	# todo: overwrite size_allocate of child
		938	my $child = $self->{vp}->child;
		939	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
		940	}
		941
		942	sub size_allocate {
		943	my ($self, $w, $h) = @_;
		944
		945	$self->SUPER::size_allocate ($w, $h);
		946
		947	my $child = $self->{vp}->child;
		948	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
799	}	949	}
800		950
801	#TODO# update range on size_allocate depending on child	951	#TODO# update range on size_allocate depending on child
802	# update viewport offset on scroll	952	# update viewport offset on scroll
803		953
…		…
854	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);
855		1005
856	sub new {	1006	sub new {
857	my $class = shift;	1007	my $class = shift;
858		1008
859	# TODO: user_x, user_y, overwrite moveto?
860
861	my $self = $class->SUPER::new (	1009	my $self = $class->SUPER::new (
862	bg => [1, 1, 1, 1],	1010	bg => [1, 1, 1, 1],
863	border_bg => [1, 1, 1, 1],	1011	border_bg => [1, 1, 1, 1],
864	border => 0.6,	1012	border => 0.6,
865	toplevel => 1,	1013	is_toplevel => 1,
866	can_events => 1,	1014	can_events => 1,
867	@_	1015	@_
868	);	1016	);
869		1017
870	$self->{title} &&= new CFClient::UI::Label	1018	$self->{title} &&= new CFClient::UI::Label
871	align => 0,	1019	align => 0,
…		…
895	my ($self, $w, $h) = @_;	1043	my ($self, $w, $h) = @_;
896		1044
897	$h -= List::Util::max 0, $self->border * 2;	1045	$h -= List::Util::max 0, $self->border * 2;
898	$w -= List::Util::max 0, $self->border * 2;	1046	$w -= List::Util::max 0, $self->border * 2;
899		1047
900	$self->{title}->configure ($self->border, $self->border - $::FONTSIZE * 2, $w, $::FONTSIZE * 2)	1048	$self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
901	if $self->{title};	1049	if $self->{title};
902		1050
903	$self->child->configure ($self->border, $self->border, $w, $h);	1051	$self->child->configure ($self->border, $self->border, $w, $h);
904	}	1052	}
905		1053
…		…
924	my ($ev, $x, $y) = @_;	1072	my ($ev, $x, $y) = @_;
925		1073
926	my $dx = $ev->{x} - $ox;	1074	my $dx = $ev->{x} - $ox;
927	my $dy = $ev->{y} - $oy;	1075	my $dy = $ev->{y} - $oy;
928		1076
		1077	$self->{user_x} = $wx + $dx * $mx;
		1078	$self->{user_y} = $wy + $dy * $my;
929	$self->{user_w} = $bw + $dx * ($mx ? -1 : 1);	1079	$self->{def_w} = $bw + $dx * ($mx ? -1 : 1);
930	$self->{user_h} = $bh + $dy * ($my ? -1 : 1);	1080	$self->{def_h} = $bh + $dy * ($my ? -1 : 1);
931	$self->move ($wx + $dx * $mx, $wy + $dy * $my);	1081	$self->move ($self->{user_x}, $self->{user_y});
932	$self->check_size;	1082	$self->check_size;
933	};	1083	};
934		1084
935	} elsif ($lr ^ $td) {	1085	} elsif ($lr ^ $td) {
936	my ($ox, $oy) = ($ev->{x}, $ev->{y});	1086	my ($ox, $oy) = ($ev->{x}, $ev->{y});
…		…
939	$self->{motion} = sub {	1089	$self->{motion} = sub {
940	my ($ev, $x, $y) = @_;	1090	my ($ev, $x, $y) = @_;
941		1091
942	($x, $y) = ($ev->{x}, $ev->{y});	1092	($x, $y) = ($ev->{x}, $ev->{y});
943		1093
944	$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});
945	$self->update;	1098	$self->update;
946	};	1099	};
947	}	1100	}
948	}	1101	}
949		1102
…		…
1011	sub new {	1164	sub new {
1012	my $class = shift;	1165	my $class = shift;
1013		1166
1014	$class->SUPER::new (	1167	$class->SUPER::new (
1015	col_expand => [],	1168	col_expand => [],
1016	@_	1169	@_,
1017	)	1170	)
		1171	}
		1172
		1173	sub children {
		1174	grep $_, map @$_, grep $_, @{ $_[0]{children} }
1018	}	1175	}
1019		1176
1020	sub add {	1177	sub add {
1021	my ($self, $x, $y, $child) = @_;	1178	my ($self, $x, $y, $child) = @_;
1022		1179
1023	$child->set_parent ($self);	1180	$child->set_parent ($self);
1024	$self->{children}[$y][$x] = $child;	1181	$self->{children}[$y][$x] = $child;
1025		1182
1026	$child->check_size;	1183	$self->check_size (1);
1027	}	1184	}
1028		1185
1029	sub children {
1030	grep $_, map @$_, grep $_, @{ $_[0]{children} }
1031	}
1032
1033	# 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?
1034	sub clear {	1187	sub clear {
1035	my ($self) = @_;	1188	my ($self) = @_;
1036		1189
1037	my @children = $self->children;	1190	my @children = $self->children;
1038	delete $self->{children};	1191	delete $self->{children};
…		…
1040	for (@children) {	1193	for (@children) {
1041	delete $_->{parent};	1194	delete $_->{parent};
1042	$_->hide;	1195	$_->hide;
1043	}	1196	}
1044		1197
		1198	$self->check_size (1);
1045	$self->update;	1199	$self->update;
1046	}	1200	}
1047		1201
1048	sub get_wh {	1202	sub get_wh {
1049	my ($self) = @_;	1203	my ($self) = @_;
…		…
1081	sub size_allocate {	1235	sub size_allocate {
1082	my ($self, $w, $h) = @_;	1236	my ($self, $w, $h) = @_;
1083		1237
1084	my ($ws, $hs) = $self->get_wh;	1238	my ($ws, $hs) = $self->get_wh;
1085		1239
1086	my $req_w = sum @$ws;	1240	my $req_w = (sum @$ws) || 1;
1087	my $req_h = sum @$hs;	1241	my $req_h = (sum @$hs) || 1;
1088		1242
1089	# TODO: nicer code && do row_expand	1243	# TODO: nicer code && do row_expand
1090	my @col_expand = @{$self->{col_expand}};	1244	my @col_expand = @{$self->{col_expand}};
1091	@col_expand = (1) x @$ws unless @col_expand;	1245	@col_expand = (1) x @$ws unless @col_expand;
1092	my $col_expand = (sum @col_expand) || 1;	1246	my $col_expand = (sum @col_expand) || 1;
…		…
1146	}	1300	}
1147	}	1301	}
1148		1302
1149	#############################################################################	1303	#############################################################################
1150		1304
1151	package CFClient::UI::HBox;	1305	package CFClient::UI::Box;
1152
1153	# TODO: wrap into common Box base class
1154		1306
1155	our @ISA = CFClient::UI::Container::;	1307	our @ISA = CFClient::UI::Container::;
1156		1308
1157	sub size_request {	1309	sub size_request {
1158	my ($self) = @_;	1310	my ($self) = @_;
1159		1311
1160	my @alloc = map [$_->size_request], @{$self->{children}};	1312	$self->{vertical}
1161		1313	? (
1162	(	1314	(List::Util::max map $_->{req_w}, @{$self->{children}}),
1163	(List::Util::sum map $_->[0], @alloc),	1315	(List::Util::sum map $_->{req_h}, @{$self->{children}}),
1164	(List::Util::max map $_->[1], @alloc),	1316	)
1165	)	1317	: (
		1318	(List::Util::sum map $_->{req_w}, @{$self->{children}}),
		1319	(List::Util::max map $_->{req_h}, @{$self->{children}}),
		1320	)
1166	}	1321	}
1167		1322
1168	sub size_allocate {	1323	sub size_allocate {
1169	my ($self, $w, $h) = @_;	1324	my ($self, $w, $h) = @_;
1170		1325
1171	($h, $w) = ($w, $h);	1326	my $space = $self->{vertical} ? $h : $w;
1172
1173	my $children = $self->{children};	1327	my $children = $self->{children};
1174		1328
1175	my @h = map $_->{req_w}, @$children;	1329	my @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children;
1176
1177	my $req_h = List::Util::sum @h;	1330	my $req = List::Util::sum @req;
1178		1331
1179	if ($req_h > $h) {	1332	if ($req > $space) {
1180	# ah well, not enough space	1333	# ah well, not enough space
1181	$_ *= $h / $req_h for @h;	1334	$_ *= $space / $req for @req;
1182	} else {	1335	} else {
1183	my $exp = List::Util::sum map $_->{expand}, @$children;	1336	my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;
1184	$exp ||= 1;
1185		1337
		1338	$req[$_] += ($space - $req) * $children->[$_]{expand} / $expand
1186	for (0 .. $#$children) {	1339	for 0 .. $#$children;
1187	my $child = $children->[$_];
1188
1189	my $alloc_h = $h[$_];
1190	$alloc_h += ($h - $req_h) * $child->{expand} / $exp;
1191	$h[$_] = $alloc_h;
1192	}
1193	}	1340	}
1194		1341
1195	CFClient::UI::harmonize \@h;	1342	CFClient::UI::harmonize \@req;
1196		1343
1197	my $y = 0;	1344	my $pos = 0;
1198	for (0 .. $#$children) {	1345	for (0 .. $#$children) {
1199	my $child = $children->[$_];
1200	my $h = $h[$_];	1346	my $alloc = $req[$_];
1201	$child->configure ($y, 0, $h, $w);	1347	$children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1202		1348
1203	$y += $h;	1349	$pos += $alloc;
1204	}	1350	}
1205		1351
1206	1	1352	1
1207	}	1353	}
1208		1354
1209	#############################################################################	1355	#############################################################################
1210		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
1211	package CFClient::UI::VBox;	1372	package CFClient::UI::VBox;
1212		1373
1213	# TODO: wrap into common Box base class
1214
1215	our @ISA = CFClient::UI::Container::;	1374	our @ISA = CFClient::UI::Box::;
1216		1375
1217	sub size_request {	1376	sub new {
1218	my ($self) = @_;	1377	my $class = shift;
1219		1378
1220	my @alloc = map [$_->size_request], @{$self->{children}};	1379	$class->SUPER::new (
1221		1380	vertical => 1,
1222	(	1381	@_,
1223	(List::Util::max map $_->[0], @alloc),
1224	(List::Util::sum map $_->[1], @alloc),
1225	)	1382	)
1226	}	1383	}
1227		1384
1228	sub size_allocate {
1229	my ($self, $w, $h) = @_;
1230
1231	Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1232
1233	my $children = $self->{children};
1234
1235	my @h = map $_->{req_h}, @$children;
1236
1237	my $req_h = List::Util::sum @h;
1238
1239	if ($req_h > $h) {
1240	# ah well, not enough space
1241	$_ *= $h / $req_h for @h;
1242	} else {
1243	my $exp = List::Util::sum map $_->{expand}, @$children;
1244	$exp ||= 1;
1245
1246	for (0 .. $#$children) {
1247	my $child = $children->[$_];
1248
1249	$h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1250	}
1251	}
1252
1253	CFClient::UI::harmonize \@h;
1254
1255	my $y = 0;
1256	for (0 .. $#$children) {
1257	my $child = $children->[$_];
1258	my $h = $h[$_];
1259	$child->configure (0, $y, $w, $h);
1260
1261	$y += $h;
1262	}
1263
1264	1
1265	}
1266
1267	#############################################################################	1385	#############################################################################
1268		1386
1269	package CFClient::UI::Label;	1387	package CFClient::UI::Label;
1270		1388
1271	our @ISA = CFClient::UI::Base::;	1389	our @ISA = CFClient::UI::DrawBG::;
1272		1390
1273	use CFClient::OpenGL;	1391	use CFClient::OpenGL;
1274		1392
1275	sub new {	1393	sub new {
1276	my ($class, %arg) = @_;	1394	my ($class, %arg) = @_;
1277		1395
1278	my $self = $class->SUPER::new (	1396	my $self = $class->SUPER::new (
1279	fg => [1, 1, 1],	1397	fg => [1, 1, 1],
		1398	#bg => none
		1399	#active_bg => none
1280	#font => default_font	1400	#font => default_font
1281	#text => initial text	1401	#text => initial text
1282	#markup => initial narkup	1402	#markup => initial narkup
		1403	#max_w => maximum pixel width
		1404	ellipsise => 3, # end
1283	layout => (new CFClient::Layout),	1405	layout => (new CFClient::Layout),
1284	fontsize => 1,	1406	fontsize => 1,
1285	align => -1,	1407	align => -1,
1286	valign => -1,	1408	valign => -1,
1287	padding => 2,	1409	padding => 2,
…		…
1302	}	1424	}
1303		1425
1304	$self	1426	$self
1305	}	1427	}
1306		1428
1307	sub escape {	1429	sub escape($) {
1308	local $_ = $_[1];	1430	local $_ = $_[0];
1309		1431
1310	s/&/&amp;/g;	1432	s/&/&amp;/g;
1311	s/>/&gt;/g;	1433	s/>/&gt;/g;
1312	s/</&lt;/g;	1434	s/</&lt;/g;
1313		1435
1314	$_[1]	1436	$_
1315	}	1437	}
1316		1438
1317	sub update {	1439	sub update {
1318	my ($self) = @_;	1440	my ($self) = @_;
1319		1441
…		…
1352	sub size_request {	1474	sub size_request {
1353	my ($self) = @_;	1475	my ($self) = @_;
1354		1476
1355	$self->{layout}->set_font ($self->{font}) if $self->{font};	1477	$self->{layout}->set_font ($self->{font}) if $self->{font};
1356	$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});
1357	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	1481	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1358		1482
1359	my ($w, $h) = $self->{layout}->size;	1483	my ($w, $h) = $self->{layout}->size;
1360		1484
1361	if (exists $self->{template}) {	1485	if (exists $self->{template}) {
…		…
1391	}	1515	}
1392		1516
1393	sub _draw {	1517	sub _draw {
1394	my ($self) = @_;	1518	my ($self) = @_;
1395		1519
		1520	$self->SUPER::_draw; # draw background, if applicable
		1521
1396	my $tex = $self->{texture} ||= do {	1522	my $tex = $self->{texture} ||= do {
1397	$self->{layout}->set_foreground (@{$self->{fg}});	1523	$self->{layout}->set_foreground (@{$self->{fg}});
1398	$self->{layout}->set_font ($self->{font}) if $self->{font};	1524	$self->{layout}->set_font ($self->{font}) if $self->{font};
1399	$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});
1400	$self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE);	1528	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1401		1529
1402	my $tex = new_from_layout CFClient::Texture $self->{layout};	1530	my $tex = new_from_layout CFClient::Texture $self->{layout};
1403		1531
1404	$self->{ox} = int $self->{align} < 0 ? $self->{padding}	1532	$self->{ox} = int ($self->{align} < 0 ? $self->{padding}
1405	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}	1533	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1406	: ($self->{w} - $tex->{w}) * 0.5;	1534	: ($self->{w} - $tex->{w}) * 0.5);
1407		1535
1408	$self->{oy} = int $self->{valign} < 0 ? $self->{padding}	1536	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding}
1409	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}	1537	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1410	: ($self->{h} - $tex->{h}) * 0.5;	1538	: ($self->{h} - $tex->{h}) * 0.5);
1411		1539
1412	$tex	1540	$tex
1413	};	1541	};
1414		1542
1415	glEnable GL_TEXTURE_2D;	1543	glEnable GL_TEXTURE_2D;
…		…
1443	active_fg => [0, 0, 0],	1571	active_fg => [0, 0, 0],
1444	can_hover => 1,	1572	can_hover => 1,
1445	can_focus => 1,	1573	can_focus => 1,
1446	valign => 0,	1574	valign => 0,
1447	can_events => 1,	1575	can_events => 1,
		1576	#text => ...
1448	@_	1577	@_
1449	)	1578	)
1450	}	1579	}
1451		1580
1452	sub _set_text {	1581	sub _set_text {
…		…
1462	$self->{text} = $text;	1591	$self->{text} = $text;
1463		1592
1464	$text =~ s/./*/g if $self->{hidden};	1593	$text =~ s/./*/g if $self->{hidden};
1465	$self->{layout}->set_text ("$text ");	1594	$self->{layout}->set_text ("$text ");
1466		1595
1467	$self->emit (changed => $self->{text});	1596	$self->_emit (changed => $self->{text});
1468	}	1597	}
1469		1598
1470	sub set_text {	1599	sub set_text {
1471	my ($self, $text) = @_;	1600	my ($self, $text) = @_;
1472		1601
1473	$self->{cursor} = length $text;	1602	$self->{cursor} = length $text;
1474	$self->_set_text ($text);	1603	$self->_set_text ($text);
		1604	$self->update;
1475	$self->check_size;	1605	$self->check_size;
1476	$self->update;
1477	}	1606	}
1478		1607
1479	sub get_text {	1608	sub get_text {
1480	$_[0]{text}	1609	$_[0]{text}
1481	}	1610	}
…		…
1484	my ($self) = @_;	1613	my ($self) = @_;
1485		1614
1486	my ($w, $h) = $self->SUPER::size_request;	1615	my ($w, $h) = $self->SUPER::size_request;
1487		1616
1488	($w + 1, $h) # add 1 for cursor	1617	($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	}	1618	}
1496		1619
1497	sub key_down {	1620	sub key_down {
1498	my ($self, $ev) = @_;	1621	my ($self, $ev) = @_;
1499		1622
…		…
1514	} elsif ($sym == CFClient::SDLK_HOME) {	1637	} elsif ($sym == CFClient::SDLK_HOME) {
1515	$self->{cursor} = 0;	1638	$self->{cursor} = 0;
1516	} elsif ($sym == CFClient::SDLK_END) {	1639	} elsif ($sym == CFClient::SDLK_END) {
1517	$self->{cursor} = length $text;	1640	$self->{cursor} = length $text;
1518	} elsif ($uni == 27) {	1641	} elsif ($uni == 27) {
1519	$self->emit ('escape');	1642	$self->_emit ('escape');
1520	} elsif ($uni) {	1643	} elsif ($uni) {
1521	substr $text, $self->{cursor}++, 0, chr $uni;	1644	substr $text, $self->{cursor}++, 0, chr $uni;
1522	}	1645	}
1523		1646
1524	$self->_set_text ($text);	1647	$self->_set_text ($text);
1525	$self->update;	1648	$self->update;
		1649	$self->check_size;
1526	}	1650	}
1527		1651
1528	sub focus_in {	1652	sub focus_in {
1529	my ($self) = @_;	1653	my ($self) = @_;
1530		1654
…		…
1610	if ($sym == 13) {	1734	if ($sym == 13) {
1611	unshift @{$self->{history}},	1735	unshift @{$self->{history}},
1612	my $txt = $self->get_text;	1736	my $txt = $self->get_text;
1613	$self->{history_pointer} = -1;	1737	$self->{history_pointer} = -1;
1614	$self->{history_saveback} = '';	1738	$self->{history_saveback} = '';
1615	$self->emit (activate => $txt);	1739	$self->_emit (activate => $txt);
1616	$self->update;	1740	$self->update;
1617		1741
1618	} elsif ($sym == CFClient::SDLK_UP) {	1742	} elsif ($sym == CFClient::SDLK_UP) {
1619	if ($self->{history_pointer} < 0) {	1743	if ($self->{history_pointer} < 0) {
1620	$self->{history_saveback} = $self->get_text;	1744	$self->{history_saveback} = $self->get_text;
…		…
1659	my $class = shift;	1783	my $class = shift;
1660		1784
1661	$class->SUPER::new (	1785	$class->SUPER::new (
1662	padding => 4,	1786	padding => 4,
1663	fg => [1, 1, 1],	1787	fg => [1, 1, 1],
1664	bg => [1, 1, 1, 0.2],
1665	active_fg => [0, 0, 1],	1788	active_fg => [0, 0, 1],
1666	can_hover => 1,	1789	can_hover => 1,
1667	align => 0,	1790	align => 0,
1668	valign => 0,	1791	valign => 0,
1669	can_events => 1,	1792	can_events => 1,
1670	@_	1793	@_
1671	)	1794	)
1672	}	1795	}
1673		1796
		1797	sub activate { }
		1798
1674	sub button_up {	1799	sub button_up {
1675	my ($self, $ev, $x, $y) = @_;	1800	my ($self, $ev, $x, $y) = @_;
1676		1801
		1802	$self->emit ("activate")
1677	if ($x >= 0 && $x < $self->{w}	1803	if $x >= 0 && $x < $self->{w}
1678	&& $y >= 0 && $y < $self->{h}) {	1804	&& $y >= 0 && $y < $self->{h};
1679	$self->emit ("activate");
1680	}
1681	}	1805	}
1682		1806
1683	sub _draw {	1807	sub _draw {
1684	my ($self) = @_;	1808	my ($self) = @_;
1685		1809
…		…
1717		1841
1718	$class->SUPER::new (	1842	$class->SUPER::new (
1719	padding => 2,	1843	padding => 2,
1720	fg => [1, 1, 1],	1844	fg => [1, 1, 1],
1721	active_fg => [1, 1, 0],	1845	active_fg => [1, 1, 0],
		1846	bg => [0, 0, 0, 0.2],
		1847	active_bg => [1, 1, 1, 0.5],
1722	state => 0,	1848	state => 0,
1723	can_hover => 1,	1849	can_hover => 1,
1724	@_	1850	@_
1725	)	1851	)
1726	}	1852	}
…		…
1735	my ($self, $ev, $x, $y) = @_;	1861	my ($self, $ev, $x, $y) = @_;
1736		1862
1737	if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}	1863	if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}
1738	&& $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {	1864	&& $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {
1739	$self->{state} = !$self->{state};	1865	$self->{state} = !$self->{state};
1740	$self->emit (changed => $self->{state});	1866	$self->_emit (changed => $self->{state});
1741	}	1867	}
1742	}	1868	}
1743		1869
1744	sub _draw {	1870	sub _draw {
1745	my ($self) = @_;	1871	my ($self) = @_;
…		…
2018	# TODO: req_w/h are wrong with vertical	2144	# TODO: req_w/h are wrong with vertical
2019	# TODO: calculations are off	2145	# TODO: calculations are off
2020	my $self = $class->SUPER::new (	2146	my $self = $class->SUPER::new (
2021	fg => [1, 1, 1],	2147	fg => [1, 1, 1],
2022	active_fg => [0, 0, 0],	2148	active_fg => [0, 0, 0],
		2149	bg => [0, 0, 0, 0.2],
		2150	active_bg => [1, 1, 1, 0.5],
2023	range => [0, 0, 100, 10],	2151	range => [0, 0, 100, 10, 0],
2024	req_w => $::WIDTH / 80,	2152	req_w => $::WIDTH / 80,
2025	req_h => $::WIDTH / 80,	2153	req_h => $::WIDTH / 80,
2026	vertical => 0,	2154	vertical => 0,
2027	can_hover => 1,	2155	can_hover => 1,
2028	inner_pad => .05,	2156	inner_pad => 0.02,
2029	@_	2157	@_
2030	);	2158	);
2031		2159
2032	$self->set_value ($self->{range}[0]);	2160	$self->set_value ($self->{range}[0]);
2033	$self->update;	2161	$self->update;
2034		2162
2035	$self	2163	$self
2036	}	2164	}
2037		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
2038	sub set_value {	2175	sub set_value {
2039	my ($self, $value) = @_;	2176	my ($self, $value) = @_;
2040		2177
2041	my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};	2178	my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
2042		2179
2043	$hi = $lo + 1 if $hi <= $lo;	2180	$hi = $lo + 1 if $hi <= $lo;
2044		2181
		2182	$page = $hi - $lo if $page > $hi - $lo;
		2183
2045	$value = $lo if $value < $lo;	2184	$value = $lo if $value < $lo;
2046	$value = $hi if $value > $hi;	2185	$value = $hi - $page if $value > $hi - $page;
2047		2186
2048	$value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit	2187	$value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
2049	if $unit;	2188	if $unit;
2050		2189
2051	$page = $hi - $lo if $page > $hi - $lo;
2052
2053	@{$self->{range}} = ($value, $lo, $hi, $page, $unit);	2190	@{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2054		2191
2055	if ($value != $old_value) {	2192	if ($value != $old_value) {
2056	$self->emit (changed => $value);	2193	$self->_emit (changed => $value);
2057	$self->update;	2194	$self->update;
2058	}	2195	}
2059	}	2196	}
2060		2197
2061	sub size_request {	2198	sub size_request {
…		…
2069		2206
2070	sub button_down {	2207	sub button_down {
2071	my ($self, $ev, $x, $y) = @_;	2208	my ($self, $ev, $x, $y) = @_;
2072		2209
2073	$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
2074	$self->mouse_motion ($ev, $x, $y);	2214	$self->mouse_motion ($ev, $x, $y);
2075	}	2215	}
2076		2216
2077	sub mouse_motion {	2217	sub mouse_motion {
2078	my ($self, $ev, $x, $y) = @_;	2218	my ($self, $ev, $x, $y) = @_;
…		…
2080	if ($GRAB == $self) {	2220	if ($GRAB == $self) {
2081	my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});	2221	my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2082		2222
2083	my (undef, $lo, $hi, $page) = @{$self->{range}};	2223	my (undef, $lo, $hi, $page) = @{$self->{range}};
2084		2224
2085	$x = $x / ($w * (1 - 2 * $self->{inner_pad})) - $self->{inner_pad};	2225	$x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2086		2226
2087	$self->set_value ($x * ($hi - $lo) + $lo);	2227	$self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2088	}	2228	}
2089	}	2229	}
2090		2230
2091	sub update {	2231	sub update {
2092	my ($self) = @_;	2232	my ($self) = @_;
2093		2233
2094	$CFClient::UI::ROOT->on_post_alloc ($self => sub {	2234	$CFClient::UI::ROOT->on_post_alloc ($self => sub {
2095	$self->set_value ($self->{range}[0]);	2235	$self->set_value ($self->{range}[0]);
2096		2236
2097	my ($value, $lo, $hi, $page) = @{$self->{range}};	2237	my ($value, $lo, $hi, $page) = @{$self->{range}};
		2238	my $range = ($hi - $page - $lo) || 1e-100;
2098		2239
2099	my $inner_w = 1 - 2 * $self->{inner_pad};	2240	my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
2100		2241
2101	$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;
2102		2244
2103	$page = $self->{scale} * $page || 10 / ($self->{w} || 1);	2245	$value = ($value - $lo) / $range;
2104	$value = $self->{scale} * ($value - $lo);	2246	$value = $value * $self->{scale} + $self->{offset};
2105		2247
2106	$value = $self->{inner_pad} + ($value - $page * 0.5);
2107
2108	$value = 0 if $value < 0;
2109	$page = 1 - $value if $value + $page > 1;
2110
2111	$self->{knob_x} = $value;	2248	$self->{knob_x} = $value - $knob_w * 0.5;
2112	$self->{knob_w} = $page;	2249	$self->{knob_w} = $knob_w;
2113	});	2250	});
2114		2251
2115	$self->SUPER::update;	2252	$self->SUPER::update;
2116	}	2253	}
2117		2254
…		…
2123	glScale $self->{w}, $self->{h};	2260	glScale $self->{w}, $self->{h};
2124		2261
2125	if ($self->{vertical}) {	2262	if ($self->{vertical}) {
2126	# draw a vertical slider like a rotated horizontal slider	2263	# draw a vertical slider like a rotated horizontal slider
2127		2264
		2265	glTranslate 1, 0, 0;
2128	glRotate 90, 0, 0, 1;	2266	glRotate 90, 0, 0, 1;
2129	glTranslate 0, 1, 0;
2130	}	2267	}
2131		2268
2132	my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};	2269	my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
2133	my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};	2270	my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
2134		2271
…		…
2141	# draw handle	2278	# draw handle
2142	$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);
2143		2280
2144	glDisable GL_TEXTURE_2D;	2281	glDisable GL_TEXTURE_2D;
2145	}	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 (@_) }
2146		2324
2147	#############################################################################	2325	#############################################################################
2148		2326
2149	package CFClient::UI::TextView;	2327	package CFClient::UI::TextView;
2150		2328
…		…
2180		2358
2181	$self->{fontsize} = $fontsize;	2359	$self->{fontsize} = $fontsize;
2182	$self->reflow;	2360	$self->reflow;
2183	}	2361	}
2184		2362
2185	sub text_height {
2186	my ($self, $text) = @_;
2187
2188	my $layout = $self->{layout};
2189
2190	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
2191	$layout->set_width ($self->{children}[0]{w});
2192	$layout->set_markup ($text);
2193
2194	($layout->size)[1]
2195	}
2196
2197	sub reflow {
2198	my ($self) = @_;
2199
2200	$self->{need_reflow}++;
2201	$self->update;
2202	}
2203
2204	sub size_allocate {	2363	sub size_allocate {
2205	my ($self, $w, $h) = @_;	2364	my ($self, $w, $h) = @_;
2206		2365
2207	$self->SUPER::size_allocate ($w, $h);	2366	$self->SUPER::size_allocate ($w, $h);
2208		2367
…		…
2211	$self->{layout}->set_width ($self->{children}[0]{w});	2370	$self->{layout}->set_width ($self->{children}[0]{w});
2212		2371
2213	$self->reflow;	2372	$self->reflow;
2214	}	2373	}
2215		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
2216	sub add_paragraph {	2409	sub add_paragraph {
2217	my ($self, $color, $text) = @_;	2410	my ($self, $color, $text, $indent) = @_;
2218		2411
2219	#TODO: intelligently "reformat" paragraph	2412	for my $line (split /\n/, $text) {
2220		2413	my ($w, $h) = $self->text_size ($line);
2221	my $height = $self->text_height ($text);
2222
2223	$self->{height} += $height;	2414	$self->{height} += $h;
		2415	push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];
		2416	}
2224		2417
2225	push @{$self->{par}}, [$height, $color, $text];
2226
2227	$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]);
2228	$self->{children}[1]->update;
2229	}	2419	}
2230		2420
2231	sub update {	2421	sub update {
2232	my ($self) = @_;	2422	my ($self) = @_;
2233		2423
…		…
2236	return unless $self->{h} > 0;	2426	return unless $self->{h} > 0;
2237		2427
2238	delete $self->{texture};	2428	delete $self->{texture};
2239		2429
2240	$ROOT->on_post_alloc ($self, sub {	2430	$ROOT->on_post_alloc ($self, sub {
		2431	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
		2432
2241	if (delete $self->{need_reflow}) {	2433	if (delete $self->{need_reflow}) {
2242	my $height = 0;	2434	my $height = 0;
2243		2435
2244	$height += $_->[0] = $self->text_height ($_->[2])	2436	my $layout = $self->{layout};
		2437
		2438	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
		2439
2245	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	}
2246		2451
2247	$self->{height} = $height;	2452	$self->{height} = $height;
2248		2453
2249	$self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];	2454	$self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2250		2455
2251	delete $self->{texture};	2456	delete $self->{texture};
2252	}	2457	}
2253		2458
2254	$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 {
2255	glClearColor 0, 0, 0, 0;	2460	glClearColor 0.5, 0.5, 0.5, 0;
2256	glClear GL_COLOR_BUFFER_BIT;	2461	glClear GL_COLOR_BUFFER_BIT;
2257		2462
2258	glEnable GL_TEXTURE_2D;
2259	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2260
2261	my $top = int $self->{children}[1]{range}[0];	2463	my $top = int $self->{children}[1]{range}[0];
2262		2464
2263	my $y0 = $top;	2465	my $y0 = $top;
2264	my $y1 = $top + $self->{h};	2466	my $y1 = $top + $H;
2265		2467
2266	my $y = 0;	2468	my $y = 0;
2267		2469
2268	my $layout = $self->{layout};	2470	my $layout = $self->{layout};
2269		2471
2270	$layout->set_font ($self->{font}) if $self->{font};	2472	$layout->set_font ($self->{font}) if $self->{font};
2271		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
2272	for my $par (@{$self->{par}}) {	2478	for my $par (@{$self->{par}}) {
2273	my $h = $par->[0];	2479	my $h = $par->[1];
2274		2480
2275	if ($y0 < $y + $h && $y < $y1) {	2481	if ($y0 < $y + $h && $y < $y1) {
2276	$layout->set_foreground (@{ $par->[1] });	2482	$layout->set_foreground (@{ $par->[2] });
		2483	$layout->set_width ($W - $par->[3]);
2277	$layout->set_markup ($par->[2]);	2484	$layout->set_markup ($par->[4]);
2278		2485
2279	my ($W, $H) = $layout->size;	2486	my ($w, $h, $data, $format, $internalformat) = $layout->render;
2280	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;
2281	}	2490	}
2282		2491
2283	$y += $h;	2492	$y += $h;
2284	}	2493	}
2285		2494
2286	glDisable GL_TEXTURE_2D;	2495	glDisable GL_BLEND;
2287	};	2496	};
2288	});	2497	});
2289	}	2498	}
2290		2499
2291	sub _draw {	2500	sub _draw {
2292	my ($self) = @_;	2501	my ($self) = @_;
2293		2502
2294	glEnable GL_TEXTURE_2D;	2503	glEnable GL_TEXTURE_2D;
2295	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2504	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2296	glColor 1, 1, 1, 1;	2505	glColor 1, 1, 1, 1;
2297	$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});
2298	glDisable GL_TEXTURE_2D;	2507	glDisable GL_TEXTURE_2D;
2299		2508
2300	$self->{children}[1]->draw;	2509	$self->{children}[1]->draw;
2301		2510
2302	}	2511	}
…		…
2351		2560
2352	sub new {	2561	sub new {
2353	my $class = shift;	2562	my $class = shift;
2354		2563
2355	my $self = $class->SUPER::new (	2564	my $self = $class->SUPER::new (
2356	state => 0,	2565	state => 0,
2357	connect_activate => \&toggle_flopper,	2566	on_activate => \&toggle_flopper,
2358	@_	2567	@_
2359	);	2568	);
2360		2569
2361	if ($self->{state}) {
2362	$self->{state} = 0;
2363	$self->toggle_flopper;
2364	}
2365
2366	$self	2570	$self
2367	}	2571	}
2368		2572
2369	sub toggle_flopper {	2573	sub toggle_flopper {
2370	my ($self) = @_;	2574	my ($self) = @_;
2371		2575
2372	# TODO: use animation	2576	$self->{other}->toggle_visibility;
2373	if ($self->{state} = !$self->{state}) {
2374	$CFClient::UI::ROOT->add ($self->{other});
2375	$self->{other}->move ($self->coord2global (0, $self->{h}));
2376	$self->emit ("open");
2377	} else {
2378	$CFClient::UI::ROOT->remove ($self->{other});
2379	$self->emit ("close");
2380	}
2381
2382	$self->emit (changed => $self->{state});
2383	}	2577	}
2384		2578
2385	#############################################################################	2579	#############################################################################
2386		2580
2387	package CFClient::UI::Tooltip;	2581	package CFClient::UI::Tooltip;
…		…
2401		2595
2402	sub set_tooltip_from {	2596	sub set_tooltip_from {
2403	my ($self, $widget) = @_;	2597	my ($self, $widget) = @_;
2404		2598
2405	$self->add (new CFClient::UI::Label	2599	$self->add (new CFClient::UI::Label
2406	markup => $widget->{tooltip},	2600	markup => $widget->{tooltip},
2407	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,	2601	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2408	fontsize => 0.8,	2602	fontsize => 0.8,
2409	fg => [0, 0, 0, 1],	2603	fg => [0, 0, 0, 1],
		2604	ellipsise => 0,
2410	font => ($widget->{tooltip_font} || $::FONT_PROP),	2605	font => ($widget->{tooltip_font} || $::FONT_PROP),
2411	);	2606	);
2412	}	2607	}
2413		2608
2414	sub size_request {	2609	sub size_request {
2415	my ($self) = @_;	2610	my ($self) = @_;
…		…
2461	use CFClient::OpenGL;	2656	use CFClient::OpenGL;
2462		2657
2463	sub new {	2658	sub new {
2464	my $class = shift;	2659	my $class = shift;
2465		2660
2466	$class->SUPER::new (	2661	my $self = $class->SUPER::new (
2467	aspect => 1,	2662	aspect => 1,
		2663	can_events => 0,
2468	@_,	2664	@_,
2469	)	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
2470	}	2682	}
2471		2683
2472	sub size_request {	2684	sub size_request {
2473	(32, 8)	2685	(32, 8)
2474	}	2686	}
2475		2687
		2688	sub update {
		2689	my ($self) = @_;
		2690
		2691	return unless $self->{visible};
		2692
		2693	$self->SUPER::update;
		2694	}
		2695
2476	sub _draw {	2696	sub _draw {
2477	my ($self) = @_;	2697	my ($self) = @_;
2478		2698
2479	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
2480	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]];	2710	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2481		2711
2482	# TODO animation
2483	if ($tex) {	2712	if ($tex) {
2484	glEnable GL_TEXTURE_2D;	2713	glEnable GL_TEXTURE_2D;
2485	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2714	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2486	glColor 1, 1, 1, 1;	2715	glColor 1, 1, 1, 1;
2487	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});	2716	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2488	glDisable GL_TEXTURE_2D;	2717	glDisable GL_TEXTURE_2D;
2489	}	2718	}
2490	}	2719	}
2491		2720
2492	#############################################################################	2721	sub DESTROY {
		2722	my ($self) = @_;
2493		2723
		2724	$self->{timer}->cancel
		2725	if $self->{timer};
		2726
		2727	$self->SUPER::DESTROY;
		2728	}
		2729
		2730	#############################################################################
		2731
2494	package CFClient::UI::InventoryItem;	2732	package CFClient::UI::Inventory;
2495		2733
2496	our @ISA = CFClient::UI::HBox::;	2734	our @ISA = CFClient::UI::ScrolledWindow::;
2497		2735
2498	sub new {	2736	sub new {
2499	my $class = shift;	2737	my $class = shift;
2500		2738
2501	my %args = @_;
2502
2503	my $item = delete $args{item};
2504
2505	my $desc = $item->{nrof} < 2
2506	? $item->{name}
2507	: "$item->{nrof} $item->{name_pl}";
2508
2509	$item->{flags} & Crossfire::Protocol::F_OPEN
2510	and $desc .= " (open)";
2511	$item->{flags} & Crossfire::Protocol::F_APPLIED
2512	and $desc .= " (applied)";
2513	$item->{flags} & Crossfire::Protocol::F_UNPAID
2514	and $desc .= " (unpaid)";
2515	$item->{flags} & Crossfire::Protocol::F_MAGIC
2516	and $desc .= " (magic)";
2517	$item->{flags} & Crossfire::Protocol::F_CURSED
2518	and $desc .= " (cursed)";
2519	$item->{flags} & Crossfire::Protocol::F_DAMNED
2520	and $desc .= " (damned)";
2521	$item->{flags} & Crossfire::Protocol::F_LOCKED
2522	and $desc .= " *";
2523
2524	my $self = $class->SUPER::new (	2739	my $self = $class->SUPER::new (
2525	can_hover => 1,	2740	scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2526	can_events => 1,
2527	tooltip => (CFClient::UI::Label->escape ($desc)
2528	. "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),
2529	connect_button_down => sub {
2530	my ($self, $ev, $x, $y) = @_;
2531
2532	# todo: maybe put examine on 1? but should just be a tooltip :(
2533	if ($ev->{button} == 1) {
2534	$::CONN->send ("move $::CONN->{player}{tag} $item->{tag} 0");
2535	} elsif ($ev->{button} == 2) {
2536	$::CONN->send ("apply $item->{tag}");
2537	} elsif ($ev->{button} == 3) {
2538	my @menu_items = (
2539	["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2540	["mark", sub { $::CONN->send ("mark $item->{tag}") }],
2541	["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2542	["drop", sub { $::CONN->send ("move $main::OPENCONT $item->{tag} 0") }],
2543	[
2544	$item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock",
2545	sub { $::CONN->send ("lock ". () ."$item->{tag}") },
2546	],
2547	);
2548
2549	CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
2550	}
2551
2552	1
2553	},
2554	%args
2555	);
2556
2557	$self->add (new CFClient::UI::Face
2558	can_events => 0,
2559	face => $item->{face},
2560	anim => $item->{anim},
2561	animspeed => $item->{animspeed},
2562	);
2563
2564	$self->add (new CFClient::UI::Label
2565	can_events => 0,
2566	text => $desc,
2567	);
2568
2569	$self
2570	}
2571
2572	#############################################################################
2573
2574	package CFClient::UI::Inventory;
2575
2576	our @ISA = CFClient::UI::ScrolledWindow::;
2577
2578	sub new {
2579	my $class = shift;
2580
2581	my $self = $class->SUPER::new (
2582	scrolled => (new CFClient::UI::VBox),
2583	@_,	2741	@_,
2584	);	2742	);
2585		2743
2586	$self	2744	$self
2587	}	2745	}
…		…
2597	or ($a->{name} cmp $b->{name})	2755	or ($a->{name} cmp $b->{name})
2598	} @$items;	2756	} @$items;
2599		2757
2600	$self->{real_items} = \@items;	2758	$self->{real_items} = \@items;
2601		2759
		2760	my $row = 0;
2602	for my $item (@items) {	2761	for my $item (@items) {
2603	my $desc = $item->{nrof} < 2	2762	CFClient::Item::update_widgets $item;
2604	? $item->{name}
2605	: "$item->{nrof} $item->{name_pl}";
2606		2763
2607	$item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item;	2764	$self->{scrolled}->add (0, $row, $item->{face_widget});
2608	}	2765	$self->{scrolled}->add (1, $row, $item->{desc_widget});
		2766	$self->{scrolled}->add (2, $row, $item->{weight_widget});
2609		2767
2610	$self->{scrolled}->add (@items);	2768	$row++;
2611		2769	}
2612	# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2613	}
2614
2615	sub size_request {
2616	my ($self) = @_;
2617	($self->{req_w}, $self->{req_h});
2618	}	2770	}
2619		2771
2620	#############################################################################	2772	#############################################################################
2621		2773
2622	package CFClient::UI::Menu;	2774	package CFClient::UI::Menu;
…		…
2657		2809
2658	# 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)
2659	sub popup {	2811	sub popup {
2660	my ($self, $ev) = @_;	2812	my ($self, $ev) = @_;
2661		2813
2662	$self->emit ("popdown");	2814	$self->_emit ("popdown");
2663		2815
2664	# maybe save $GRAB? must be careful about events...	2816	# maybe save $GRAB? must be careful about events...
2665	$GRAB = $self;	2817	$GRAB = $self;
2666	$self->{button} = $ev->{button};	2818	$self->{button} = $ev->{button};
2667		2819
…		…
2682		2834
2683	if ($ev->{button} == $self->{button}) {	2835	if ($ev->{button} == $self->{button}) {
2684	undef $GRAB;	2836	undef $GRAB;
2685	$self->hide;	2837	$self->hide;
2686		2838
2687	$self->emit ("popdown");	2839	$self->_emit ("popdown");
2688	$self->{hover}[1]->() if $self->{hover};	2840	$self->{hover}[1]->() if $self->{hover};
2689	}	2841	}
2690	}	2842	}
2691		2843
2692	#############################################################################	2844	#############################################################################
2693		2845
2694	package CFClient::UI::Statusbox;	2846	package CFClient::UI::Statusbox;
2695		2847
2696	our @ISA = CFClient::UI::VBox::;	2848	our @ISA = CFClient::UI::VBox::;
		2849
		2850	sub new {
		2851	my $class = shift;
		2852
		2853	$class->SUPER::new (
		2854	fontsize => 0.8,
		2855	@_,
		2856	)
		2857	}
2697		2858
2698	sub reorder {	2859	sub reorder {
2699	my ($self) = @_;	2860	my ($self) = @_;
2700	my $NOW = time;	2861	my $NOW = time;
2701		2862
…		…
2721	: $item->{text};	2882	: $item->{text};
2722		2883
2723	for ($short) {	2884	for ($short) {
2724	s/^\s+//;	2885	s/^\s+//;
2725	s/\s+/ /g;	2886	s/\s+/ /g;
2726	my $len = int 40 / $item->{fontsize};
2727	substr $_, $len, length, "…" if $len < length;
2728	}	2887	}
2729		2888
2730	new CFClient::UI::Label	2889	new CFClient::UI::Label
2731	markup => $short,	2890	markup => $short,
2732	tooltip => $item->{tooltip},	2891	tooltip => $item->{tooltip},
2733	tooltip_font => $::FONT_PROP,	2892	tooltip_font => $::FONT_PROP,
2734	tooltip_width => 0.67,	2893	tooltip_width => 0.67,
2735	fontsize => $item->{fontsize},	2894	fontsize => $item->{fontsize} || $self->{fontsize},
		2895	max_w => $::WIDTH * 0.44,
2736	fg => $item->{fg},	2896	fg => $item->{fg},
2737	can_events => 1,	2897	can_events => 1,
2738	can_hover => 1	2898	can_hover => 1
2739	};	2899	};
2740	}	2900	}
…		…
2746	sub add {	2906	sub add {
2747	my ($self, $text, %arg) = @_;	2907	my ($self, $text, %arg) = @_;
2748		2908
2749	$text =~ s/^\s+//;	2909	$text =~ s/^\s+//;
2750	$text =~ s/\s+$//;	2910	$text =~ s/\s+$//;
		2911
		2912	return unless $text;
2751		2913
2752	my $timeout = time + ((delete $arg{timeout}) || 60);	2914	my $timeout = time + ((delete $arg{timeout}) || 60);
2753		2915
2754	my $group = exists $arg{group} ? $arg{group} : ++$self->{id};	2916	my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2755		2917
…		…
2767	$self->{item}{$group} = {	2929	$self->{item}{$group} = {
2768	id => ++$self->{id},	2930	id => ++$self->{id},
2769	text => $text,	2931	text => $text,
2770	timeout => $timeout,	2932	timeout => $timeout,
2771	tooltip => $text,	2933	tooltip => $text,
2772	fontsize => 0.8,
2773	fg => [0.8, 0.8, 0.8, 0.8],	2934	fg => [0.8, 0.8, 0.8, 0.8],
2774	pri => 0,	2935	pri => 0,
2775	count => 1,	2936	count => 1,
2776	%arg,	2937	%arg,
2777	};	2938	};
2778	}	2939	}
2779		2940
2780	$self->reorder;	2941	$self->reorder;
2781	}	2942	}
2782		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
2783	#############################################################################	2954	#############################################################################
2784		2955
2785	package CFClient::UI::Root;	2956	package CFClient::UI::Root;
2786		2957
2787	our @ISA = CFClient::UI::Container::;	2958	our @ISA = CFClient::UI::Container::;
…		…
2790		2961
2791	sub new {	2962	sub new {
2792	my $class = shift;	2963	my $class = shift;
2793		2964
2794	$class->SUPER::new (	2965	$class->SUPER::new (
		2966	visible => 1,
2795	@_,	2967	@_,
2796	)	2968	)
2797	}	2969	}
2798		2970
2799	sub configure {	2971	sub configure {
…		…
2817	}	2989	}
2818		2990
2819	sub size_allocate {	2991	sub size_allocate {
2820	my ($self, $w, $h) = @_;	2992	my ($self, $w, $h) = @_;
2821		2993
2822	my $old_w = $self->{old_w}; $self->{old_w} = $w;
2823	my $old_h = $self->{old_h}; $self->{old_h} = $h;
2824
2825	CFClient::UI::rescale_widgets $w / $old_w, $h / $old_h
2826	if $old_w && $old_h && ($old_w != $w || $old_h != $h);
2827
2828	for my $child ($self->children) {	2994	for my $child ($self->children) {
2829	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)};
2830		2996
2831	$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
2832	if exists $child->{req_x};	2998	if exists $child->{req_x};
2833		2999
2834	$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
2835	if exists $child->{req_y};	3001	if exists $child->{req_y};
2836		3002
		3003	delete @$child{qw(req_x req_y)};
		3004
2837	$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;
2838	$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;
2839		3007
2840	$child->configure ($X, $Y, $W, $H);	3008	$child->configure ($X, $Y, $W, $H);
2841	}	3009	}
…		…
2862		3030
2863	sub add {	3031	sub add {
2864	my ($self, @children) = @_;	3032	my ($self, @children) = @_;
2865		3033
2866	for my $child (@children) {	3034	for my $child (@children) {
2867	$child->{toplevel} = 1;	3035	$child->{is_toplevel} = 1;
2868		3036
2869	# integerise window positions	3037	# integerise window positions
2870	$child->{x} = int $child->{x};	3038	$child->{x} = int $child->{x};
2871	$child->{y} = int $child->{y};	3039	$child->{y} = int $child->{y};
2872	}	3040	}
2873		3041
2874	$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	}
2875	}	3061	}
2876		3062
2877	sub on_refresh {	3063	sub on_refresh {
2878	my ($self, $id, $cb) = @_;	3064	my ($self, $id, $cb) = @_;
2879		3065
…		…
2893	$_->()	3079	$_->()
2894	for values %{delete $self->{refresh_hook}};	3080	for values %{delete $self->{refresh_hook}};
2895	}	3081	}
2896		3082
2897	if ($self->{check_size}) {	3083	if ($self->{check_size}) {
2898	my @queue = ([], []);	3084	my @queue;
2899		3085
2900	for (;;) {	3086	for (;;) {
2901	if ($self->{check_size}) {	3087	if ($self->{check_size}) {
2902	# heuristic: check containers last	3088	#TODO use array-of-depth approach
2903	push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_	3089
		3090	@queue = sort { $a->{visible} <=> $b->{visible} }
2904	for values %{delete $self->{check_size}}	3091	@queue, values %{delete $self->{check_size}};
2905	}	3092	}
2906		3093
2907	my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last;	3094	my $widget = pop @queue || last;
2908		3095
		3096	defined $widget->{visible} or last; # do not resize invisible widgets
		3097
2909	my ($w, $h) = $widget->{user_w} && $widget->{user_h}	3098	my ($w, $h) = $widget->{def_w} && $widget->{def_h}
2910	? @$widget{qw(user_w user_h)}	3099	? @$widget{qw(def_w def_h)}
2911	: $widget->size_request;	3100	: $widget->size_request;
2912		3101
2913	if (delete $widget->{force_alloc}	3102	if (delete $widget->{force_alloc}
2914	or $w != $widget->{req_w} or $h != $widget->{req_h}) {	3103	or $w != $widget->{req_w} or $h != $widget->{req_h}) {
2915	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#
…		…
2932	$w = 0 if $w < 0;	3121	$w = 0 if $w < 0;
2933	$h = 0 if $h < 0;	3122	$h = 0 if $h < 0;
2934		3123
2935	$widget->{w} = $w;	3124	$widget->{w} = $w;
2936	$widget->{h} = $h;	3125	$widget->{h} = $h;
2937	$widget->size_allocate ($w, $h);
2938	$widget->emit (size_allocate => $w, $h);	3126	$widget->emit (size_allocate => $w, $h);
2939	}	3127	}
2940	}	3128	}
2941		3129
2942	while ($self->{post_alloc_hook}) {	3130	while ($self->{post_alloc_hook}) {
…		…
2948	glClearColor +($::CFG->{fow_intensity}) x 3, 1;	3136	glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2949	glClear GL_COLOR_BUFFER_BIT;	3137	glClear GL_COLOR_BUFFER_BIT;
2950		3138
2951	glMatrixMode GL_PROJECTION;	3139	glMatrixMode GL_PROJECTION;
2952	glLoadIdentity;	3140	glLoadIdentity;
2953	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000;	3141	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
2954	glMatrixMode GL_MODELVIEW;	3142	glMatrixMode GL_MODELVIEW;
2955	glLoadIdentity;	3143	glLoadIdentity;
2956		3144
2957	$self->_draw;	3145	$self->_draw;
2958	}	3146	}
…		…
2960	#############################################################################	3148	#############################################################################
2961		3149
2962	package CFClient::UI;	3150	package CFClient::UI;
2963		3151
2964	$ROOT = new CFClient::UI::Root;	3152	$ROOT = new CFClient::UI::Root;
2965	$TOOLTIP = new CFClient::UI::Tooltip;	3153	$TOOLTIP = new CFClient::UI::Tooltip z => 900;
2966		3154
2967	1	3155	1
2968		3156

Diff Legend

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