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.214 by root, Wed May 17 22:59:13 2006 UTC vs.
Revision 1.253 by root, Sun May 28 23:28:12 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}) {
23		43
24	if ($TOOLTIP->{owner} != $widget) {	44	if ($TOOLTIP->{owner} != $widget) {
		45	$TOOLTIP->hide;
		46
25	$TOOLTIP->{owner} = $widget;	47	$TOOLTIP->{owner} = $widget;
26		48
27	my $tip = $widget->{tooltip};	49	my $tip = $widget->{tooltip};
28		50
29	$tip = $tip->($widget) if CODE:: eq ref $tip;	51	$tip = $tip->($widget) if CODE:: eq ref $tip;
30		52
31	$TOOLTIP->set_tooltip_from ($widget);	53	$TOOLTIP->set_tooltip_from ($widget);
32	$TOOLTIP->show;	54	$TOOLTIP->show;
33
34	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
35
36	($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0)
37	if $x + $TOOLTIP->{w} > $::WIDTH;
38
39	$TOOLTIP->move ($x, $y);
40	$TOOLTIP->check_size;
41	$TOOLTIP->update;
42	}	55	}
43		56
44	return;	57	return;
45	}	58	}
46	}	59	}
…		…
50	delete $TOOLTIP->{owner};	63	delete $TOOLTIP->{owner};
51	}	64	}
52		65
53	# class methods for events	66	# class methods for events
54	sub feed_sdl_key_down_event {	67	sub feed_sdl_key_down_event {
55	$FOCUS->emit (key_down => $_[0]) || $FOCUS->key_down ($_[0])	68	$FOCUS->emit (key_down => $_[0])
56	if $FOCUS;	69	if $FOCUS;
57	}	70	}
58		71
59	sub feed_sdl_key_up_event {	72	sub feed_sdl_key_up_event {
60	$FOCUS->emit (key_up => $_[0]) || $FOCUS->key_up ($_[0])	73	$FOCUS->emit (key_up => $_[0])
61	if $FOCUS;	74	if $FOCUS;
62	}	75	}
63		76
64	sub feed_sdl_button_down_event {	77	sub feed_sdl_button_down_event {
65	my ($ev) = @_;	78	my ($ev) = @_;
…		…
74	check_tooltip;	87	check_tooltip;
75	}	88	}
76		89
77	$BUTTON_STATE |= 1 << ($ev->{button} - 1);	90	$BUTTON_STATE |= 1 << ($ev->{button} - 1);
78		91
79	if ($GRAB) {	92	$GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))
80	($x, $y) = $GRAB->coord2local ($x, $y);	93	if $GRAB;
81	$GRAB->emit (button_down => $ev, $x, $y) || $GRAB->button_down ($ev, $x, $y);
82	}
83	}	94	}
84		95
85	sub feed_sdl_button_up_event {	96	sub feed_sdl_button_up_event {
86	my ($ev) = @_;	97	my ($ev) = @_;
87	my ($x, $y) = ($ev->{x}, $ev->{y});	98	my ($x, $y) = ($ev->{x}, $ev->{y});
88		99
89	my $widget = $GRAB || $ROOT->find_widget ($x, $y);	100	my $widget = $GRAB || $ROOT->find_widget ($x, $y);
90		101
91	$BUTTON_STATE &= ~(1 << ($ev->{button} - 1));	102	$BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
92		103
93	if ($GRAB) {	104	$GRAB->emit (button_up => $ev, $GRAB->coord2local ($x, $y))
94	($x, $y) = $GRAB->coord2local ($x, $y);	105	if $GRAB;
95	$GRAB->emit (button_up => $ev, $x, $y) || $GRAB->button_up ($ev, $x, $y);
96	}
97		106
98	if (!$BUTTON_STATE) {	107	if (!$BUTTON_STATE) {
99	my $grab = $GRAB; undef $GRAB;	108	my $grab = $GRAB; undef $GRAB;
100	$grab->update if $grab;	109	$grab->update if $grab;
101	$GRAB->update if $GRAB;	110	$GRAB->update if $GRAB;
…		…
117	$HOVER->update if $HOVER && $HOVER->{can_hover};	126	$HOVER->update if $HOVER && $HOVER->{can_hover};
118		127
119	check_tooltip;	128	check_tooltip;
120	}	129	}
121		130
122	if ($HOVER) {
123	($x, $y) = $HOVER->coord2local ($x, $y);
124	$HOVER->emit (mouse_motion => $ev, $x, $y) || $HOVER->mouse_motion ($ev, $x, $y);	131	$HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
125	}	132	if $HOVER;
126	}	133	}
127		134
128	# convert position array to integers	135	# convert position array to integers
129	sub harmonize {	136	sub harmonize {
130	my ($vals) = @_;	137	my ($vals) = @_;
…		…
136	$rem += $_ - $i;	143	$rem += $_ - $i;
137	$_ = $i;	144	$_ = $i;
138	}	145	}
139	}	146	}
140		147
		148	sub full_refresh {
		149	# make a copy, otherwise for complains about freed values.
		150	my @widgets = values %WIDGET;
		151
		152	$_->update
		153	for @widgets;
		154	}
		155
		156	sub reconfigure_widgets {
		157	# make a copy, otherwise C<for> complains about freed values.
		158	my @widgets = values %WIDGET;
		159
		160	$_->reconfigure
		161	for @widgets;
		162	}
		163
141	# call when resolution changes etc.	164	# call when resolution changes etc.
142	sub rescale_widgets {	165	sub rescale_widgets {
143	my ($sx, $sy) = @_;	166	my ($sx, $sy) = @_;
144		167
145	# make a copy, otherwise for complains about freed values.
146	my @widgets = values %WIDGET;	168	for my $widget (values %WIDGET) {
147
148	for my $widget (@widgets) {
149	if ($widget->{toplevel}) {	169	if ($widget->{is_toplevel}) {
150	$widget->{x} = int 0.5 + $widget->{x} * $sx if exists $widget->{x};	170	$widget->{x} = int 0.5 + $widget->{x} * $sx if exists $widget->{x};
151	$widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};	171	$widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};
152	$widget->{req_w} = int 0.5 + $widget->{req_w} * $sx if exists $widget->{req_w};	172	$widget->{req_w} = int 0.5 + $widget->{req_w} * $sx if exists $widget->{req_w};
153	$widget->{user_w} = int 0.5 + $widget->{user_w} * $sx if exists $widget->{user_w};
154	$widget->{y} = int 0.5 + $widget->{y} * $sy if exists $widget->{y};	173	$widget->{y} = int 0.5 + $widget->{y} * $sy if exists $widget->{y};
155	$widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};	174	$widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};
156	$widget->{req_h} = int 0.5 + $widget->{req_h} * $sy if exists $widget->{req_h};	175	$widget->{req_h} = int 0.5 + $widget->{req_h} * $sy if exists $widget->{req_h};
157	$widget->{user_h} = int 0.5 + $widget->{user_h} * $sy if exists $widget->{user_h};
158	}	176	}
159
160	$widget->reconfigure;
161	}	177	}
		178
		179	reconfigure_widgets;
162	}	180	}
163		181
164	#############################################################################	182	#############################################################################
165		183
166	package CFClient::UI::Base;	184	package CFClient::UI::Base;
…		…
179	can_events => 1,	197	can_events => 1,
180	@_	198	@_
181	}, $class;	199	}, $class;
182		200
183	for (keys %$self) {	201	for (keys %$self) {
184	if (/^connect_(.*)$/) {	202	if (/^on_(.*)$/) {
185	$self->connect ($1 => delete $self->{$_});	203	$self->connect ($1 => delete $self->{$_});
186	}	204	}
187	}	205	}
188		206
189	Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);	207	Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
190		208
		209	if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {
		210	$self->{req_x} = $layout->{x} * $::WIDTH;
		211	$self->{req_y} = $layout->{y} * $::HEIGHT;
		212	$self->{def_w} = ($layout->{w} != 0 ? $layout->{w} : 1) * $::WIDTH;
		213	$self->{def_h} = ($layout->{h} != 0 ? $layout->{h} : 1) * $::HEIGHT;
		214	}
		215
