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.123 by root, Mon Apr 17 19:50:22 2006 UTC vs.
Revision 1.185 by root, Mon May 8 17:23:08 2006 UTC

…		…
8	use CFClient;	8	use CFClient;
9		9
10	our ($FOCUS, $HOVER, $GRAB); # various widgets	10	our ($FOCUS, $HOVER, $GRAB); # various widgets
11		11
12	our $ROOT;	12	our $ROOT;
		13	our $TOOLTIP;
13	our $BUTTON_STATE;	14	our $BUTTON_STATE;
		15
		16	sub check_tooltip {
		17	if (!$GRAB) {
		18	for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
		19	if (length $widget->{tooltip}) {
		20
		21	if ($TOOLTIP->{owner} != $widget) {
		22	$TOOLTIP->{owner} = $widget;
		23
		24	my $tip = $widget->{tooltip};
		25
		26	$tip = $tip->($widget) if CODE:: eq ref $tip;
		27
		28	$TOOLTIP->set_markup ($widget->{tooltip});
		29
		30	$TOOLTIP->show;
		31
		32	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
		33
		34	if ($x + $TOOLTIP->{w} > $::WIDTH) {
		35	($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0);
		36	}
		37
		38	$TOOLTIP->move ($x, $y);
		39	}
		40
		41	return;
		42	}
		43	}
		44	}
		45
		46	$TOOLTIP->hide;
		47	delete $TOOLTIP->{owner};
		48	}
14		49
15	# class methods for events	50	# class methods for events
16	sub feed_sdl_key_down_event {	51	sub feed_sdl_key_down_event {
17	$FOCUS->key_down ($_[0]) if $FOCUS;	52	$FOCUS->emit (key_down => $_[0]) || $FOCUS->key_down ($_[0])
		53	if $FOCUS;
18	}	54	}
19		55
20	sub feed_sdl_key_up_event {	56	sub feed_sdl_key_up_event {
21	$FOCUS->key_up ($_[0]) if $FOCUS;	57	$FOCUS->emit (key_up => $_[0]) || $FOCUS->key_up ($_[0])
		58	if $FOCUS;
22	}	59	}
23		60
24	sub feed_sdl_button_down_event {	61	sub feed_sdl_button_down_event {
25	my ($ev) = @_;	62	my ($ev) = @_;
26	my ($x, $y) = ($ev->motion_x, $ev->motion_y);	63	my ($x, $y) = ($ev->{x}, $ev->{y});
27		64
28	if (!$BUTTON_STATE) {	65	if (!$BUTTON_STATE) {
29	my $widget = $ROOT->find_widget ($x, $y);	66	my $widget = $ROOT->find_widget ($x, $y);
30		67
31	$GRAB = $widget;	68	$GRAB = $widget;
32	$GRAB->update if $GRAB;	69	$GRAB->update if $GRAB;
33	}
34		70
		71	check_tooltip;
		72	}
		73
35	$BUTTON_STATE |= 1 << ($ev->button - 1);	74	$BUTTON_STATE |= 1 << ($ev->{button} - 1);
36		75
37	$GRAB->button_down ($ev, $GRAB->coord2local ($x, $y)) if $GRAB;	76	if ($GRAB) {
		77	($x, $y) = $GRAB->coord2local ($x, $y);
		78	$GRAB->emit (button_down => $ev, $x, $y) || $GRAB->button_down ($ev, $x, $y);
		79	}
38	}	80	}
39		81
40	sub feed_sdl_button_up_event {	82	sub feed_sdl_button_up_event {
41	my ($ev) = @_;	83	my ($ev) = @_;
42	my ($x, $y) = ($ev->motion_x, $ev->motion_y);	84	my ($x, $y) = ($ev->{x}, $ev->{y});
43		85
44	my $widget = $GRAB || $ROOT->find_widget ($x, $y);	86	my $widget = $GRAB || $ROOT->find_widget ($x, $y);
45		87
46	$BUTTON_STATE &= ~(1 << ($ev->button - 1));	88	$BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
47		89
48	$GRAB->button_up ($ev, $GRAB->coord2local ($x, $y)) if $GRAB;	90	if ($GRAB) {
		91	($x, $y) = $GRAB->coord2local ($x, $y);
		92	$GRAB->emit (button_up => $ev, $x, $y) || $GRAB->button_up ($ev, $x, $y);
		93	}
49		94
50	if (!$BUTTON_STATE) {	95	if (!$BUTTON_STATE) {
51	my $grab = $GRAB; undef $GRAB;	96	my $grab = $GRAB; undef $GRAB;
52	$grab->update if $grab;	97	$grab->update if $grab;
53	$GRAB->update if $GRAB;	98	$GRAB->update if $GRAB;
		99
		100	check_tooltip;
54	}	101	}
55	}	102	}
56		103
57	sub feed_sdl_motion_event {	104	sub feed_sdl_motion_event {
58	my ($ev) = @_;	105	my ($ev) = @_;
59	my ($x, $y) = ($ev->motion_x, $ev->motion_y);	106	my ($x, $y) = ($ev->{x}, $ev->{y});
60		107
61	my $widget = $GRAB || $ROOT->find_widget ($x, $y);	108	my $widget = $GRAB || $ROOT->find_widget ($x, $y);
62		109
63	if ($widget != $HOVER) {	110	if ($widget != $HOVER) {
64	my $hover = $HOVER; $HOVER = $widget;	111	my $hover = $HOVER; $HOVER = $widget;
65		112
66	$hover->update if $hover && $hover->{can_hover};	113	$hover->update if $hover && $hover->{can_hover};
67	$HOVER->update if $HOVER && $HOVER->{can_hover};	114	$HOVER->update if $HOVER && $HOVER->{can_hover};
68	}
69		115
70	$HOVER->mouse_motion ($ev, $HOVER->coord2local ($x, $y)) if $HOVER;	116	check_tooltip;
		117	}
		118
		119	if ($HOVER) {
		120	($x, $y) = $HOVER->coord2local ($x, $y);
		121	$HOVER->emit (mouse_motion => $ev, $x, $y) || $HOVER->mouse_motion ($ev, $x, $y);
		122	}
71	}	123	}
72		124
73	# convert position array to integers	125	# convert position array to integers
74	sub harmonize {	126	sub harmonize {
75	my ($vals) = @_;	127	my ($vals) = @_;
…		…
87		139
88	package CFClient::UI::Base;	140	package CFClient::UI::Base;
89		141
90	use strict;	142	use strict;
91		143
92	use SDL::OpenGL;	144	use CFClient::OpenGL;
93		145
94	sub new {	146	sub new {
95	my $class = shift;	147	my $class = shift;
96		148
97	my $self = bless {	149	my $self = bless {
98	x => 0,	150	x => 0,
99	y => 0,	151	y => 0,
100	z => 0,	152	z => 0,
101	w => -1,	153	can_events => 1,
102	h => -1,
103	@_	154	@_
104	}, $class;	155	}, $class;
105		156
106	for (keys %$self) {	157	for (keys %$self) {
107	if (/^connect_(.*)$/) {	158	if (/^connect_(.*)$/) {
…		…
110	}	161	}
111		162
112	$self	163	$self
113	}	164	}
114		165
		166	sub destroy {
		167	my ($self) = @_;
		168
		169	$self->hide;
		170	%$self = ();
		171	}
		172
		173	sub show {
		174	my ($self) = @_;
		175
		176	return if $self->{parent};
		177
		178	$CFClient::UI::ROOT->add ($self);
		179	}
		180
		181	sub hide {
		182	my ($self) = @_;
		183
		184	undef $GRAB if $GRAB == $self;
		185	undef $HOVER if $HOVER == $self;
		186
		187	$self->{parent}->remove ($self)
		188	if $self->{parent};
		189	}
		190
115	sub move {	191	sub move {
116	my ($self, $x, $y, $z) = @_;	192	my ($self, $x, $y, $z) = @_;
		193
117	$self->{x} = int $x;	194	$self->{x} = int $x;
118	$self->{y} = int $y;	195	$self->{y} = int $y;
119	$self->{z} = $z if defined $z;	196	$self->{z} = $z if defined $z;
120	}
121		197
122	sub needs_redraw {	198	$self->update;
123	0	199	}
		200
		201	sub set_size {
		202	my ($self, $w, $h) = @_;
		203
		204	$self->{user_w} = $w;
		205	$self->{user_h} = $h;
		206
		207	$self->check_size;
124	}	208	}
125		209
126	sub size_request {	210	sub size_request {
127	require Carp;	211	require Carp;
128	Carp::confess "size_request is abtract";	212	Carp::confess "size_request is abstract";
129	}	213	}
130		214
131	sub _size_allocate {	215	sub configure {
132	my ($self, $x, $y, $w, $h) = @_;	216	my ($self, $x, $y, $w, $h) = @_;
133		217
		218	if ($self->{aspect}) {
		219	my $w2 = List::Util::min $w, int $h * $self->{aspect};
		220	my $h2 = List::Util::min $h, int $w / $self->{aspect};
		221
		222	# use alignment to adjust x, y
		223
		224	$x += int +($w - $w2) * 0.5;
		225	$y += int +($h - $h2) * 0.5;
		226
		227	($w, $h) = ($w2, $h2);
		228	}
		229
		230	if ($self->{x} != $x || $self->{y} != $y) {
134	$self->{x} = $x;	231	$self->{x} = $x;
135	$self->{y} = $y;	232	$self->{y} = $y;
		233	$self->update;
		234	}
136		235
137	return unless $self->{w} != $w || $self->{h} != $h;	236	if ($self->{w} != $w || $self->{h} != $h) {
138
139	$self->{w} = $w;	237	$self->{w} = $w;
140	$self->{h} = $h;	238	$self->{h} = $h;
141		239
		240	$self->size_allocate ($w, $h);
		241	$self->update;
		242	$self->emit (size_allocate => $w, $h);
142	1	243	}
143	}	244	}
144		245
145	sub size_allocate {	246	sub size_allocate {
		247	# nothing to be done
		248	}
		249
		250	sub children {
		251	}
		252
		253	# call when resolution changes etc.
		254	sub reconfigure {
		255	my ($self) = @_;
		256
		257	$_->reconfigure
		258	for $self->children;
		259
		260	$_->check_size;
		261	}
		262
		263	sub set_max_size {
146	my ($self, $x, $y, $w, $h) = @_;	264	my ($self, $w, $h) = @_;
147		265
148	$self->_size_allocate ($x, $y, $w, $h);	266	delete $self->{max_w}; $self->{max_w} = $w if $w;
		267	delete $self->{max_h}; $self->{max_h} = $h if $h;
149	}	268	}
150		269
151	# return top left coordinates	270	# return top left coordinates
152	sub _topleft {	271	sub _topleft {
153	my ($self, $x, $y) = @_;	272	my ($self, $x, $y) = @_;
		273
		274	$self->{parent}
		275	or Carp::confess "no parent widget in _topleft\n";#d#
154		276
155	$self->{parent}->_topleft ($x + $self->{x}, $y + $self->{y});	277	$self->{parent}->_topleft ($x + $self->{x}, $y + $self->{y});
156	}	278	}
157		279
158	# translate global coordinates to local coordinate system	280	# translate global coordinates to local coordinate system
…		…
236	glVertex $x + $self->{w}, $y + $self->{h};	358	glVertex $x + $self->{w}, $y + $self->{h};
237	glVertex $x , $y + $self->{h};	359	glVertex $x , $y + $self->{h};
238	glEnd;	360	glEnd;
239	glDisable GL_BLEND;	361	glDisable GL_BLEND;
240	}	362	}
		363
		364	if ($ENV{PCLIENT_DEBUG}) {
		365	glPushMatrix;
		366	glColor 1, 1, 0, 1;
		367	glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
		368	glBegin GL_LINE_LOOP;
		369	glVertex 0 , 0;
		370	glVertex $self->{w}, 0;
		371	glVertex $self->{w}, $self->{h};
		372	glVertex 0 , $self->{h};
		373	glEnd;
		374	glPopMatrix;
		375	CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
		376	}
241	}	377	}
242		378
243	sub _draw {	379	sub _draw {
244	my ($self) = @_;	380	my ($self) = @_;
245		381
246	warn "no draw defined for $self\n";	382	warn "no draw defined for $self\n";
247	}	383	}
248		384
249	sub find_widget {	385	sub find_widget {
250	my ($self, $x, $y) = @_;	386	my ($self, $x, $y) = @_;
		387
		388	return () unless $self->{can_events};
251		389
252	return $self	390	return $self
253	if $x >= $self->{x} && $x < $self->{x} + $self->{w}	391	if $x >= $self->{x} && $x < $self->{x} + $self->{w}
254	&& $y >= $self->{y} && $y < $self->{y} + $self->{h};	392	&& $y >= $self->{y} && $y < $self->{y} + $self->{h};
255		393
…		…
260	my ($self, $parent) = @_;	398	my ($self, $parent) = @_;
261		399
262	Scalar::Util::weaken ($self->{parent} = $parent);	400	Scalar::Util::weaken ($self->{parent} = $parent);
263	}	401	}
264		402
		403	sub check_size {
		404	my ($self) = @_;
		405
		406	$self->{parent}
		407	or return 1;
		408
		409	my ($w, $h) = $self->{user_w} && $self->{user_h}
		410	? @$self{qw(user_w user_h)}
		411	: $self->size_request;
		412
		413	if ($w != $self->{req_w} || $h != $self->{req_h}) {
		414	$self->{req_w} = $w;
		415	$self->{req_h} = $h;
		416
		417	$self->{parent}->check_size
		418	or $self->size_allocate (
		419	(List::Util::max $self->{w}, $w),
		420	(List::Util::max $self->{h}, $h),
		421	);
		422
		423	1
		424	} else {
		425	0
		426	}
		427	}
		428