191	$self	216	$self
192	}	217	}
193		218
194	sub destroy {	219	sub destroy {
195	my ($self) = @_;	220	my ($self) = @_;
…		…
204	return if $self->{parent};	229	return if $self->{parent};
205		230
206	$CFClient::UI::ROOT->add ($self);	231	$CFClient::UI::ROOT->add ($self);
207	}	232	}
208		233
209	sub hide {	234	sub center {
210	my ($self) = @_;	235	my ($self) = @_;
		236
		237	$CFClient::UI::ROOT->on_post_alloc (
		238	"center_$self" => sub {
		239	$self->move (($self->{parent}{w} - $self->{w}) * 0.5, ($self->{parent}{h} - $self->{h}) * 0.5);
		240	},
		241	);
		242
		243	$self->update;
		244	}
		245
		246	sub set_visible {
		247	my ($self) = @_;
		248
		249	return if $self->{visible};
		250
		251	$self->{root} = $self->{parent}{root};
		252	$self->{visible} = $self->{parent}{visible} + 1;
		253
		254	$self->emit (visibility_change => 1);
		255
		256	$self->realloc if !exists $self->{req_w};
		257
		258	$_->set_visible for $self->children;
		259	}
		260
		261	sub set_invisible {
		262	my ($self) = @_;
		263
		264	return unless $self->{visible};
		265
		266	$_->set_invisible for $self->children;
		267
		268	delete $self->{root};
		269	delete $self->{visible};
211		270
212	undef $GRAB if $GRAB == $self;	271	undef $GRAB if $GRAB == $self;
213	undef $HOVER if $HOVER == $self;	272	undef $HOVER if $HOVER == $self;
		273
		274	CFClient::UI::check_tooltip
		275	if $TOOLTIP->{owner} == $self;
		276
		277	$self->focus_out;
		278
		279	$self->emit (visibility_change => 0);
		280	}
		281
		282	sub set_visibility {
		283	my ($self, $visible) = @_;
		284
		285	return if $self->{visible} == $visible;
		286
		287	$visible ? $self->hide
		288	: $self->show;
		289	}
		290
		291	sub toggle_visibility {
		292	my ($self) = @_;
		293
		294	$self->{visible}
		295	? $self->hide
		296	: $self->show;
		297	}
		298
		299	sub hide {
		300	my ($self) = @_;
		301
		302	$self->set_invisible;
214		303
215	$self->{parent}->remove ($self)	304	$self->{parent}->remove ($self)
216	if $self->{parent};	305	if $self->{parent};
217	}	306	}
218		307
…		…
227	}	316	}
228		317
229	sub set_size {	318	sub set_size {
230	my ($self, $w, $h) = @_;	319	my ($self, $w, $h) = @_;
231		320
232	$self->{user_w} = $w;	321	$self->{def_w} = $w;
233	$self->{user_h} = $h;	322	$self->{def_h} = $h;
234		323
235	$self->check_size;	324	$self->realloc;
236	}	325	}
237		326
238	sub size_request {	327	sub size_request {
239	require Carp;	328	require Carp;
240	Carp::confess "size_request is abstract";	329	Carp::confess "size_request is abstract";
…		…
260	$self->{y} = $y;	349	$self->{y} = $y;
261	$self->update;	350	$self->update;
262	}	351	}
263		352
264	if ($self->{w} != $w || $self->{h} != $h) {	353	if ($self->{w} != $w || $self->{h} != $h) {
		354	return unless $self->{visible};
		355
265	$CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $w, $h];	356	$self->{root}->{size_alloc}{$self+0} = [$self, $w, $h];
266	}	357	}
267	}	358	}
268		359
269	sub size_allocate {	360	sub size_allocate {
270	# nothing to be done	361	# nothing to be done
271	}	362	}
272		363
273	sub reconfigure {
274	my ($self) = @_;
275
276	$self->check_size (1);
277	$self->update;
278	}
279
280	sub children {	364	sub children {
281	}	365	}
282		366
283	sub set_max_size {	367	sub set_max_size {
284	my ($self, $w, $h) = @_;	368	my ($self, $w, $h) = @_;
…		…
287	delete $self->{max_h}; $self->{max_h} = $h if $h;	371	delete $self->{max_h}; $self->{max_h} = $h if $h;
288	}	372	}
289		373
290	sub set_tooltip {	374	sub set_tooltip {
291	my ($self, $tooltip) = @_;	375	my ($self, $tooltip) = @_;
		376
		377	$tooltip =~ s/^\s+//;
		378	$tooltip =~ s/\s+$//;
		379
		380	return if $self->{tooltip} eq $tooltip;
292		381
293	$self->{tooltip} = $tooltip;	382	$self->{tooltip} = $tooltip;
294		383
295	if ($CFClient::UI::TOOLTIP->{owner} == $self) {	384	if ($CFClient::UI::TOOLTIP->{owner} == $self) {
296	delete $CFClient::UI::TOOLTIP->{owner};	385	delete $CFClient::UI::TOOLTIP->{owner};
…		…
318	return if $FOCUS == $self;	407	return if $FOCUS == $self;
319	return unless $self->{can_focus};	408	return unless $self->{can_focus};
320		409
321	my $focus = $FOCUS; $FOCUS = $self;	410	my $focus = $FOCUS; $FOCUS = $self;
322		411
323	$self->emit (focus_in => $focus);	412	$self->_emit (focus_in => $focus);
324		413
325	$focus->update if $focus;	414	$focus->update if $focus;
326	$FOCUS->update;	415	$FOCUS->update;
327	}	416	}
328		417
…		…
331		420
332	return unless $FOCUS == $self;	421	return unless $FOCUS == $self;
333		422
334	my $focus = $FOCUS; undef $FOCUS;	423	my $focus = $FOCUS; undef $FOCUS;
335		424
336	$self->emit (focus_out => $focus);	425	$self->_emit (focus_out => $focus);
337		426
338	$focus->update if $focus; #?	427	$focus->update if $focus; #?
		428
		429	$::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus
		430	unless $FOCUS;
339	}	431	}
340		432
341	sub mouse_motion { }	433	sub mouse_motion { }
342	sub button_up { }	434	sub button_up { }
343	sub key_down { }	435	sub key_down { }
344	sub key_up { }	436	sub key_up { }
345		437
346	sub button_down {	438	sub button_down {
347	my ($self, $ev, $x, $y) = @_;	439	my ($self, $ev, $x, $y) = @_;
348		440
349	$self->focus_in;	441	$self->focus_in;
…		…
352	sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} }	444	sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} }
353	sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} }	445	sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} }
354	sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} }	446	sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} }
355	sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} }	447	sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} }
356	sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} }	448	sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} }
		449
		450	sub find_widget {
		451	my ($self, $x, $y) = @_;
		452
		453	return () unless $self->{can_events};
		454
		455	return $self
		456	if $x >= $self->{x} && $x < $self->{x} + $self->{w}
		457	&& $y >= $self->{y} && $y < $self->{y} + $self->{h};
		458
		459	()
		460	}
		461
		462	sub set_parent {
		463	my ($self, $parent) = @_;
		464
		465	Scalar::Util::weaken ($self->{parent} = $parent);
		466
		467	$self->set_visible if $parent->{visible};
		468	}
		469
		470	sub connect {
		471	my ($self, $signal, $cb) = @_;
		472
		473	push @{ $self->{signal_cb}{$signal} }, $cb;
		474	}
		475
		476	sub _emit {
		477	my ($self, $signal, @args) = @_;
		478
		479	List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
		480	}
		481
		482	sub emit {
		483	my ($self, $signal, @args) = @_;
		484
		485	$self->_emit ($signal, @args)
		486	|| $self->$signal (@args);
		487	}
		488
		489	sub visibility_change {
		490	#my ($self, $visible) = @_;
		491	}
		492
		493	sub realloc {
		494	my ($self) = @_;
		495
		496	if ($self->{visible}) {
		497	return if $self->{root}{realloc}{$self};
		498
		499	$self->{root}{realloc}{$self} = $self;
		500	$self->{root}->update;
		501	} else {
		502	delete $self->{req_w};
		503	}
		504	}
		505
		506	sub update {
		507	my ($self) = @_;
		508
		509	$self->{parent}->update
		510	if $self->{parent};
		511	}
357		512
358	sub draw {	513	sub draw {
359	my ($self) = @_;	514	my ($self) = @_;
360		515
361	return unless $self->{h} && $self->{w};	516	return unless $self->{h} && $self->{w};
…		…
383	if ($ENV{PCLIENT_DEBUG}) {	538	if ($ENV{PCLIENT_DEBUG}) {
384	glPushMatrix;	539	glPushMatrix;
385	glColor 1, 1, 0, 1;	540	glColor 1, 1, 0, 1;
386	glTranslate $self->{x} + 0.375, $self->{y} + 0.375;	541	glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
387	glBegin GL_LINE_LOOP;	542	glBegin GL_LINE_LOOP;
388	glVertex 0 , 0;	543	glVertex 0 , 0;
389	glVertex $self->{w}, 0;	544	glVertex $self->{w} - 1, 0;
390	glVertex $self->{w}, $self->{h};	545	glVertex $self->{w} - 1, $self->{h} - 1;
391	glVertex 0 , $self->{h};	546	glVertex 0 , $self->{h} - 1;
392	glEnd;	547	glEnd;
393	glPopMatrix;	548	glPopMatrix;
394	#CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;	549	#CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
395	}	550	}
396	}	551	}
397		552
398	sub _draw {	553	sub _draw {
399	my ($self) = @_;	554	my ($self) = @_;
400		555
401	warn "no draw defined for $self\n";	556	warn "no draw defined for $self\n";
402	}
403
404	sub find_widget {
405	my ($self, $x, $y) = @_;
406
407	return () unless $self->{can_events};
408
409	return $self
410	if $x >= $self->{x} && $x < $self->{x} + $self->{w}
411	&& $y >= $self->{y} && $y < $self->{y} + $self->{h};
412
413	()
414	}
415
416	sub set_parent {
417	my ($self, $parent) = @_;
418
419	Scalar::Util::weaken ($self->{parent} = $parent);
420
421	# TODO: req_w _does_change after ->reconfigure
422	$self->check_size
423	unless exists $self->{req_w};
424	}
425
426	sub check_size {
427	my ($self, $forced) = @_;
428
429	$self->{force_alloc} = 1 if $forced;
430	$CFClient::UI::ROOT->{check_size}{$self} = $self;
431	}
432
433	sub update {
434	my ($self) = @_;
435
436	$self->{parent}->update
437	if $self->{parent};
438	}
439
440	sub connect {
441	my ($self, $signal, $cb) = @_;
442
443	push @{ $self->{signal_cb}{$signal} }, $cb;
444	}
445
446	sub emit {
447	my ($self, $signal, @args) = @_;
448
449	List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
450	}	557	}
451		558
452	sub DESTROY {	559	sub DESTROY {
453	my ($self) = @_;	560	my ($self) = @_;
454		561
…		…
551	$self->{children} = [	658	$self->{children} = [
552	sort { $a->{z} <=> $b->{z} }	659	sort { $a->{z} <=> $b->{z} }
553	@{$self->{children}}, @widgets	660	@{$self->{children}}, @widgets
554	];	661	];
555		662
556	$self->check_size (1);	663	$self->realloc;
557	$self->update;
558	}	664	}
559		665
560	sub children {	666	sub children {
561	@{ $_[0]{children} }	667	@{ $_[0]{children} }
562	}	668	}
…		…
567	delete $child->{parent};	673	delete $child->{parent};
568	$child->hide;	674	$child->hide;
569		675
570	$self->{children} = [ grep $_ != $child, @{ $self->{children} } ];	676	$self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
571		677
572	$self->check_size;	678	$self->realloc;
573	$self->update;
574	}	679	}
575		680
576	sub clear {	681	sub clear {
577	my ($self) = @_;	682	my ($self) = @_;
578		683
…		…
582	for (@$children) {	687	for (@$children) {
583	delete $_->{parent};	688	delete $_->{parent};
584	$_->hide;	689	$_->hide;
585	}	690	}
586		691
587	$self->check_size;	692	$self->realloc;
588	$self->update;
589	}	693	}
590		694
591	sub find_widget {	695	sub find_widget {
592	my ($self, $x, $y) = @_;	696	my ($self, $x, $y) = @_;
593		697
…		…
646	sub size_request {	750	sub size_request {
647	$_[0]{children}[0]->size_request	751	$_[0]{children}[0]->size_request
648	}	752	}
649		753
650	sub size_allocate {	754	sub size_allocate {
651	my ($self, $w, $h) = @_;	755	my ($self, $w, $h, $changed) = @_;
652		756
653	$self->{children}[0]->configure (0, 0, $w, $h);	757	$self->{children}[0]->configure (0, 0, $w, $h);
654	}	758	}
655		759
656	#############################################################################	760	#############################################################################
…		…
673	$ROOT->on_post_alloc ($self => sub { $self->render_child });	777	$ROOT->on_post_alloc ($self => sub { $self->render_child });
674	$self->SUPER::update;	778	$self->SUPER::update;
675	}	779	}
676		780
677	sub size_allocate {	781	sub size_allocate {
678	my ($self, $w, $h) = @_;	782	my ($self, $w, $h, $changed) = @_;
679		783
680	$self->SUPER::size_allocate ($w, $h);	784	$self->SUPER::size_allocate ($w, $h, $changed);
681	$self->update;	785	$self->update
		786	if $changed;
682	}	787	}
683		788
684	sub _render {	789	sub _render {
685	$_[0]{children}[0]->draw;	790	$_[0]{children}[0]->draw;
686	}	791	}
…		…
691	$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 {
692	glClearColor 0, 0, 0, 0;	797	glClearColor 0, 0, 0, 0;
693	glClear GL_COLOR_BUFFER_BIT;	798	glClear GL_COLOR_BUFFER_BIT;
694		799
695	$self->_render;	800	$self->_render;
696	# glColorMask 1, 1, 1, 0;
697	# glEnable GL_BLEND;
698	# glBlendFunc GL_SRC_ALPHA, GL_ZERO;
699	# glRasterPos 0, 0;
700	# glCopyPixels 0, 0, $self->{w}, $self->{h};
701	# glDisable GL_BLEND;
702	# glColorMask 1, 1, 1, 1;
703	};	801	};
704	}	802	}
705		803
706	sub _draw {	804	sub _draw {
707	my ($self) = @_;	805	my ($self) = @_;
…		…
711	my $tex = $self->{texture}	809	my $tex = $self->{texture}
712	or return;	810	or return;
713		811
714	glEnable GL_TEXTURE_2D;	812	glEnable GL_TEXTURE_2D;
715	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	813	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
716	glColor 0, 0, 0, 1;	814	glColor 1, 1, 1, 1;
717		815
718	$tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);	816	$tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
719		817
720	glDisable GL_TEXTURE_2D;	818	glDisable GL_TEXTURE_2D;
721	}	819	}
…		…
724		822
725	package CFClient::UI::ViewPort;	823	package CFClient::UI::ViewPort;
726		824
727	our @ISA = CFClient::UI::Window::;	825	our @ISA = CFClient::UI::Window::;
728		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
729	sub size_request {	837	sub size_request {
730	my ($self) = @_;	838	my ($self) = @_;
731		839
732	@$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};	840	my ($w, $h) = @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};
733	$self->child->configure (0, 0, @$self{qw(child_w child_h)});
734		841
735	@$self{qw(child_w child_h)}	842	$w = 10 if $self->{scroll_x};
		843	$h = 10 if $self->{scroll_y};
		844
		845	($w, $h)
736	}	846	}
737		847
738	sub size_allocate {	848	sub size_allocate {
739	my ($self, $w, $h) = @_;	849	my ($self, $w, $h, $changed) = @_;
740		850
		851	$w = $self->{child_w} if $self->{scroll_x} && $self->{child_w};
		852	$h = $self->{child_h} if $self->{scroll_y} && $self->{child_h};
		853
		854	$self->child->configure (0, 0, $w, $h);
741	$self->update;	855	$self->update;
742	}	856	}
743		857
744	sub set_offset {	858	sub set_offset {
745	my ($self, $x, $y) = @_;	859	my ($self, $x, $y) = @_;
…		…
796	my $class = shift;	910	my $class = shift;
797		911
798	my $self;	912	my $self;
799		913
800	my $slider = new CFClient::UI::Slider	914	my $slider = new CFClient::UI::Slider
801	vertical => 1,	915	vertical => 1,
802	range => [0, 0, 1, 0.01], # HACK fix	916	range => [0, 0, 1, 0.01], # HACK fix
803	connect_changed => sub {	917	on_changed => sub {
804	$self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h}));	918	$self->{vp}->set_offset (0, $_[1]);
805	},	919	},
806	;	920	;
807		921
808	$self = $class->SUPER::new (	922	$self = $class->SUPER::new (
809	vp => (new CFClient::UI::ViewPort),	923	vp => (new CFClient::UI::ViewPort expand => 1),
810	slider => $slider,	924	slider => $slider,
811	@_,	925	@_,
812	);	926	);
813		927
814	$self->{vp}->add ($self->{scrolled});	928	$self->{vp}->add ($self->{scrolled});
815	$self->add ($self->{vp});	929	$self->add ($self->{vp});
816	$self->add ($self->{slider});	930	$self->add ($self->{slider});
817		931
818	$self	932	$self
		933	}
		934
		935	sub update {
		936	my ($self) = @_;
		937
		938	$self->SUPER::update;
		939
		940	# todo: overwrite size_allocate of child
		941	my $child = $self->{vp}->child;
		942	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
		943	}
		944
		945	sub size_allocate {
		946	my ($self, $w, $h, $changed) = @_;
		947
		948	$self->SUPER::size_allocate ($w, $h, $changed);
		949
		950	my $child = $self->{vp}->child;
		951	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
819	}	952	}
820		953
821	#TODO# update range on size_allocate depending on child	954	#TODO# update range on size_allocate depending on child
822	# update viewport offset on scroll	955	# update viewport offset on scroll
823		956
…		…
874	qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);	1007	qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
875		1008
876	sub new {	1009	sub new {
877	my $class = shift;	1010	my $class = shift;
878		1011
879	# TODO: user_x, user_y, overwrite moveto?
880
881	my $self = $class->SUPER::new (	1012	my $self = $class->SUPER::new (
882	bg => [1, 1, 1, 1],	1013	bg => [1, 1, 1, 1],
883	border_bg => [1, 1, 1, 1],	1014	border_bg => [1, 1, 1, 1],
884	border => 0.6,	1015	border => 0.6,
885	toplevel => 1,	1016	is_toplevel => 1,
886	can_events => 1,	1017	can_events => 1,
887	@_	1018	@_
888	);	1019	);
889		1020
890	$self->{title} &&= new CFClient::UI::Label	1021	$self->{title} &&= new CFClient::UI::Label
891	align => 0,	1022	align => 0,
…		…
910	$h + $self->border * 2,	1041	$h + $self->border * 2,
911	)	1042	)
912	}	1043	}
913		1044
914	sub size_allocate {	1045	sub size_allocate {
915	my ($self, $w, $h) = @_;	1046	my ($self, $w, $h, $changed) = @_;
		1047
		1048	return unless $changed;
916		1049
917	$h -= List::Util::max 0, $self->border * 2;	1050	$h -= List::Util::max 0, $self->border * 2;
918	$w -= List::Util::max 0, $self->border * 2;	1051	$w -= List::Util::max 0, $self->border * 2;
919		1052
920	$self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)	1053	$self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
…		…
944	my ($ev, $x, $y) = @_;	1077	my ($ev, $x, $y) = @_;
945		1078
946	my $dx = $ev->{x} - $ox;	1079	my $dx = $ev->{x} - $ox;
947	my $dy = $ev->{y} - $oy;	1080	my $dy = $ev->{y} - $oy;
948		1081
		1082	$self->{user_x} = $wx + $dx * $mx;
		1083	$self->{user_y} = $wy + $dy * $my;
949	$self->{user_w} = $bw + $dx * ($mx ? -1 : 1);	1084	$self->{def_w} = $bw + $dx * ($mx ? -1 : 1);
950	$self->{user_h} = $bh + $dy * ($my ? -1 : 1);	1085	$self->{def_h} = $bh + $dy * ($my ? -1 : 1);
951	$self->move ($wx + $dx * $mx, $wy + $dy * $my);	1086	$self->move ($self->{user_x}, $self->{user_y});
952	$self->check_size;	1087	$self->realloc;
953	};	1088	};
954		1089
955	} elsif ($lr ^ $td) {	1090	} elsif ($lr ^ $td) {
956	my ($ox, $oy) = ($ev->{x}, $ev->{y});	1091	my ($ox, $oy) = ($ev->{x}, $ev->{y});
957	my ($bx, $by) = ($self->{x}, $self->{y});	1092	my ($bx, $by) = ($self->{x}, $self->{y});
…		…
959	$self->{motion} = sub {	1094	$self->{motion} = sub {
960	my ($ev, $x, $y) = @_;	1095	my ($ev, $x, $y) = @_;
961		1096
962	($x, $y) = ($ev->{x}, $ev->{y});	1097	($x, $y) = ($ev->{x}, $ev->{y});
963		1098
964	$self->move ($bx + $x - $ox, $by + $y - $oy);	1099	$self->{user_x} = $bx + $x - $ox;
		1100	$self->{user_y} = $by + $y - $oy;
		1101
		1102	$self->move ($self->{user_x}, $self->{user_y});
965	$self->update;	1103	$self->realloc;
966	};	1104	};
967	}	1105	}
968	}	1106	}
969		1107
970	sub button_up {	1108	sub button_up {
…		…
1031	sub new {	1169	sub new {
1032	my $class = shift;	1170	my $class = shift;
1033		1171
1034	$class->SUPER::new (	1172	$class->SUPER::new (
1035	col_expand => [],	1173	col_expand => [],
1036	@_	1174	@_,
1037	)	1175	)
		1176	}
		1177
		1178	sub children {
		1179	grep $_, map @$_, grep $_, @{ $_[0]{children} }
1038	}	1180	}
1039		1181
1040	sub add {	1182	sub add {
1041	my ($self, $x, $y, $child) = @_;	1183	my ($self, $x, $y, $child) = @_;
1042		1184
1043	$child->set_parent ($self);	1185	$child->set_parent ($self);
1044	$self->{children}[$y][$x] = $child;	1186	$self->{children}[$y][$x] = $child;
1045		1187
1046	$child->check_size;	1188	$self->realloc;
1047	}	1189	}
1048		1190
1049	sub children {
1050	grep $_, map @$_, grep $_, @{ $_[0]{children} }
1051	}
1052
1053	# TODO: move to container class maybe? send childs a signal on removal?	1191	# TODO: move to container class maybe? send children a signal on removal?
1054	sub clear {	1192	sub clear {
1055	my ($self) = @_;	1193	my ($self) = @_;
1056		1194
1057	my @children = $self->children;	1195	my @children = $self->children;
1058	delete $self->{children};	1196	delete $self->{children};
…		…
1060	for (@children) {	1198	for (@children) {
1061	delete $_->{parent};	1199	delete $_->{parent};
1062	$_->hide;	1200	$_->hide;
1063	}	1201	}
1064		1202
1065	$self->update;	1203	$self->realloc;
1066	}	1204	}
1067		1205
1068	sub get_wh {	1206	sub get_wh {
1069	my ($self) = @_;	1207	my ($self) = @_;
1070		1208
…		…
1097	(sum @$hs),	1235	(sum @$hs),
1098	)	1236	)
1099	}	1237	}
1100		1238
1101	sub size_allocate {	1239	sub size_allocate {
1102	my ($self, $w, $h) = @_;	1240	my ($self, $w, $h, $changed) = @_;
1103		1241
1104	my ($ws, $hs) = $self->get_wh;	1242	my ($ws, $hs) = $self->get_wh;
1105		1243
1106	my $req_w = sum @$ws;	1244	my $req_w = (sum @$ws) || 1;
1107	my $req_h = sum @$hs;	1245	my $req_h = (sum @$hs) || 1;
1108		1246
1109	# TODO: nicer code && do row_expand	1247	# TODO: nicer code && do row_expand
1110	my @col_expand = @{$self->{col_expand}};	1248	my @col_expand = @{$self->{col_expand}};
1111	@col_expand = (1) x @$ws unless @col_expand;	1249	@col_expand = (1) x @$ws unless @col_expand;
1112	my $col_expand = (sum @col_expand) || 1;	1250	my $col_expand = (sum @col_expand) || 1;
…		…
1166	}	1304	}
1167	}	1305	}
1168		1306
1169	#############################################################################	1307	#############################################################################
1170		1308
		1309	package CFClient::UI::Box;
		1310
		1311	our @ISA = CFClient::UI::Container::;
		1312
		1313	sub size_request {
		1314	my ($self) = @_;
		1315
		1316	$self->{vertical}
		1317	? (
		1318	(List::Util::max map $_->{req_w}, @{$self->{children}}),
		1319	(List::Util::sum map $_->{req_h}, @{$self->{children}}),
		1320	)
		1321	: (
		1322	(List::Util::sum map $_->{req_w}, @{$self->{children}}),
		1323	(List::Util::max map $_->{req_h}, @{$self->{children}}),
		1324	)
		1325	}
		1326
		1327	sub size_allocate {
		1328	my ($self, $w, $h, $changed) = @_;
		1329
		1330	my $space = $self->{vertical} ? $h : $w;
		1331	my $children = $self->{children};
		1332
		1333	my @req;
		1334
		1335	if ($self->{homogeneous}) {
		1336	@req = ($space / (@$children || 1)) x @$children;
		1337	} else {
		1338	@req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children;
		1339	my $req = List::Util::sum @req;
		1340
		1341	if ($req > $space) {
		1342	# ah well, not enough space
		1343	$_ *= $space / $req for @req;
		1344	} else {
		1345	my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;
		1346
		1347	$space = ($space - $req) / $expand; # remaining space to give away
		1348
		1349	$req[$_] += $space * $children->[$_]{expand}
		1350	for 0 .. $#$children;
		1351	}
		1352	}
		1353
		1354	CFClient::UI::harmonize \@req;
		1355
		1356	my $pos = 0;
		1357	for (0 .. $#$children) {
		1358	my $alloc = $req[$_];
		1359	$children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
		1360
		1361	$pos += $alloc;
		1362	}
		1363
		1364	1
		1365	}
		1366
		1367	#############################################################################
		1368