265	sub update {	429	sub update {
266	my ($self) = @_;	430	my ($self) = @_;
267		431
268	$self->{parent}->update	432	$self->{parent}->update
269	if $self->{parent};	433	if $self->{parent};
270	}	434	}
271		435
272	sub connect {	436	sub connect {
273	my ($self, $signal, $cb) = @_;	437	my ($self, $signal, $cb) = @_;
274		438
275	push @{ $self->{cb}{$signal} }, $cb;	439	push @{ $self->{signal_cb}{$signal} }, $cb;
276	}	440	}
277		441
278	sub emit {	442	sub emit {
279	my ($self, $signal, @args) = @_;	443	my ($self, $signal, @args) = @_;
280		444
281	$_->($self, @args)	445	List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
282	for @{$self->{cb}{$signal} || []};
283	}	446	}
284		447
285	sub DESTROY {	448	sub DESTROY {
286	my ($self) = @_;	449	my ($self) = @_;
287		450
…		…
293	package CFClient::UI::DrawBG;	456	package CFClient::UI::DrawBG;
294		457
295	our @ISA = CFClient::UI::Base::;	458	our @ISA = CFClient::UI::Base::;
296		459
297	use strict;	460	use strict;
298	use SDL::OpenGL;	461	use CFClient::OpenGL;
299		462
300	sub new {	463	sub new {
301	my $class = shift;	464	my $class = shift;
302		465
303	# range [value, low, high, page]	466	# range [value, low, high, page]
…		…
332		495
333	package CFClient::UI::Empty;	496	package CFClient::UI::Empty;
334		497
335	our @ISA = CFClient::UI::Base::;	498	our @ISA = CFClient::UI::Base::;
336		499
		500	sub new {
		501	my ($class, %arg) = @_;
		502	$class->SUPER::new (can_events => 0, %arg);
		503	}
		504
337	sub size_request {	505	sub size_request {
338	(0, 0)	506	(0, 0)
339	}	507	}
340		508
341	sub draw { }	509	sub draw { }
…		…
349	sub new {	517	sub new {
350	my ($class, %arg) = @_;	518	my ($class, %arg) = @_;
351		519
352	my $children = delete $arg{children} || [];	520	my $children = delete $arg{children} || [];
353		521
354	my $self = $class->SUPER::new (children => [], %arg);	522	my $self = $class->SUPER::new (
		523	children => [],
		524	can_events => 0,
		525	%arg,
		526	);
355	$self->add ($_) for @$children;	527	$self->add ($_) for @$children;
356		528
357	$self	529	$self
358	}	530	}
359		531
…		…
367	$self->{children} = [	539	$self->{children} = [
368	sort { $a->{z} <=> $b->{z} }	540	sort { $a->{z} <=> $b->{z} }
369	@{$self->{children}}, $child	541	@{$self->{children}}, $child
370	];	542	];
371		543
372	$self->{w} = $self->{h} = -1;	544	$child->check_size;
373	$self->update;	545	$self->update;
374	}	546	}
375		547
		548	sub children {
		549	@{ $_[0]{children} }
		550	}
		551
376	sub remove {	552	sub remove {
377	my ($self, $widget) = @_;	553	my ($self, $child) = @_;
378		554
		555	delete $child->{parent};
		556	$child->hide;
		557
379	$self->{children} = [ grep $_ != $widget, @{ $self->{children} } ];	558	$self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
380		559
381	$self->size_allocate (0, 0, $self->{w}, $self->{h});	560	$self->check_size;
		561	$self->update;
		562	}
		563
		564	sub clear {
		565	my ($self) = @_;
		566
		567	my $children = delete $self->{children};
		568	$self->{children} = [];
		569
		570	for (@$children) {
		571	delete $_->{parent};
		572	$_->hide;
		573	}
		574
		575	$self->check_size;
		576	$self->update;
382	}	577	}
383		578
384	sub find_widget {	579	sub find_widget {
385	my ($self, $x, $y) = @_;	580	my ($self, $x, $y) = @_;
386		581
…		…
416		611
417	$class->SUPER::new (children => [$child], %arg)	612	$class->SUPER::new (children => [$child], %arg)
418	}	613	}
419		614
420	sub add {	615	sub add {
421	my ($self, $widget) = @_;	616	my ($self, $child) = @_;
422		617
423	$self->{children} = [];	618	$self->{children} = [];
424		619
425	$self->SUPER::add ($widget);	620	$self->SUPER::add ($child);
426	}	621	}
427		622
428	sub remove {	623	sub remove {
429	my ($self, $widget) = @_;	624	my ($self, $widget) = @_;
430		625
…		…
439	sub size_request {	634	sub size_request {
440	$_[0]{children}[0]->size_request	635	$_[0]{children}[0]->size_request
441	}	636	}
442		637
443	sub size_allocate {	638	sub size_allocate {
444	my ($self, $x, $y, $w, $h) = @_;	639	my ($self, $w, $h) = @_;
445		640
446	$self->_size_allocate ($x, $y, $w, $h) or return;
447
448	$self->{children}[0]->size_allocate (0, 0, $w, $h);	641	$self->{children}[0]->configure (0, 0, $w, $h);
449	}	642	}
450		643
451	#############################################################################	644	#############################################################################
452		645
453	package CFClient::UI::Window;	646	package CFClient::UI::Window;
454		647
455	our @ISA = CFClient::UI::Bin::;	648	our @ISA = CFClient::UI::Bin::;
456		649
457	use SDL::OpenGL;	650	use CFClient::OpenGL;
458		651
459	sub new {	652	sub new {
460	my ($class, %arg) = @_;	653	my ($class, %arg) = @_;
461		654
462	my $self = $class->SUPER::new (%arg);	655	my $self = $class->SUPER::new (%arg);
463	}	656	}
464		657
465	sub update {	658	sub update {
466	my ($self) = @_;	659	my ($self) = @_;
467		660
468	# we want to do this delayed...	661	$ROOT->on_refresh ($self => sub { $self->render_child });
469	$self->render_chld;
470	$self->SUPER::update;	662	$self->SUPER::update;
471	}	663	}
472		664
		665	sub size_allocate {
		666	my ($self, $w, $h) = @_;
		667
		668	$self->SUPER::size_allocate ($w, $h);
		669	$self->update;
		670	}
		671
		672	sub _render {
		673	$_[0]{children}[0]->draw;
		674	}
		675
473	sub render_chld {	676	sub render_child {
474	my ($self) = @_;	677	my ($self) = @_;
475		678
476	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {	679	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
477	glClearColor 0, 0, 0, 1;	680	glClearColor 0, 0, 0, 0;
478	glClear GL_COLOR_BUFFER_BIT;	681	glClear GL_COLOR_BUFFER_BIT;
479	$self->child->draw;	682
		683	$self->_render;
		684	# glColorMask 1, 1, 1, 0;
		685	# glEnable GL_BLEND;
		686	# glBlendFunc GL_SRC_ALPHA, GL_ZERO;
		687	# glRasterPos 0, 0;
		688	# glCopyPixels 0, 0, $self->{w}, $self->{h};
		689	# glDisable GL_BLEND;
		690	# glColorMask 1, 1, 1, 1;
480	};	691	};
481	}
482
483	sub size_allocate {
484	my ($self, $x, $y, $w, $h) = @_;
485
486	$self->_size_allocate ($x, $y, $w, $h) or return;
487
488	$self->child->size_allocate (0, 0, $w, $h);
489
490	$self->render_chld;
491	}	692	}
492		693
493	sub _draw {	694	sub _draw {
494	my ($self) = @_;	695	my ($self) = @_;
495		696
496	my ($w, $h) = ($self->w, $self->h);	697	my ($w, $h) = ($self->w, $self->h);
497		698
498	my $tex = $self->{texture}	699	my $tex = $self->{texture}
499	or return;	700	or return;
		701
		702	glEnable GL_BLEND;
		703	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
		704	glEnable GL_TEXTURE_2D;
		705	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
		706	glColor 0, 0, 0, 1;
		707
		708	$tex->draw_quad (0, 0, $w, $h);
		709
		710	glDisable GL_BLEND;
		711	glDisable GL_TEXTURE_2D;
		712	}
		713
		714	#############################################################################
		715
		716	package CFClient::UI::ViewPort;
		717
		718	our @ISA = CFClient::UI::Window::;
		719
		720	sub size_request {
		721	my ($self) = @_;
		722
		723	@$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};
		724	$self->child->configure (0, 0, @$self{qw(child_w child_h)});
		725
		726	@$self{qw(child_w child_h)}
		727	}
		728
		729	sub size_allocate {
		730	my ($self, $w, $h) = @_;
		731
		732	$self->update;
		733	}
		734
		735	sub set_offset {
		736	my ($self, $x, $y) = @_;
		737
		738	$self->{view_x} = int $x;
		739	$self->{view_y} = int $y;
		740
		741	$self->update;
		742	}
		743
		744	# hmm, this does not work for topleft of $self... but we should not aks for that
		745	sub _topleft {
		746	my ($self, $x, $y) = @_;
		747
		748	$self->SUPER::_topleft ($x - $self->{view_x}, $y - $self->{view_y})
		749	}
		750
		751	sub find_widget {
		752	my ($self, $x, $y) = @_;
		753
		754	if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
		755	&& $y >= $self->{y} && $y < $self->{y} + $self->{h}
		756	) {
		757	$self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
		758	} else {
		759	$self->CFClient::UI::Base::find_widget ($x, $y)
		760	}
		761	}
		762
		763	sub _render {
		764	my ($self) = @_;
		765
		766	CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
		767
		768	$self->SUPER::_render;
		769	}
		770
		771	#############################################################################
		772
		773	package CFClient::UI::ScrolledWindow;
		774
		775	our @ISA = CFClient::UI::HBox::;
		776
		777	sub new {
		778	my $class = shift;
		779
		780	my $self;
		781
		782	my $slider = new CFClient::UI::Slider
		783	vertical => 1,
		784	range => [0, 0, 1, 0.01], # HACK fix
		785	connect_changed => sub {
		786	$self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h}));
		787	},
		788	;
		789
		790	$self = $class->SUPER::new (
		791	vp => (new CFClient::UI::ViewPort),
		792	slider => $slider,
		793	@_,
		794	);
		795
		796	$self->{vp}->add ($self->{scrolled});
		797	$self->add ($self->{vp});
		798	$self->add ($self->{slider});
		799
		800	$self
		801	}
		802
		803	#TODO# update range on size_allocate depeneing on child
		804	# update viewport offset on scroll
		805
		806	#############################################################################
		807
		808	package CFClient::UI::Frame;
		809
		810	our @ISA = CFClient::UI::Bin::;
		811
		812	use CFClient::OpenGL;
		813
		814	sub new {
		815	my $class = shift;
		816
		817	my $self = $class->SUPER::new (
		818	bg => [1, 1, 1, 1],
		819	border_bg => [1, 1, 1, 1],
		820	border => 0.8,
		821	@_
		822	);
		823
		824	$self
		825	}
		826
		827	sub _draw {
		828	my ($self) = @_;
		829
		830	my ($w, $h) = ($self->{w}, $self->{h});
500		831
501	glEnable GL_BLEND;	832	glEnable GL_BLEND;
502	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	833	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
503	glEnable GL_TEXTURE_2D;	834	glEnable GL_TEXTURE_2D;
504	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	835	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
505		836
506	$tex->draw_quad (0, 0, $w, $h);	837	# glBegin GL_QUADS;
		838	# glColor 0, 0, 0, 0;
		839	# glVertex 0 , 0;
		840	# glVertex 0 , $h;
		841	# glVertex $w, $h;
		842	# glVertex $w, 0;
		843	# glEnd;
507		844
		845
		846	$self->child->draw;
508	glDisable GL_BLEND;	847	glDisable GL_BLEND;
509	glDisable GL_TEXTURE_2D;	848	glDisable GL_TEXTURE_2D;
510	}	849	}
511		850
512	#############################################################################	851	#############################################################################
513		852
514	package CFClient::UI::Frame;	853	package CFClient::UI::FancyFrame;
515		854
516	our @ISA = CFClient::UI::Bin::;	855	our @ISA = CFClient::UI::Bin::;
517		856
518	use SDL::OpenGL;	857	use CFClient::OpenGL;
519
520	sub size_request {
521	my ($self) = @_;
522	my $chld = $self->child
523	or return (0, 0);
524
525	$chld->move (2, 2);
526
527	map { $_ + 4 } $chld->size_request;
528	}
529
530	sub size_allocate {
531	my ($self, $x, $y, $w, $h) = @_;
532
533	$self->_size_allocate ($x, $y, $w, $h) or return;
534
535	$self->child->size_allocate (2, 2, $w - 4, $h - 4);
536	}
537
538	sub _draw {
539	my ($self) = @_;
540
541	my $chld = $self->child;
542
543	my ($w, $h) = $chld->size_request;
544
545	glBegin GL_QUADS;
546	glColor 0, 0, 0;
547	glVertex 0 , 0;
548	glVertex 0 , $h + 4;
549	glVertex $w + 4 , $h + 4;
550	glVertex $w + 4 , 0;
551	glEnd;
552
553	$chld->draw;
554	}
555
556	#############################################################################
557
558	package CFClient::UI::FancyFrame;
559
560	our @ISA = CFClient::UI::Bin::;
561
562	use SDL::OpenGL;
563		858
564	my @tex =	859	my @tex =
565	map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }	860	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
566	qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);	861	qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
567		862
568	sub new {	863	sub new {
569	my $class = shift;	864	my $class = shift;
570		865
571	# TODO: user_x, user_y, overwrite moveto?	866	# TODO: user_x, user_y, overwrite moveto?
572		867
573	$class->SUPER::new (	868	my $self = $class->SUPER::new (
574	bg => [1, 1, 1, 1],	869	bg => [1, 1, 1, 1],
575	border_bg => [1, 1, 1, 1],	870	border_bg => [1, 1, 1, 1],
576	border => int $::FONTSIZE * 0.8,	871	border => 0.6,
		872	can_events => 1,
577	@_	873	@_
		874	);
		875
		876	$self->{title} &&= new CFClient::UI::Label
		877	align => 0,
		878	valign => 1,
		879	text => $self->{title},
		880	fontsize => $self->{border};
		881
		882	$self
		883	}
		884
		885	sub border {
		886	int $_[0]{border} * $::FONTSIZE
		887	}
		888
		889	sub size_request {
		890	my ($self) = @_;
		891
		892	my ($w, $h) = $self->SUPER::size_request;
		893
		894	(
		895	$w + $self->border * 2,
		896	$h + $self->border * 2,
578	)	897	)
579	}	898	}
580		899
581	sub size_request {
582	my ($self) = @_;
583
584	return ($self->{user_w}, $self->{user_h}) if $self->{user_w} && $self->{user_h};
585
586	my ($w, $h) = $self->SUPER::size_request;
587
588	(
589	$w + $self->{border} * 2,
590	$h + $self->{border} * 2,
591	)
592	}
593
594	sub size_allocate {	900	sub size_allocate {
595	my ($self, $x, $y, $w, $h) = @_;	901	my ($self, $w, $h) = @_;
596		902
597	$self->_size_allocate ($x, $y, $w, $h) or return;
598
599	$h -= List::Util::max 0, $self->{border} * 2;	903	$h -= List::Util::max 0, $self->border * 2;
600	$w -= List::Util::max 0, $self->{border} * 2;	904	$w -= List::Util::max 0, $self->border * 2;
601		905
		906	$self->{title}->configure ($self->border, $self->border - $::FONTSIZE * 2, $w, $::FONTSIZE * 2)
		907	if $self->{title};
		908
602	$self->child->size_allocate ($self->{border}, $self->{border}, $w, $h);	909	$self->child->configure ($self->border, $self->border, $w, $h);
603	}	910	}
604		911
605	sub button_down {	912	sub button_down {
606	my ($self, $ev, $x, $y) = @_;	913	my ($self, $ev, $x, $y) = @_;
607		914
608	if ($x < $self->{w} && $x >= $self->{w} - $self->{border}	915	my ($w, $h) = @$self{qw(w h)};
609	&& $y < $self->{h} && $y >= $self->{h} - $self->{border}) {	916	my $border = $self->border;
610		917
		918	my $lr = ($x >= 0 && $x < $border) || ($x > $w - $border && $x < $w);
		919	my $td = ($y >= 0 && $y < $border) || ($y > $h - $border && $y < $h);
		920
		921	if ($lr & $td) {
		922	my ($wx, $wy) = ($self->{x}, $self->{y});
611	my ($ox, $oy) = ($ev->button_x, $ev->button_y);	923	my ($ox, $oy) = ($ev->{x}, $ev->{y});
612	my ($bw, $bh) = ($self->{w}, $self->{h});	924	my ($bw, $bh) = ($self->{w}, $self->{h});
		925
		926	my $mx = $x < $border;
		927	my $my = $y < $border;
613		928
614	$self->{motion} = sub {	929	$self->{motion} = sub {
615	my ($ev, $x, $y) = @_;	930	my ($ev, $x, $y) = @_;
616		931
617	($x, $y) = ($ev->motion_x, $ev->motion_y);	932	my $dx = $ev->{x} - $ox;
		933	my $dy = $ev->{y} - $oy;
618		934
619	$self->{user_w} = $bw + $x - $ox;	935	$self->{user_w} = $bw + $dx * ($mx ? -1 : 1);
620	$self->{user_h} = $bh + $y - $oy;	936	$self->{user_h} = $bh + $dy * ($my ? -1 : 1);
621	$self->update;	937	$self->move ($wx + $dx * $mx, $wy + $dy * $my);
		938	$self->check_size;
622	};	939	};
623		940
624	} elsif ($x >= 0 && $x < $self->{w}	941	} elsif ($lr ^ $td) {
625	&& $y >= 0 && $y < $self->{border}) {
626
627	my ($ox, $oy) = ($ev->button_x, $ev->button_y);	942	my ($ox, $oy) = ($ev->{x}, $ev->{y});
628	my ($bx, $by) = ($self->{x}, $self->{y});	943	my ($bx, $by) = ($self->{x}, $self->{y});
629		944
630	$self->{motion} = sub {	945	$self->{motion} = sub {
631	my ($ev, $x, $y) = @_;	946	my ($ev, $x, $y) = @_;
632		947
633	($x, $y) = ($ev->motion_x, $ev->motion_y);	948	($x, $y) = ($ev->{x}, $ev->{y});
634		949
635	$self->move ($bx + $x - $ox, $by + $y - $oy);	950	$self->move ($bx + $x - $ox, $by + $y - $oy);
636	$self->update;	951	$self->update;
637	};	952	};
638	}	953	}
…		…
659	glEnable GL_BLEND;	974	glEnable GL_BLEND;
660	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	975	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
661	glEnable GL_TEXTURE_2D;	976	glEnable GL_TEXTURE_2D;
662	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	977	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
663		978
		979	my $border = $self->border;
		980
664	glColor @{ $self->{border_bg} };	981	glColor @{ $self->{border_bg} };
665	$tex[1]->draw_quad (0, 0, $w, $self->{border});	982	$tex[1]->draw_quad (0, 0, $w, $border);
666	$tex[3]->draw_quad (0, $self->{border}, $self->{border}, $ch);	983	$tex[3]->draw_quad (0, $border, $border, $ch);
667	$tex[2]->draw_quad ($w - $self->{border}, $self->{border}, $self->{border}, $ch);	984	$tex[2]->draw_quad ($w - $border, $border, $border, $ch);
668	$tex[4]->draw_quad (0, $h - $self->{border}, $w, $self->{border});	985	$tex[4]->draw_quad (0, $h - $border, $w, $border);
669		986
		987	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
670	my $bg = $tex[0];	988	my $bg = $tex[0];
671		989
672	# TODO: repeat texture not scale	990	# TODO: repeat texture not scale
673	my $rep_x = $cw / $bg->{w};	991	my $rep_x = $cw / $bg->{w};
674	my $rep_y = $ch / $bg->{h};	992	my $rep_y = $ch / $bg->{h};
675		993
676	glColor @{ $self->{bg} };	994	glColor @{ $self->{bg} };
677		995
678	$bg->{s} = $rep_x;	996	$bg->{s} = $rep_x;
679	$bg->{t} = $rep_y;	997	$bg->{t} = $rep_y;
680	$bg->{wrap_mode} = 1;	998	$bg->{wrap_mode} = 1;
681	$bg->draw_quad ($self->{border}, $self->{border}, $cw, $ch);	999	$bg->draw_quad ($border, $border, $cw, $ch);
682		1000
683	glDisable GL_TEXTURE_2D;	1001	glDisable GL_TEXTURE_2D;
684	glDisable GL_BLEND;	1002	glDisable GL_BLEND;
		1003	}
		1004
		1005	$self->{title}->draw if $self->{title};
685		1006
686	$self->child->draw;	1007	$self->child->draw;
687	}	1008	}
688		1009
689	#############################################################################	1010	#############################################################################
…		…
692		1013
693	our @ISA = CFClient::UI::Base::;	1014	our @ISA = CFClient::UI::Base::;
694		1015
695	use List::Util qw(max sum);	1016	use List::Util qw(max sum);
696		1017
697	use SDL::OpenGL;	1018	use CFClient::OpenGL;
698		1019
699	sub new {	1020	sub new {
700	my $class = shift;	1021	my $class = shift;
701		1022
702	$class->SUPER::new (	1023	$class->SUPER::new (
…		…
709	my ($self, $x, $y, $child) = @_;	1030	my ($self, $x, $y, $child) = @_;
710		1031
711	$child->set_parent ($self);	1032	$child->set_parent ($self);
712	$self->{children}[$y][$x] = $child;	1033	$self->{children}[$y][$x] = $child;
713		1034
714	$self->{w} = $self->{h} = -1;	1035	$child->check_size;
715	$self->update;	1036	}
		1037
		1038	sub children {
		1039	grep $_, map @$_, grep $_, @{ $_[0]{children} }
716	}	1040	}
717		1041
718	# TODO: move to container class maybe? send childs a signal on removal?	1042	# TODO: move to container class maybe? send childs a signal on removal?
719	sub clear {	1043	sub clear {
720	my ($self) = @_;	1044	my ($self) = @_;
721		1045
		1046	my @children = $self->children;
722	delete $self->{children};	1047	delete $self->{children};
		1048
		1049	for (@children) {
		1050	delete $_->{parent};
		1051	$_->hide;
		1052	}
		1053
723	$self->update;	1054	$self->update;
724	}	1055	}
725		1056
726	sub get_wh {	1057	sub get_wh {
727	my ($self) = @_;	1058	my ($self) = @_;
…		…
733	or next;	1064	or next;
734		1065
735	for my $x (0 .. $#$row) {	1066	for my $x (0 .. $#$row) {
736	my $widget = $row->[$x]	1067	my $widget = $row->[$x]
737	or next;	1068	or next;
738	my ($w, $h) = $widget->size_request;	1069	my ($w, $h) = @$widget{qw(req_w req_h)};
739		1070
740	$w[$x] = max $w[$x], $w;	1071	$w[$x] = max $w[$x], $w;
741	$h[$y] = max $h[$y], $h;	1072	$h[$y] = max $h[$y], $h;
742	}	1073	}
743	}	1074	}
…		…
755	(sum @$hs),	1086	(sum @$hs),
756	)	1087	)
757	}	1088	}
758		1089
759	sub size_allocate {	1090	sub size_allocate {
760	my ($self, $x, $y, $w, $h) = @_;	1091	my ($self, $w, $h) = @_;
761
762	$self->_size_allocate ($x, $y, $w, $h) or return;
763		1092
764	my ($ws, $hs) = $self->get_wh;	1093	my ($ws, $hs) = $self->get_wh;
765		1094
766	my $req_w = sum @$ws;	1095	my $req_w = sum @$ws;
767	my $req_h = sum @$hs;	1096	my $req_h = sum @$hs;
…		…
789		1118
790	for my $c (0 .. $#$row) {	1119	for my $c (0 .. $#$row) {
791	my $col_w = $ws->[$c];	1120	my $col_w = $ws->[$c];
792		1121
793	if (my $widget = $row->[$c]) {	1122	if (my $widget = $row->[$c]) {
794	$widget->size_allocate ($x, $y, $col_w, $row_h);	1123	$widget->configure ($x, $y, $col_w, $row_h);
795	}	1124	}
796		1125
797	$x += $col_w;	1126	$x += $col_w;
798	}	1127	}
799		1128
…		…
844	(List::Util::max map $_->[1], @alloc),	1173	(List::Util::max map $_->[1], @alloc),
845	)	1174	)
846	}	1175	}
847		1176
848	sub size_allocate {	1177	sub size_allocate {
849	my ($self, $x, $y, $w, $h) = @_;	1178	my ($self, $w, $h) = @_;
850
851	$self->_size_allocate ($x, $y, $w, $h);
852		1179
853	($h, $w) = ($w, $h);	1180	($h, $w) = ($w, $h);
854		1181
855	my $children = $self->{children};	1182	my $children = $self->{children};
856		1183
857	my @h = map +($_->size_request)[0], @$children;	1184	my @h = map $_->{req_w}, @$children;
858		1185
859	my $req_h = List::Util::sum @h;	1186	my $req_h = List::Util::sum @h;
860		1187
861	if ($req_h > $h) {	1188	if ($req_h > $h) {
862	# ah well, not enough space	1189	# ah well, not enough space
…		…
878		1205
879	my $y = 0;	1206	my $y = 0;
880	for (0 .. $#$children) {	1207	for (0 .. $#$children) {
881	my $child = $children->[$_];	1208	my $child = $children->[$_];
882	my $h = $h[$_];	1209	my $h = $h[$_];
883	$child->size_allocate ($y, 0, $h, $w);	1210	$child->configure ($y, 0, $h, $w);
884		1211
885	$y += $h;	1212	$y += $h;
886	}	1213	}
		1214
		1215	1
887	}	1216	}
888		1217
889	#############################################################################	1218	#############################################################################
890		1219
891	package CFClient::UI::VBox;	1220	package CFClient::UI::VBox;
…		…
904	(List::Util::sum map $_->[1], @alloc),	1233	(List::Util::sum map $_->[1], @alloc),
905	)	1234	)
906	}	1235	}
907		1236
908	sub size_allocate {	1237	sub size_allocate {
909	my ($self, $x, $y, $w, $h) = @_;	1238	my ($self, $w, $h) = @_;
910
911	$self->_size_allocate ($x, $y, $w, $h);
912		1239
913	my $children = $self->{children};	1240	my $children = $self->{children};
914		1241
915	my @h = map +($_->size_request)[1], @$children;	1242	my @h = map $_->{req_h}, @$children;
916		1243
917	my $req_h = List::Util::sum @h;	1244	my $req_h = List::Util::sum @h;
918		1245
919	if ($req_h > $h) {	1246	if ($req_h > $h) {
920	# ah well, not enough space	1247	# ah well, not enough space
…		…
934		1261
935	my $y = 0;	1262	my $y = 0;
936	for (0 .. $#$children) {	1263	for (0 .. $#$children) {
937	my $child = $children->[$_];	1264	my $child = $children->[$_];
938	my $h = $h[$_];	1265	my $h = $h[$_];
939	$child->size_allocate (0, $y, $w, $h);	1266	$child->configure (0, $y, $w, $h);
940		1267
941	$y += $h;	1268	$y += $h;
942	}	1269	}
		1270
		1271	1
943	}	1272	}
944		1273
945	#############################################################################	1274	#############################################################################
946		1275
947	package CFClient::UI::Label;	1276	package CFClient::UI::Label;
948		1277
949	our @ISA = CFClient::UI::Base::;	1278	our @ISA = CFClient::UI::Base::;
950		1279
951	use SDL::OpenGL;	1280	use CFClient::OpenGL;
952		1281
953	sub new {	1282	sub new {
954	my ($class, %arg) = @_;	1283	my ($class, %arg) = @_;
955		1284
956	my $self = $class->SUPER::new (	1285	my $self = $class->SUPER::new (
957	fg => [1, 1, 1],	1286	fg => [1, 1, 1],
958	fontsize => $::FONTSIZE,	1287	#font => default_font
		1288	fontsize => 1,
959	text => "",	1289	text => "",
960	align => -1,	1290	align => -1,
961	valign => -1,	1291	valign => -1,
962	padding => 2,	1292	padding => 2,
963	layout => new CFClient::Layout,	1293	layout => new CFClient::Layout,
		1294	can_events => 0,
964	%arg	1295	%arg
965	);	1296	);
966		1297
967	$self->{xxx}++ if $self->{text} eq "Client Setup" && $self->{align};#d#	1298	if (exists $self->{template}) {
		1299	my $layout = new CFClient::Layout;
		1300	$layout->set_text (delete $self->{template});
		1301	$self->{template} = $layout;
		1302	}
968		1303
969	$self->set_text (delete $self->{text}) if exists $self->{text};	1304	$self->set_text (delete $self->{text}) if exists $self->{text};
970	$self->set_markup (delete $self->{markup}) if exists $self->{markup};	1305	$self->set_markup (delete $self->{markup}) if exists $self->{markup};
971		1306
972	$self	1307	$self
973	}	1308	}
974		1309
975	sub escape_text {	1310	sub escape {
976	local $_ = $_[1];	1311	local $_ = $_[1];
977		1312
978	s/&/&amp;/g;	1313	s/&/&amp;/g;
979	s/>/&gt;/g;	1314	s/>/&gt;/g;
980	s/</&lt;/g;	1315	s/</&lt;/g;
981		1316
982	$_[1]	1317	$_[1]
983	}	1318	}
984		1319
		1320	sub update {
		1321	my ($self) = @_;
		1322
		1323	delete $self->{texture};
		1324	$self->SUPER::update;
		1325	}
		1326
		1327	sub reconfigure {
		1328	my ($self) = @_;
		1329
		1330	delete $self->{texture};
		1331	}
		1332