1171	package CFClient::UI::HBox;	1369	package CFClient::UI::HBox;
1172		1370
1173	# TODO: wrap into common Box base class
1174
1175	our @ISA = CFClient::UI::Container::;	1371	our @ISA = CFClient::UI::Box::;
1176		1372
1177	sub size_request {	1373	sub new {
1178	my ($self) = @_;	1374	my $class = shift;
1179		1375
1180	my @alloc = map [$_->size_request], @{$self->{children}};	1376	$class->SUPER::new (
1181		1377	vertical => 0,
1182	(	1378	@_,
1183	(List::Util::sum map $_->[0], @alloc),
1184	(List::Util::max map $_->[1], @alloc),
1185	)	1379	)
1186	}	1380	}
1187		1381
1188	sub size_allocate {
1189	my ($self, $w, $h) = @_;
1190
1191	($h, $w) = ($w, $h);
1192
1193	my $children = $self->{children};
1194
1195	my @h = map $_->{req_w}, @$children;
1196
1197	my $req_h = List::Util::sum @h;
1198
1199	if ($req_h > $h) {
1200	# ah well, not enough space
1201	$_ *= $h / $req_h for @h;
1202	} else {
1203	my $exp = List::Util::sum map $_->{expand}, @$children;
1204	$exp ||= 1;
1205
1206	for (0 .. $#$children) {
1207	my $child = $children->[$_];
1208
1209	my $alloc_h = $h[$_];
1210	$alloc_h += ($h - $req_h) * $child->{expand} / $exp;
1211	$h[$_] = $alloc_h;
1212	}
1213	}
1214
1215	CFClient::UI::harmonize \@h;
1216
1217	my $y = 0;
1218	for (0 .. $#$children) {
1219	my $child = $children->[$_];
1220	my $h = $h[$_];
1221	$child->configure ($y, 0, $h, $w);
1222
1223	$y += $h;
1224	}
1225
1226	1
1227	}
1228
1229	#############################################################################	1382	#############################################################################
1230		1383
1231	package CFClient::UI::VBox;	1384	package CFClient::UI::VBox;
1232		1385
1233	# TODO: wrap into common Box base class
1234
1235	our @ISA = CFClient::UI::Container::;	1386	our @ISA = CFClient::UI::Box::;
1236		1387
1237	sub size_request {	1388	sub new {
1238	my ($self) = @_;	1389	my $class = shift;
1239		1390
1240	my @alloc = map [$_->size_request], @{$self->{children}};	1391	$class->SUPER::new (
1241		1392	vertical => 1,
1242	(	1393	@_,
1243	(List::Util::max map $_->[0], @alloc),
1244	(List::Util::sum map $_->[1], @alloc),
1245	)	1394	)
1246	}
1247
1248	sub size_allocate {
1249	my ($self, $w, $h) = @_;
1250
1251	Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1252
1253	my $children = $self->{children};
1254
1255	my @h = map $_->{req_h}, @$children;
1256
1257	my $req_h = List::Util::sum @h;
1258
1259	if ($req_h > $h) {
1260	# ah well, not enough space
1261	$_ *= $h / $req_h for @h;
1262	} else {
1263	my $exp = List::Util::sum map $_->{expand}, @$children;
1264	$exp ||= 1;
1265
1266	for (0 .. $#$children) {
1267	my $child = $children->[$_];
1268
1269	$h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1270	}
1271	}
1272
1273	CFClient::UI::harmonize \@h;
1274
1275	my $y = 0;
1276	for (0 .. $#$children) {
1277	my $child = $children->[$_];
1278	my $h = $h[$_];
1279	$child->configure (0, $y, $w, $h);
1280
1281	$y += $h;
1282	}
1283
1284	1
1285	}	1395	}
1286		1396
1287	#############################################################################	1397	#############################################################################
1288		1398
1289	package CFClient::UI::Label;	1399	package CFClient::UI::Label;
…		…
1352	$self->{text} = "T$text";	1462	$self->{text} = "T$text";
1353		1463
1354	$self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;	1464	$self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1355	$self->{layout}->set_text ($text);	1465	$self->{layout}->set_text ($text);
1356		1466
		1467	$self->realloc;
1357	$self->update;	1468	$self->update;
1358	$self->check_size;
1359	}	1469	}
1360		1470
1361	sub set_markup {	1471	sub set_markup {
1362	my ($self, $markup) = @_;	1472	my ($self, $markup) = @_;
1363		1473
…		…
1367	my $rgba = $markup =~ /span.*(?:foreground|background)/;	1477	my $rgba = $markup =~ /span.*(?:foreground|background)/;
1368		1478
1369	$self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;	1479	$self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1370	$self->{layout}->set_markup ($markup);	1480	$self->{layout}->set_markup ($markup);
1371		1481
		1482	$self->realloc;
1372	$self->update;	1483	$self->update;
1373	$self->check_size;
1374	}	1484	}
1375		1485
1376	sub size_request {	1486	sub size_request {
1377	my ($self) = @_;	1487	my ($self) = @_;
1378		1488
…		…
1399	$h + $self->{padding} * 2,	1509	$h + $self->{padding} * 2,
1400	)	1510	)
1401	}	1511	}
1402		1512
1403	sub size_allocate {	1513	sub size_allocate {
1404	my ($self, $w, $h) = @_;	1514	my ($self, $w, $h, $changed) = @_;
1405		1515
1406	delete $self->{texture};	1516	delete $self->{texture}
		1517	if $changed;
1407	}	1518	}
1408		1519
1409	sub set_fontsize {	1520	sub set_fontsize {
1410	my ($self, $fontsize) = @_;	1521	my ($self, $fontsize) = @_;
1411		1522
1412	$self->{fontsize} = $fontsize;	1523	$self->{fontsize} = $fontsize;
1413	delete $self->{texture};	1524	delete $self->{texture};
1414		1525
1415	$self->update;	1526	$self->realloc;
1416	$self->check_size;
1417	}	1527	}
1418		1528
1419	sub _draw {	1529	sub _draw {
1420	my ($self) = @_;	1530	my ($self) = @_;
1421		1531
…		…
1473	active_fg => [0, 0, 0],	1583	active_fg => [0, 0, 0],
1474	can_hover => 1,	1584	can_hover => 1,
1475	can_focus => 1,	1585	can_focus => 1,
1476	valign => 0,	1586	valign => 0,
1477	can_events => 1,	1587	can_events => 1,
		1588	#text => ...
1478	@_	1589	@_
1479	)	1590	)
1480	}	1591	}
1481		1592
1482	sub _set_text {	1593	sub _set_text {
…		…
1492	$self->{text} = $text;	1603	$self->{text} = $text;
1493		1604
1494	$text =~ s/./*/g if $self->{hidden};	1605	$text =~ s/./*/g if $self->{hidden};
1495	$self->{layout}->set_text ("$text ");	1606	$self->{layout}->set_text ("$text ");
1496		1607
1497	$self->emit (changed => $self->{text});	1608	$self->_emit (changed => $self->{text});
1498	}	1609	}
1499		1610
1500	sub set_text {	1611	sub set_text {
1501	my ($self, $text) = @_;	1612	my ($self, $text) = @_;
1502		1613
1503	$self->{cursor} = length $text;	1614	$self->{cursor} = length $text;
1504	$self->_set_text ($text);	1615	$self->_set_text ($text);
1505	$self->update;	1616
1506	$self->check_size;	1617	$self->realloc;
1507	}	1618	}
1508		1619
1509	sub get_text {	1620	sub get_text {
1510	$_[0]{text}	1621	$_[0]{text}
1511	}	1622	}
…		…
1514	my ($self) = @_;	1625	my ($self) = @_;
1515		1626
1516	my ($w, $h) = $self->SUPER::size_request;	1627	my ($w, $h) = $self->SUPER::size_request;
1517		1628
1518	($w + 1, $h) # add 1 for cursor	1629	($w + 1, $h) # add 1 for cursor
1519	}
1520
1521	sub size_allocate {
1522	my ($self, $w, $h) = @_;
1523
1524	$self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1525	}	1630	}
1526		1631
1527	sub key_down {	1632	sub key_down {
1528	my ($self, $ev) = @_;	1633	my ($self, $ev) = @_;
1529		1634
…		…
1544	} elsif ($sym == CFClient::SDLK_HOME) {	1649	} elsif ($sym == CFClient::SDLK_HOME) {
1545	$self->{cursor} = 0;	1650	$self->{cursor} = 0;
1546	} elsif ($sym == CFClient::SDLK_END) {	1651	} elsif ($sym == CFClient::SDLK_END) {
1547	$self->{cursor} = length $text;	1652	$self->{cursor} = length $text;
1548	} elsif ($uni == 27) {	1653	} elsif ($uni == 27) {
1549	$self->emit ('escape');	1654	$self->_emit ('escape');
1550	} elsif ($uni) {	1655	} elsif ($uni) {
1551	substr $text, $self->{cursor}++, 0, chr $uni;	1656	substr $text, $self->{cursor}++, 0, chr $uni;
1552	}	1657	}
1553		1658
1554	$self->_set_text ($text);	1659	$self->_set_text ($text);
1555	$self->update;	1660
1556	$self->check_size;	1661	$self->realloc;
1557	}	1662	}
1558		1663
1559	sub focus_in {	1664	sub focus_in {
1560	my ($self) = @_;	1665	my ($self) = @_;
1561		1666
…		…
1641	if ($sym == 13) {	1746	if ($sym == 13) {
1642	unshift @{$self->{history}},	1747	unshift @{$self->{history}},
1643	my $txt = $self->get_text;	1748	my $txt = $self->get_text;
1644	$self->{history_pointer} = -1;	1749	$self->{history_pointer} = -1;
1645	$self->{history_saveback} = '';	1750	$self->{history_saveback} = '';
1646	$self->emit (activate => $txt);	1751	$self->_emit (activate => $txt);
1647	$self->update;	1752	$self->update;
1648		1753
1649	} elsif ($sym == CFClient::SDLK_UP) {	1754	} elsif ($sym == CFClient::SDLK_UP) {
1650	if ($self->{history_pointer} < 0) {	1755	if ($self->{history_pointer} < 0) {
1651	$self->{history_saveback} = $self->get_text;	1756	$self->{history_saveback} = $self->get_text;
…		…
1699	can_events => 1,	1804	can_events => 1,
1700	@_	1805	@_
1701	)	1806	)
1702	}	1807	}
1703		1808
		1809	sub activate { }
		1810
1704	sub button_up {	1811	sub button_up {
1705	my ($self, $ev, $x, $y) = @_;	1812	my ($self, $ev, $x, $y) = @_;
1706		1813
		1814	$self->emit ("activate")
1707	if ($x >= 0 && $x < $self->{w}	1815	if $x >= 0 && $x < $self->{w}
1708	&& $y >= 0 && $y < $self->{h}) {	1816	&& $y >= 0 && $y < $self->{h};
1709	$self->emit ("activate");
1710	}
1711	}	1817	}
1712		1818
1713	sub _draw {	1819	sub _draw {
1714	my ($self) = @_;	1820	my ($self) = @_;
1715		1821
…		…
1767	my ($self, $ev, $x, $y) = @_;	1873	my ($self, $ev, $x, $y) = @_;
1768		1874
1769	if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}	1875	if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}
1770	&& $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {	1876	&& $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {
1771	$self->{state} = !$self->{state};	1877	$self->{state} = !$self->{state};
1772	$self->emit (changed => $self->{state});	1878	$self->_emit (changed => $self->{state});
1773	}	1879	}
1774	}	1880	}
1775		1881
1776	sub _draw {	1882	sub _draw {
1777	my ($self) = @_;	1883	my ($self) = @_;
…		…
2052	my $self = $class->SUPER::new (	2158	my $self = $class->SUPER::new (
2053	fg => [1, 1, 1],	2159	fg => [1, 1, 1],
2054	active_fg => [0, 0, 0],	2160	active_fg => [0, 0, 0],
2055	bg => [0, 0, 0, 0.2],	2161	bg => [0, 0, 0, 0.2],
2056	active_bg => [1, 1, 1, 0.5],	2162	active_bg => [1, 1, 1, 0.5],
2057	range => [0, 0, 100, 10],	2163	range => [0, 0, 100, 10, 0],
2058	req_w => $::WIDTH / 80,	2164	req_w => $::WIDTH / 80,
2059	req_h => $::WIDTH / 80,	2165	req_h => $::WIDTH / 80,
2060	vertical => 0,	2166	vertical => 0,
2061	can_hover => 1,	2167	can_hover => 1,
2062	inner_pad => .05,	2168	inner_pad => 0.02,
2063	@_	2169	@_
2064	);	2170	);
2065		2171
2066	$self->set_value ($self->{range}[0]);	2172	$self->set_value ($self->{range}[0]);
2067	$self->update;	2173	$self->update;
2068		2174
2069	$self	2175	$self
2070	}	2176	}
2071		2177
		2178	sub changed { }
		2179
		2180	sub set_range {
		2181	my ($self, $range) = @_;
		2182
		2183	($range, $self->{range}) = ($self->{range}, $range);
		2184
		2185	$self->update
		2186	if "@$range" ne "@{$self->{range}}";
		2187	}
		2188
2072	sub set_value {	2189	sub set_value {
2073	my ($self, $value) = @_;	2190	my ($self, $value) = @_;
2074		2191
2075	my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};	2192	my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
2076		2193
2077	$hi = $lo + 1 if $hi <= $lo;	2194	$hi = $lo + 1 if $hi <= $lo;
2078		2195
		2196	$page = $hi - $lo if $page > $hi - $lo;
		2197
2079	$value = $lo if $value < $lo;	2198	$value = $lo if $value < $lo;
2080	$value = $hi if $value > $hi;	2199	$value = $hi - $page if $value > $hi - $page;
2081		2200
2082	$value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit	2201	$value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
2083	if $unit;	2202	if $unit;
2084		2203
2085	$page = $hi - $lo if $page > $hi - $lo;
2086
2087	@{$self->{range}} = ($value, $lo, $hi, $page, $unit);	2204	@{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2088		2205
2089	if ($value != $old_value) {	2206	if ($value != $old_value) {
2090	$self->emit (changed => $value);	2207	$self->_emit (changed => $value);
2091	$self->update;	2208	$self->update;
2092	}	2209	}
2093	}	2210	}
2094		2211
2095	sub size_request {	2212	sub size_request {
…		…
2103		2220
2104	sub button_down {	2221	sub button_down {
2105	my ($self, $ev, $x, $y) = @_;	2222	my ($self, $ev, $x, $y) = @_;
2106		2223
2107	$self->SUPER::button_down ($ev, $x, $y);	2224	$self->SUPER::button_down ($ev, $x, $y);
		2225
		2226	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
		2227
2108	$self->mouse_motion ($ev, $x, $y);	2228	$self->mouse_motion ($ev, $x, $y);
2109	}	2229	}
2110		2230
2111	sub mouse_motion {	2231	sub mouse_motion {
2112	my ($self, $ev, $x, $y) = @_;	2232	my ($self, $ev, $x, $y) = @_;
…		…
2114	if ($GRAB == $self) {	2234	if ($GRAB == $self) {
2115	my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});	2235	my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2116		2236
2117	my (undef, $lo, $hi, $page) = @{$self->{range}};	2237	my (undef, $lo, $hi, $page) = @{$self->{range}};
2118		2238
2119	$x = $x / ($w * (1 - 2 * $self->{inner_pad})) - $self->{inner_pad};	2239	$x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2120		2240
2121	$self->set_value ($x * ($hi - $lo) + $lo);	2241	$self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2122	}	2242	}
2123	}	2243	}
2124		2244
2125	sub update {	2245	sub update {
2126	my ($self) = @_;	2246	my ($self) = @_;
2127		2247
2128	$CFClient::UI::ROOT->on_post_alloc ($self => sub {	2248	$CFClient::UI::ROOT->on_post_alloc ($self => sub {
2129	$self->set_value ($self->{range}[0]);	2249	$self->set_value ($self->{range}[0]);
2130		2250
2131	my ($value, $lo, $hi, $page) = @{$self->{range}};	2251	my ($value, $lo, $hi, $page) = @{$self->{range}};
		2252	my $range = ($hi - $page - $lo) || 1e-100;
2132		2253
2133	my $inner_w = 1 - 2 * $self->{inner_pad};	2254	my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
2134		2255
2135	$self->{scale} = ($inner_w / ($hi - $lo)) || 1;	2256	$self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
		2257	$self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
2136		2258
2137	$page = $self->{scale} * $page || 10 / ($self->{w} || 1);	2259	$value = ($value - $lo) / $range;
2138	$value = $self->{scale} * ($value - $lo);	2260	$value = $value * $self->{scale} + $self->{offset};
2139		2261
2140	$value = $self->{inner_pad} + ($value - $page * 0.5);
2141
2142	$value = 0 if $value < 0;
2143	$page = 1 - $value if $value + $page > 1;
2144
2145	$self->{knob_x} = $value;	2262	$self->{knob_x} = $value - $knob_w * 0.5;
2146	$self->{knob_w} = $page;	2263	$self->{knob_w} = $knob_w;
2147	});	2264	});
2148		2265
2149	$self->SUPER::update;	2266	$self->SUPER::update;
2150	}	2267	}
2151		2268
…		…
2175	# draw handle	2292	# draw handle
2176	$tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1);	2293	$tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1);
2177		2294
2178	glDisable GL_TEXTURE_2D;	2295	glDisable GL_TEXTURE_2D;
2179	}	2296	}
		2297
		2298	#############################################################################
		2299
		2300	package CFClient::UI::ValSlider;
		2301
		2302	our @ISA = CFClient::UI::HBox::;
		2303
		2304	sub new {
		2305	my ($class, %arg) = @_;
		2306
		2307	my $range = delete $arg{range};
		2308
		2309	my $self = $class->SUPER::new (
		2310	slider => (new CFClient::UI::Slider expand => 1, range => $range),
		2311	entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),
		2312	to_value => sub { shift },
		2313	from_value => sub { shift },
		2314	%arg,
		2315	);
		2316
		2317	$self->{slider}->connect (changed => sub {
		2318	my ($self, $value) = @_;
		2319	$self->{parent}{entry}->set_text ($self->{parent}{to_value}->($value));
		2320	$self->{parent}->emit (changed => $value);
		2321	});
		2322
		2323	# $self->{entry}->connect (changed => sub {
		2324	# my ($self, $value) = @_;
		2325	# $self->{parent}{slider}->set_value ($self->{parent}{from_value}->($value));
		2326	# $self->{parent}->emit (changed => $value);
		2327	# });
		2328
		2329	$self->add ($self->{slider}, $self->{entry});
		2330
		2331	$self->{slider}->emit (changed => $self->{slider}{range}[0]);
		2332
		2333	$self
		2334	}
		2335
		2336	sub set_range { shift->{slider}->set_range (@_) }
		2337	sub set_value { shift->{slider}->set_value (@_) }