985	sub set_text {	1333	sub set_text {
986	my ($self, $text) = @_;	1334	my ($self, $text) = @_;
987		1335
		1336	return if $self->{text} eq "T$text";
		1337	$self->{text} = "T$text";
		1338
988	$self->{layout}->set_text ($text);	1339	$self->{layout}->set_text ($text);
989		1340
990	delete $self->{texture};	1341	delete $self->{texture};
991	$self->update;	1342	$self->update;
		1343	$self->check_size;
992	}	1344	}
993		1345
994	sub set_markup {	1346	sub set_markup {
995	my ($self, $markup) = @_;	1347	my ($self, $markup) = @_;
996		1348
		1349	return if $self->{text} eq "M$markup";
		1350	$self->{text} = "M$markup";
		1351
997	$self->{layout}->set_markup ($markup);	1352	$self->{layout}->set_markup ($markup);
998		1353
999	delete $self->{texture};	1354	delete $self->{texture};
1000	$self->update;	1355	$self->update;
		1356	$self->check_size;
1001	}	1357	}
1002		1358
1003	sub size_request {	1359	sub size_request {
1004	my ($self) = @_;	1360	my ($self) = @_;
1005		1361
1006	$self->{layout}->set_width;	1362	$self->{layout}->set_font ($self->{font}) if $self->{font};
		1363	$self->{layout}->set_width ($self->{max_w} || -1);
1007	$self->{layout}->set_height ($self->{fontsize});	1364	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1008		1365
1009	my ($w, $h) = $self->{layout}->size;	1366	my ($w, $h) = $self->{layout}->size;
		1367
		1368	if (exists $self->{template}) {
		1369	$self->{template}->set_font ($self->{font}) if $self->{font};
		1370	$self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
		1371
		1372	my ($w2, $h2) = $self->{template}->size;
		1373
		1374	$w = List::Util::max $w, $w2;
		1375	$h = List::Util::max $h, $h2;
		1376	}
1010		1377
1011	(	1378	(
1012	$w + $self->{padding} * 2,	1379	$w + $self->{padding} * 2,
1013	$h + $self->{padding} * 2,	1380	$h + $self->{padding} * 2,
1014	)	1381	)
1015	}	1382	}
1016		1383
1017	sub size_allocate {	1384	sub size_allocate {
1018	my ($self, $x, $y, $w, $h) = @_;	1385	my ($self, $w, $h) = @_;
1019
1020	$self->_size_allocate ($x, $y, $w, $h) or return;
1021		1386
1022	delete $self->{texture};	1387	delete $self->{texture};
1023	}	1388	}
1024		1389
1025	sub update {	1390	sub set_fontsize {
1026	my ($self) = @_;	1391	my ($self, $fontsize) = @_;
1027		1392
		1393	$self->{fontsize} = $fontsize;
1028	delete $self->{texture};	1394	delete $self->{texture};
		1395	$self->check_size;
1029	$self->SUPER::update;	1396	$self->update;
1030	}	1397	}
1031		1398
1032	sub _draw {	1399	sub _draw {
1033	my ($self) = @_;	1400	my ($self) = @_;
1034		1401
1035	my $tex = $self->{texture} ||= do {	1402	my $tex = $self->{texture} ||= do {
		1403	$self->{layout}->set_font ($self->{font}) if $self->{font};
1036	$self->{layout}->set_width ($self->{w});	1404	$self->{layout}->set_width ($self->{w});
1037	$self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize});	1405	$self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE);
1038	new_from_layout CFClient::Texture $self->{layout}	1406	new_from_layout CFClient::Texture $self->{layout}
1039	};	1407	};
1040		1408
1041	glEnable GL_BLEND;	1409	glEnable GL_BLEND;
1042	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	1410	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
…		…
1067		1435
1068	package CFClient::UI::EntryBase;	1436	package CFClient::UI::EntryBase;
1069		1437
1070	our @ISA = CFClient::UI::Label::;	1438	our @ISA = CFClient::UI::Label::;
1071		1439
1072	use SDL;	1440	use CFClient::OpenGL;
1073	use SDL::OpenGL;
1074		1441
1075	sub new {	1442	sub new {
1076	my $class = shift;	1443	my $class = shift;
1077		1444
1078	$class->SUPER::new (	1445	$class->SUPER::new (
1079	fg => [1, 1, 1],	1446	fg => [1, 1, 1],
1080	bg => [0, 0, 0, 0.2],	1447	bg => [0, 0, 0, 0.2],
1081	active_bg => [1, 1, 1, 0.5],	1448	active_bg => [1, 1, 1, 0.5],
1082	active_fg => [0, 0, 0],	1449	active_fg => [0, 0, 0],
1083	can_hover => 1,	1450	can_hover => 1,
1084	can_focus => 1,	1451	can_focus => 1,
1085	valign => 0,	1452	valign => 0,
		1453	can_events => 1,
1086	@_	1454	@_
1087	)	1455	)
1088	}	1456	}
1089		1457
1090	sub _set_text {	1458	sub _set_text {
…		…
1092		1460
1093	delete $self->{cur_h};	1461	delete $self->{cur_h};
1094		1462
1095	return if $self->{text} eq $text;	1463	return if $self->{text} eq $text;
1096		1464
		1465	delete $self->{texture};
		1466
1097	$self->{last_activity} = $::NOW;	1467	$self->{last_activity} = $::NOW;
1098	$self->{text} = $text;	1468	$self->{text} = $text;
1099		1469
1100	$text =~ s/./*/g if $self->{hidden};	1470	$text =~ s/./*/g if $self->{hidden};
1101	$self->{layout}->set_text ("$text ");	1471	$self->{layout}->set_text ("$text ");
…		…
1114		1484
1115	($w + 1, $h) # add 1 for cursor	1485	($w + 1, $h) # add 1 for cursor
1116	}	1486	}
1117		1487
1118	sub size_allocate {	1488	sub size_allocate {
1119	my ($self, $x, $y, $w, $h) = @_;	1489	my ($self, $w, $h) = @_;
1120		1490
1121	$self->SUPER::size_allocate ($x, $y, $w, $h);	1491	$self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1122
1123	$self->_set_text ($self->{text});
1124	}	1492	}
1125		1493
1126	sub set_text {	1494	sub set_text {
1127	my ($self, $text) = @_;	1495	my ($self, $text) = @_;
1128		1496
…		…
1132	}	1500	}
1133		1501
1134	sub key_down {	1502	sub key_down {
1135	my ($self, $ev) = @_;	1503	my ($self, $ev) = @_;
1136		1504
1137	my $mod = $ev->key_mod;	1505	my $mod = $ev->{mod};
1138	my $sym = $ev->key_sym;	1506	my $sym = $ev->{sym};
1139
1140	my $uni = $ev->key_unicode;	1507	my $uni = $ev->{unicode};
1141		1508
1142	my $text = $self->get_text;	1509	my $text = $self->get_text;
1143		1510
1144	if ($sym == SDLK_BACKSPACE) {	1511	if ($sym == 8) {
1145	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};	1512	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1146	} elsif ($sym == SDLK_DELETE) {	1513	} elsif ($sym == 127) {
1147	substr $text, $self->{cursor}, 1, "";	1514	substr $text, $self->{cursor}, 1, "";
1148	} elsif ($sym == SDLK_LEFT) {	1515	} elsif ($sym == CFClient::SDLK_LEFT) {
1149	--$self->{cursor} if $self->{cursor};	1516	--$self->{cursor} if $self->{cursor};
1150	} elsif ($sym == SDLK_RIGHT) {	1517	} elsif ($sym == CFClient::SDLK_RIGHT) {
1151	++$self->{cursor} if $self->{cursor} < length $self->{text};	1518	++$self->{cursor} if $self->{cursor} < length $self->{text};
1152	} elsif ($sym == SDLK_HOME) {	1519	} elsif ($sym == CFClient::SDLK_HOME) {
1153	$self->{cursor} = 0;	1520	$self->{cursor} = 0;
1154	} elsif ($sym == SDLK_END) {	1521	} elsif ($sym == CFClient::SDLK_END) {
1155	$self->{cursor} = length $text;	1522	$self->{cursor} = length $text;
1156	} elsif ($sym == SDLK_ESCAPE) {	1523	} elsif ($sym == 27) {
1157	$self->emit ('escape');	1524	$self->emit ('escape');
1158	} elsif ($uni) {	1525	} elsif ($uni) {
1159	substr $text, $self->{cursor}++, 0, chr $uni;	1526	substr $text, $self->{cursor}++, 0, chr $uni;
1160	}	1527	}
1161		1528
…		…
1236		1603
1237	package CFClient::UI::Entry;	1604	package CFClient::UI::Entry;
1238		1605
1239	our @ISA = CFClient::UI::EntryBase::;	1606	our @ISA = CFClient::UI::EntryBase::;
1240		1607
1241	use SDL;	1608	use CFClient::OpenGL;
1242	use SDL::OpenGL;
1243		1609
1244	sub key_down {	1610	sub key_down {
1245	my ($self, $ev) = @_;	1611	my ($self, $ev) = @_;
1246		1612
1247	my $sym = $ev->key_sym;	1613	my $sym = $ev->{sym};
1248		1614
1249	if ($sym == SDLK_RETURN) {	1615	if ($sym == 13) {
		1616	unshift @{$self->{history}},
		1617	my $txt = $self->get_text;
		1618	$self->{history_pointer} = -1;
		1619	$self->{history_saveback} = '';
1250	$self->emit (activate => $self->get_text);	1620	$self->emit (activate => $txt);
1251	$self->update;	1621	$self->update;
		1622
		1623	} elsif ($sym == CFClient::SDLK_UP) {
		1624	if ($self->{history_pointer} < 0) {
		1625	$self->{history_saveback} = $self->get_text;
		1626	}
		1627	if (@{$self->{history} || []} > 0) {
		1628	$self->{history_pointer}++;
		1629	if ($self->{history_pointer} >= @{$self->{history} || []}) {
		1630	$self->{history_pointer} = @{$self->{history} || []} - 1;
		1631	}
		1632	$self->set_text ($self->{history}->[$self->{history_pointer}]);
		1633	}
		1634
		1635	} elsif ($sym == CFClient::SDLK_DOWN) {
		1636	$self->{history_pointer}--;
		1637	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;
		1638
		1639	if ($self->{history_pointer} >= 0) {
		1640	$self->set_text ($self->{history}->[$self->{history_pointer}]);
		1641	} else {
		1642	$self->set_text ($self->{history_saveback});
		1643	}
1252		1644
1253	} else {	1645	} else {
1254	$self->SUPER::key_down ($ev);	1646	$self->SUPER::key_down ($ev);
1255	}	1647	}
1256		1648
…		…
1260		1652
1261	package CFClient::UI::Button;	1653	package CFClient::UI::Button;
1262		1654
1263	our @ISA = CFClient::UI::Label::;	1655	our @ISA = CFClient::UI::Label::;
1264		1656
1265	use SDL;	1657	use CFClient::OpenGL;
1266	use SDL::OpenGL;
1267		1658
1268	my @tex =	1659	my @tex =
1269	map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }	1660	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1270	qw(b1_button_active.png);	1661	qw(b1_button_active.png);
1271		1662
1272	sub new {	1663	sub new {
1273	my $class = shift;	1664	my $class = shift;
1274		1665
1275	$class->SUPER::new (	1666	$class->SUPER::new (
1276	padding => 4,	1667	padding => 4,
1277	fg => [1, 1, 1],	1668	fg => [1, 1, 1],
1278	bg => [1, 1, 1, 0.2],	1669	bg => [1, 1, 1, 0.2],
1279	active_fg => [0, 0, 1],	1670	active_fg => [0, 0, 1],
1280	can_hover => 1,	1671	can_hover => 1,
		1672	align => 0,
		1673	valign => 0,
		1674	can_events => 1,
1281	@_	1675	@_
1282	)	1676	)
1283	}	1677	}
1284		1678
1285	sub button_up {	1679	sub button_up {
…		…
1319	package CFClient::UI::CheckBox;	1713	package CFClient::UI::CheckBox;
1320		1714
1321	our @ISA = CFClient::UI::DrawBG::;	1715	our @ISA = CFClient::UI::DrawBG::;
1322		1716
1323	my @tex =	1717	my @tex =
1324	map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }	1718	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1325	qw(c1_checkbox_bg.png c1_checkbox_active.png);	1719	qw(c1_checkbox_bg.png c1_checkbox_active.png);
1326		1720
1327	use SDL;	1721	use CFClient::OpenGL;
1328	use SDL::OpenGL;
1329		1722
1330	sub new {	1723	sub new {
1331	my $class = shift;	1724	my $class = shift;
1332		1725
1333	$class->SUPER::new (	1726	$class->SUPER::new (
…		…
1344	my ($self) = @_;	1737	my ($self) = @_;
1345		1738
1346	($self->{padding} * 2 + 6) x 2	1739	($self->{padding} * 2 + 6) x 2
1347	}	1740	}
1348		1741
1349	sub size_allocate {
1350	my ($self, $x, $y, $w, $h) = @_;
1351
1352	$self->_size_allocate ($x, $y, $w, $h);
1353	}
1354
1355	sub button_down {	1742	sub button_down {
1356	my ($self, $ev, $x, $y) = @_;	1743	my ($self, $ev, $x, $y) = @_;
1357		1744
1358	if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}	1745	if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}
1359	&& $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {	1746	&& $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {
…		…
1385	glDisable GL_BLEND;	1772	glDisable GL_BLEND;
1386	}	1773	}
1387		1774
1388	#############################################################################	1775	#############################################################################
1389		1776
		1777	package CFClient::UI::Image;
		1778
		1779	our @ISA = CFClient::UI::Base::;
		1780
		1781	use CFClient::OpenGL;
		1782	use Carp qw/confess/;
		1783
		1784	our %loaded_images;
		1785
		1786	sub new {
		1787	my $class = shift;
		1788
		1789	my $self = $class->SUPER::new (can_events => 0, @_);
		1790
		1791	$self->{image} or confess "Image has 'image' not set. This is a fatal error!";
		1792
		1793	$loaded_images{$self->{image}} ||=
		1794	new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1;
		1795
		1796	my $tex = $self->{tex} = $loaded_images{$self->{image}};
		1797
		1798	Scalar::Util::weaken $loaded_images{$self->{image}};
		1799
		1800	$self->{aspect} = $tex->{w} / $tex->{h};
		1801
		1802	$self
		1803	}
		1804
		1805	sub size_request {
		1806	my ($self) = @_;
		1807
		1808	($self->{tex}->{w}, $self->{tex}->{h})
		1809	}
		1810
		1811	sub _draw {
		1812	my ($self) = @_;
		1813
		1814	my $tex = $self->{tex};
		1815
		1816	my ($w, $h) = ($self->{w}, $self->{h});
		1817
		1818	if ($self->{rot90}) {
		1819	glRotate 90, 0, 0, 1;
		1820	glTranslate 0, -$self->{w}, 0;
		1821
		1822	($w, $h) = ($h, $w);
		1823	}
		1824
		1825	glEnable GL_BLEND;
		1826	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
		1827	glEnable GL_TEXTURE_2D;
		1828	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
		1829
		1830	$tex->draw_quad (0, 0, $w, $h);
		1831
		1832	glDisable GL_BLEND;
		1833	glDisable GL_TEXTURE_2D;
		1834	}
		1835
		1836	#############################################################################
		1837
		1838	package CFClient::UI::VGauge;
		1839
		1840	our @ISA = CFClient::UI::Base::;
		1841
		1842	use List::Util qw(min max);
		1843
		1844	use CFClient::OpenGL;
		1845
		1846	my %tex = (
		1847	food => [
		1848	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
		1849	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
		1850	],
		1851	grace => [
		1852	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
		1853	qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
		1854	],
		1855	hp => [
		1856	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
		1857	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
		1858	],
		1859	mana => [
		1860	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
		1861	qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
		1862	],
		1863	);
		1864
		1865	# eg. VGauge->new (gauge => 'food'), default gauge: food
		1866	sub new {
		1867	my $class = shift;
		1868
		1869	my $self = $class->SUPER::new (
		1870	type => 'food',
		1871	@_
		1872	);
		1873
		1874	$self->{aspect} = $tex{$self->{type}}[0]{w} / $tex{$self->{type}}[0]{h};
		1875
		1876	$self
		1877	}
		1878
		1879	sub size_request {
		1880	my ($self) = @_;
		1881
		1882	#my $tex = $tex{$self->{type}}[0];
		1883	#@$tex{qw(w h)}
		1884	(0, 0)
		1885	}
		1886
		1887	sub set_max {
		1888	my ($self, $max) = @_;
		1889
		1890	return if $self->{max_val} == $max;
		1891
		1892	$self->{max_val} = $max;
		1893	$self->update;
		1894	}
		1895
		1896	sub set_value {
		1897	my ($self, $val, $max) = @_;
		1898
		1899	$self->set_max ($max)
		1900	if defined $max;
		1901
		1902	return if $self->{val} == $val;
		1903
		1904	$self->{val} = $val;
		1905	$self->update;
		1906	}
		1907
		1908	sub _draw {
		1909	my ($self) = @_;
		1910
		1911	my $tex = $tex{$self->{type}};
		1912	my ($t1, $t2, $t3) = @$tex;
		1913
		1914	my ($w, $h) = ($self->{w}, $self->{h});
		1915
		1916	if ($self->{vertical}) {
		1917	glRotate 90, 0, 0, 1;
		1918	glTranslate 0, -$self->{w}, 0;
		1919
		1920	($w, $h) = ($h, $w);
		1921	}
		1922
		1923	my $ycut = $self->{val} / ($self->{max_val} || 1);
		1924
		1925	my $ycut1 = max 0, min 1, $ycut;
		1926	my $ycut2 = max 0, min 1, $ycut - 1;
		1927
		1928	my $h1 = $self->{h} * (1 - $ycut1);
		1929	my $h2 = $self->{h} * (1 - $ycut2);
		1930
		1931	glEnable GL_BLEND;
		1932	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
		1933	glEnable GL_TEXTURE_2D;
		1934	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
		1935
		1936	glBindTexture GL_TEXTURE_2D, $t1->{name};
		1937	glBegin GL_QUADS;
		1938	glTexCoord 0 , 0; glVertex 0 , 0;
		1939	glTexCoord 0 , $t1->{t} * (1 - $ycut1); glVertex 0 , $h1;
		1940	glTexCoord $t1->{s}, $t1->{t} * (1 - $ycut1); glVertex $w, $h1;
		1941	glTexCoord $t1->{s}, 0; glVertex $w, 0;
		1942	glEnd;
		1943
		1944	my $ycut1 = List::Util::min 1, $ycut;
		1945	glBindTexture GL_TEXTURE_2D, $t2->{name};
		1946	glBegin GL_QUADS;
		1947	glTexCoord 0 , $t2->{t} * (1 - $ycut1); glVertex 0 , $h1;
		1948	glTexCoord 0 , $t2->{t} * (1 - $ycut2); glVertex 0 , $h2;
		1949	glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut2); glVertex $w, $h2;
		1950	glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut1); glVertex $w, $h1;
		1951	glEnd;
		1952
		1953	if ($t3) {
		1954	glBindTexture GL_TEXTURE_2D, $t3->{name};
		1955	glBegin GL_QUADS;
		1956	glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
		1957	glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h};
		1958	glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h};
		1959	glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
		1960	glEnd;
		1961	}
		1962
		1963	glDisable GL_BLEND;
		1964	glDisable GL_TEXTURE_2D;
		1965	}
		1966
		1967	#############################################################################
		1968
		1969	package CFClient::UI::Gauge;
		1970
		1971	our @ISA = CFClient::UI::VBox::;
		1972
		1973	sub new {
		1974	my ($class, %arg) = @_;
		1975
		1976	my $self = $class->SUPER::new (
		1977	tooltip => $arg{type},
		1978	can_hover => 1,
		1979	can_events => 1,
		1980	%arg,
		1981	);
		1982
		1983	$self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999");
		1984	$self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
		1985	$self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999");
		1986
		1987	$self
		1988	}
		1989
		1990	sub set_fontsize {
		1991	my ($self, $fsize) = @_;
		1992
		1993	$self->{value}->set_fontsize ($fsize);
		1994	$self->{max} ->set_fontsize ($fsize);
		1995	}
		1996
		1997	sub set_max {
		1998	my ($self, $max) = @_;
		1999
		2000	$self->{gauge}->set_max ($max);
		2001	$self->{max}->set_text ($max);
		2002	}
		2003
		2004	sub set_value {
		2005	my ($self, $val, $max) = @_;
		2006
		2007	$self->set_max ($max)
		2008	if defined $max;
		2009
		2010	$self->{gauge}->set_value ($val, $max);
		2011	$self->{value}->set_text ($val);
		2012	}
		2013
		2014	#############################################################################
		2015
1390	package CFClient::UI::Slider;	2016	package CFClient::UI::Slider;
1391		2017
1392	use strict;	2018	use strict;
1393		2019
1394	use SDL::OpenGL;	2020	use CFClient::OpenGL;
1395		2021
1396	our @ISA = CFClient::UI::DrawBG::;	2022	our @ISA = CFClient::UI::DrawBG::;
1397		2023
1398	my @tex =	2024	my @tex =
1399	map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }	2025	map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
…		…
1409	# TODO: calculations are off	2035	# TODO: calculations are off
1410	my $self = $class->SUPER::new (	2036	my $self = $class->SUPER::new (
1411	fg => [1, 1, 1],	2037	fg => [1, 1, 1],
1412	active_fg => [0, 0, 0],	2038	active_fg => [0, 0, 0],
1413	range => [0, 0, 100, 10],	2039	range => [0, 0, 100, 10],
1414	req_w => 40,	2040	req_w => $::WIDTH / 80,
1415	req_h => 13,	2041	req_h => $::WIDTH / 80,
1416	vertical => 0,	2042	vertical => 0,
1417	can_hover => 1,	2043	can_hover => 1,
1418	inner_pad => 5,	2044	inner_pad => 5,
1419	@_	2045	@_
1420	);	2046	);
…		…
1524		2150
1525	package CFClient::UI::TextView;	2151	package CFClient::UI::TextView;
1526		2152
1527	our @ISA = CFClient::UI::HBox::;	2153	our @ISA = CFClient::UI::HBox::;
1528		2154
1529	use SDL::OpenGL;	2155	use CFClient::OpenGL;
1530		2156
1531	sub new {	2157	sub new {
1532	my $class = shift;	2158	my $class = shift;
1533		2159
1534	my $self = $class->SUPER::new (	2160	my $self = $class->SUPER::new (
1535	req_w => $::WIDTH / 6,	2161	fontsize => 1,
1536	req_h => $::HEIGHT / 6,	2162	can_events => 0,
1537	fontsize => $::FONTSIZE,	2163	#font => default_font
1538	@_,	2164	@_,
1539		2165
1540	layout => (new CFClient::Layout),	2166	layout => (new CFClient::Layout),
1541	par => [],	2167	par => [],
1542	height => 0,	2168	height => 0,
1543	children => [	2169	children => [
1544	(new CFClient::UI::Empty expand => 1),	2170	(new CFClient::UI::Empty expand => 1),
1545	(new CFClient::UI::Slider vertical => 1),	2171	(new CFClient::UI::Slider vertical => 1),
1546	],	2172	],
1547	);	2173	);
1548		2174
1549	$self->{children}[1]->connect (changed => sub {	2175	$self->{children}[1]->connect (changed => sub { $self->update });
1550	$self->update;
1551	});
1552		2176
1553	$self	2177	$self
1554	}	2178	}
1555		2179
1556	sub set_fontsize {	2180	sub set_fontsize {
…		…
1563	sub text_height {	2187	sub text_height {
1564	my ($self, $text) = @_;	2188	my ($self, $text) = @_;
1565		2189
1566	my $layout = $self->{layout};	2190	my $layout = $self->{layout};
1567		2191
1568	$layout->set_height ($self->{fontsize});	2192	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
1569	$layout->set_width ($self->{w});	2193	$layout->set_width ($self->{children}[0]{w});
1570	$layout->set_text ($text);	2194	$layout->set_text ($text);
1571		2195
1572	($layout->size)[1]	2196	($layout->size)[1]
1573	}	2197	}
1574		2198
…		…
1577		2201
1578	$self->{need_reflow}++;	2202	$self->{need_reflow}++;
1579	$self->update;	2203	$self->update;
1580	}	2204	}
1581		2205
1582	sub size_request {
1583	my ($self) = @_;
1584
1585	($self->{req_w}, $self->{req_h})
1586	}
1587
1588	sub size_allocate {	2206	sub size_allocate {
1589	my ($self, $x, $y, $w, $h) = @_;	2207	my ($self, $w, $h) = @_;
1590		2208
1591	$self->SUPER::size_allocate ($x, $y, $w, $h);	2209	$self->SUPER::size_allocate ($w, $h);
1592		2210
		2211	$self->{layout}->set_font ($self->{font}) if $self->{font};
1593	$self->{layout}->set_height ($self->{fontsize});	2212	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1594	$self->{layout}->set_width ($self->{w});	2213	$self->{layout}->set_width ($self->{children}[0]{w});
1595		2214
1596	$self->reflow;	2215	$self->reflow;
1597	}	2216	}
1598		2217
1599	sub add_paragraph {	2218	sub add_paragraph {
…		…
1632	$self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];	2251	$self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];
1633		2252
1634	delete $self->{texture};	2253	delete $self->{texture};
1635	}	2254	}
1636		2255
1637	$self->{texture} ||= new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {	2256	$self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub {
1638	glClearColor 0, 0, 0, 1;	2257	glClearColor 0, 0, 0, 0;
1639	glClear GL_COLOR_BUFFER_BIT;	2258	glClear GL_COLOR_BUFFER_BIT;
1640		2259
1641	glEnable GL_BLEND;	2260	glEnable GL_BLEND;
1642	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	2261	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1643	glEnable GL_TEXTURE_2D;	2262	glEnable GL_TEXTURE_2D;
…		…
1650		2269
1651	my $y = 0;	2270	my $y = 0;
1652		2271
1653	my $layout = $self->{layout};	2272	my $layout = $self->{layout};
1654		2273
		2274	$layout->set_font ($self->{font}) if $self->{font};
		2275
1655	for my $par (@{$self->{par}}) {	2276	for my $par (@{$self->{par}}) {
1656	my $h = $par->[0];	2277	my $h = $par->[0];
1657		2278
1658	if ($y0 < $y + $h && $y < $y1) {	2279	if ($y0 < $y + $h && $y < $y1) {
1659	$layout->set_text ($par->[2]);	2280	$layout->set_text ($par->[2]);
…		…
1673	}	2294	}
1674		2295
1675	sub _draw {	2296	sub _draw {
1676	my ($self) = @_;	2297	my ($self) = @_;
1677		2298
1678	if ($self->{texture}) {	2299	glEnable GL_BLEND;
		2300	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1679	glEnable GL_TEXTURE_2D;	2301	glEnable GL_TEXTURE_2D;
1680	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2302	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
		2303	glColor 1, 1, 1, 1;
1681	$self->{texture}->draw_quad (0, 0, $self->{w}, $self->{h});	2304	$self->{texture}->draw_quad (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
1682	glDisable GL_TEXTURE_2D;	2305	glDisable GL_TEXTURE_2D;
1683	}	2306	glDisable GL_BLEND;
1684		2307
1685	$self->{children}[1]->draw;	2308	$self->{children}[1]->draw;
1686		2309
1687	}	2310	}
1688		2311
1689	#############################################################################	2312	#############################################################################
1690		2313
1691	package CFClient::UI::MapWidget;
1692
1693	use strict;
1694
1695	use List::Util qw(min max);
1696
1697	use SDL;
1698	use SDL::OpenGL;
1699
1700	our @ISA = CFClient::UI::Base::;
1701
1702	sub new {
1703	my $class = shift;
1704
1705	$class->SUPER::new (
1706	z => -1,
1707	can_focus => 1,
1708	list => (glGenLists 1),
1709	@_
1710	)
1711	}
1712
1713	sub key_down {
1714	print "MAPKEYDOWN\n";
1715	}
1716
1717	sub key_up {
1718	}
1719
1720	sub button_down {
1721	my ($self, $ev, $x, $y) = @_;
1722
1723	$self->focus_in;
1724
1725	if ($ev->button == 2) {
1726	my ($ox, $oy) = ($ev->button_x, $ev->button_y);
1727	my ($bw, $bh) = ($::CFG->{map_shift_x}, $::CFG->{map_shift_y});
1728
1729	$self->{motion} = sub {
1730	my ($ev, $x, $y) = @_;
1731
1732	($x, $y) = ($ev->motion_x, $ev->motion_y);
1733
1734	$::CFG->{map_shift_x} = $bw + $x - $ox;
1735	$::CFG->{map_shift_y} = $bh + $y - $oy;
1736
1737	$self->update;
1738	};
1739	}
1740	}
1741
1742	sub button_up {
1743	my ($self, $ev, $x, $y) = @_;
1744
1745	delete $self->{motion};
1746	}
1747
1748	sub mouse_motion {
1749	my ($self, $ev, $x, $y) = @_;
1750
1751	$self->{motion}->($ev, $x, $y) if $self->{motion};
1752	}
1753
1754	sub size_request {
1755	(
1756	1 + 32 * int $::WIDTH / 32,
1757	1 + 32 * int $::HEIGHT / 32,
1758	)
1759	}
1760
1761	sub update {
1762	my ($self) = @_;
1763
1764	$self->{need_update} = 1;
1765	$self->SUPER::update;
1766	}
1767
1768	sub draw {
1769	my ($self) = @_;
1770
1771	if (delete $self->{need_update}) {
1772	glNewList $self->{list}, GL_COMPILE;
1773
1774	if ($::MAP) {
1775	my $sw = int $::WIDTH / 32;
1776	my $sh = int $::HEIGHT / 32;
1777
1778	my $sx = $::CFG->{map_shift_x}; my $sx0 = $sx & 31; $sx = ($sx - $sx0) / 32;
1779	my $sy = $::CFG->{map_shift_y}; my $sy0 = $sy & 31; $sy = ($sy - $sy0) / 32;
1780
1781	glTranslate $sx0 - 32, $sy0 - 32, 0;
1782
1783	my ($w, $h, $data) = $::MAP->draw ($sx, $sy, 0, 0, $sw + 1, $sh + 1);
1784
1785	if ($::CFG->{fow_enable}) {
1786	if ($::CFG->{fow_smooth}) { # smooth fog of war
1787	glConvolutionParameter GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER;
1788	glConvolutionFilter2D
1789	GL_CONVOLUTION_2D,
1790	GL_ALPHA,
1791	3, 3,
1792	GL_ALPHA, GL_FLOAT,
1793	pack "f*",
1794	0.1, 0.1, 0.1,
1795	0.1, 0.2, 0.1,
1796	0.1, 0.1, 0.1,
1797	;
1798	glEnable GL_CONVOLUTION_2D;
1799	}
1800
1801	$self->{fow_texture} = new CFClient::Texture
1802	w => $w,
1803	h => $h,
1804	data => $data,
1805	internalformat => GL_ALPHA,
1806	format => GL_ALPHA;
1807
1808	glDisable GL_CONVOLUTION_2D if $::CFG->{fow_smooth};
1809
1810	glEnable GL_BLEND;
1811	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1812	glEnable GL_TEXTURE_2D;
1813	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1814
1815	glColor +($::CFG->{fow_intensity}) x 3, 1;
1816	$self->{fow_texture}->draw_quad (0, 0, $w * 32, $h * 32);
1817
1818	glDisable GL_TEXTURE_2D;
1819	glDisable GL_BLEND;
1820	}
1821
1822	# HACK BEGIN
1823	{
1824	glTranslate -($sx0 - 32), -($sy0 - 32), 0;#remove
1825	my ($w, $h) = (250, 250);
1826
1827	glEnable GL_BLEND;
1828	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1829	glEnable GL_TEXTURE_2D;
1830	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1831
1832	$self->{mapmap_texture} =
1833	new CFClient::Texture
1834	w => $w,
1835	h => $h,
1836	data => $::MAP->mapmap ($w, $h),
1837	type => GL_UNSIGNED_INT_8_8_8_8_REV;
1838
1839	$self->{mapmap_texture}->draw_quad (100, 100);
1840
1841	glDisable GL_TEXTURE_2D;
1842	glDisable GL_BLEND;
1843	}
1844	# HACK END
1845	}
1846
1847	glEndList;
1848	}
1849
1850	glPushMatrix;
1851	glCallList $self->{list};
1852	glPopMatrix;
1853
1854	if ($FOCUS != $self) {
1855	glColor 64/255, 64/255, 64/255;
1856	glLogicOp GL_AND;
1857	glEnable GL_COLOR_LOGIC_OP;
1858	glBegin GL_QUADS;
1859	glVertex 0, 0;
1860	glVertex 0, $::HEIGHT;
1861	glVertex $::WIDTH, $::HEIGHT;
1862	glVertex $::WIDTH, 0;
1863	glEnd;
1864	glDisable GL_COLOR_LOGIC_OP;
1865	}
1866	}
1867
1868	my %DIR = (
1869	SDLK_KP8, [1, "north"],
1870	SDLK_KP9, [2, "northeast"],
1871	SDLK_KP6, [3, "east"],
1872	SDLK_KP3, [4, "southeast"],
1873	SDLK_KP2, [5, "south"],
1874	SDLK_KP1, [6, "southwest"],
1875	SDLK_KP4, [7, "west"],
1876	SDLK_KP7, [8, "northwest"],
1877
1878	SDLK_UP, [1, "north"],
1879	SDLK_RIGHT, [3, "east"],
1880	SDLK_DOWN, [5, "south"],
1881	SDLK_LEFT, [7, "west"],
1882	);
1883
1884	sub key_down {
1885	my ($self, $ev) = @_;
1886
1887	my $mod = $ev->key_mod;
1888	my $sym = $ev->key_sym;
1889
1890	if ($sym == SDLK_KP5) {
1891	$::CONN->user_send ("stay fire");
1892	} elsif ($sym == SDLK_a) {
1893	$::CONN->user_send ("apply");
1894	} elsif ($sym == SDLK_QUOTE) {
1895	$self->emit ('activate_console');
1896	} elsif ($sym == SDLK_SLASH) {
1897	$self->emit ('activate_console' => '/');
1898	} elsif (exists $DIR{$sym}) {
1899	if ($mod & KMOD_SHIFT) {
1900	$self->{shft}++;
1901	$::CONN->user_send ("fire $DIR{$sym}[0]");
1902	} elsif ($mod & KMOD_CTRL) {
1903	$self->{ctrl}++;
1904	$::CONN->user_send ("run $DIR{$sym}[0]");
1905	} else {
1906	$::CONN->user_send ("$DIR{$sym}[1]");
1907	}
1908	}
1909	}
1910
1911	sub key_up {
1912	my ($self, $ev) = @_;
1913
1914	my $mod = $ev->key_mod;
1915	my $sym = $ev->key_sym;
1916
1917	if (!($mod & KMOD_SHIFT) && delete $self->{shft}) {
1918	$::CONN->user_send ("fire_stop");
1919	}
1920	if (!($mod & KMOD_CTRL ) && delete $self->{ctrl}) {
1921	$::CONN->user_send ("run_stop");
1922	}
1923	}
1924
1925	#############################################################################
1926
1927	package CFClient::UI::Animator;	2314	package CFClient::UI::Animator;
1928		2315
1929	use SDL::OpenGL;	2316	use CFClient::OpenGL;
1930		2317
1931	our @ISA = CFClient::UI::Bin::;	2318	our @ISA = CFClient::UI::Bin::;
1932		2319
1933	sub moveto {	2320	sub moveto {
1934	my ($self, $x, $y) = @_;	2321	my ($self, $x, $y) = @_;
…		…
1972		2359
1973	sub new {	2360	sub new {
1974	my $class = shift;	2361	my $class = shift;
1975		2362
1976	my $self = $class->SUPER::new (	2363	my $self = $class->SUPER::new (
1977	state => 0,	2364	state => 0,
1978	connect_activate => \&toggle_flopper,	2365	connect_activate => \&toggle_flopper,
1979	@_	2366	@_
1980	);	2367	);
1981		2368
1982	if ($self->{state}) {	2369	if ($self->{state}) {
…		…
2003	$self->emit (changed => $self->{state});	2390	$self->emit (changed => $self->{state});
2004	}	2391	}
2005		2392
2006	#############################################################################	2393	#############################################################################
2007		2394
		2395	package CFClient::UI::Tooltip;
		2396
		2397	our @ISA = CFClient::UI::Bin::;
		2398
		2399	use CFClient::OpenGL;
		2400
		2401	sub new {
		2402	my $class = shift;
		2403
		2404	$class->SUPER::new (
		2405	@_,
		2406	can_events => 0,
		2407	)
		2408	}
		2409
		2410	sub set_markup {
		2411	my ($self, $text) = @_;
		2412
		2413	$self->{label} ||= new CFClient::UI::Label fontsize => 0.8, fg => [0, 0, 0];
		2414	$self->{label}->set_markup ($text);
		2415	$self->add ($self->{label});
		2416	}
		2417
		2418	sub size_request {
		2419	my ($self) = @_;
		2420
		2421	$self->child->set_max_size ($::WIDTH * 0.3);
		2422
		2423	my ($w, $h) = @{$self->child}{qw(req_w req_h)};
		2424
		2425	($w + 4, $h + 4)
		2426	}
		2427
		2428	sub size_allocate {
		2429	my ($self, $w, $h) = @_;
		2430
		2431	$self->SUPER::size_allocate ($w - 4, $h - 4);
		2432	}
		2433
		2434	sub _draw {
		2435	my ($self) = @_;
		2436
		2437	glPushMatrix;
		2438	glTranslate 0.375, 0.375;
		2439
		2440	my ($w, $h) = @$self{qw(w h)};
		2441
		2442	glColor 1, 0.8, 0.4;
		2443	glBegin GL_QUADS;
		2444	glVertex 0 , 0;
		2445	glVertex 0 , $h;
		2446	glVertex $w, $h;
		2447	glVertex $w, 0;
		2448	glEnd;
		2449
		2450	glColor 0, 0, 0;
		2451	glBegin GL_LINE_LOOP;
		2452	glVertex 0 , 0;
		2453	glVertex 0 , $h;
		2454	glVertex $w, $h;
		2455	glVertex $w, 0;
		2456	glEnd;
		2457
		2458	glPopMatrix;
		2459
		2460	glTranslate 2, 2;
		2461	$self->SUPER::_draw;
		2462	}
		2463
		2464	#############################################################################
		2465
		2466	package CFClient::UI::Face;
		2467
		2468	our @ISA = CFClient::UI::Base::;
		2469
		2470	use CFClient::OpenGL;
		2471
		2472	sub new {
		2473	my $class = shift;
		2474
		2475	$class->SUPER::new (
		2476	aspect => 1,
		2477	@_,
		2478	)
		2479	}
		2480
		2481	sub size_request {
		2482	(32, 8)
		2483	}
		2484
		2485	sub _draw {
		2486	my ($self) = @_;
		2487
		2488	return unless $::CONN;#d# manage and cache textures differently
		2489	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]];
		2490
		2491	# TODO animation
		2492	if ($tex) {
		2493	glEnable GL_BLEND;
		2494	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
		2495	glEnable GL_TEXTURE_2D;
		2496	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
		2497	glColor 1, 1, 1, 1;
		2498	$tex->draw_quad (0, 0, $self->{w}, $self->{h});
		2499	glDisable GL_TEXTURE_2D;
		2500	glDisable GL_BLEND;
		2501	}
		2502	}
		2503
		2504	#############################################################################
		2505
		2506	package CFClient::UI::Menu;
		2507
		2508	our @ISA = CFClient::UI::FancyFrame::;
		2509
		2510	use CFClient::OpenGL;
		2511
		2512	sub new {
		2513	my $class = shift;
		2514
		2515	my $self = $class->SUPER::new (
		2516	items => [],
		2517	z => 100,
		2518	@_,
		2519	);
		2520
		2521	$self->add ($self->{vbox} = new CFClient::UI::VBox);
		2522
		2523	for my $item (@{ $self->{items} }) {
		2524	my ($widget, $cb) = @$item;
		2525
		2526	# handle various types of items, only text for now
		2527	if (!ref $widget) {
		2528	$widget = new CFClient::UI::Label
		2529	can_hover => 1,
		2530	can_events => 1,
		2531	text => $widget;
		2532	}
		2533
		2534	$self->{item}{$widget} = $item;
		2535
		2536	$self->{vbox}->add ($widget);
		2537	}
		2538
		2539	$self
		2540	}
		2541
		2542	# popup given the event (must be a mouse button down event currently)
		2543	sub popup {
		2544	my ($self, $ev) = @_;
		2545
		2546	$self->emit ("popdown");
		2547
		2548	# maybe save $GRAB? must be careful about events...
		2549	$GRAB = $self;
		2550	$self->{button} = $ev->{button};
		2551
		2552	$self->show;
		2553	$self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
		2554	}
		2555
		2556	sub mouse_motion {
		2557	my ($self, $ev, $x, $y) = @_;
		2558
		2559	# TODO: should use vbox->find_widget or so
		2560	$HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
		2561	$self->{hover} = $self->{item}{$HOVER};
		2562	}
		2563
		2564	sub button_up {
		2565	my ($self, $ev, $x, $y) = @_;
		2566
		2567	if ($ev->{button} == $self->{button}) {
		2568	undef $GRAB;
		2569	$self->hide;
		2570
		2571	$self->emit ("popdown");
		2572	$self->{hover}[1]->() if $self->{hover};
		2573	}
		2574	}
		2575
		2576	#############################################################################
		2577
2008	package CFClient::UI::Root;	2578	package CFClient::UI::Root;
2009		2579
2010	our @ISA = CFClient::UI::Container::;	2580	our @ISA = CFClient::UI::Container::;
2011		2581
2012	use SDL::OpenGL;	2582	use CFClient::OpenGL;
		2583
		2584	sub check_size {
		2585	my ($self) = @_;
		2586
		2587	$self->configure (0, 0, $::WIDTH, $::HEIGHT);
		2588	}
2013		2589
2014	sub size_request {	2590	sub size_request {
2015	($::WIDTH, $::HEIGHT)	2591	($::WIDTH, $::HEIGHT)
2016	}	2592	}
2017		2593
2018	sub size_allocate {	2594	sub configure {
2019	my ($self, $x, $y, $w, $h) = @_;	2595	my ($self, $x, $y, $w, $h) = @_;
2020		2596
2021	$self->_size_allocate ($x, $y, $w, $h);	2597	$self->SUPER::configure ($x, $y, $w, $h);
2022		2598
2023	$_->size_allocate ($_->{x}, $_->{y}, $_->size_request)
2024	for @{$self->{children}};	2599	for my $child (@{$self->{children}}) {
		2600	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
		2601
		2602	$X = List::Util::max 0, List::Util::min $w - $W, $X;
		2603	$Y = List::Util::max 0, List::Util::min $h - $H, $Y;
		2604	$child->configure ($X, $Y, $W,$H);
		2605	}
2025	}	2606	}
2026		2607
2027	sub _topleft {	2608	sub _topleft {
2028	my ($self, $x, $y) = @_;	2609	my ($self, $x, $y) = @_;
2029		2610
…		…
2031	}	2612	}
2032		2613
2033	sub update {	2614	sub update {
2034	my ($self) = @_;	2615	my ($self) = @_;
2035		2616
2036	$self->size_allocate (0, 0, $::WIDTH, $::HEIGHT);	2617	$self->check_size;
2037	::refresh ();	2618	::refresh ();
2038	}	2619	}
2039		2620
2040	sub add {	2621	sub add {
2041	my ($self, $widget) = @_;	2622	my ($self, $child) = @_;
2042		2623
		2624	# integerize window positions
		2625	$child->{x} = int $child->{x};
		2626	$child->{y} = int $child->{y};
		2627
2043	$self->SUPER::add ($widget);	2628	$self->SUPER::add ($child);
2044
2045	$widget->size_allocate (int $widget->{x}, int $widget->{y}, $widget->size_request);
2046	}	2629	}
2047		2630
2048	sub on_refresh {	2631	sub on_refresh {
2049	my ($self, $id, $cb) = @_;	2632	my ($self, $id, $cb) = @_;
2050		2633
…		…
2071	$self->_draw;	2654	$self->_draw;
2072	}	2655	}
2073		2656
2074	#############################################################################	2657	#############################################################################
2075		2658
		2659	package CFClient::UI::InventoryItem;
		2660
		2661	our @ISA = CFClient::UI::HBox::;
		2662
		2663	sub new {
		2664	my $class = shift;
		2665
		2666	my %args = @_;
		2667
		2668	my $item = $args{item};
		2669
		2670	my $desc = $item->{nrof} < 2
		2671	? $item->{name}
		2672	: "$item->{nrof} $item->{name_pl}";
		2673
		2674
		2675	my $self = $class->SUPER::new (
		2676	can_hover => 1,
		2677	can_events => 1,
		2678	tooltip => (CFClient::UI::Label->escape ($desc)
		2679	. "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),
		2680	connect_button_down => sub {
		2681	my ($self, $ev, $x, $y) = @_;
		2682
		2683	# todo: maybe put examine on 1? but should just be a tooltip :(
		2684	if ($ev->{button} == 1) {
		2685	$::CONN->send ("move $::CONN->{player}{tag} $item->{tag} 0");
		2686	} elsif ($ev->{button} == 2) {
		2687	$::CONN->send ("apply $item->{tag}");
		2688	} elsif ($ev->{button} == 3) {
		2689	CFClient::UI::Menu->new (
		2690	items => [
		2691	["examine", sub { $::CONN->send ("examine $item->{tag}") }],
		2692	[
		2693	$item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock",
		2694	sub { $::CONN->send ("lock $item->{tag}") },
		2695	],
		2696	["mark", sub { $::CONN->send ("mark $item->{tag}") }],
		2697	["apply", sub { $::CONN->send ("apply $item->{tag}") }],
		2698	["drop", sub { $::CONN->send ("move 0 $item->{tag} 0") }],
		2699	],
		2700	)->popup ($ev);
		2701	}
		2702
		2703	1
		2704	},
		2705	%args
		2706	);
		2707	$self->add(new CFClient::UI::Face
		2708	can_events => 0,
		2709	face => $item->{face},
		2710	anim => $item->{anim},
		2711	animspeed => $item->{animspeed});
		2712	$self->add(new CFClient::UI::Label
		2713	can_events => 0,
		2714	text => $desc);
		2715
		2716	$self
		2717	}
		2718
		2719	#############################################################################
		2720
		2721	package CFClient::UI::Inventory;
		2722
		2723	our @ISA = CFClient::UI::ScrolledWindow::;
		2724
		2725	sub new {
		2726	my $class = shift;
		2727
		2728	my $self = $class->SUPER::new (
		2729	scrolled => (new CFClient::UI::VBox),
		2730	@_,
		2731	);
		2732
		2733	$self
		2734	}
		2735
		2736	sub set_items {
		2737	my ($self, $items) = @_;
		2738
		2739	$self->{scrolled}->clear;
		2740	return unless $items;
		2741
		2742	my @items = sort { $a->{type} <=> $b->{type} } @$items;
		2743
		2744	$self->{real_items} = \@items;
		2745
		2746	for my $item (@items) {
		2747	my $desc = $item->{nrof} < 2
		2748	? $item->{name}
		2749	: "$item->{nrof} $item->{name_pl}";
		2750
		2751	$self->{scrolled}->add (new CFClient::UI::InventoryItem item => $item);
		2752	}
		2753
		2754	# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
		2755	}
		2756
		2757	sub size_request {
		2758	my ($self) = @_;
		2759	($self->{req_w}, $self->{req_h});
		2760	}
		2761
		2762	#############################################################################
		2763
2076	package CFClient::UI;	2764	package CFClient::UI;
2077		2765
2078	$ROOT = new CFClient::UI::Root;	2766	$ROOT = new CFClient::UI::Root;
		2767	$TOOLTIP = new CFClient::UI::Tooltip;
2079		2768
2080	1	2769	1
2081		2770

Diff Legend

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