2180		2338
2181	#############################################################################	2339	#############################################################################
2182		2340
2183	package CFClient::UI::TextView;	2341	package CFClient::UI::TextView;
2184		2342
…		…
2214		2372
2215	$self->{fontsize} = $fontsize;	2373	$self->{fontsize} = $fontsize;
2216	$self->reflow;	2374	$self->reflow;
2217	}	2375	}
2218		2376
2219	sub text_height {
2220	my ($self, $text) = @_;
2221
2222	my $layout = $self->{layout};
2223
2224	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
2225	$layout->set_width ($self->{children}[0]{w});
2226	$layout->set_markup ($text);
2227
2228	($layout->size)[1]
2229	}
2230
2231	sub reflow {
2232	my ($self) = @_;
2233
2234	$self->{need_reflow}++;
2235	$self->update;
2236	}
2237
2238	sub size_allocate {	2377	sub size_allocate {
2239	my ($self, $w, $h) = @_;	2378	my ($self, $w, $h, $changed) = @_;
2240		2379
2241	$self->SUPER::size_allocate ($w, $h);	2380	$self->SUPER::size_allocate ($w, $h, $changed);
		2381
		2382	return unless $changed;
2242		2383
2243	$self->{layout}->set_font ($self->{font}) if $self->{font};	2384	$self->{layout}->set_font ($self->{font}) if $self->{font};
2244	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	2385	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2245	$self->{layout}->set_width ($self->{children}[0]{w});	2386	$self->{layout}->set_width ($self->{children}[0]{w});
2246		2387
2247	$self->reflow;	2388	$self->reflow;
2248	}	2389	}
2249		2390
		2391	sub text_size {
		2392	my ($self, $text, $indent) = @_;
		2393
		2394	my $layout = $self->{layout};
		2395
		2396	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
		2397	$layout->set_width ($self->{children}[0]{w} - $indent);
		2398	$layout->set_markup ($text);
		2399
		2400	$layout->size
		2401	}
		2402
		2403	sub reflow {
		2404	my ($self) = @_;
		2405
		2406	$self->{need_reflow}++;
		2407	$self->update;
		2408	}
		2409
		2410	sub set_offset {
		2411	my ($self, $offset) = @_;
		2412
		2413	# todo: base offset on lines or so, not on pixels
		2414	$self->{children}[1]->set_value ($offset);
		2415	}
		2416
		2417	sub clear {
		2418	my ($self) = @_;
		2419
		2420	$self->{par} = [];
		2421	$self->{height} = 0;
		2422	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
		2423	}
		2424
2250	sub add_paragraph {	2425	sub add_paragraph {
2251	my ($self, $color, $text) = @_;	2426	my ($self, $color, $text, $indent) = @_;
2252		2427
2253	#TODO: intelligently "reformat" paragraph	2428	for my $line (split /\n/, $text) {
2254		2429	my ($w, $h) = $self->text_size ($line);
2255	my $height = $self->text_height ($text);
2256
2257	$self->{height} += $height;	2430	$self->{height} += $h;
		2431	push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];
		2432	}
2258		2433
2259	push @{$self->{par}}, [$height, $color, $text];
2260
2261	$self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}];	2434	$self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]);
2262	$self->{children}[1]->update;
2263	}	2435	}
2264		2436
2265	sub update {	2437	sub update {
2266	my ($self) = @_;	2438	my ($self) = @_;
2267		2439
…		…
2270	return unless $self->{h} > 0;	2442	return unless $self->{h} > 0;
2271		2443
2272	delete $self->{texture};	2444	delete $self->{texture};
2273		2445
2274	$ROOT->on_post_alloc ($self, sub {	2446	$ROOT->on_post_alloc ($self, sub {
		2447	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
		2448
2275	if (delete $self->{need_reflow}) {	2449	if (delete $self->{need_reflow}) {
2276	my $height = 0;	2450	my $height = 0;
2277		2451
2278	$height += $_->[0] = $self->text_height ($_->[2])	2452	my $layout = $self->{layout};
		2453
		2454	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
		2455
2279	for @{$self->{par}};	2456	for (@{$self->{par}}) {
		2457	if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
		2458	$layout->set_width ($W - $_->[3]);
		2459	$layout->set_markup ($_->[4]);
		2460	my ($w, $h) = $layout->size;
		2461	$_->[0] = $w + $_->[3];
		2462	$_->[1] = $h;
		2463	}
		2464
		2465	$height += $_->[1];
		2466	}
2280		2467
2281	$self->{height} = $height;	2468	$self->{height} = $height;
2282		2469
2283	$self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];	2470	$self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2284		2471
2285	delete $self->{texture};	2472	delete $self->{texture};
2286	}	2473	}
2287		2474
2288	$self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub {	2475	$self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2289	glClearColor 0, 0, 0, 0;	2476	glClearColor 0.5, 0.5, 0.5, 0;
2290	glClear GL_COLOR_BUFFER_BIT;	2477	glClear GL_COLOR_BUFFER_BIT;
2291		2478
2292	glEnable GL_TEXTURE_2D;
2293	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2294
2295	my $top = int $self->{children}[1]{range}[0];	2479	my $top = int $self->{children}[1]{range}[0];
2296		2480
2297	my $y0 = $top;	2481	my $y0 = $top;
2298	my $y1 = $top + $self->{h};	2482	my $y1 = $top + $H;
2299		2483
2300	my $y = 0;	2484	my $y = 0;
2301		2485
2302	my $layout = $self->{layout};	2486	my $layout = $self->{layout};
2303		2487
2304	$layout->set_font ($self->{font}) if $self->{font};	2488	$layout->set_font ($self->{font}) if $self->{font};
2305		2489
		2490	glEnable GL_BLEND;
		2491	#TODO# not correct in windows where rgba is forced off
		2492	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
		2493
2306	for my $par (@{$self->{par}}) {	2494	for my $par (@{$self->{par}}) {
2307	my $h = $par->[0];	2495	my $h = $par->[1];
2308		2496
2309	if ($y0 < $y + $h && $y < $y1) {	2497	if ($y0 < $y + $h && $y < $y1) {
2310	$layout->set_foreground (@{ $par->[1] });	2498	$layout->set_foreground (@{ $par->[2] });
		2499	$layout->set_width ($W - $par->[3]);
2311	$layout->set_markup ($par->[2]);	2500	$layout->set_markup ($par->[4]);
2312		2501
2313	my ($W, $H) = $layout->size;	2502	my ($w, $h, $data, $format, $internalformat) = $layout->render;
2314	CFClient::Texture->new_from_layout ($layout)->draw_quad_alpha_premultiplied (0, $y - $y0);	2503
		2504	glRasterPos $par->[3], $y - $y0;
		2505	glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2315	}	2506	}
2316		2507
2317	$y += $h;	2508	$y += $h;
2318	}	2509	}
2319		2510
2320	glDisable GL_TEXTURE_2D;	2511	glDisable GL_BLEND;
2321	};	2512	};
2322	});	2513	});
2323	}	2514	}
2324		2515
2325	sub _draw {	2516	sub _draw {
2326	my ($self) = @_;	2517	my ($self) = @_;
2327		2518
2328	glEnable GL_TEXTURE_2D;	2519	glEnable GL_TEXTURE_2D;
2329	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2520	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2330	glColor 1, 1, 1, 1;	2521	glColor 1, 1, 1, 1;
2331	$self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});	2522	$self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2332	glDisable GL_TEXTURE_2D;	2523	glDisable GL_TEXTURE_2D;
2333		2524
2334	$self->{children}[1]->draw;	2525	$self->{children}[1]->draw;
2335		2526
2336	}	2527	}
…		…
2385		2576
2386	sub new {	2577	sub new {
2387	my $class = shift;	2578	my $class = shift;
2388		2579
2389	my $self = $class->SUPER::new (	2580	my $self = $class->SUPER::new (
2390	state => 0,	2581	state => 0,
2391	connect_activate => \&toggle_flopper,	2582	on_activate => \&toggle_flopper,
2392	@_	2583	@_
2393	);	2584	);
2394		2585
2395	if ($self->{state}) {
2396	$self->{state} = 0;
2397	$self->toggle_flopper;
2398	}
2399
2400	$self	2586	$self
2401	}	2587	}
2402		2588
2403	sub toggle_flopper {	2589	sub toggle_flopper {
2404	my ($self) = @_;	2590	my ($self) = @_;
2405		2591
2406	# TODO: use animation	2592	$self->{other}->toggle_visibility;
2407	if ($self->{state} = !$self->{state}) {
2408	$CFClient::UI::ROOT->add ($self->{other});
2409	$self->{other}->move ($self->coord2global (0, $self->{h}));
2410	$self->emit ("open");
2411	} else {
2412	$CFClient::UI::ROOT->remove ($self->{other});
2413	$self->emit ("close");
2414	}
2415
2416	$self->emit (changed => $self->{state});
2417	}	2593	}
2418		2594
2419	#############################################################################	2595	#############################################################################
2420		2596
2421	package CFClient::UI::Tooltip;	2597	package CFClient::UI::Tooltip;
…		…
2453		2629
2454	($w + 4, $h + 4)	2630	($w + 4, $h + 4)
2455	}	2631	}
2456		2632
2457	sub size_allocate {	2633	sub size_allocate {
2458	my ($self, $w, $h) = @_;	2634	my ($self, $w, $h, $changed) = @_;
2459		2635
		2636	return unless $changed;
		2637
2460	$self->SUPER::size_allocate ($w - 4, $h - 4);	2638	$self->SUPER::size_allocate ($w - 4, $h - 4, $changed);
		2639	}
		2640
		2641	sub visibility_change {
		2642	my ($self, $visible) = @_;
		2643
		2644	return unless $visible;
		2645
		2646	$self->{root}->on_post_alloc ("move_$self" => sub {
		2647	my $widget = $self->{owner};
		2648
		2649	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
		2650
		2651	($x, $y) = $widget->coord2global (-$self->{w}, 0)
		2652	if $x + $self->{w} > $::WIDTH;
		2653
		2654	$self->move ($x, $y);
		2655	});
2461	}	2656	}
2462		2657
2463	sub _draw {	2658	sub _draw {
2464	my ($self) = @_;	2659	my ($self) = @_;
2465		2660
…		…
2482	glVertex $w, $h;	2677	glVertex $w, $h;
2483	glVertex $w, 0;	2678	glVertex $w, 0;
2484	glEnd;	2679	glEnd;
2485		2680
2486	glTranslate 2 - 0.375, 2 - 0.375;	2681	glTranslate 2 - 0.375, 2 - 0.375;
		2682
2487	$self->SUPER::_draw;	2683	$self->SUPER::_draw;
2488	}	2684	}
2489		2685
2490	#############################################################################	2686	#############################################################################
2491		2687
…		…
2496	use CFClient::OpenGL;	2692	use CFClient::OpenGL;
2497		2693
2498	sub new {	2694	sub new {
2499	my $class = shift;	2695	my $class = shift;
2500		2696
2501	$class->SUPER::new (	2697	my $self = $class->SUPER::new (
2502	aspect => 1,	2698	aspect => 1,
		2699	can_events => 0,
2503	@_,	2700	@_,
2504	)	2701	);
		2702
		2703	if ($self->{anim} && $self->{animspeed}) {
		2704	Scalar::Util::weaken (my $widget = $self);
		2705
		2706	$self->{timer} = Event->timer (
		2707	at => $self->{animspeed} * int $::NOW / $self->{animspeed},
		2708	hard => 1,
		2709	interval => $self->{animspeed},
		2710	cb => sub {
		2711	++$widget->{frame};
		2712	$widget->update;
		2713	},
		2714	);
		2715	}
		2716
		2717	$self
2505	}	2718	}
2506		2719
2507	sub size_request {	2720	sub size_request {
2508	(32, 8)	2721	(32, 8)
2509	}	2722	}
2510		2723
		2724	sub update {
		2725	my ($self) = @_;
		2726
		2727	return unless $self->{visible};
		2728
		2729	$self->SUPER::update;
		2730	}
		2731
2511	sub _draw {	2732	sub _draw {
2512	my ($self) = @_;	2733	my ($self) = @_;
2513		2734
2514	return unless $::CONN;#d# manage and cache textures differently	2735	return unless $::CONN;
		2736
		2737	my $face;
		2738
		2739	if ($self->{frame}) {
		2740	my $anim = $::CONN->{anim}[$self->{anim}];
		2741
		2742	$face = $anim->[ $self->{frame} % @$anim ]
		2743	if $anim && @$anim;
		2744	}
		2745
2515	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]];	2746	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2516		2747
2517	# TODO animation
2518	if ($tex) {	2748	if ($tex) {
2519	glEnable GL_TEXTURE_2D;	2749	glEnable GL_TEXTURE_2D;
2520	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2750	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2521	glColor 1, 1, 1, 1;	2751	glColor 1, 1, 1, 1;
2522	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});	2752	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2523	glDisable GL_TEXTURE_2D;	2753	glDisable GL_TEXTURE_2D;
2524	}	2754	}
2525	}	2755	}
2526		2756
2527	#############################################################################	2757	sub DESTROY {
		2758	my ($self) = @_;
2528		2759
		2760	$self->{timer}->cancel
		2761	if $self->{timer};
		2762
		2763	$self->SUPER::DESTROY;
		2764	}
		2765
		2766	#############################################################################
		2767
2529	package CFClient::UI::InventoryItem;	2768	package CFClient::UI::Inventory;
2530		2769
2531	our @ISA = CFClient::UI::HBox::;	2770	our @ISA = CFClient::UI::ScrolledWindow::;
2532
2533	sub _item_to_desc {
2534	my ($item) = @_;
2535
2536	my $desc =
2537	$item->{nrof} < 2
2538	? $item->{name}
2539	: "$item->{nrof} $item->{name_pl}";
2540
2541	$item->{flags} & Crossfire::Protocol::F_OPEN
2542	and $desc .= " (open)";
2543	$item->{flags} & Crossfire::Protocol::F_APPLIED
2544	and $desc .= " (applied)";
2545	$item->{flags} & Crossfire::Protocol::F_UNPAID
2546	and $desc .= " (unpaid)";
2547	$item->{flags} & Crossfire::Protocol::F_MAGIC
2548	and $desc .= " (magic)";
2549	$item->{flags} & Crossfire::Protocol::F_CURSED
2550	and $desc .= " (cursed)";
2551	$item->{flags} & Crossfire::Protocol::F_DAMNED
2552	and $desc .= " (damned)";
2553	$item->{flags} & Crossfire::Protocol::F_LOCKED
2554	and $desc .= " *";
2555
2556	$desc
2557	}
2558		2771
2559	sub new {	2772	sub new {
2560	my $class = shift;	2773	my $class = shift;
2561		2774
2562	my %args = @_;
2563
2564	my $item = delete $args{item};
2565
2566	my $desc = _item_to_desc ($item);
2567
2568	my $self = $class->SUPER::new (	2775	my $self = $class->SUPER::new (
2569	can_hover => 1,	2776	scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2570	can_events => 1,
2571	tooltip => ((CFClient::UI::Label::escape $desc)
2572	. "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),
2573	connect_button_down => sub {
2574	my ($self, $ev, $x, $y) = @_;
2575
2576	# todo: maybe put examine on 1? but should just be a tooltip :(
2577	if ($ev->{button} == 1) {
2578	my $targ = $::CONN->{player}{tag};
2579
2580	if ($item->{container} == $::CONN->{player}{tag}) {
2581	$targ = $main::OPENCONT;
2582	}
2583
2584	$::CONN->send ("move $targ $item->{tag} 0");
2585	} elsif ($ev->{button} == 2) {
2586	$::CONN->send ("apply $item->{tag}");
2587	} elsif ($ev->{button} == 3) {
2588	my @menu_items = (
2589	["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2590	["mark", sub { $::CONN->send ("mark $item->{tag}") }],
2591	["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2592	["drop", sub { $::CONN->send ("move $main::OPENCONT $item->{tag} 0") }],
2593	[
2594	$item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock",
2595	sub { $::CONN->send ("lock $item->{tag}") },
2596	],
2597	);
2598
2599	CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
2600	}
2601
2602	1
2603	},
2604	%args
2605	);
2606
2607
2608	$self->add (new CFClient::UI::Face
2609	can_events => 0,
2610	face => $item->{face},
2611	anim => $item->{anim},
2612	animspeed => $item->{animspeed},
2613	);
2614
2615	$self->add ($self->{name_lbl} = new CFClient::UI::Label can_events => 0);
2616
2617	$self->{item} = $item;
2618
2619	$self->update_item;
2620
2621	$self
2622	}
2623
2624	sub update_item {
2625	my ($self) = @_;
2626
2627	my $desc = _item_to_desc ($self->{item});
2628
2629	$self->{name_lbl}->set_text ($desc);
2630	}
2631
2632	#############################################################################
2633
2634	package CFClient::UI::Inventory;
2635
2636	our @ISA = CFClient::UI::ScrolledWindow::;
2637
2638	sub new {
2639	my $class = shift;
2640
2641	my $self = $class->SUPER::new (
2642	scrolled => (new CFClient::UI::VBox),
2643	@_,	2777	@_,
2644	);	2778	);
2645		2779
2646	$self	2780	$self
2647	}	2781	}
…		…
2657	or ($a->{name} cmp $b->{name})	2791	or ($a->{name} cmp $b->{name})
2658	} @$items;	2792	} @$items;
2659		2793
2660	$self->{real_items} = \@items;	2794	$self->{real_items} = \@items;
2661		2795
		2796	my $row = 0;
2662	for my $item (@items) {	2797	for my $item (@items) {
2663	$item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item;	2798	CFClient::Item::update_widgets $item;
2664	$item->update_item ();
2665	}
2666		2799
2667	$self->{scrolled}->add (@items);	2800	$self->{scrolled}->add (0, $row, $item->{face_widget});
		2801	$self->{scrolled}->add (1, $row, $item->{desc_widget});
		2802	$self->{scrolled}->add (2, $row, $item->{weight_widget});
2668		2803
2669	# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];	2804	$row++;
2670	}	2805	}
2671
2672	sub size_request {
2673	my ($self) = @_;
2674	($self->{req_w}, $self->{req_h});
2675	}	2806	}
2676		2807
2677	#############################################################################	2808	#############################################################################
2678		2809
2679	package CFClient::UI::Menu;	2810	package CFClient::UI::Menu;
…		…
2714		2845
2715	# popup given the event (must be a mouse button down event currently)	2846	# popup given the event (must be a mouse button down event currently)
2716	sub popup {	2847	sub popup {
2717	my ($self, $ev) = @_;	2848	my ($self, $ev) = @_;
2718		2849
2719	$self->emit ("popdown");	2850	$self->_emit ("popdown");
2720		2851
2721	# maybe save $GRAB? must be careful about events...	2852	# maybe save $GRAB? must be careful about events...
2722	$GRAB = $self;	2853	$GRAB = $self;
2723	$self->{button} = $ev->{button};	2854	$self->{button} = $ev->{button};
2724		2855
…		…
2739		2870
2740	if ($ev->{button} == $self->{button}) {	2871	if ($ev->{button} == $self->{button}) {
2741	undef $GRAB;	2872	undef $GRAB;
2742	$self->hide;	2873	$self->hide;
2743		2874
2744	$self->emit ("popdown");	2875	$self->_emit ("popdown");
2745	$self->{hover}[1]->() if $self->{hover};	2876	$self->{hover}[1]->() if $self->{hover};
2746	}	2877	}
2747	}	2878	}
2748		2879
2749	#############################################################################	2880	#############################################################################
…		…
2811	sub add {	2942	sub add {
2812	my ($self, $text, %arg) = @_;	2943	my ($self, $text, %arg) = @_;
2813		2944
2814	$text =~ s/^\s+//;	2945	$text =~ s/^\s+//;
2815	$text =~ s/\s+$//;	2946	$text =~ s/\s+$//;
		2947
		2948	return unless $text;
2816		2949
2817	my $timeout = time + ((delete $arg{timeout}) || 60);	2950	my $timeout = time + ((delete $arg{timeout}) || 60);
2818		2951
2819	my $group = exists $arg{group} ? $arg{group} : ++$self->{id};	2952	my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2820		2953
…		…
2863	use CFClient::OpenGL;	2996	use CFClient::OpenGL;
2864		2997
2865	sub new {	2998	sub new {
2866	my $class = shift;	2999	my $class = shift;
2867		3000
2868	$class->SUPER::new (	3001	my $self = $class->SUPER::new (
		3002	visible => 1,
2869	@_,	3003	@_,
2870	)	3004	);
		3005
		3006	Scalar::Util::weaken ($self->{root} = $self);
		3007
		3008	$self
2871	}	3009	}
2872		3010
2873	sub configure {	3011	sub configure {
2874	my ($self, $x, $y, $w, $h) = @_;	3012	my ($self, $x, $y, $w, $h) = @_;
2875		3013
2876	$self->{w} = $w;	3014	$self->{w} = $w;
2877	$self->{h} = $h;	3015	$self->{h} = $h;
2878	}	3016	}
2879		3017
2880	sub check_size {	3018	sub reconfigure {
2881	my ($self) = @_;	3019	my ($self) = @_;
2882		3020
		3021	$self->SUPER::reconfigure;
		3022
2883	$self->size_allocate ($self->{w}, $self->{h})	3023	$self->size_allocate ($self->{w}, $self->{h}, 1)
2884	if $self->{w};	3024	if $self->{w};
2885	}	3025	}
2886		3026
2887	sub size_request {	3027	sub size_request {
2888	my ($self) = @_;	3028	my ($self) = @_;
2889		3029
2890	($self->{w}, $self->{h})	3030	($self->{w}, $self->{h})
2891	}	3031	}
2892		3032
2893	sub size_allocate {	3033	sub size_allocate {
2894	my ($self, $w, $h) = @_;	3034	my ($self, $w, $h, $changed) = @_;
2895
2896	my $old_w = $self->{old_w}; $self->{old_w} = $w;
2897	my $old_h = $self->{old_h}; $self->{old_h} = $h;
2898
2899	CFClient::UI::rescale_widgets $w / $old_w, $h / $old_h
2900	if $old_w && $old_h && ($old_w != $w || $old_h != $h);
2901		3035
2902	for my $child ($self->children) {	3036	for my $child ($self->children) {
2903	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};	3037	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2904		3038
2905	$X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1	3039	$X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1
2906	if exists $child->{req_x};	3040	if exists $child->{req_x};
2907		3041
2908	$Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1	3042	$Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1
2909	if exists $child->{req_y};	3043	if exists $child->{req_y};
2910		3044
		3045	#delete @$child{qw(req_x req_y)};#d# def_x, def_y
		3046
2911	$X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;	3047	$X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
2912	$Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;	3048	$Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
2913		3049
2914	$child->configure ($X, $Y, $W, $H);	3050	$child->configure ($X, $Y, $W, $H);
2915	}	3051	}
…		…
2928	}	3064	}
2929		3065
2930	sub update {	3066	sub update {
2931	my ($self) = @_;	3067	my ($self) = @_;
2932		3068
2933	$self->check_size;
2934	$::WANT_REFRESH++;	3069	$::WANT_REFRESH++;
2935	}	3070	}
2936		3071
2937	sub add {	3072	sub add {
2938	my ($self, @children) = @_;	3073	my ($self, @children) = @_;
2939		3074
2940	for my $child (@children) {	3075	for my $child (@children) {
2941	$child->{toplevel} = 1;	3076	$child->{is_toplevel} = 1;
2942		3077
2943	# integerise window positions	3078	# integerise window positions
2944	$child->{x} = int $child->{x};	3079	$child->{x} = int $child->{x};
2945	$child->{y} = int $child->{y};	3080	$child->{y} = int $child->{y};
2946	}	3081	}
2947		3082
2948	$self->SUPER::add (@children);	3083	$self->SUPER::add (@children);
2949	}	3084	}
2950		3085
		3086	sub remove {
		3087	my ($self, @children) = @_;
		3088
		3089	$self->SUPER::remove (@children);
		3090
		3091	while (@children) {
		3092	my $w = pop @children;
		3093	push @children, $w->children;
		3094	$w->set_invisible;
		3095	}
		3096	}
		3097
2951	sub on_refresh {	3098	sub on_refresh {
2952	my ($self, $id, $cb) = @_;	3099	my ($self, $id, $cb) = @_;
2953		3100
2954	$self->{refresh_hook}{$id} = $cb;	3101	$self->{refresh_hook}{$id} = $cb;
2955	}	3102	}
…		…
2966	while ($self->{refresh_hook}) {	3113	while ($self->{refresh_hook}) {
2967	$_->()	3114	$_->()
2968	for values %{delete $self->{refresh_hook}};	3115	for values %{delete $self->{refresh_hook}};
2969	}	3116	}
2970		3117
2971	if ($self->{check_size}) {	3118	if ($self->{realloc}) {
2972	my @queue = ([], []);	3119	my @queue;
2973		3120
2974	for (;;) {	3121	while () {
2975	if ($self->{check_size}) {	3122	if ($self->{realloc}) {
2976	# heuristic: check containers last	3123	#TODO use array-of-depth approach
2977	push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_	3124
2978	for values %{delete $self->{check_size}}	3125	@queue = sort { $a->{visible} <=> $b->{visible} }
		3126	@queue, values %{delete $self->{realloc}};
2979	}	3127	}
2980		3128
2981	my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last;	3129	my $widget = pop @queue || last;
2982		3130
		3131	$widget->{visible} or last; # do not resize invisible widgets
		3132
2983	my ($w, $h) = $widget->{user_w} && $widget->{user_h}	3133	my ($w, $h) = $widget->{def_w} && $widget->{def_h}
2984	? @$widget{qw(user_w user_h)}	3134	? @$widget{qw(def_w def_h)}
2985	: $widget->size_request;	3135	: $widget->size_request;
2986		3136
2987	if (delete $widget->{force_alloc}
2988	or $w != $widget->{req_w} or $h != $widget->{req_h}) {
2989	Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#	3137	Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
2990		3138
2991	$widget->{req_w} = $w;	3139	$widget->{req_w} = $w;
2992	$widget->{req_h} = $h;	3140	$widget->{req_h} = $h;
2993		3141
2994	$self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h];	3142	$self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h];
2995		3143
2996	$widget->{parent}->check_size	3144	push @queue, $widget->{parent}
2997	if $widget->{parent};	3145	if $widget->{parent};
2998	}
2999	}	3146	}
3000	}	3147	}
3001		3148
3002	while ($self->{size_alloc}) {	3149	while (my $size_alloc = delete $self->{size_alloc}) {
3003	for (values %{delete $self->{size_alloc}}) {	3150	my @queue = sort $b->[0]{visible} <=> $a->[0]{visible},
3004	my ($widget, $w, $h) = @$_;	3151	values %$size_alloc;
		3152
		3153	while () {
		3154	my ($widget, $w, $h) = @{ pop @queue or last };
3005		3155
3006	$w = 0 if $w < 0;	3156	$w = 0 if $w < 0;
3007	$h = 0 if $h < 0;	3157	$h = 0 if $h < 0;
3008		3158
		3159	my $changed = $widget->{w} != $w || $widget->{h} != $h;
		3160
3009	$widget->{w} = $w;	3161	$widget->{w} = $w;
3010	$widget->{h} = $h;	3162	$widget->{h} = $h;
3011	$widget->size_allocate ($w, $h);	3163
3012	$widget->emit (size_allocate => $w, $h);	3164	$widget->emit (size_allocate => $w, $h, $changed);
3013	}	3165	}
3014	}	3166	}
3015		3167
3016	while ($self->{post_alloc_hook}) {	3168	while ($self->{post_alloc_hook}) {
3017	$_->()	3169	$_->()
…		…
3022	glClearColor +($::CFG->{fow_intensity}) x 3, 1;	3174	glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3023	glClear GL_COLOR_BUFFER_BIT;	3175	glClear GL_COLOR_BUFFER_BIT;
3024		3176
3025	glMatrixMode GL_PROJECTION;	3177	glMatrixMode GL_PROJECTION;
3026	glLoadIdentity;	3178	glLoadIdentity;
3027	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000;	3179	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3028	glMatrixMode GL_MODELVIEW;	3180	glMatrixMode GL_MODELVIEW;
3029	glLoadIdentity;	3181	glLoadIdentity;
3030		3182
3031	$self->_draw;	3183	$self->_draw;
3032	}	3184	}

Diff Legend

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