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.258 by root, Tue May 30 02:55:45 2006 UTC vs.
Revision 1.374 by root, Mon Jul 16 12:36:48 2007 UTC

1	package CFClient::UI;	1	package CFPlus::UI;
2		2
3	use utf8;	3	use utf8;
4	use strict;	4	use strict;
5		5
6	use Scalar::Util ();
7	use List::Util ();	6	use List::Util ();
		7	use Event;
8		8
9	use CFClient;	9	use CFPlus;
		10	use CFPlus::Pod;
10	use CFClient::Texture;	11	use CFPlus::Texture;
11		12
12	our ($FOCUS, $HOVER, $GRAB); # various widgets	13	our ($FOCUS, $HOVER, $GRAB); # various widgets
13		14
14	our $LAYOUT;	15	our $LAYOUT;
15	our $ROOT;	16	our $ROOT;
16	our $TOOLTIP;	17	our $TOOLTIP;
17	our $BUTTON_STATE;	18	our $BUTTON_STATE;
18		19
19	our %WIDGET; # all widgets, weak-referenced	20	our %WIDGET; # all widgets, weak-referenced
		21
		22	our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub {
		23	if (!$GRAB) {
		24	for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
		25	if (length $widget->{tooltip}) {
		26	if ($TOOLTIP->{owner} != $widget) {
		27	$TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner};
		28	$TOOLTIP->hide;
		29
		30	$TOOLTIP->{owner} = $widget;
		31	$TOOLTIP->{owner}->emit ("tooltip_show") if $TOOLTIP->{owner};
		32
		33	return if $ENV{CFPLUS_DEBUG} & 8;
		34
		35	my $tip = $widget->{tooltip};
		36
		37	$tip = $tip->($widget) if CODE:: eq ref $tip;
		38
		39	$TOOLTIP->set_tooltip_from ($widget);
		40	$TOOLTIP->show;
		41	}
		42
		43	return;
		44	}
		45	}
		46	}
		47
		48	$TOOLTIP->hide;
		49	$TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner};
		50	delete $TOOLTIP->{owner};
		51	});
20		52
21	sub get_layout {	53	sub get_layout {
22	my $layout;	54	my $layout;
23		55
24	for (grep { $_->{name} } values %WIDGET) {	56	for (grep { $_->{name} } values %WIDGET) {
…		…
39	my ($layout) = @_;	71	my ($layout) = @_;
40		72
41	$LAYOUT = $layout;	73	$LAYOUT = $layout;
42	}	74	}
43		75
44	sub check_tooltip {
45	if (!$GRAB) {
46	for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
47	if (length $widget->{tooltip}) {
48
49	if ($TOOLTIP->{owner} != $widget) {
50	$TOOLTIP->hide;
51
52	$TOOLTIP->{owner} = $widget;
53
54	my $tip = $widget->{tooltip};
55
56	$tip = $tip->($widget) if CODE:: eq ref $tip;
57
58	$TOOLTIP->set_tooltip_from ($widget);
59	$TOOLTIP->show;
60	}
61
62	return;
63	}
64	}
65	}
66
67	$TOOLTIP->hide;
68	delete $TOOLTIP->{owner};
69	}
70
71	# class methods for events	76	# class methods for events
72	sub feed_sdl_key_down_event {	77	sub feed_sdl_key_down_event {
73	$FOCUS->emit (key_down => $_[0])	78	$FOCUS->emit (key_down => $_[0])
74	if $FOCUS;	79	if $FOCUS;
75	}	80	}
…		…
77	sub feed_sdl_key_up_event {	82	sub feed_sdl_key_up_event {
78	$FOCUS->emit (key_up => $_[0])	83	$FOCUS->emit (key_up => $_[0])
79	if $FOCUS;	84	if $FOCUS;
80	}	85	}
81		86
		87	sub check_hover {
		88	my ($widget) = @_;
		89
		90	if ($widget != $HOVER) {
		91	my $hover = $HOVER; $HOVER = $widget;
		92
		93	$hover->update if $hover && $hover->{can_hover};
		94	$HOVER->update if $HOVER && $HOVER->{can_hover};
		95
		96	$TOOLTIP_WATCHER->start;
		97	}
		98	}
		99
82	sub feed_sdl_button_down_event {	100	sub feed_sdl_button_down_event {
83	my ($ev) = @_;	101	my ($ev) = @_;
84	my ($x, $y) = ($ev->{x}, $ev->{y});	102	my ($x, $y) = ($ev->{x}, $ev->{y});
85		103
86	if (!$BUTTON_STATE) {	104	$BUTTON_STATE |= 1 << ($ev->{button} - 1);
		105
		106	unless ($GRAB) {
87	my $widget = $ROOT->find_widget ($x, $y);	107	my $widget = $ROOT->find_widget ($x, $y);
88		108
89	$GRAB = $widget;	109	$GRAB = $widget;
90	$GRAB->update if $GRAB;	110	$GRAB->update if $GRAB;
91		111
92	check_tooltip;	112	$TOOLTIP_WATCHER->cb->();
93	}	113	}
94		114
95	$BUTTON_STATE |= 1 << ($ev->{button} - 1);	115	if ($GRAB) {
96		116	if ($ev->{button} == 4 || $ev->{button} == 5) {
97	$GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))	117	# mousewheel
98	if $GRAB;	118	$ev->{dx} = 0;
		119	$ev->{dy} = $ev->{button} * 2 - 9;
		120	$GRAB->emit (mouse_wheel => $ev);
		121	} else {
		122	$GRAB->emit (button_down => $ev)
		123	}
		124	}
99	}	125	}
100		126
101	sub feed_sdl_button_up_event {	127	sub feed_sdl_button_up_event {
102	my ($ev) = @_;	128	my ($ev) = @_;
103	my ($x, $y) = ($ev->{x}, $ev->{y});
104		129
105	my $widget = $GRAB || $ROOT->find_widget ($x, $y);	130	my $widget = $GRAB || $ROOT->find_widget ($ev->{x}, $ev->{y});
106		131
107	$BUTTON_STATE &= ~(1 << ($ev->{button} - 1));	132	$BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
108		133
109	$GRAB->emit (button_up => $ev, $GRAB->coord2local ($x, $y))	134	$GRAB->emit (button_up => $ev)
110	if $GRAB;	135	if $GRAB && $ev->{button} != 4 && $ev->{button} != 5;
111		136
112	if (!$BUTTON_STATE) {	137	unless ($BUTTON_STATE) {
113	my $grab = $GRAB; undef $GRAB;	138	my $grab = $GRAB; undef $GRAB;
114	$grab->update if $grab;	139	$grab->update if $grab;
115	$GRAB->update if $GRAB;	140	$GRAB->update if $GRAB;
116		141
117	check_tooltip;	142	check_hover $widget;
		143	$TOOLTIP_WATCHER->cb->();
118	}	144	}
119	}	145	}
120		146
121	sub feed_sdl_motion_event {	147	sub feed_sdl_motion_event {
122	my ($ev) = @_;	148	my ($ev) = @_;
123	my ($x, $y) = ($ev->{x}, $ev->{y});	149	my ($x, $y) = ($ev->{x}, $ev->{y});
124		150
125	my $widget = $GRAB || $ROOT->find_widget ($x, $y);	151	my $widget = $GRAB || $ROOT->find_widget ($x, $y);
126		152
127	if ($widget != $HOVER) {	153	check_hover $widget;
128	my $hover = $HOVER; $HOVER = $widget;
129		154
130	$hover->update if $hover && $hover->{can_hover};	155	$HOVER->emit (mouse_motion => $ev)
131	$HOVER->update if $HOVER && $HOVER->{can_hover};
132
133	check_tooltip;
134	}
135
136	$HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
137	if $HOVER;	156	if $HOVER;
138	}	157	}
139		158
140	# convert position array to integers	159	# convert position array to integers
141	sub harmonize {	160	sub harmonize {
…		…
170	sub rescale_widgets {	189	sub rescale_widgets {
171	my ($sx, $sy) = @_;	190	my ($sx, $sy) = @_;
172		191
173	for my $widget (values %WIDGET) {	192	for my $widget (values %WIDGET) {
174	if ($widget->{is_toplevel}) {	193	if ($widget->{is_toplevel}) {
175	$widget->{x} += $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;	194	$widget->{x} += int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
176	$widget->{y} += $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;	195	$widget->{y} += int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
177		196
178	$widget->{x} = int 0.5 + $widget->{x} * $sx if $widget->{x} =~ /^[0-9.]+$/;	197	$widget->{x} = int 0.5 + $widget->{x} * $sx if $widget->{x} =~ /^[0-9.]+$/;
179	$widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};	198	$widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};
180	$widget->{force_w} = int 0.5 + $widget->{force_w} * $sx if exists $widget->{force_w};	199	$widget->{force_w} = int 0.5 + $widget->{force_w} * $sx if exists $widget->{force_w};
181	$widget->{y} = int 0.5 + $widget->{y} * $sy if $widget->{y} =~ /^[0-9.]+$/;	200	$widget->{y} = int 0.5 + $widget->{y} * $sy if $widget->{y} =~ /^[0-9.]+$/;
182	$widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};	201	$widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};
183	$widget->{force_h} = int 0.5 + $widget->{force_h} * $sy if exists $widget->{force_h};	202	$widget->{force_h} = int 0.5 + $widget->{force_h} * $sy if exists $widget->{force_h};
184		203
185	$widget->{x} -= $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;	204	$widget->{x} -= int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
186	$widget->{y} -= $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;	205	$widget->{y} -= int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
187		206
188	}	207	}
189	}	208	}
190		209
191	reconfigure_widgets;	210	reconfigure_widgets;
192	}	211	}
193		212
194	#############################################################################	213	#############################################################################
195		214
		215	package CFPlus::UI::Event;
		216
		217	sub xy {
		218	$_[1]->coord2local ($_[0]{x}, $_[0]{y})
		219	}
		220
		221	#############################################################################
		222
196	package CFClient::UI::Base;	223	package CFPlus::UI::Base;
197		224
198	use strict;	225	use strict;
199		226
200	use CFClient::OpenGL;	227	use CFPlus::OpenGL;
201		228
202	sub new {	229	sub new {
203	my $class = shift;	230	my $class = shift;
204		231
205	my $self = bless {	232	my $self = bless {
…		…
210	h => undef,	237	h => undef,
211	can_events => 1,	238	can_events => 1,
212	@_	239	@_
213	}, $class;	240	}, $class;
214		241
215	Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);	242	CFPlus::weaken ($CFPlus::UI::WIDGET{$self+0} = $self);
216		243
217	for (keys %$self) {	244	for (keys %$self) {
218	if (/^on_(.*)$/) {	245	if (/^on_(.*)$/) {
219	$self->connect ($1 => delete $self->{$_});	246	$self->connect ($1 => delete $self->{$_});
220	}	247	}
221	}	248	}
222		249
223	if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {	250	if (my $layout = $CFPlus::UI::LAYOUT->{$self->{name}}) {
224	$self->{x} = $layout->{x} * $CFClient::UI::ROOT->{w} if exists $layout->{x};	251	$self->{x} = $layout->{x} * $CFPlus::UI::ROOT->{alloc_w} if exists $layout->{x};
225	$self->{y} = $layout->{y} * $CFClient::UI::ROOT->{h} if exists $layout->{y};	252	$self->{y} = $layout->{y} * $CFPlus::UI::ROOT->{alloc_h} if exists $layout->{y};
226	$self->{force_w} = $layout->{w} * $CFClient::UI::ROOT->{w} if exists $layout->{w};	253	$self->{force_w} = $layout->{w} * $CFPlus::UI::ROOT->{alloc_w} if exists $layout->{w};
227	$self->{force_h} = $layout->{h} * $CFClient::UI::ROOT->{h} if exists $layout->{h};	254	$self->{force_h} = $layout->{h} * $CFPlus::UI::ROOT->{alloc_h} if exists $layout->{h};
228		255
229	$self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};	256	$self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
230	$self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};	257	$self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
231		258
232	$self->show if $layout->{show};	259	$self->show if $layout->{show};
…		…
237		264
238	sub destroy {	265	sub destroy {
239	my ($self) = @_;	266	my ($self) = @_;
240		267
241	$self->hide;	268	$self->hide;
		269	$self->emit ("destroy");
242	%$self = ();	270	%$self = ();
243	}	271	}
244		272
		273	sub TO_JSON {
		274	{ __widget_ref__ => $_[0]{s_id} }
		275	}
		276
245	sub show {	277	sub show {
246	my ($self) = @_;	278	my ($self) = @_;
247		279
248	return if $self->{parent};	280	return if $self->{parent};
249		281
250	$CFClient::UI::ROOT->add ($self);	282	$CFPlus::UI::ROOT->add ($self);
251	}	283	}
252		284
253	sub set_visible {	285	sub set_visible {
254	my ($self) = @_;	286	my ($self) = @_;
255		287
…		…
270		302
271	return unless $self->{visible};	303	return unless $self->{visible};
272		304
273	$_->set_invisible for $self->children;	305	$_->set_invisible for $self->children;
274		306
		307	delete $self->{visible};
275	delete $self->{root};	308	delete $self->{root};
276	delete $self->{visible};
277		309
278	undef $GRAB if $GRAB == $self;	310	undef $GRAB if $GRAB == $self;
279	undef $HOVER if $HOVER == $self;	311	undef $HOVER if $HOVER == $self;
280		312
281	CFClient::UI::check_tooltip	313	$CFPlus::UI::TOOLTIP_WATCHER->cb->()
282	if $TOOLTIP->{owner} == $self;	314	if $TOOLTIP->{owner} == $self;
283		315
284	$self->focus_out;	316	$self->emit ("focus_out");
285
286	$self->emit (visibility_change => 0);	317	$self->emit (visibility_change => 0);
287	}	318	}
288		319
289	sub set_visibility {	320	sub set_visibility {
290	my ($self, $visible) = @_;	321	my ($self, $visible) = @_;
291		322
292	return if $self->{visible} == $visible;	323	return if $self->{visible} == $visible;
293		324
294	$visible ? $self->hide	325	$visible ? $self->show
295	: $self->show;	326	: $self->hide;
296	}	327	}
297		328
298	sub toggle_visibility {	329	sub toggle_visibility {
299	my ($self) = @_;	330	my ($self) = @_;
300		331
…		…
313	}	344	}
314		345
315	sub move_abs {	346	sub move_abs {
316	my ($self, $x, $y, $z) = @_;	347	my ($self, $x, $y, $z) = @_;
317		348
318	$self->{x} = List::Util::max 0, int $x;	349	$self->{x} = List::Util::max 0, List::Util::min $self->{root}{w} - $self->{w}, int $x;
319	$self->{y} = List::Util::max 0, int $y;	350	$self->{y} = List::Util::max 0, List::Util::min $self->{root}{h} - $self->{h}, int $y;
320	$self->{z} = $z if defined $z;	351	$self->{z} = $z if defined $z;
321		352
322	$self->update;	353	$self->update;
323	}	354	}
324		355
…		…
334	sub size_request {	365	sub size_request {
335	require Carp;	366	require Carp;
336	Carp::confess "size_request is abstract";	367	Carp::confess "size_request is abstract";
337	}	368	}
338		369
		370	sub baseline_shift {
		371	0
		372	}
		373
339	sub configure {	374	sub configure {
340	my ($self, $x, $y, $w, $h) = @_;	375	my ($self, $x, $y, $w, $h) = @_;
341		376
342	if ($self->{aspect}) {	377	if ($self->{aspect}) {
343	my ($ow, $oh) = ($w, $h);	378	my ($ow, $oh) = ($w, $h);
344		379
345	$w = List::Util::min $w, int $h * $self->{aspect};	380	$w = List::Util::min $w, CFPlus::ceil $h * $self->{aspect};
346	$h = List::Util::min $h, int $w / $self->{aspect};	381	$h = List::Util::min $h, CFPlus::ceil $w / $self->{aspect};
347		382
348	# use alignment to adjust x, y	383	# use alignment to adjust x, y
349		384
350	$x += int 0.5 * ($ow - $w);	385	$x += int 0.5 * ($ow - $w);
351	$y += int 0.5 * ($oh - $h);	386	$y += int 0.5 * ($oh - $h);
…		…
355	$self->{x} = $x;	390	$self->{x} = $x;
356	$self->{y} = $y;	391	$self->{y} = $y;
357	$self->update;	392	$self->update;
358	}	393	}
359		394
360	if ($self->{w} != $w || $self->{h} != $h) {	395	if ($self->{alloc_w} != $w || $self->{alloc_h} != $h) {
361	return unless $self->{visible};	396	return unless $self->{visible};
362		397
		398	$self->{alloc_w} = $w;
		399	$self->{alloc_h} = $h;
		400
363	$self->{root}->{size_alloc}{$self+0} = [$self, $w, $h];	401	$self->{root}{size_alloc}{$self+0} = $self;
364	}	402	}
365	}
366
367	sub size_allocate {
368	# nothing to be done
369	}	403	}
370		404
371	sub children {	405	sub children {
		406	# nop
		407	}
		408
		409	sub visible_children {
		410	$_[0]->children
372	}	411	}
373		412
374	sub set_max_size {	413	sub set_max_size {
375	my ($self, $w, $h) = @_;	414	my ($self, $w, $h) = @_;
376		415
377	delete $self->{max_w}; $self->{max_w} = $w if $w;	416	$self->{max_w} = int $w if defined $w;
378	delete $self->{max_h}; $self->{max_h} = $h if $h;	417	$self->{max_h} = int $h if defined $h;
		418
		419	$self->realloc;
379	}	420	}
380		421
381	sub set_tooltip {	422	sub set_tooltip {
382	my ($self, $tooltip) = @_;	423	my ($self, $tooltip) = @_;
383		424
…		…
386		427
387	return if $self->{tooltip} eq $tooltip;	428	return if $self->{tooltip} eq $tooltip;
388		429
389	$self->{tooltip} = $tooltip;	430	$self->{tooltip} = $tooltip;
390		431
391	if ($CFClient::UI::TOOLTIP->{owner} == $self) {	432	if ($CFPlus::UI::TOOLTIP->{owner} == $self) {
392	delete $CFClient::UI::TOOLTIP->{owner};	433	delete $CFPlus::UI::TOOLTIP->{owner};
393	CFClient::UI::check_tooltip;	434	$CFPlus::UI::TOOLTIP_WATCHER->cb->();
394	}	435	}
395	}	436	}
396		437
397	# translate global coordinates to local coordinate system	438	# translate global coordinates to local coordinate system
398	sub coord2local {	439	sub coord2local {
399	my ($self, $x, $y) = @_;	440	my ($self, $x, $y) = @_;
400		441
		442	Carp::confess unless $self->{parent};#d#
		443
401	$self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})	444	$self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
402	}	445	}
403		446
404	# translate local coordinates to global coordinate system	447	# translate local coordinates to global coordinate system
405	sub coord2global {	448	sub coord2global {
406	my ($self, $x, $y) = @_;	449	my ($self, $x, $y) = @_;
407		450
		451	Carp::confess unless $self->{parent};#d#
		452
408	$self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})	453	$self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
409	}	454	}
410		455
411	sub focus_in {	456	sub invoke_focus_in {
412	my ($self) = @_;	457	my ($self) = @_;
413		458
414	return if $FOCUS == $self;	459	return if $FOCUS == $self;
415	return unless $self->{can_focus};	460	return unless $self->{can_focus};
416		461
417	my $focus = $FOCUS; $FOCUS = $self;	462	$FOCUS = $self;
418		463
419	$self->_emit (focus_in => $focus);	464	$self->update;
420		465
421	$focus->update if $focus;	466	0
422	$FOCUS->update;
423	}	467	}
424		468
425	sub focus_out {	469	sub invoke_focus_out {
426	my ($self) = @_;	470	my ($self) = @_;
427		471
428	return unless $FOCUS == $self;	472	return unless $FOCUS == $self;
429		473
430	my $focus = $FOCUS; undef $FOCUS;	474	undef $FOCUS;
431		475
432	$self->_emit (focus_out => $focus);	476	$self->update;
433		477
434	$focus->update if $focus; #?
435
436	$::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus	478	$::MAPWIDGET->grab_focus #d# focus mapwidget if no other widget has focus
437	unless $FOCUS;	479	unless $FOCUS;
438	}
439		480
		481	0
		482	}
		483
		484	sub grab_focus {
		485	my ($self) = @_;
		486
		487	$FOCUS->emit ("focus_out") if $FOCUS;
		488	$self->emit ("focus_in");
		489	}
		490
440	sub mouse_motion { }	491	sub invoke_mouse_motion { 0 }
441	sub button_up { }	492	sub invoke_button_up { 0 }
442	sub key_down { }	493	sub invoke_key_down { 0 }
443	sub key_up { }	494	sub invoke_key_up { 0 }
		495	sub invoke_mouse_wheel { 0 }
444		496
445	sub button_down {	497	sub invoke_button_down {
446	my ($self, $ev, $x, $y) = @_;	498	my ($self, $ev, $x, $y) = @_;
447		499
448	$self->focus_in;	500	$self->grab_focus;
449	}
450		501
451	sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} }	502	0
452	sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} }	503	}
453	sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} }	504
454	sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} }	505	sub connect {
455	sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} }	506	my ($self, $signal, $cb) = @_;
		507
		508	push @{ $self->{signal_cb}{$signal} }, $cb;
		509
		510	defined wantarray and CFPlus::guard {
		511	@{ $self->{signal_cb}{$signal} } = grep $_ != $cb,
		512	@{ $self->{signal_cb}{$signal} };
		513	}
		514	}
		515
		516	sub disconnect_all {
		517	my ($self, $signal) = @_;
		518
		519	delete $self->{signal_cb}{$signal};
		520	}
		521
		522	my %has_coords = (
		523	button_down => 1,
		524	button_up => 1,
		525	mouse_motion => 1,
		526	mouse_wheel => 1,
		527	);
		528
		529	sub emit {
		530	my ($self, $signal, @args) = @_;
		531
		532	# I do not really like this solution, but I do not like duplication
		533	# and needlessly verbose code, either.
		534	my @append
		535	= $has_coords{$signal}
		536	? $args[0]->xy ($self)
		537	: ();
		538
		539	#warn +(caller(1))[3] . "emit $signal on $self (parent $self->{parent})\n";#d#
		540
		541	for my $cb (
		542	@{$self->{signal_cb}{$signal} || []}, # before
		543	($self->can ("invoke_$signal") || sub { 1 }), # closure
		544	) {
		545	return $cb->($self, @args, @append) || next;
		546	}
		547
		548	# parent
		549	$self->{parent} && $self->{parent}->emit ($signal, @args)
		550	}
456		551
457	sub find_widget {	552	sub find_widget {
458	my ($self, $x, $y) = @_;	553	my ($self, $x, $y) = @_;
459		554
460	return () unless $self->{can_events};	555	return () unless $self->{can_events};
…		…
467	}	562	}
468		563
469	sub set_parent {	564	sub set_parent {
470	my ($self, $parent) = @_;	565	my ($self, $parent) = @_;
471		566
472	Scalar::Util::weaken ($self->{parent} = $parent);	567	CFPlus::weaken ($self->{parent} = $parent);
473	$self->set_visible if $parent->{visible};	568	$self->set_visible if $parent->{visible};
474	}	569	}
475		570
476	sub connect {
477	my ($self, $signal, $cb) = @_;
478
479	push @{ $self->{signal_cb}{$signal} }, $cb;
480	}
481
482	sub _emit {
483	my ($self, $signal, @args) = @_;
484
485	List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
486	}
487
488	sub emit {
489	my ($self, $signal, @args) = @_;
490
491	$self->_emit ($signal, @args)
492	|| $self->$signal (@args);
493	}
494
495	sub visibility_change {
496	#my ($self, $visible) = @_;
497	}
498
499	sub realloc {	571	sub realloc {
500	my ($self) = @_;	572	my ($self) = @_;
501		573
502	if ($self->{visible}) {	574	if ($self->{visible}) {
503	return if $self->{root}{realloc}{$self};	575	return if $self->{root}{realloc}{$self+0};
504		576
505	$self->{root}{realloc}{$self} = $self;	577	$self->{root}{realloc}{$self+0} = $self;
506	$self->{root}->update;	578	$self->{root}->update;
507	} else {	579	} else {
508	delete $self->{req_w};	580	delete $self->{req_w};
		581	delete $self->{req_h};
509	}	582	}
510	}	583	}
511		584
512	sub update {	585	sub update {
513	my ($self) = @_;	586	my ($self) = @_;
…		…
521		594
522	$self->realloc;	595	$self->realloc;
523	$self->update;	596	$self->update;
524	}	597	}
525		598
		599	# using global variables seems a bit hacky, but passing through all drawing
		600	# functions seems pointless.
		601	our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn
		602
526	sub draw {	603	sub draw {
527	my ($self) = @_;	604	my ($self) = @_;
528		605
529	return unless $self->{h} && $self->{w};	606	return unless $self->{h} && $self->{w};
		607
		608	# update screen rectangle
		609	local $draw_x = $draw_x + $self->{x};
		610	local $draw_y = $draw_y + $self->{y};
		611
		612	# skip widgets that are entirely outside the drawing area
		613	return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
		614	|| ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
530		615
531	glPushMatrix;	616	glPushMatrix;
532	glTranslate $self->{x}, $self->{y}, 0;	617	glTranslate $self->{x}, $self->{y}, 0;
533	$self->_draw;
534	glPopMatrix;
535		618
536	if ($self == $HOVER && $self->{can_hover}) {	619	if ($self == $HOVER && $self->{can_hover}) {
537	my ($x, $y) = @$self{qw(x y)};
538
539	glColor 1, 0.8, 0.5, 0.2;	620	glColor 1*0.2, 0.8*0.2, 0.5*0.2, 0.2;
540	glEnable GL_BLEND;	621	glEnable GL_BLEND;
541	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	622	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
542	glBegin GL_QUADS;	623	glBegin GL_QUADS;
543	glVertex $x , $y;	624	glVertex 0 , 0;
544	glVertex $x + $self->{w}, $y;	625	glVertex $self->{w}, 0;
545	glVertex $x + $self->{w}, $y + $self->{h};	626	glVertex $self->{w}, $self->{h};
546	glVertex $x , $y + $self->{h};	627	glVertex 0 , $self->{h};
547	glEnd;	628	glEnd;
548	glDisable GL_BLEND;	629	glDisable GL_BLEND;
549	}	630	}
550		631
551	if ($ENV{CFPLUS_DEBUG}) {	632	if ($ENV{CFPLUS_DEBUG} & 1) {
552	glPushMatrix;	633	glPushMatrix;
553	glColor 1, 1, 0, 1;	634	glColor 1, 1, 0, 1;
554	glTranslate $self->{x} + 0.375, $self->{y} + 0.375;	635	glTranslate 0.375, 0.375;
555	glBegin GL_LINE_LOOP;	636	glBegin GL_LINE_LOOP;
556	glVertex 0 , 0;	637	glVertex 0 , 0;
557	glVertex $self->{w} - 1, 0;	638	glVertex $self->{w} - 1, 0;
558	glVertex $self->{w} - 1, $self->{h} - 1;	639	glVertex $self->{w} - 1, $self->{h} - 1;
559	glVertex 0 , $self->{h} - 1;	640	glVertex 0 , $self->{h} - 1;
560	glEnd;	641	glEnd;
561	glPopMatrix;	642	glPopMatrix;
562	#CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;	643	#CFPlus::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
563	}	644	}
		645
		646	$self->_draw;
		647	glPopMatrix;
564	}	648	}
565		649
566	sub _draw {	650	sub _draw {
567	my ($self) = @_;	651	my ($self) = @_;
568		652
569	warn "no draw defined for $self\n";	653	warn "no draw defined for $self\n";
570	}	654	}
571		655
		656	my $cntx;#d#
572	sub DESTROY {	657	sub DESTROY {
573	my ($self) = @_;	658	my ($self) = @_;
574		659
		660	return if CFPlus::in_destruct;
		661
		662	eval { $self->destroy };
		663	warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
		664
575	delete $WIDGET{$self+0};	665	delete $WIDGET{$self+0};
576	#$self->deactivate;
577	}	666	}
578		667
579	#############################################################################	668	#############################################################################
580		669
581	package CFClient::UI::DrawBG;	670	package CFPlus::UI::DrawBG;
582		671
583	our @ISA = CFClient::UI::Base::;	672	our @ISA = CFPlus::UI::Base::;
584		673
585	use strict;	674	use strict;
586	use CFClient::OpenGL;	675	use CFPlus::OpenGL;
587		676
588	sub new {	677	sub new {
589	my $class = shift;	678	my $class = shift;
590		679
591	# range [value, low, high, page]	680	# range [value, low, high, page]
…		…
606		695
607	if ($color && (@$color < 4 || $color->[3])) {	696	if ($color && (@$color < 4 || $color->[3])) {
608	my ($w, $h) = @$self{qw(w h)};	697	my ($w, $h) = @$self{qw(w h)};
609		698
610	glEnable GL_BLEND;	699	glEnable GL_BLEND;
611	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	700	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
612	glColor @$color;	701	glColor_premultiply @$color;
613		702
614	glBegin GL_QUADS;	703	glBegin GL_QUADS;
615	glVertex 0 , 0;	704	glVertex 0 , 0;
616	glVertex 0 , $h;	705	glVertex 0 , $h;
617	glVertex $w, $h;	706	glVertex $w, $h;
…		…
622	}	711	}
623	}	712	}
624		713
625	#############################################################################	714	#############################################################################
626		715
627	package CFClient::UI::Empty;	716	package CFPlus::UI::Empty;
628		717
629	our @ISA = CFClient::UI::Base::;	718	our @ISA = CFPlus::UI::Base::;
630		719
631	sub new {	720	sub new {
632	my ($class, %arg) = @_;	721	my ($class, %arg) = @_;
633	$class->SUPER::new (can_events => 0, %arg);	722	$class->SUPER::new (can_events => 0, %arg);
634	}	723	}
…		…
641		730
642	sub draw { }	731	sub draw { }
643		732
644	#############################################################################	733	#############################################################################
645		734
646	package CFClient::UI::Container;	735	package CFPlus::UI::Container;
647		736
648	our @ISA = CFClient::UI::Base::;	737	our @ISA = CFPlus::UI::Base::;
649		738
650	sub new {	739	sub new {
651	my ($class, %arg) = @_;	740	my ($class, %arg) = @_;
652		741
653	my $children = delete $arg{children} || [];	742	my $children = delete $arg{children};
654		743
655	my $self = $class->SUPER::new (	744	my $self = $class->SUPER::new (
656	children => [],	745	children => [],
657	can_events => 0,	746	can_events => 0,
658	%arg,	747	%arg,
659	);	748	);
		749
660	$self->add ($_) for @$children;	750	$self->add (@$children)
		751	if $children;
661		752
662	$self	753	$self
		754	}
		755
		756	sub realloc {
		757	my ($self) = @_;
		758
		759	$self->{force_realloc} = 1;
		760	$self->{force_size_alloc} = 1;
		761	$self->SUPER::realloc;
663	}	762	}
664		763
665	sub add {	764	sub add {
666	my ($self, @widgets) = @_;	765	my ($self, @widgets) = @_;
667		766
…		…
713	$x -= $self->{x};	812	$x -= $self->{x};
714	$y -= $self->{y};	813	$y -= $self->{y};
715		814
716	my $res;	815	my $res;
717		816
718	for (reverse @{ $self->{children} }) {	817	for (reverse $self->visible_children) {
719	$res = $_->find_widget ($x, $y)	818	$res = $_->find_widget ($x, $y)
720	and return $res;	819	and return $res;
721	}	820	}
722		821
723	$self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})	822	$self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
…		…
729	$_->draw for @{$self->{children}};	828	$_->draw for @{$self->{children}};
730	}	829	}
731		830
732	#############################################################################	831	#############################################################################
733		832
734	package CFClient::UI::Bin;	833	package CFPlus::UI::Bin;
735		834
736	our @ISA = CFClient::UI::Container::;	835	our @ISA = CFPlus::UI::Container::;
737		836
738	sub new {	837	sub new {
739	my ($class, %arg) = @_;	838	my ($class, %arg) = @_;
740		839
741	my $child = (delete $arg{child}) || new CFClient::UI::Empty::;	840	my $child = (delete $arg{child}) || new CFPlus::UI::Empty::;
742		841
743	$class->SUPER::new (children => [$child], %arg)	842	$class->SUPER::new (children => [$child], %arg)
744	}	843	}
745		844
746	sub add {	845	sub add {
747	my ($self, $child) = @_;	846	my ($self, $child) = @_;
748		847
749	$self->{children} = [];	848	$self->SUPER::remove ($_) for @{ $self->{children} };
750
751	$self->SUPER::add ($child);	849	$self->SUPER::add ($child);
752	}	850	}
753		851
754	sub remove {	852	sub remove {
755	my ($self, $widget) = @_;	853	my ($self, $widget) = @_;
756		854
757	$self->SUPER::remove ($widget);	855	$self->SUPER::remove ($widget);
758		856
759	$self->{children} = [new CFClient::UI::Empty]	857	$self->{children} = [new CFPlus::UI::Empty]
760	unless @{$self->{children}};	858	unless @{$self->{children}};
761	}	859	}
762		860
763	sub child { $_[0]->{children}[0] }	861	sub child { $_[0]->{children}[0] }
764		862
765	sub size_request {	863	sub size_request {
766	$_[0]{children}[0]->size_request	864	$_[0]{children}[0]->size_request
767	}	865	}
768		866
769	sub size_allocate {	867	sub invoke_size_allocate {
770	my ($self, $w, $h, $changed) = @_;	868	my ($self, $w, $h) = @_;
771		869
772	$self->{children}[0]->configure (0, 0, $w, $h);	870	$self->{children}[0]->configure (0, 0, $w, $h);
		871
		872	1
773	}	873	}
774		874
775	#############################################################################	875	#############################################################################
776		876
		877	# back-buffered drawing area
		878
777	package CFClient::UI::Window;	879	package CFPlus::UI::Window;
778		880
779	our @ISA = CFClient::UI::Bin::;	881	our @ISA = CFPlus::UI::Bin::;
780		882
781	use CFClient::OpenGL;	883	use CFPlus::OpenGL;
782		884
783	sub new {	885	sub new {
784	my ($class, %arg) = @_;	886	my ($class, %arg) = @_;
785		887
786	my $self = $class->SUPER::new (%arg);	888	my $self = $class->SUPER::new (%arg);
…		…
791		893
792	$ROOT->on_post_alloc ($self => sub { $self->render_child });	894	$ROOT->on_post_alloc ($self => sub { $self->render_child });
793	$self->SUPER::update;	895	$self->SUPER::update;
794	}	896	}
795		897
796	sub size_allocate {	898	sub invoke_size_allocate {
797	my ($self, $w, $h, $changed) = @_;	899	my ($self, $w, $h) = @_;
798		900
799	$self->SUPER::size_allocate ($w, $h, $changed);
800	$self->update	901	$self->update;
801	if $changed;	902
		903	$self->SUPER::invoke_size_allocate ($w, $h)
802	}	904	}
803		905
804	sub _render {	906	sub _render {
		907	my ($self) = @_;
		908
805	$_[0]{children}[0]->draw;	909	$self->{children}[0]->draw;
806	}	910	}
807		911
808	sub render_child {	912	sub render_child {
809	my ($self) = @_;	913	my ($self) = @_;
810		914
811	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {	915	$self->{texture} = new_from_opengl CFPlus::Texture $self->{w}, $self->{h}, sub {
812	glClearColor 0, 0, 0, 0;	916	glClearColor 0, 0, 0, 0;
813	glClear GL_COLOR_BUFFER_BIT;	917	glClear GL_COLOR_BUFFER_BIT;
814		918
		919	{
		920	package CFPlus::UI::Base;
		921
		922	local ($draw_x, $draw_y, $draw_w, $draw_h) =
		923	(0, 0, $self->{w}, $self->{h});
		924
815	$self->_render;	925	$self->_render;
		926	}
816	};	927	};
817	}	928	}
818		929
819	sub _draw {	930	sub _draw {
820	my ($self) = @_;	931	my ($self) = @_;
821
822	my ($w, $h) = ($self->w, $self->h);
823		932
824	my $tex = $self->{texture}	933	my $tex = $self->{texture}
825	or return;	934	or return;
826		935
827	glEnable GL_TEXTURE_2D;	936	glEnable GL_TEXTURE_2D;
828	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	937	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
829	glColor 1, 1, 1, 1;	938	glColor 0, 0, 0, 1;
830		939
831	$tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);	940	$tex->draw_quad_alpha_premultiplied (0, 0);
832		941
833	glDisable GL_TEXTURE_2D;	942	glDisable GL_TEXTURE_2D;
834	}	943	}
835		944
836	#############################################################################	945	#############################################################################
837		946
838	package CFClient::UI::ViewPort;	947	package CFPlus::UI::ViewPort;
839		948
840	our @ISA = CFClient::UI::Window::;	949	our @ISA = CFPlus::UI::Window::;
841		950
842	sub new {	951	sub new {
843	my $class = shift;	952	my $class = shift;
844		953
845	$class->SUPER::new (	954	$class->SUPER::new (
…		…
850	}	959	}
851		960
852	sub size_request {	961	sub size_request {
853	my ($self) = @_;	962	my ($self) = @_;
854		963
855	my ($w, $h) = @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};	964	my ($w, $h) = @{$self->child}{qw(req_w req_h)};
856		965
857	$w = 10 if $self->{scroll_x};	966	$w = 10 if $self->{scroll_x};
858	$h = 10 if $self->{scroll_y};	967	$h = 10 if $self->{scroll_y};
859		968
860	($w, $h)	969	($w, $h)
861	}	970	}
862		971
863	sub size_allocate {	972	sub invoke_size_allocate {
864	my ($self, $w, $h, $changed) = @_;	973	my ($self, $w, $h) = @_;
865		974
		975	my $child = $self->child;
		976
866	$w = $self->{child_w} if $self->{scroll_x} && $self->{child_w};	977	$w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
867	$h = $self->{child_h} if $self->{scroll_y} && $self->{child_h};	978	$h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
868		979
869	$self->child->configure (0, 0, $w, $h);	980	$self->child->configure (0, 0, $w, $h);
870	$self->update;	981	$self->update;
		982
		983	1
871	}	984	}
872		985
873	sub set_offset {	986	sub set_offset {
874	my ($self, $x, $y) = @_;	987	my ($self, $x, $y) = @_;
875		988
…		…
901	if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}	1014	if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
902	&& $y >= $self->{y} && $y < $self->{y} + $self->{h}	1015	&& $y >= $self->{y} && $y < $self->{y} + $self->{h}
903	) {	1016	) {
904	$self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})	1017	$self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
905	} else {	1018	} else {
906	$self->CFClient::UI::Base::find_widget ($x, $y)	1019	$self->CFPlus::UI::Base::find_widget ($x, $y)
907	}	1020	}
908	}	1021	}
909		1022
910	sub _render {	1023	sub _render {
911	my ($self) = @_;	1024	my ($self) = @_;
912		1025
		1026	local $CFPlus::UI::Base::draw_x = $CFPlus::UI::Base::draw_x - $self->{view_x};
		1027	local $CFPlus::UI::Base::draw_y = $CFPlus::UI::Base::draw_y - $self->{view_y};
		1028
913	CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};	1029	CFPlus::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
914		1030
915	$self->SUPER::_render;	1031	$self->SUPER::_render;
916	}	1032	}
917		1033
918	#############################################################################	1034	#############################################################################
919		1035
920	package CFClient::UI::ScrolledWindow;	1036	package CFPlus::UI::ScrolledWindow;
921		1037
922	our @ISA = CFClient::UI::HBox::;	1038	our @ISA = CFPlus::UI::Table::;
923		1039
924	sub new {	1040	sub new {
925	my $class = shift;	1041	my ($class, %arg) = @_;
		1042
		1043	my $child = delete $arg{child};
926		1044
927	my $self;	1045	my $self;
928		1046
929	my $slider = new CFClient::UI::Slider	1047	my $hslider = new CFPlus::UI::Slider
		1048	vertical => 0,
		1049	range => [0, 0, 1, 0.01], # HACK fix
		1050	on_changed => sub {
		1051	$self->{hpos} = $_[1];
		1052	$self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
		1053	},
		1054	;
		1055
		1056	my $vslider = new CFPlus::UI::Slider
930	vertical => 1,	1057	vertical => 1,
931	range => [0, 0, 1, 0.01], # HACK fix	1058	range => [0, 0, 1, 0.01], # HACK fix
932	on_changed => sub {	1059	on_changed => sub {
933	$self->{vp}->set_offset (0, $_[1]);	1060	$self->{vpos} = $_[1];
		1061	$self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
934	},	1062	},
935	;	1063	;
936		1064
937	$self = $class->SUPER::new (	1065	$self = $class->SUPER::new (
938	vp => (new CFClient::UI::ViewPort expand => 1),	1066	scroll_x => 0,
		1067	scroll_y => 1,
		1068	can_events => 1,
939	slider => $slider,	1069	hslider => $hslider,
940	@_,	1070	vslider => $vslider,
		1071	col_expand => [1, 0],
		1072	row_expand => [1, 0],
		1073	%arg,
941	);	1074	);
942		1075
943	$self->{vp}->add ($self->{scrolled});	1076	$self->{vp} = new CFPlus::UI::ViewPort
		1077	expand => 1,
		1078	scroll_x => $self->{scroll_x},
		1079	scroll_y => $self->{scroll_y},
		1080	;
		1081
944	$self->add ($self->{vp});	1082	$self->SUPER::add (0, 0, $self->{vp});
945	$self->add ($self->{slider});	1083
		1084	$self->add ($child) if $child;
946		1085
947	$self	1086	$self
948	}	1087	}
949		1088
		1089	#TODO# update range on size_allocate depending on child
		1090
		1091	sub add {
		1092	my ($self, $widget) = @_;
		1093
		1094	$self->{vp}->add ($self->{child} = $widget);
		1095	}
		1096
		1097	sub invoke_mouse_wheel {
		1098	my ($self, $ev) = @_;
		1099
		1100	return 0 unless $ev->{dy}; # only vertical movements for now
		1101
		1102	$self->{vslider}->emit (mouse_wheel => $ev);
		1103
		1104	1
		1105	}
		1106
		1107	sub update_slider {
		1108	my ($self) = @_;
		1109
		1110	my $child = ($self->{vp} or return)->child;
		1111
		1112	my ($w1, $w2) = ($child->{w}, $self->{vp}{w});
		1113	$self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]);
		1114
		1115	my $visible = $w1 > $w2;
		1116	if ($visible != $self->{hslider}{visible}) {
		1117	$visible ? $self->SUPER::add (0, 1, $self->{hslider})
		1118	: $self->{hslider}->hide;
		1119	}
		1120
		1121	my ($h1, $h2) = ($child->{h}, $self->{vp}{h});
		1122	$self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]);
		1123
		1124	my $visible = $h1 > $h2;
		1125	if ($visible != $self->{vslider}{visible}) {
		1126	$visible ? $self->SUPER::add (1, 0, $self->{vslider})
		1127	: $self->{vslider}->hide;
		1128	}
		1129	}
		1130
950	sub update {	1131	sub update {
951	my ($self) = @_;	1132	my ($self) = @_;
952		1133
953	$self->SUPER::update;	1134	$self->SUPER::update;
954		1135	$self->update_slider;
955	# todo: overwrite size_allocate of child
956	my $child = $self->{vp}->child;
957	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
958	}	1136	}
959		1137
960	sub size_allocate {	1138	sub invoke_size_allocate {
961	my ($self, $w, $h, $changed) = @_;	1139	my ($self, $w, $h) = @_;
962		1140
		1141	$self->update_slider;
963	$self->SUPER::size_allocate ($w, $h, $changed);	1142	$self->SUPER::invoke_size_allocate ($w, $h)
964
965	my $child = $self->{vp}->child;
966	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
967	}	1143	}
968
969	#TODO# update range on size_allocate depending on child
970	# update viewport offset on scroll
971		1144
972	#############################################################################	1145	#############################################################################
973		1146
974	package CFClient::UI::Frame;	1147	package CFPlus::UI::Frame;
975		1148
976	our @ISA = CFClient::UI::Bin::;	1149	our @ISA = CFPlus::UI::Bin::;
977		1150
978	use CFClient::OpenGL;	1151	use CFPlus::OpenGL;
979		1152
980	sub new {	1153	sub new {
981	my $class = shift;	1154	my $class = shift;
982		1155
983	$class->SUPER::new (	1156	$class->SUPER::new (
…		…
991		1164
992	if ($self->{bg}) {	1165	if ($self->{bg}) {
993	my ($w, $h) = @$self{qw(w h)};	1166	my ($w, $h) = @$self{qw(w h)};
994		1167
995	glEnable GL_BLEND;	1168	glEnable GL_BLEND;
996	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	1169	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
997	glColor @{ $self->{bg} };	1170	glColor_premultiply @{ $self->{bg} };
998		1171
999	glBegin GL_QUADS;	1172	glBegin GL_QUADS;
1000	glVertex 0 , 0;	1173	glVertex 0 , 0;
1001	glVertex 0 , $h;	1174	glVertex 0 , $h;
1002	glVertex $w, $h;	1175	glVertex $w, $h;
…		…
1009	$self->SUPER::_draw;	1182	$self->SUPER::_draw;
1010	}	1183	}
1011		1184
1012	#############################################################################	1185	#############################################################################
1013		1186
1014	package CFClient::UI::FancyFrame;	1187	package CFPlus::UI::FancyFrame;
1015		1188
1016	our @ISA = CFClient::UI::Bin::;	1189	our @ISA = CFPlus::UI::Bin::;
1017		1190
1018	use CFClient::OpenGL;	1191	use CFPlus::OpenGL;
		1192
		1193	sub new {
		1194	my ($class, %arg) = @_;
		1195
		1196	if ((exists $arg{label}) && !ref $arg{label}) {
		1197	$arg{label} = new CFPlus::UI::Label
		1198	align => 1,
		1199	valign => 0,
		1200	text => $arg{label},
		1201	fontsize => ($arg{border} || 0.8) * 0.75;
		1202	}
		1203
		1204	my $self = $class->SUPER::new (
		1205	# label => "",
		1206	fg => [0.6, 0.3, 0.1],
		1207	border => 0.8,
		1208	style => 'single',
		1209	%arg,
		1210	);
		1211
		1212	$self
		1213	}
		1214
		1215	sub add {
		1216	my ($self, @widgets) = @_;
		1217
		1218	$self->SUPER::add (@widgets);
		1219	$self->CFPlus::UI::Container::add ($self->{label}) if $self->{label};
		1220	}
		1221
		1222	sub border {
		1223	int $_[0]{border} * $::FONTSIZE
		1224	}
		1225
		1226	sub size_request {
		1227	my ($self) = @_;
		1228
		1229	($self->{label_w}, undef) = $self->{label}->size_request
		1230	if $self->{label};
		1231
		1232	my ($w, $h) = $self->SUPER::size_request;
		1233
		1234	(
		1235	$w + $self->border * 2,
		1236	$h + $self->border * 2,
		1237	)
		1238	}
		1239
		1240	sub invoke_size_allocate {
		1241	my ($self, $w, $h) = @_;
		1242
		1243	my $border = $self->border;
		1244
		1245	$w -= List::Util::max 0, $border * 2;
		1246	$h -= List::Util::max 0, $border * 2;
		1247
		1248	if (my $label = $self->{label}) {
		1249	$label->{w} = List::Util::max 0, List::Util::min $self->{label_w}, $w - $border * 2;
		1250	$label->{h} = List::Util::min $h, $border;
		1251	$label->invoke_size_allocate ($label->{w}, $label->{h});
		1252	}
		1253
		1254	$self->child->configure ($border, $border, $w, $h);
		1255
		1256	1
		1257	}
		1258
		1259	sub _draw {
		1260	my ($self) = @_;
		1261
		1262	my $child = $self->{children}[0];
		1263
		1264	my $border = $self->border;
		1265	my ($w, $h) = ($self->{w}, $self->{h});
		1266
		1267	$child->draw;
		1268
		1269	glColor @{$self->{fg}};
		1270	glBegin GL_LINE_STRIP;
		1271	glVertex $border * 1.5 , $border * 0.5 + 0.5;
		1272	glVertex $border * 0.5 + 0.5, $border * 0.5 + 0.5;
		1273	glVertex $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
		1274	glVertex $w - $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
		1275	glVertex $w - $border * 0.5 + 0.5, $border * 0.5 + 0.5;
		1276	glVertex $self->{label} ? $border * 2 + $self->{label}{w} : $border * 1.5, $border * 0.5 + 0.5;
		1277	glEnd;
		1278
		1279	if ($self->{label}) {
		1280	glTranslate $border * 2, 0;
		1281	$self->{label}->_draw;
		1282	}
		1283	}
		1284
		1285	#############################################################################
		1286
		1287	package CFPlus::UI::Toplevel;
		1288
		1289	our @ISA = CFPlus::UI::Bin::;
		1290
		1291	use CFPlus::OpenGL;
1019		1292
1020	my $bg =	1293	my $bg =
1021	new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",	1294	new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png",
1022	mipmap => 1, wrap => 1;	1295	mipmap => 1, wrap => 1;
1023		1296
1024	my @border =	1297	my @border =
1025	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	1298	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1026	qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);	1299	qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1027		1300
1028	sub new {	1301	sub new {
1029	my $class = shift;	1302	my ($class, %arg) = @_;
1030		1303
1031	my $self = $class->SUPER::new (	1304	my $self = $class->SUPER::new (
1032	bg => [1, 1, 1, 1],	1305	bg => [1, 1, 1, 1],
1033	border_bg => [1, 1, 1, 1],	1306	border_bg => [1, 1, 1, 1],
1034	border => 0.6,	1307	border => 0.6,
1035	can_events => 1,	1308	can_events => 1,
1036	min_w => 16,	1309	min_w => 64,
1037	min_h => 16,	1310	min_h => 32,
1038	@_	1311	%arg,
1039	);	1312	);
1040		1313
1041	$self->{title} &&= new CFClient::UI::Label	1314	$self->{title_widget} = new CFPlus::UI::Label
1042	align => 0,	1315	align => 0,
1043	valign => 1,	1316	valign => 1,
1044	text => $self->{title},	1317	text => $self->{title},
1045	fontsize => $self->{border};	1318	fontsize => $self->{border},
		1319	if exists $self->{title};
		1320
		1321	if ($self->{has_close_button}) {
		1322	$self->{close_button} =
		1323	new CFPlus::UI::ImageButton
		1324	path => 'x1_close.png',
		1325	on_activate => sub { $self->emit ("delete") };
		1326
		1327	$self->CFPlus::UI::Container::add ($self->{close_button});
		1328	}
1046		1329
1047	$self	1330	$self
		1331	}
		1332
		1333	sub add {
		1334	my ($self, @widgets) = @_;
		1335
		1336	$self->SUPER::add (@widgets);
		1337	$self->CFPlus::UI::Container::add ($self->{close_button}) if $self->{close_button};
		1338	$self->CFPlus::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1048	}	1339	}
1049		1340
1050	sub border {	1341	sub border {
1051	int $_[0]{border} * $::FONTSIZE	1342	int $_[0]{border} * $::FONTSIZE
1052	}	1343	}
1053		1344
1054	sub size_request {	1345	sub size_request {
1055	my ($self) = @_;	1346	my ($self) = @_;
		1347
		1348	$self->{title_widget}->size_request
		1349	if $self->{title_widget};
		1350
		1351	$self->{close_button}->size_request
		1352	if $self->{close_button};
1056		1353
1057	my ($w, $h) = $self->SUPER::size_request;	1354	my ($w, $h) = $self->SUPER::size_request;
1058		1355
1059	(	1356	(
1060	$w + $self->border * 2,	1357	$w + $self->border * 2,
1061	$h + $self->border * 2,	1358	$h + $self->border * 2,
1062	)	1359	)
1063	}	1360	}
1064		1361
1065	sub size_allocate {	1362	sub invoke_size_allocate {
1066	my ($self, $w, $h, $changed) = @_;	1363	my ($self, $w, $h) = @_;
1067		1364
1068	return unless $changed;	1365	if ($self->{title_widget}) {
		1366	$self->{title_widget}{w} = $w;
		1367	$self->{title_widget}{h} = $h;
		1368	$self->{title_widget}->invoke_size_allocate ($w, $h);
		1369	}
1069		1370
		1371	my $border = $self->border;
		1372
1070	$h -= List::Util::max 0, $self->border * 2;	1373	$h -= List::Util::max 0, $border * 2;
1071	$w -= List::Util::max 0, $self->border * 2;	1374	$w -= List::Util::max 0, $border * 2;
1072		1375
1073	$self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
1074	if $self->{title};
1075
1076	$self->child->configure ($self->border, $self->border, $w, $h);	1376	$self->child->configure ($border, $border, $w, $h);
1077	}
1078		1377
		1378	$self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
		1379	if $self->{close_button};
		1380
		1381	1
		1382	}
		1383
		1384	sub invoke_delete {
		1385	my ($self) = @_;
		1386
		1387	$self->hide;
		1388
		1389	1
		1390	}
		1391
1079	sub button_down {	1392	sub invoke_button_down {
1080	my ($self, $ev, $x, $y) = @_;	1393	my ($self, $ev, $x, $y) = @_;
1081		1394
1082	my ($w, $h) = @$self{qw(w h)};	1395	my ($w, $h) = @$self{qw(w h)};
1083	my $border = $self->border;	1396	my $border = $self->border;
1084		1397
…		…
1100	my $dy = $ev->{y} - $oy;	1413	my $dy = $ev->{y} - $oy;
1101		1414
1102	$self->{force_w} = $bw + $dx * ($mx ? -1 : 1);	1415	$self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
1103	$self->{force_h} = $bh + $dy * ($my ? -1 : 1);	1416	$self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1104		1417
		1418	$self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1105	$self->realloc;	1419	$self->realloc;
1106	$self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1107	};	1420	};
1108		1421
1109	} elsif ($lr ^ $td) {	1422	} elsif ($lr ^ $td) {
1110	my ($ox, $oy) = ($ev->{x}, $ev->{y});	1423	my ($ox, $oy) = ($ev->{x}, $ev->{y});
1111	my ($bx, $by) = ($self->{x}, $self->{y});	1424	my ($bx, $by) = ($self->{x}, $self->{y});
…		…
1114	my ($ev, $x, $y) = @_;	1427	my ($ev, $x, $y) = @_;
1115		1428
1116	($x, $y) = ($ev->{x}, $ev->{y});	1429	($x, $y) = ($ev->{x}, $ev->{y});
1117		1430
1118	$self->move_abs ($bx + $x - $ox, $by + $y - $oy);	1431	$self->move_abs ($bx + $x - $ox, $by + $y - $oy);
		1432	# HACK: the next line is required to enforce placement
		1433	$self->{parent}->invoke_size_allocate ($self->{parent}{w}, $self->{parent}{h});
1119	};	1434	};
		1435	} else {
		1436	return 0;
		1437	}
		1438
1120	}	1439	1
1121	}	1440	}
1122		1441
1123	sub button_up {	1442	sub invoke_button_up {
1124	my ($self, $ev, $x, $y) = @_;	1443	my ($self, $ev, $x, $y) = @_;
1125		1444
1126	delete $self->{motion};	1445	! ! delete $self->{motion}
1127	}	1446	}
1128		1447
1129	sub mouse_motion {	1448	sub invoke_mouse_motion {
1130	my ($self, $ev, $x, $y) = @_;	1449	my ($self, $ev, $x, $y) = @_;
1131		1450
1132	$self->{motion}->($ev, $x, $y) if $self->{motion};	1451	$self->{motion}->($ev, $x, $y) if $self->{motion};
		1452
		1453	! ! $self->{motion}
		1454	}
		1455
		1456	sub invoke_visibility_change {
		1457	my ($self, $visible) = @_;
		1458
		1459	delete $self->{motion} unless $visible;
		1460
		1461	0
1133	}	1462	}
1134		1463
1135	sub _draw {	1464	sub _draw {
1136	my ($self) = @_;	1465	my ($self) = @_;
1137		1466
		1467	my $child = $self->{children}[0];
		1468
1138	my ($w, $h ) = ($self->{w}, $self->{h});	1469	my ($w, $h ) = ($self->{w}, $self->{h});
1139	my ($cw, $ch) = ($self->child->{w}, $self->child->{h});	1470	my ($cw, $ch) = ($child->{w}, $child->{h});
1140		1471
1141	glEnable GL_TEXTURE_2D;	1472	glEnable GL_TEXTURE_2D;
1142	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	1473	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1143		1474
1144	my $border = $self->border;	1475	my $border = $self->border;
…		…
1159	$bg->draw_quad_alpha ($border, $border, $cw, $ch);	1490	$bg->draw_quad_alpha ($border, $border, $cw, $ch);
1160	}	1491	}
1161		1492
1162	glDisable GL_TEXTURE_2D;	1493	glDisable GL_TEXTURE_2D;
1163		1494
1164	$self->{title}->draw if $self->{title};
1165
1166	$self->child->draw;	1495	$child->draw;
		1496
		1497	if ($self->{title_widget}) {
		1498	glTranslate 0, $border - $self->{h};
		1499	$self->{title_widget}->_draw;
		1500
		1501	glTranslate 0, - ($border - $self->{h});
		1502	}
		1503
		1504	$self->{close_button}->draw
		1505	if $self->{close_button};
1167	}	1506	}
1168		1507
1169	#############################################################################	1508	#############################################################################
1170		1509
1171	package CFClient::UI::Table;	1510	package CFPlus::UI::Table;
1172		1511
1173	our @ISA = CFClient::UI::Base::;	1512	our @ISA = CFPlus::UI::Base::;
1174		1513
1175	use List::Util qw(max sum);	1514	use List::Util qw(max sum);
1176		1515
1177	use CFClient::OpenGL;	1516	use CFPlus::OpenGL;
1178		1517
1179	sub new {	1518	sub new {
1180	my $class = shift;	1519	my $class = shift;
1181		1520
1182	$class->SUPER::new (	1521	$class->SUPER::new (
		1522	children => [],
1183	col_expand => [],	1523	col_expand => [],
		1524	row_expand => [],
1184	@_,	1525	@_,
1185	)	1526	)
1186	}	1527	}
1187		1528
1188	sub children {	1529	sub children {
1189	grep $_, map @$_, grep $_, @{ $_[0]{children} }	1530	grep $_, map @$_, grep $_, @{ $_[0]{children} }
1190	}	1531	}
1191		1532
		1533	# TODO: store row/col info in child widget and use standard add/del
1192	sub add {	1534	sub add {
1193	my ($self, $x, $y, $child) = @_;	1535	my ($self) = shift;
1194		1536
		1537	while (@_) {
		1538	my ($x, $y, $child) = splice @_, 0, 3, ();
1195	$child->set_parent ($self);	1539	$child->set_parent ($self);
1196	$self->{children}[$y][$x] = $child;	1540	$self->{children}[$y][$x] = $child;
		1541	}
1197		1542
		1543	$self->{force_realloc} = 1;
		1544	$self->{force_size_alloc} = 1;
1198	$self->realloc;	1545	$self->realloc;
		1546	}
		1547
		1548	sub remove {
		1549	my ($self, $child) = @_;
		1550
		1551	for (@{ $self->{children} }) {
		1552	for (@{ $_ || [] }) {
		1553	$_ = undef if $_ == $child;
		1554	}
		1555	}
1199	}	1556	}
1200		1557
1201	# TODO: move to container class maybe? send children a signal on removal?	1558	# TODO: move to container class maybe? send children a signal on removal?
1202	sub clear {	1559	sub clear {
1203	my ($self) = @_;	1560	my ($self) = @_;
…		…
1244	(sum @$ws),	1601	(sum @$ws),
1245	(sum @$hs),	1602	(sum @$hs),
1246	)	1603	)
1247	}	1604	}
1248		1605
1249	sub size_allocate {	1606	sub invoke_size_allocate {
1250	my ($self, $w, $h, $changed) = @_;	1607	my ($self, $w, $h) = @_;
1251		1608
1252	my ($ws, $hs) = $self->get_wh;	1609	my ($ws, $hs) = $self->get_wh;
1253		1610
1254	my $req_w = (sum @$ws) || 1;	1611	my $req_w = (sum @$ws) || 1;
1255	my $req_h = (sum @$hs) || 1;	1612	my $req_h = (sum @$hs) || 1;
1256		1613
1257	# TODO: nicer code && do row_expand	1614	# TODO: nicer code
1258	my @col_expand = @{$self->{col_expand}};	1615	my @col_expand = @{$self->{col_expand}};
1259	@col_expand = (1) x @$ws unless @col_expand;	1616	@col_expand = (1) x @$ws unless @col_expand;
1260	my $col_expand = (sum @col_expand) || 1;	1617	my $col_expand = (sum @col_expand) || 1;
1261		1618
1262	# linearly scale sizes
1263	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;	1619	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1264	$hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1265		1620
1266	CFClient::UI::harmonize $ws;	1621	CFPlus::UI::harmonize $ws;
		1622
		1623	my @row_expand = @{$self->{row_expand}};
		1624	@row_expand = (1) x @$ws unless @row_expand;
		1625	my $row_expand = (sum @row_expand) || 1;
		1626
		1627	$hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
		1628
1267	CFClient::UI::harmonize $hs;	1629	CFPlus::UI::harmonize $hs;
1268		1630
1269	my $y;	1631	my $y;
1270		1632
1271	for my $r (0 .. $#{$self->{children}}) {	1633	for my $r (0 .. $#{$self->{children}}) {
1272	my $row = $self->{children}[$r]	1634	my $row = $self->{children}[$r]
…		…
1286	}	1648	}
1287		1649
1288	$y += $row_h;	1650	$y += $row_h;
1289	}	1651	}
1290		1652
		1653	1
1291	}	1654	}
1292		1655
1293	sub find_widget {	1656	sub find_widget {
1294	my ($self, $x, $y) = @_;	1657	my ($self, $x, $y) = @_;
1295		1658
…		…
1314	}	1677	}
1315	}	1678	}
1316		1679
1317	#############################################################################	1680	#############################################################################
1318		1681
1319	package CFClient::UI::Box;	1682	package CFPlus::UI::Fixed;
1320		1683
		1684	use List::Util qw(min max);
		1685
1321	our @ISA = CFClient::UI::Container::;	1686	our @ISA = CFPlus::UI::Container::;
		1687
		1688	sub add {
		1689	my ($self, $child, $posmode, $x, $y, $sizemode, $w, $h) = @_;
		1690
		1691	$child->{_fixed} = [$posmode, $x, $y, $sizemode, $w, $h];
		1692	$self->SUPER::add ($child);
		1693	}
		1694
		1695	sub _scale($$$) {
		1696	my ($mode, $val, $max) = @_;
		1697
		1698	$mode eq "abs" ? $val
		1699	: $mode eq "rel" ? $val * $max
		1700	: 0
		1701	}
		1702
		1703	sub size_request {
		1704	my ($self) = @_;
		1705
		1706	my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0);
		1707
		1708	# determine overall size by querying abs widgets
		1709	for my $child ($self->visible_children) {
		1710	my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
		1711
		1712	if ($pos eq "abs") {
		1713	$w = _scale $size, $w, $child->{req_w};
		1714	$h = _scale $size, $h, $child->{req_h};
		1715
		1716	$x1 = min $x1, $x; $x2 = max $x2, $x + $w;
		1717	$y1 = min $y1, $y; $y2 = max $y2, $y + $h;
		1718	}
		1719	}
		1720
		1721	my $W = $x2 - $x1;
		1722	my $H = $y2 - $y1;
		1723
		1724	# now layout remaining widgets
		1725	for my $child ($self->visible_children) {
		1726	my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
		1727
		1728	if ($pos ne "abs") {
		1729	$x = _scale $pos, $x, $W;
		1730	$y = _scale $pos, $x, $H;
		1731	$w = _scale $size, $w, $child->{req_w};
		1732	$h = _scale $size, $h, $child->{req_h};
		1733
		1734	$x1 = min $x1, $x; $x2 = max $x2, $x + $w;
		1735	$y1 = min $y1, $y; $y2 = max $y2, $y + $h;
		1736	}
		1737	}
		1738
		1739	my $W = $x2 - $x1;
		1740	my $H = $y2 - $y1;
		1741
		1742	($W, $H)
		1743	}
		1744
		1745	sub invoke_size_allocate {
		1746	my ($self, $W, $H) = @_;
		1747
		1748	for my $child ($self->visible_children) {
		1749	my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
		1750
		1751	$x = _scale $pos, $x, $W;
		1752	$y = _scale $pos, $x, $H;
		1753	$w = _scale $size, $w, $child->{req_w};
		1754	$h = _scale $size, $h, $child->{req_h};
		1755
		1756	$child->configure ($x, $y, $w, $h);
		1757	}
		1758
		1759	1
		1760	}
		1761
		1762	#############################################################################
		1763
		1764	package CFPlus::UI::Box;
		1765
		1766	our @ISA = CFPlus::UI::Container::;
1322		1767
1323	sub size_request {	1768	sub size_request {
1324	my ($self) = @_;	1769	my ($self) = @_;
1325		1770
1326	$self->{vertical}	1771	$self->{vertical}
…		…
1332	(List::Util::sum map $_->{req_w}, @{$self->{children}}),	1777	(List::Util::sum map $_->{req_w}, @{$self->{children}}),
1333	(List::Util::max map $_->{req_h}, @{$self->{children}}),	1778	(List::Util::max map $_->{req_h}, @{$self->{children}}),
1334	)	1779	)
1335	}	1780	}
1336		1781
1337	sub size_allocate {	1782	sub invoke_size_allocate {
1338	my ($self, $w, $h, $changed) = @_;	1783	my ($self, $w, $h) = @_;
1339		1784
1340	my $space = $self->{vertical} ? $h : $w;	1785	my $space = $self->{vertical} ? $h : $w;
1341	my $children = $self->{children};	1786	my @children = $self->visible_children;
1342		1787
1343	my @req;	1788	my @req;
1344		1789
1345	if ($self->{homogeneous}) {	1790	if ($self->{homogeneous}) {
1346	@req = ($space / (@$children || 1)) x @$children;	1791	@req = ($space / (@children || 1)) x @children;
1347	} else {	1792	} else {
1348	@req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children;	1793	@req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @children;
1349	my $req = List::Util::sum @req;	1794	my $req = List::Util::sum @req;
1350		1795
1351	if ($req > $space) {	1796	if ($req > $space) {
1352	# ah well, not enough space	1797	# ah well, not enough space
1353	$_ *= $space / $req for @req;	1798	$_ *= $space / $req for @req;
1354	} else {	1799	} else {
1355	my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;	1800	my $expand = (List::Util::sum map $_->{expand}, @children) || 1;
1356		1801
1357	$space = ($space - $req) / $expand; # remaining space to give away	1802	$space = ($space - $req) / $expand; # remaining space to give away
1358		1803
1359	$req[$_] += $space * $children->[$_]{expand}	1804	$req[$_] += $space * $children[$_]{expand}
1360	for 0 .. $#$children;	1805	for 0 .. $#children;
1361	}	1806	}
1362	}	1807	}
1363		1808
1364	CFClient::UI::harmonize \@req;	1809	CFPlus::UI::harmonize \@req;
1365		1810
1366	my $pos = 0;	1811	my $pos = 0;
1367	for (0 .. $#$children) {	1812	for (0 .. $#children) {
1368	my $alloc = $req[$_];	1813	my $alloc = $req[$_];
1369	$children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));	1814	$children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1370		1815
1371	$pos += $alloc;	1816	$pos += $alloc;
1372	}	1817	}
1373		1818
1374	1	1819	1
1375	}	1820	}
1376		1821
1377	#############################################################################	1822	#############################################################################
1378		1823
1379	package CFClient::UI::HBox;	1824	package CFPlus::UI::HBox;
1380		1825
1381	our @ISA = CFClient::UI::Box::;	1826	our @ISA = CFPlus::UI::Box::;
1382		1827
1383	sub new {	1828	sub new {
1384	my $class = shift;	1829	my $class = shift;
1385		1830
1386	$class->SUPER::new (	1831	$class->SUPER::new (
…		…
1389	)	1834	)
1390	}	1835	}
1391		1836
1392	#############################################################################	1837	#############################################################################
1393		1838
1394	package CFClient::UI::VBox;	1839	package CFPlus::UI::VBox;
1395		1840
1396	our @ISA = CFClient::UI::Box::;	1841	our @ISA = CFPlus::UI::Box::;
1397		1842
1398	sub new {	1843	sub new {
1399	my $class = shift;	1844	my $class = shift;
1400		1845
1401	$class->SUPER::new (	1846	$class->SUPER::new (
…		…
1404	)	1849	)
1405	}	1850	}
1406		1851
1407	#############################################################################	1852	#############################################################################
1408		1853
1409	package CFClient::UI::Label;	1854	package CFPlus::UI::Label;
1410		1855
1411	our @ISA = CFClient::UI::DrawBG::;	1856	our @ISA = CFPlus::UI::DrawBG::;
1412		1857
1413	use CFClient::OpenGL;	1858	use CFPlus::OpenGL;
1414		1859
1415	sub new {	1860	sub new {
1416	my ($class, %arg) = @_;	1861	my ($class, %arg) = @_;
1417		1862
1418	my $self = $class->SUPER::new (	1863	my $self = $class->SUPER::new (
…		…
1421	#active_bg => none	1866	#active_bg => none
1422	#font => default_font	1867	#font => default_font
1423	#text => initial text	1868	#text => initial text
1424	#markup => initial narkup	1869	#markup => initial narkup
1425	#max_w => maximum pixel width	1870	#max_w => maximum pixel width
		1871	#style => 0, # render flags
1426	ellipsise => 3, # end	1872	ellipsise => 3, # end
1427	layout => (new CFClient::Layout),	1873	layout => (new CFPlus::Layout),
1428	fontsize => 1,	1874	fontsize => 1,
1429	align => -1,	1875	align => -1,
1430	valign => -1,	1876	valign => -1,
1431	padding_x => 2,	1877	padding_x => 2,
1432	padding_y => 2,	1878	padding_y => 2,
1433	can_events => 0,	1879	can_events => 0,
1434	%arg	1880	%arg
1435	);	1881	);
1436		1882
1437	if (exists $self->{template}) {	1883	if (exists $self->{template}) {
1438	my $layout = new CFClient::Layout;	1884	my $layout = new CFPlus::Layout;
1439	$layout->set_text (delete $self->{template});	1885	$layout->set_text (delete $self->{template});
1440	$self->{template} = $layout;	1886	$self->{template} = $layout;
1441	}	1887	}
1442		1888
1443	if (exists $self->{markup}) {	1889	if (exists $self->{markup}) {
…		…
1447	}	1893	}
1448		1894
1449	$self	1895	$self
1450	}	1896	}
1451		1897
1452	sub escape($) {
1453	local $_ = $_[0];
1454
1455	s/&/&amp;/g;
1456	s/>/&gt;/g;
1457	s/</&lt;/g;
1458
1459	$_
1460	}
1461
1462	sub update {	1898	sub update {
1463	my ($self) = @_;	1899	my ($self) = @_;
1464		1900
1465	delete $self->{texture};	1901	delete $self->{texture};
1466	$self->SUPER::update;	1902	$self->SUPER::update;
1467	}	1903	}
1468		1904
		1905	sub realloc {
		1906	my ($self) = @_;
		1907
		1908	delete $self->{ox};
		1909	$self->SUPER::realloc;
		1910	}
		1911
1469	sub set_text {	1912	sub set_text {
1470	my ($self, $text) = @_;	1913	my ($self, $text) = @_;
1471		1914
1472	return if $self->{text} eq "T$text";	1915	return if $self->{text} eq "T$text";
1473	$self->{text} = "T$text";	1916	$self->{text} = "T$text";
1474		1917
1475	$self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1476	$self->{layout}->set_text ($text);	1918	$self->{layout}->set_text ($text);
1477		1919
		1920	delete $self->{size_req};
1478	$self->realloc;	1921	$self->realloc;
1479	$self->update;	1922	$self->update;
1480	}	1923	}
1481		1924
1482	sub set_markup {	1925	sub set_markup {
…		…
1485	return if $self->{text} eq "M$markup";	1928	return if $self->{text} eq "M$markup";
1486	$self->{text} = "M$markup";	1929	$self->{text} = "M$markup";
1487		1930
1488	my $rgba = $markup =~ /span.*(?:foreground|background)/;	1931	my $rgba = $markup =~ /span.*(?:foreground|background)/;
1489		1932
1490	$self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1491	$self->{layout}->set_markup ($markup);	1933	$self->{layout}->set_markup ($markup);
1492		1934
		1935	delete $self->{size_req};
1493	$self->realloc;	1936	$self->realloc;
1494	$self->update;	1937	$self->update;
1495	}	1938	}
1496		1939
1497	sub size_request {	1940	sub size_request {
1498	my ($self) = @_;	1941	my ($self) = @_;
1499		1942
		1943	$self->{size_req} ||= do {
1500	$self->{layout}->set_font ($self->{font}) if $self->{font};	1944	$self->{layout}->set_font ($self->{font}) if $self->{font};
1501	$self->{layout}->set_width ($self->{max_w} || -1);	1945	$self->{layout}->set_width ($self->{max_w} || -1);
1502	$self->{layout}->set_ellipsise ($self->{ellipsise});	1946	$self->{layout}->set_ellipsise ($self->{ellipsise});
1503	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});	1947	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1504	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	1948	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1505		1949
1506	my ($w, $h) = $self->{layout}->size;	1950	my ($w, $h) = $self->{layout}->size;
1507		1951
1508	if (exists $self->{template}) {	1952	if (exists $self->{template}) {
1509	$self->{template}->set_font ($self->{font}) if $self->{font};	1953	$self->{template}->set_font ($self->{font}) if $self->{font};
		1954	$self->{template}->set_width ($self->{max_w} || -1);
1510	$self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);	1955	$self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1511		1956
1512	my ($w2, $h2) = $self->{template}->size;	1957	my ($w2, $h2) = $self->{template}->size;
1513		1958
1514	$w = List::Util::max $w, $w2;	1959	$w = List::Util::max $w, $w2;
1515	$h = List::Util::max $h, $h2;	1960	$h = List::Util::max $h, $h2;
		1961	}
		1962
		1963	[$w, $h]
1516	}	1964	};
1517		1965
1518	($w, $h)	1966	@{ $self->{size_req} }
1519	}	1967	}
1520		1968
		1969	sub baseline_shift {
		1970	$_[0]{layout}->descent
		1971	}
		1972
1521	sub size_allocate {	1973	sub invoke_size_allocate {
1522	my ($self, $w, $h, $changed) = @_;	1974	my ($self, $w, $h) = @_;
		1975
		1976	delete $self->{ox};
1523		1977
1524	delete $self->{texture}	1978	delete $self->{texture}
1525	if $changed;	1979	unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
		1980
		1981	1
1526	}	1982	}
1527		1983
1528	sub set_fontsize {	1984	sub set_fontsize {
1529	my ($self, $fontsize) = @_;	1985	my ($self, $fontsize) = @_;
1530		1986
1531	$self->{fontsize} = $fontsize;	1987	$self->{fontsize} = $fontsize;
		1988	delete $self->{size_req};
1532	delete $self->{texture};	1989	delete $self->{texture};
1533		1990
1534	$self->realloc;	1991	$self->realloc;
1535	}	1992	}
1536		1993
		1994	sub reconfigure {
		1995	my ($self) = @_;
		1996
		1997	delete $self->{size_req};
		1998	delete $self->{texture};
		1999
		2000	$self->SUPER::reconfigure;
		2001	}
		2002
1537	sub _draw {	2003	sub _draw {
1538	my ($self) = @_;	2004	my ($self) = @_;
1539		2005
1540	$self->SUPER::_draw; # draw background, if applicable	2006	$self->SUPER::_draw; # draw background, if applicable
1541		2007
1542	my $tex = $self->{texture} ||= do {	2008	my $size = $self->{texture} ||= do {
1543	$self->{layout}->set_foreground (@{$self->{fg}});	2009	$self->{layout}->set_foreground (@{$self->{fg}});
1544	$self->{layout}->set_font ($self->{font}) if $self->{font};	2010	$self->{layout}->set_font ($self->{font}) if $self->{font};
1545	$self->{layout}->set_width ($self->{w});	2011	$self->{layout}->set_width ($self->{w});
1546	$self->{layout}->set_ellipsise ($self->{ellipsise});	2012	$self->{layout}->set_ellipsise ($self->{ellipsise});
1547	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});	2013	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1548	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	2014	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1549		2015
1550	my $tex = new_from_layout CFClient::Texture $self->{layout};	2016	[$self->{layout}->size]
		2017	};
1551		2018
		2019	unless (exists $self->{ox}) {
1552	$self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}	2020	$self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1553	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}	2021	: $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
1554	: ($self->{w} - $tex->{w}) * 0.5);	2022	: ($self->{w} - $size->[0]) * 0.5);
1555		2023
1556	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}	2024	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1557	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}	2025	: $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1558	: ($self->{h} - $tex->{h}) * 0.5);	2026	: ($self->{h} - $size->[1]) * 0.5);
1559
1560	$tex
1561	};	2027	};
1562		2028
1563	glEnable GL_TEXTURE_2D;	2029	my $w = List::Util::min $self->{w} + 4, $size->[0];
1564	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2030	my $h = List::Util::min $self->{h} + 2, $size->[1];
1565		2031
1566	if ($tex->{format} == GL_ALPHA) {	2032	$self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1567	glColor @{$self->{fg}};
1568	$tex->draw_quad_alpha ($self->{ox}, $self->{oy});
1569	} else {
1570	$tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1571	}
1572
1573	glDisable GL_TEXTURE_2D;
1574	}	2033	}
1575		2034
1576	#############################################################################	2035	#############################################################################
1577		2036
1578	package CFClient::UI::EntryBase;	2037	package CFPlus::UI::EntryBase;
1579		2038
1580	our @ISA = CFClient::UI::Label::;	2039	our @ISA = CFPlus::UI::Label::;
1581		2040
1582	use CFClient::OpenGL;	2041	use CFPlus::OpenGL;
1583		2042
1584	sub new {	2043	sub new {
1585	my $class = shift;	2044	my $class = shift;
1586		2045
1587	$class->SUPER::new (	2046	$class->SUPER::new (
…		…
1591	active_fg => [0, 0, 0],	2050	active_fg => [0, 0, 0],
1592	can_hover => 1,	2051	can_hover => 1,
1593	can_focus => 1,	2052	can_focus => 1,
1594	valign => 0,	2053	valign => 0,
1595	can_events => 1,	2054	can_events => 1,
		2055	ellipsise => 0,
1596	#text => ...	2056	#text => ...
		2057	#hidden => "*",
1597	@_	2058	@_
1598	)	2059	)
1599	}	2060	}
1600		2061
1601	sub _set_text {	2062	sub _set_text {
…		…
1603		2064
1604	delete $self->{cur_h};	2065	delete $self->{cur_h};
1605		2066
1606	return if $self->{text} eq $text;	2067	return if $self->{text} eq $text;
1607		2068
1608	delete $self->{texture};
1609
1610	$self->{last_activity} = $::NOW;	2069	$self->{last_activity} = $::NOW;
1611	$self->{text} = $text;	2070	$self->{text} = $text;
1612		2071
1613	$text =~ s/./*/g if $self->{hidden};	2072	$text =~ s/./*/g if $self->{hidden};
1614	$self->{layout}->set_text ("$text ");	2073	$self->{layout}->set_text ("$text ");
		2074	delete $self->{size_req};
1615		2075
1616	$self->_emit (changed => $self->{text});	2076	$self->emit (changed => $self->{text});
		2077
		2078	$self->realloc;
		2079	$self->update;
1617	}	2080	}
1618		2081
1619	sub set_text {	2082	sub set_text {
1620	my ($self, $text) = @_;	2083	my ($self, $text) = @_;
1621		2084
1622	$self->{cursor} = length $text;	2085	$self->{cursor} = length $text;
1623	$self->_set_text ($text);	2086	$self->_set_text ($text);
1624
1625	$self->realloc;
1626	}	2087	}
1627		2088
1628	sub get_text {	2089	sub get_text {
1629	$_[0]{text}	2090	$_[0]{text}
1630	}	2091	}
…		…
1635	my ($w, $h) = $self->SUPER::size_request;	2096	my ($w, $h) = $self->SUPER::size_request;
1636		2097
1637	($w + 1, $h) # add 1 for cursor	2098	($w + 1, $h) # add 1 for cursor
1638	}	2099	}
1639		2100
1640	sub key_down {	2101	sub invoke_key_down {
1641	my ($self, $ev) = @_;	2102	my ($self, $ev) = @_;
1642		2103
1643	my $mod = $ev->{mod};	2104	my $mod = $ev->{mod};
1644	my $sym = $ev->{sym};	2105	my $sym = $ev->{sym};
1645	my $uni = $ev->{unicode};	2106	my $uni = $ev->{unicode};
1646		2107
1647	my $text = $self->get_text;	2108	my $text = $self->get_text;
		2109
		2110	$self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;
1648		2111
1649	if ($uni == 8) {	2112	if ($uni == 8) {
1650	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};	2113	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1651	} elsif ($uni == 127) {	2114	} elsif ($uni == 127) {
1652	substr $text, $self->{cursor}, 1, "";	2115	substr $text, $self->{cursor}, 1, "";
1653	} elsif ($sym == CFClient::SDLK_LEFT) {	2116	} elsif ($sym == CFPlus::SDLK_LEFT) {
1654	--$self->{cursor} if $self->{cursor};	2117	--$self->{cursor} if $self->{cursor};
1655	} elsif ($sym == CFClient::SDLK_RIGHT) {	2118	} elsif ($sym == CFPlus::SDLK_RIGHT) {
1656	++$self->{cursor} if $self->{cursor} < length $self->{text};	2119	++$self->{cursor} if $self->{cursor} < length $self->{text};
1657	} elsif ($sym == CFClient::SDLK_HOME) {	2120	} elsif ($sym == CFPlus::SDLK_HOME) {
		2121	# what a hack
		2122	$self->{cursor} =
		2123	(substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/
		2124	? length $1
		2125	: 0;
		2126	} elsif ($sym == CFPlus::SDLK_END) {
		2127	# uh, again
		2128	$self->{cursor} =
		2129	(substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/
		2130	? $self->{cursor} + length $1
		2131	: length $self->{text};
		2132	} elsif ($uni == 21) { # ctrl-u
		2133	$text = "";
1658	$self->{cursor} = 0;	2134	$self->{cursor} = 0;
1659	} elsif ($sym == CFClient::SDLK_END) {
1660	$self->{cursor} = length $text;
1661	} elsif ($uni == 27) {	2135	} elsif ($uni == 27) {
1662	$self->_emit ('escape');	2136	$self->emit ('escape');
1663	} elsif ($uni) {	2137	} elsif ($uni == 0x0d) {
		2138	substr $text, $self->{cursor}++, 0, "\012";
		2139	} elsif ($uni >= 0x20) {
1664	substr $text, $self->{cursor}++, 0, chr $uni;	2140	substr $text, $self->{cursor}++, 0, chr $uni;
		2141	} else {
		2142	return 0;
1665	}	2143	}
1666		2144
1667	$self->_set_text ($text);	2145	$self->_set_text ($text);
1668		2146
1669	$self->realloc;	2147	$self->realloc;
1670	}	2148	$self->update;
1671		2149
		2150	1
		2151	}
		2152
1672	sub focus_in {	2153	sub invoke_focus_in {
1673	my ($self) = @_;	2154	my ($self) = @_;
1674		2155
1675	$self->{last_activity} = $::NOW;	2156	$self->{last_activity} = $::NOW;
1676		2157
1677	$self->SUPER::focus_in;	2158	$self->SUPER::invoke_focus_in
1678	}	2159	}
1679		2160
1680	sub button_down {	2161	sub invoke_button_down {
1681	my ($self, $ev, $x, $y) = @_;	2162	my ($self, $ev, $x, $y) = @_;
1682		2163
1683	$self->SUPER::button_down ($ev, $x, $y);	2164	$self->SUPER::invoke_button_down ($ev, $x, $y);
1684		2165
1685	my $idx = $self->{layout}->xy_to_index ($x, $y);	2166	my $idx = $self->{layout}->xy_to_index ($x, $y);
1686		2167
1687	# byte-index to char-index	2168	# byte-index to char-index
1688	my $text = $self->{text};	2169	my $text = $self->{text};
1689	utf8::encode $text;	2170	utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1690	$self->{cursor} = length substr $text, 0, $idx;	2171	$self->{cursor} = length $text;
1691		2172
1692	$self->_set_text ($self->{text});	2173	$self->_set_text ($self->{text});
1693	$self->update;	2174	$self->update;
		2175
		2176	1
1694	}	2177	}
1695		2178
1696	sub mouse_motion {	2179	sub invoke_mouse_motion {
1697	my ($self, $ev, $x, $y) = @_;	2180	my ($self, $ev, $x, $y) = @_;
1698	# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#	2181	# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
		2182
		2183	1
1699	}	2184	}
1700		2185
1701	sub _draw {	2186	sub _draw {
1702	my ($self) = @_;	2187	my ($self) = @_;
1703		2188
1704	local $self->{fg} = $self->{fg};	2189	local $self->{fg} = $self->{fg};
1705		2190
1706	if ($FOCUS == $self) {	2191	if ($FOCUS == $self) {
1707	glColor @{$self->{active_bg}};	2192	glColor_premultiply @{$self->{active_bg}};
1708	$self->{fg} = $self->{active_fg};	2193	$self->{fg} = $self->{active_fg};
1709	} else {	2194	} else {
1710	glColor @{$self->{bg}};	2195	glColor_premultiply @{$self->{bg}};
1711	}	2196	}
1712		2197
1713	glEnable GL_BLEND;	2198	glEnable GL_BLEND;
1714	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	2199	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1715	glBegin GL_QUADS;	2200	glBegin GL_QUADS;
1716	glVertex 0 , 0;	2201	glVertex 0 , 0;
1717	glVertex 0 , $self->{h};	2202	glVertex 0 , $self->{h};
1718	glVertex $self->{w}, $self->{h};	2203	glVertex $self->{w}, $self->{h};
1719	glVertex $self->{w}, 0;	2204	glVertex $self->{w}, 0;
…		…
1730	utf8::encode $text;	2215	utf8::encode $text;
1731		2216
1732	@$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)	2217	@$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)
1733	}	2218	}
1734		2219
1735	glColor @{$self->{fg}};
1736	glBegin GL_LINES;	2220	glBegin GL_LINES;
1737	glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};	2221	glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};
1738	glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};	2222	glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1739	glEnd;	2223	glEnd;
1740	}	2224	}
1741	}	2225	}
1742		2226
		2227	#############################################################################
		2228
1743	package CFClient::UI::Entry;	2229	package CFPlus::UI::Entry;
1744		2230
1745	our @ISA = CFClient::UI::EntryBase::;	2231	our @ISA = CFPlus::UI::EntryBase::;
1746		2232
1747	use CFClient::OpenGL;	2233	use CFPlus::OpenGL;
1748		2234
1749	sub key_down {	2235	sub invoke_key_down {
1750	my ($self, $ev) = @_;	2236	my ($self, $ev) = @_;
1751		2237
1752	my $sym = $ev->{sym};	2238	my $sym = $ev->{sym};
1753		2239
1754	if ($sym == 13) {	2240	if ($ev->{uni} == 0x0d || $sym == 13) {
1755	unshift @{$self->{history}},	2241	unshift @{$self->{history}},
1756	my $txt = $self->get_text;	2242	my $txt = $self->get_text;
		2243
1757	$self->{history_pointer} = -1;	2244	$self->{history_pointer} = -1;
1758	$self->{history_saveback} = '';	2245	$self->{history_saveback} = '';
1759	$self->_emit (activate => $txt);	2246	$self->emit (activate => $txt);
1760	$self->update;	2247	$self->update;
1761		2248
1762	} elsif ($sym == CFClient::SDLK_UP) {	2249	} elsif ($sym == CFPlus::SDLK_UP) {
1763	if ($self->{history_pointer} < 0) {	2250	if ($self->{history_pointer} < 0) {
1764	$self->{history_saveback} = $self->get_text;	2251	$self->{history_saveback} = $self->get_text;
1765	}	2252	}
1766	if (@{$self->{history} || []} > 0) {	2253	if (@{$self->{history} || []} > 0) {
1767	$self->{history_pointer}++;	2254	$self->{history_pointer}++;
…		…
1769	$self->{history_pointer} = @{$self->{history} || []} - 1;	2256	$self->{history_pointer} = @{$self->{history} || []} - 1;
1770	}	2257	}
1771	$self->set_text ($self->{history}->[$self->{history_pointer}]);	2258	$self->set_text ($self->{history}->[$self->{history_pointer}]);
1772	}	2259	}
1773		2260
1774	} elsif ($sym == CFClient::SDLK_DOWN) {	2261	} elsif ($sym == CFPlus::SDLK_DOWN) {
1775	$self->{history_pointer}--;	2262	$self->{history_pointer}--;
1776	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;	2263	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1777		2264
1778	if ($self->{history_pointer} >= 0) {	2265	if ($self->{history_pointer} >= 0) {
1779	$self->set_text ($self->{history}->[$self->{history_pointer}]);	2266	$self->set_text ($self->{history}->[$self->{history_pointer}]);
1780	} else {	2267	} else {
1781	$self->set_text ($self->{history_saveback});	2268	$self->set_text ($self->{history_saveback});
1782	}	2269	}
1783		2270
1784	} else {	2271	} else {
1785	$self->SUPER::key_down ($ev);	2272	return $self->SUPER::invoke_key_down ($ev)
		2273	}
		2274
1786	}	2275	1
1787
1788	}	2276	}
1789		2277
1790	#############################################################################	2278	#############################################################################
1791		2279
		2280	package CFPlus::UI::TextEdit;
		2281
		2282	our @ISA = CFPlus::UI::EntryBase::;
		2283
		2284	use CFPlus::OpenGL;
		2285
		2286	sub move_cursor_ver {
		2287	my ($self, $dy) = @_;
		2288
		2289	my ($y, $x) = $self->{layout}->index_to_line_x ($self->{cursor});
		2290
		2291	$y += $dy;
		2292
		2293	if (defined (my $index = $self->{layout}->line_x_to_index ($y, $x))) {
		2294	$self->{cursor} = $index;
		2295	delete $self->{cur_h};
		2296	$self->update;
		2297	return;
		2298	}
		2299	}
		2300
		2301	sub invoke_key_down {
		2302	my ($self, $ev) = @_;
		2303
		2304	my $sym = $ev->{sym};
		2305
		2306	if ($sym == CFPlus::SDLK_UP) {
		2307	$self->move_cursor_ver (-1);
		2308	} elsif ($sym == CFPlus::SDLK_DOWN) {
		2309	$self->move_cursor_ver (+1);
		2310	} else {
		2311	return $self->SUPER::invoke_key_down ($ev)
		2312	}
		2313
		2314	1
		2315	}
		2316
		2317	#############################################################################
		2318
1792	package CFClient::UI::Button;	2319	package CFPlus::UI::Button;
1793		2320
1794	our @ISA = CFClient::UI::Label::;	2321	our @ISA = CFPlus::UI::Label::;
1795		2322
1796	use CFClient::OpenGL;	2323	use CFPlus::OpenGL;
1797		2324
1798	my @tex =	2325	my @tex =
1799	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2326	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1800	qw(b1_button_active.png);	2327	qw(b1_button_active.png);
1801		2328
1802	sub new {	2329	sub new {
1803	my $class = shift;	2330	my $class = shift;
1804		2331
…		…
1813	can_events => 1,	2340	can_events => 1,
1814	@_	2341	@_
1815	)	2342	)
1816	}	2343	}
1817		2344
1818	sub activate { }
1819
1820	sub button_up {	2345	sub invoke_button_up {
1821	my ($self, $ev, $x, $y) = @_;	2346	my ($self, $ev, $x, $y) = @_;
1822		2347
1823	$self->emit ("activate")	2348	$self->emit ("activate")
1824	if $x >= 0 && $x < $self->{w}	2349	if $x >= 0 && $x < $self->{w}
1825	&& $y >= 0 && $y < $self->{h};	2350	&& $y >= 0 && $y < $self->{h};
		2351
		2352	1
1826	}	2353	}
1827		2354
1828	sub _draw {	2355	sub _draw {
1829	my ($self) = @_;	2356	my ($self) = @_;
1830		2357
1831	local $self->{fg} = $self->{fg};	2358	local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1832
1833	if ($GRAB == $self) {
1834	$self->{fg} = $self->{active_fg};
1835	}
1836		2359
1837	glEnable GL_TEXTURE_2D;	2360	glEnable GL_TEXTURE_2D;
1838	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2361	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1839	glColor 0, 0, 0, 1;	2362	glColor 0, 0, 0, 1;
1840		2363
…		…
1845	$self->SUPER::_draw;	2368	$self->SUPER::_draw;
1846	}	2369	}
1847		2370
1848	#############################################################################	2371	#############################################################################
1849		2372
1850	package CFClient::UI::CheckBox;	2373	package CFPlus::UI::CheckBox;
1851		2374
1852	our @ISA = CFClient::UI::DrawBG::;	2375	our @ISA = CFPlus::UI::DrawBG::;
1853		2376
1854	my @tex =	2377	my @tex =
1855	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2378	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1856	qw(c1_checkbox_bg.png c1_checkbox_active.png);	2379	qw(c1_checkbox_bg.png c1_checkbox_active.png);
1857		2380
1858	use CFClient::OpenGL;	2381	use CFPlus::OpenGL;
1859		2382
1860	sub new {	2383	sub new {
1861	my $class = shift;	2384	my $class = shift;
1862		2385
1863	$class->SUPER::new (	2386	$class->SUPER::new (
…		…
1877	my ($self) = @_;	2400	my ($self) = @_;
1878		2401
1879	(6) x 2	2402	(6) x 2
1880	}	2403	}
1881		2404
		2405	sub toggle {
		2406	my ($self) = @_;
		2407
		2408	$self->{state} = !$self->{state};
		2409	$self->emit (changed => $self->{state});
		2410	$self->update;
		2411	}
		2412
1882	sub button_down {	2413	sub invoke_button_down {
1883	my ($self, $ev, $x, $y) = @_;	2414	my ($self, $ev, $x, $y) = @_;
1884		2415
1885	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}	2416	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1886	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {	2417	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1887	$self->{state} = !$self->{state};	2418	$self->toggle;
1888	$self->_emit (changed => $self->{state});	2419	} else {
		2420	return 0
		2421	}
		2422
1889	}	2423	1
1890	}	2424	}
1891		2425
1892	sub _draw {	2426	sub _draw {
1893	my ($self) = @_;	2427	my ($self) = @_;
1894		2428
…		…
1909	glDisable GL_TEXTURE_2D;	2443	glDisable GL_TEXTURE_2D;
1910	}	2444	}
1911		2445
1912	#############################################################################	2446	#############################################################################
1913		2447
1914	package CFClient::UI::Image;	2448	package CFPlus::UI::Image;
1915		2449
1916	our @ISA = CFClient::UI::Base::;	2450	our @ISA = CFPlus::UI::Base::;
1917		2451
1918	use CFClient::OpenGL;	2452	use CFPlus::OpenGL;
1919	use Carp qw/confess/;
1920		2453
1921	our %loaded_images;	2454	our %texture_cache;
1922		2455
1923	sub new {	2456	sub new {
1924	my $class = shift;	2457	my $class = shift;
1925		2458
1926	my $self = $class->SUPER::new (can_events => 0, @_);	2459	my $self = $class->SUPER::new (
		2460	can_events => 0,
		2461	@_,
		2462	);
1927		2463
1928	$self->{image} or confess "Image has 'image' not set. This is a fatal error!";	2464	$self->{path} || $self->{tex}
		2465	or Carp::croak "'path' or 'tex' attributes required";
1929		2466
1930	$loaded_images{$self->{image}} ||=	2467	$self->{tex} ||= $texture_cache{$self->{path}} ||=
1931	new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1;	2468	new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;
1932		2469
1933	my $tex = $self->{tex} = $loaded_images{$self->{image}};	2470	CFPlus::weaken $texture_cache{$self->{path}};
1934		2471
1935	Scalar::Util::weaken $loaded_images{$self->{image}};	2472	$self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
1936
1937	$self->{aspect} = $tex->{w} / $tex->{h};
1938		2473
1939	$self	2474	$self
1940	}	2475	}
1941		2476
		2477	sub STORABLE_freeze {
		2478	my ($self, $cloning) = @_;
		2479
		2480	$self->{path}
		2481	or die "cannot serialise CFPlus::UI::Image on non-loadable images\n";
		2482
		2483	$self->{path}
		2484	}
		2485
		2486	sub STORABLE_attach {
		2487	my ($self, $cloning, $path) = @_;
		2488
		2489	$self->new (path => $path)
		2490	}
		2491
1942	sub size_request {	2492	sub size_request {
1943	my ($self) = @_;	2493	my ($self) = @_;
1944		2494
1945	($self->{tex}->{w}, $self->{tex}->{h})	2495	($self->{tex}{w}, $self->{tex}{h})
1946	}	2496	}
1947		2497
1948	sub _draw {	2498	sub _draw {
1949	my ($self) = @_;	2499	my ($self) = @_;
1950		2500
…		…
1960	}	2510	}
1961		2511
1962	glEnable GL_TEXTURE_2D;	2512	glEnable GL_TEXTURE_2D;
1963	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2513	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1964		2514
1965	$tex->draw_quad_alpha (0, 0, $w, $h);	2515	$tex->draw_quad (0, 0, $w, $h);
1966		2516
1967	glDisable GL_TEXTURE_2D;	2517	glDisable GL_TEXTURE_2D;
1968	}	2518	}
1969		2519
1970	#############################################################################	2520	#############################################################################
1971		2521
		2522	package CFPlus::UI::ImageButton;
		2523
		2524	our @ISA = CFPlus::UI::Image::;
		2525
		2526	use CFPlus::OpenGL;
		2527
		2528	my %textures;
		2529
		2530	sub new {
		2531	my $class = shift;
		2532
		2533	my $self = $class->SUPER::new (
		2534	padding_x => 4,
		2535	padding_y => 4,
		2536	fg => [1, 1, 1],
		2537	active_fg => [0, 0, 1],
		2538	can_hover => 1,
		2539	align => 0,
		2540	valign => 0,
		2541	can_events => 1,
		2542	@_
		2543	);
		2544	}
		2545
		2546	sub invoke_button_up {
		2547	my ($self, $ev, $x, $y) = @_;
		2548
		2549	$self->emit ("activate")
		2550	if $x >= 0 && $x < $self->{w}
		2551	&& $y >= 0 && $y < $self->{h};
		2552
		2553	1
		2554	}
		2555
		2556	#############################################################################
		2557
1972	package CFClient::UI::VGauge;	2558	package CFPlus::UI::VGauge;
1973		2559
1974	our @ISA = CFClient::UI::Base::;	2560	our @ISA = CFPlus::UI::Base::;
1975		2561
1976	use List::Util qw(min max);	2562	use List::Util qw(min max);
1977		2563
1978	use CFClient::OpenGL;	2564	use CFPlus::OpenGL;
1979		2565
1980	my %tex = (	2566	my %tex = (
1981	food => [	2567	food => [
1982	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2568	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1983	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/	2569	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
1984	],	2570	],
1985	grace => [	2571	grace => [
1986	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2572	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1987	qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/	2573	qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
1988	],	2574	],
1989	hp => [	2575	hp => [
1990	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2576	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1991	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/	2577	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
1992	],	2578	],
1993	mana => [	2579	mana => [
1994	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2580	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1995	qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/	2581	qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
1996	],	2582	],
1997	);	2583	);
1998		2584
1999	# eg. VGauge->new (gauge => 'food'), default gauge: food	2585	# eg. VGauge->new (gauge => 'food'), default gauge: food
…		…
2059	my $ycut1 = max 0, min 1, $ycut;	2645	my $ycut1 = max 0, min 1, $ycut;
2060	my $ycut2 = max 0, min 1, $ycut - 1;	2646	my $ycut2 = max 0, min 1, $ycut - 1;
2061		2647
2062	my $h1 = $self->{h} * (1 - $ycut1);	2648	my $h1 = $self->{h} * (1 - $ycut1);
2063	my $h2 = $self->{h} * (1 - $ycut2);	2649	my $h2 = $self->{h} * (1 - $ycut2);
		2650	my $h3 = $self->{h};
		2651
		2652	$_ = $_ * (284-4)/288 + 4/288 for ($h1, $h2, $h3);
2064		2653
2065	glEnable GL_BLEND;	2654	glEnable GL_BLEND;
2066	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	2655	glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
		2656	GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2067	glEnable GL_TEXTURE_2D;	2657	glEnable GL_TEXTURE_2D;
2068	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2658	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2069		2659
2070	glBindTexture GL_TEXTURE_2D, $t1->{name};	2660	glBindTexture GL_TEXTURE_2D, $t1->{name};
2071	glBegin GL_QUADS;	2661	glBegin GL_QUADS;
…		…
2086		2676
2087	if ($t3) {	2677	if ($t3) {
2088	glBindTexture GL_TEXTURE_2D, $t3->{name};	2678	glBindTexture GL_TEXTURE_2D, $t3->{name};
2089	glBegin GL_QUADS;	2679	glBegin GL_QUADS;
2090	glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;	2680	glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2091	glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h};	2681	glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2092	glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h};	2682	glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2093	glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;	2683	glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2094	glEnd;	2684	glEnd;
2095	}	2685	}
2096		2686
2097	glDisable GL_BLEND;	2687	glDisable GL_BLEND;
2098	glDisable GL_TEXTURE_2D;	2688	glDisable GL_TEXTURE_2D;
2099	}	2689	}
2100		2690
2101	#############################################################################	2691	#############################################################################
2102		2692
2103	package CFClient::UI::Gauge;	2693	package CFPlus::UI::Gauge;
2104		2694
2105	our @ISA = CFClient::UI::VBox::;	2695	our @ISA = CFPlus::UI::VBox::;
2106		2696
2107	sub new {	2697	sub new {
2108	my ($class, %arg) = @_;	2698	my ($class, %arg) = @_;
2109		2699
2110	my $self = $class->SUPER::new (	2700	my $self = $class->SUPER::new (
…		…
2112	can_hover => 1,	2702	can_hover => 1,
2113	can_events => 1,	2703	can_events => 1,
2114	%arg,	2704	%arg,
2115	);	2705	);
2116		2706
2117	$self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999");	2707	$self->add ($self->{value} = new CFPlus::UI::Label valign => +1, align => 0, template => "999");
2118	$self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);	2708	$self->add ($self->{gauge} = new CFPlus::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
2119	$self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999");	2709	$self->add ($self->{max} = new CFPlus::UI::Label valign => -1, align => 0, template => "999");
2120		2710
2121	$self	2711	$self
2122	}	2712	}
2123		2713
2124	sub set_fontsize {	2714	sub set_fontsize {
…		…
2145	$self->{value}->set_text ($val);	2735	$self->{value}->set_text ($val);
2146	}	2736	}
2147		2737
2148	#############################################################################	2738	#############################################################################
2149		2739
2150	package CFClient::UI::Slider;	2740	package CFPlus::UI::Slider;
2151		2741
2152	use strict;	2742	use strict;
2153		2743
2154	use CFClient::OpenGL;	2744	use CFPlus::OpenGL;
2155		2745
2156	our @ISA = CFClient::UI::DrawBG::;	2746	our @ISA = CFPlus::UI::DrawBG::;
2157		2747
2158	my @tex =	2748	my @tex =
2159	map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }	2749	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
2160	qw(s1_slider.png s1_slider_bg.png);	2750	qw(s1_slider.png s1_slider_bg.png);
2161		2751
2162	sub new {	2752	sub new {
2163	my $class = shift;	2753	my $class = shift;
2164		2754
…		…
2185	$self->update;	2775	$self->update;
2186		2776
2187	$self	2777	$self
2188	}	2778	}
2189		2779
2190	sub changed { }
2191
2192	sub set_range {	2780	sub set_range {
2193	my ($self, $range) = @_;	2781	my ($self, $range) = @_;
2194		2782
2195	($range, $self->{range}) = ($self->{range}, $range);	2783	($range, $self->{range}) = ($self->{range}, $range);
2196		2784
2197	$self->update
2198	if "@$range" ne "@{$self->{range}}";	2785	if ("@$range" ne "@{$self->{range}}") {
		2786	$self->update;
		2787	$self->set_value ($self->{range}[0]);
		2788	}
2199	}	2789	}
2200		2790
2201	sub set_value {	2791	sub set_value {
2202	my ($self, $value) = @_;	2792	my ($self, $value) = @_;
2203		2793
…		…
2214	if $unit;	2804	if $unit;
2215		2805
2216	@{$self->{range}} = ($value, $lo, $hi, $page, $unit);	2806	@{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2217		2807
2218	if ($value != $old_value) {	2808	if ($value != $old_value) {
2219	$self->_emit (changed => $value);	2809	$self->emit (changed => $value);
2220	$self->update;	2810	$self->update;
2221	}	2811	}
2222	}	2812	}
2223		2813
2224	sub size_request {	2814	sub size_request {
2225	my ($self) = @_;	2815	my ($self) = @_;
2226		2816
2227	($self->{req_w}, $self->{req_h})	2817	($self->{req_w}, $self->{req_h})
2228	}	2818	}
2229		2819
2230	sub button_down {	2820	sub invoke_button_down {
2231	my ($self, $ev, $x, $y) = @_;	2821	my ($self, $ev, $x, $y) = @_;
2232		2822
2233	$self->SUPER::button_down ($ev, $x, $y);	2823	$self->SUPER::invoke_button_down ($ev, $x, $y);
2234		2824
2235	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];	2825	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2236		2826
2237	$self->mouse_motion ($ev, $x, $y);	2827	$self->invoke_mouse_motion ($ev, $x, $y)
2238	}	2828	}
2239		2829
2240	sub mouse_motion {	2830	sub invoke_mouse_motion {
2241	my ($self, $ev, $x, $y) = @_;	2831	my ($self, $ev, $x, $y) = @_;
2242		2832
2243	if ($GRAB == $self) {	2833	if ($GRAB == $self) {
2244	my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});	2834	my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2245		2835
2246	my (undef, $lo, $hi, $page) = @{$self->{range}};	2836	my (undef, $lo, $hi, $page) = @{$self->{range}};
2247		2837
2248	$x = ($x - $self->{click}[1]) / ($w * $self->{scale});	2838	$x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2249		2839
2250	$self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));	2840	$self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
		2841	} else {
		2842	return 0;
		2843	}
		2844
2251	}	2845	1
		2846	}
		2847
		2848	sub invoke_mouse_wheel {
		2849	my ($self, $ev) = @_;
		2850
		2851	my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
		2852
		2853	my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
		2854
		2855	$self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
		2856
		2857	! ! $delta
2252	}	2858	}
2253		2859
2254	sub update {	2860	sub update {
2255	my ($self) = @_;	2861	my ($self) = @_;
2256		2862
2257	$CFClient::UI::ROOT->on_post_alloc ($self => sub {	2863	delete $self->{knob_w};
		2864	$self->SUPER::update;
		2865	}
		2866
		2867	sub _draw {
		2868	my ($self) = @_;
		2869
		2870	unless ($self->{knob_w}) {
2258	$self->set_value ($self->{range}[0]);	2871	$self->set_value ($self->{range}[0]);
2259		2872
2260	my ($value, $lo, $hi, $page) = @{$self->{range}};	2873	my ($value, $lo, $hi, $page) = @{$self->{range}};
2261	my $range = ($hi - $page - $lo) || 1e-100;	2874	my $range = ($hi - $page - $lo) || 1e-100;
2262		2875
…		…
2268	$value = ($value - $lo) / $range;	2881	$value = ($value - $lo) / $range;
2269	$value = $value * $self->{scale} + $self->{offset};	2882	$value = $value * $self->{scale} + $self->{offset};
2270		2883
2271	$self->{knob_x} = $value - $knob_w * 0.5;	2884	$self->{knob_x} = $value - $knob_w * 0.5;
2272	$self->{knob_w} = $knob_w;	2885	$self->{knob_w} = $knob_w;
2273	});	2886	}
2274
2275	$self->SUPER::update;
2276	}
2277
2278	sub _draw {
2279	my ($self) = @_;
2280		2887
2281	$self->SUPER::_draw ();	2888	$self->SUPER::_draw ();
2282		2889
2283	glScale $self->{w}, $self->{h};	2890	glScale $self->{w}, $self->{h};
2284		2891
…		…
2304	glDisable GL_TEXTURE_2D;	2911	glDisable GL_TEXTURE_2D;
2305	}	2912	}
2306		2913
2307	#############################################################################	2914	#############################################################################
2308		2915
2309	package CFClient::UI::ValSlider;	2916	package CFPlus::UI::ValSlider;
2310		2917
2311	our @ISA = CFClient::UI::HBox::;	2918	our @ISA = CFPlus::UI::HBox::;
2312		2919
2313	sub new {	2920	sub new {
2314	my ($class, %arg) = @_;	2921	my ($class, %arg) = @_;
2315		2922
2316	my $range = delete $arg{range};	2923	my $range = delete $arg{range};
2317		2924
2318	my $self = $class->SUPER::new (	2925	my $self = $class->SUPER::new (
2319	slider => (new CFClient::UI::Slider expand => 1, range => $range),	2926	slider => (new CFPlus::UI::Slider expand => 1, range => $range),
2320	entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),	2927	entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
2321	to_value => sub { shift },	2928	to_value => sub { shift },
2322	from_value => sub { shift },	2929	from_value => sub { shift },
2323	%arg,	2930	%arg,
2324	);	2931	);
2325		2932
…		…
2345	sub set_range { shift->{slider}->set_range (@_) }	2952	sub set_range { shift->{slider}->set_range (@_) }
2346	sub set_value { shift->{slider}->set_value (@_) }	2953	sub set_value { shift->{slider}->set_value (@_) }
2347		2954
2348	#############################################################################	2955	#############################################################################
2349		2956
2350	package CFClient::UI::TextView;	2957	package CFPlus::UI::TextScroller;
2351		2958
2352	our @ISA = CFClient::UI::HBox::;	2959	our @ISA = CFPlus::UI::HBox::;
2353		2960
2354	use CFClient::OpenGL;	2961	use CFPlus::OpenGL;
2355		2962
2356	sub new {	2963	sub new {
2357	my $class = shift;	2964	my $class = shift;
2358		2965
2359	my $self = $class->SUPER::new (	2966	my $self = $class->SUPER::new (
2360	fontsize => 1,	2967	fontsize => 1,
2361	can_events => 0,	2968	can_events => 1,
		2969	indent => 0,
2362	#font => default_font	2970	#font => default_font
2363	@_,	2971	@_,
2364		2972
2365	layout => (new CFClient::Layout 1),	2973	layout => (new CFPlus::Layout),
2366	par => [],	2974	par => [],
		2975	max_par => 0,
2367	height => 0,	2976	height => 0,
2368	children => [	2977	children => [
2369	(new CFClient::UI::Empty expand => 1),	2978	(new CFPlus::UI::Empty expand => 1),
2370	(new CFClient::UI::Slider vertical => 1),	2979	(new CFPlus::UI::Slider vertical => 1),
2371	],	2980	],
2372	);	2981	);
2373		2982
2374	$self->{children}[1]->connect (changed => sub { $self->update });	2983	$self->{children}[1]->connect (changed => sub { $self->update });
2375		2984
…		…
2381		2990
2382	$self->{fontsize} = $fontsize;	2991	$self->{fontsize} = $fontsize;
2383	$self->reflow;	2992	$self->reflow;
2384	}	2993	}
2385		2994
		2995	sub size_request {
		2996	my ($self) = @_;
		2997
		2998	my ($empty, $slider) = @{ $self->{children} };
		2999
		3000	local $self->{children} = [$empty, $slider];
		3001	$self->SUPER::size_request
		3002	}
		3003
2386	sub size_allocate {	3004	sub invoke_size_allocate {
2387	my ($self, $w, $h, $changed) = @_;	3005	my ($self, $w, $h) = @_;
2388		3006
2389	$self->SUPER::size_allocate ($w, $h, $changed);	3007	my ($empty, $slider, @other) = @{ $self->{children} };
2390		3008	$_->configure (@$_{qw(x y req_w req_h)}) for @other;
2391	return unless $changed;
2392		3009
2393	$self->{layout}->set_font ($self->{font}) if $self->{font};	3010	$self->{layout}->set_font ($self->{font}) if $self->{font};
2394	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	3011	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2395	$self->{layout}->set_width ($self->{children}[0]{w});	3012	$self->{layout}->set_width ($empty->{w});
		3013	$self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2396		3014
2397	$self->reflow;	3015	$self->reflow;
2398	}
2399		3016
2400	sub text_size {	3017	local $self->{children} = [$empty, $slider];
		3018	$self->SUPER::invoke_size_allocate ($w, $h)
		3019	}
		3020
		3021	sub invoke_mouse_wheel {
2401	my ($self, $text, $indent) = @_;	3022	my ($self, $ev) = @_;
		3023
		3024	return 0 unless $ev->{dy}; # only vertical movements
		3025
		3026	$self->{children}[1]->emit (mouse_wheel => $ev);
		3027
		3028	1
		3029	}
		3030
		3031	sub get_layout {
		3032	my ($self, $para) = @_;
2402		3033
2403	my $layout = $self->{layout};	3034	my $layout = $self->{layout};
2404		3035
		3036	$layout->set_font ($self->{font}) if $self->{font};
		3037	$layout->set_foreground (@{$para->{fg}});
2405	$layout->set_height ($self->{fontsize} * $::FONTSIZE);	3038	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
2406	$layout->set_width ($self->{children}[0]{w} - $indent);	3039	$layout->set_width ($self->{children}[0]{w} - $para->{indent});
		3040	$layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2407	$layout->set_markup ($text);	3041	$layout->set_markup ($para->{markup});
		3042
		3043	$layout->set_shapes (
		3044	map
		3045	+(0, $_->baseline_shift +$_->{padding_y} - $_->{h}, $_->{w}, $_->{h}),
		3046	@{$para->{widget}}
2408		3047	);
		3048
2409	$layout->size	3049	$layout
2410	}	3050	}
2411		3051
2412	sub reflow {	3052	sub reflow {
2413	my ($self) = @_;	3053	my ($self) = @_;
2414		3054
…		…
2421		3061
2422	# todo: base offset on lines or so, not on pixels	3062	# todo: base offset on lines or so, not on pixels
2423	$self->{children}[1]->set_value ($offset);	3063	$self->{children}[1]->set_value ($offset);
2424	}	3064	}
2425		3065
		3066	sub current_paragraph {
		3067	my ($self) = @_;
		3068
		3069	$self->{top_paragraph} - 1
		3070	}
		3071
		3072	sub scroll_to {
		3073	my ($self, $para) = @_;
		3074
		3075	$para = List::Util::max 0, List::Util::min $#{$self->{par}}, $para;
		3076
		3077	$self->{scroll_to} = $para;
		3078	$self->update;
		3079	}
		3080
2426	sub clear {	3081	sub clear {
2427	my ($self) = @_;	3082	my ($self) = @_;
		3083
		3084	my (undef, undef, @other) = @{ $self->{children} };
		3085	$self->remove ($_) for @other;
2428		3086
2429	$self->{par} = [];	3087	$self->{par} = [];
2430	$self->{height} = 0;	3088	$self->{height} = 0;
2431	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);	3089	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2432	}	3090	}
2433		3091
2434	sub add_paragraph {	3092	sub add_paragraph {
2435	my ($self, $color, $text, $indent) = @_;	3093	my $self = shift;
2436		3094
2437	for my $line (split /\n/, $text) {	3095	for my $para (@_) {
2438	my ($w, $h) = $self->text_size ($line);	3096	$para = {
		3097	fg => [1, 1, 1, 1],
		3098	indent => 0,
		3099	markup => "",
		3100	widget => [],
		3101	ref $para ? %$para : (markup => $para),
		3102	w => 1e10,
		3103	wrapped => 1,
		3104	};
		3105
		3106	$self->add (@{ $para->{widget} }) if @{ $para->{widget} };
		3107	push @{$self->{par}}, $para;
		3108	}
		3109
		3110	if (my $max = $self->{max_par}) {
		3111	shift @{$self->{par}} while @{$self->{par}} > $max;
		3112	}
		3113
		3114	$self->{need_reflow}++;
		3115	$self->update;
		3116	}
		3117
		3118	sub scroll_to_bottom {
		3119	my ($self) = @_;
		3120
		3121	$self->{scroll_to} = $#{$self->{par}};
		3122	$self->update;
		3123	}
		3124
		3125	sub force_uptodate {
		3126	my ($self) = @_;
		3127
		3128	if (delete $self->{need_reflow}) {
		3129	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
		3130
		3131	my $height = 0;
		3132
		3133	for my $para (@{$self->{par}}) {
		3134	if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
		3135	my $layout = $self->get_layout ($para);
		3136	my ($w, $h) = $layout->size;
		3137
		3138	$para->{w} = $w + $para->{indent};
		3139	$para->{h} = $h;
		3140	$para->{wrapped} = $layout->has_wrapped;
		3141	}
		3142
		3143	$para->{y} = $height;
		3144	$height += $para->{h};
		3145	}
		3146
2439	$self->{height} += $h;	3147	$self->{height} = $height;
2440	push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];	3148	$self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2441	}
2442		3149
2443	$self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]);	3150	delete $self->{texture};
		3151	}
		3152
		3153	if (my $paridx = delete $self->{scroll_to}) {
		3154	$self->{children}[1]->set_value ($self->{par}[$paridx]{y});
		3155	}
2444	}	3156	}
2445		3157
2446	sub update {	3158	sub update {
2447	my ($self) = @_;	3159	my ($self) = @_;
2448		3160
…		…
2450		3162
2451	return unless $self->{h} > 0;	3163	return unless $self->{h} > 0;
2452		3164
2453	delete $self->{texture};	3165	delete $self->{texture};
2454		3166
2455	$ROOT->on_post_alloc ($self, sub {	3167	$ROOT->on_post_alloc ($self => sub {
		3168	$self->force_uptodate;
		3169
2456	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};	3170	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2457		3171
2458	if (delete $self->{need_reflow}) {
2459	my $height = 0;
2460
2461	my $layout = $self->{layout};
2462
2463	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
2464
2465	for (@{$self->{par}}) {
2466	if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2467	$layout->set_width ($W - $_->[3]);
2468	$layout->set_markup ($_->[4]);
2469	my ($w, $h) = $layout->size;
2470	$_->[0] = $w + $_->[3];
2471	$_->[1] = $h;
2472	}
2473
2474	$height += $_->[1];
2475	}
2476
2477	$self->{height} = $height;
2478
2479	$self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2480
2481	delete $self->{texture};
2482	}
2483
2484	$self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {	3172	$self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2485	glClearColor 0.5, 0.5, 0.5, 0;	3173	glClearColor 0, 0, 0, 0;
2486	glClear GL_COLOR_BUFFER_BIT;	3174	glClear GL_COLOR_BUFFER_BIT;
2487		3175
		3176	package CFPlus::UI::Base;
		3177	local ($draw_x, $draw_y, $draw_w, $draw_h) =
		3178	(0, 0, $self->{w}, $self->{h});
		3179
		3180	my $top = int $self->{children}[1]{range}[0];
		3181
		3182	my $paridx = 0;
		3183	my $top_paragraph;
2488	my $top = int $self->{children}[1]{range}[0];	3184	my $top = int $self->{children}[1]{range}[0];
2489		3185
2490	my $y0 = $top;	3186	my $y0 = $top;
2491	my $y1 = $top + $H;	3187	my $y1 = $top + $H;
2492		3188
2493	my $y = 0;
2494
2495	my $layout = $self->{layout};
2496
2497	$layout->set_font ($self->{font}) if $self->{font};
2498
2499	glEnable GL_BLEND;
2500	#TODO# not correct in windows where rgba is forced off
2501	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2502
2503	for my $par (@{$self->{par}}) {	3189	for my $para (@{$self->{par}}) {
2504	my $h = $par->[1];	3190	my $h = $para->{h};
		3191	my $y = $para->{y};
2505		3192
2506	if ($y0 < $y + $h && $y < $y1) {	3193	if ($y0 < $y + $h && $y < $y1) {
2507	$layout->set_foreground (@{ $par->[2] });	3194	my $layout = $self->get_layout ($para);
2508	$layout->set_width ($W - $par->[3]);
2509	$layout->set_markup ($par->[4]);
2510		3195
2511	my ($w, $h, $data, $format, $internalformat) = $layout->render;	3196	$layout->render ($para->{indent}, $y - $y0);
2512		3197
2513	glRasterPos $par->[3], $y - $y0;	3198	if (my @w = @{ $para->{widget} }) {
2514	glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;	3199	my @s = $layout->get_shapes;
		3200
		3201	for (@w) {
		3202	my ($dx, $dy) = splice @s, 0, 2, ();
		3203
		3204	$_->{x} = $dx + $para->{indent};
		3205	$_->{y} = $dy + $y - $y0;
		3206
		3207	$_->draw;
		3208	}
		3209	}
2515	}	3210	}
2516		3211
2517	$y += $h;	3212	$paridx++;
		3213	$top_paragraph ||= $paridx if $y >= $top;
2518	}	3214	}
2519		3215
2520	glDisable GL_BLEND;	3216	$self->{top_paragraph} = $top_paragraph;
2521	};	3217	};
2522	});	3218	});
2523	}	3219	}
2524		3220
		3221	sub reconfigure {
		3222	my ($self) = @_;
		3223
		3224	$self->SUPER::reconfigure;
		3225
		3226	$_->{w} = 1e10 for @{ $self->{par} };
		3227	$self->reflow;
		3228	}
		3229
2525	sub _draw {	3230	sub _draw {
2526	my ($self) = @_;	3231	my ($self) = @_;
2527		3232
2528	glEnable GL_TEXTURE_2D;	3233	glEnable GL_TEXTURE_2D;
2529	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	3234	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2530	glColor 1, 1, 1, 1;	3235	glColor 0, 0, 0, 1;
2531	$self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});	3236	$self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2532	glDisable GL_TEXTURE_2D;	3237	glDisable GL_TEXTURE_2D;
2533		3238
2534	$self->{children}[1]->draw;	3239	$self->{children}[1]->draw;
2535
2536	}	3240	}
2537		3241
2538	#############################################################################	3242	#############################################################################
2539		3243
2540	package CFClient::UI::Animator;	3244	package CFPlus::UI::Animator;
2541		3245
2542	use CFClient::OpenGL;	3246	use CFPlus::OpenGL;
2543		3247
2544	our @ISA = CFClient::UI::Bin::;	3248	our @ISA = CFPlus::UI::Bin::;
2545		3249
2546	sub moveto {	3250	sub moveto {
2547	my ($self, $x, $y) = @_;	3251	my ($self, $x, $y) = @_;
2548		3252
2549	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];	3253	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
…		…
2577	glPopMatrix;	3281	glPopMatrix;
2578	}	3282	}
2579		3283
2580	#############################################################################	3284	#############################################################################
2581		3285
2582	package CFClient::UI::Flopper;	3286	package CFPlus::UI::Flopper;
2583		3287
2584	our @ISA = CFClient::UI::Button::;	3288	our @ISA = CFPlus::UI::Button::;
2585		3289
2586	sub new {	3290	sub new {
2587	my $class = shift;	3291	my $class = shift;
2588		3292
2589	my $self = $class->SUPER::new (	3293	my $self = $class->SUPER::new (
…		…
2601	$self->{other}->toggle_visibility;	3305	$self->{other}->toggle_visibility;
2602	}	3306	}
2603		3307
2604	#############################################################################	3308	#############################################################################
2605		3309
2606	package CFClient::UI::Tooltip;	3310	package CFPlus::UI::Tooltip;
2607		3311
2608	our @ISA = CFClient::UI::Bin::;	3312	our @ISA = CFPlus::UI::Bin::;
2609		3313
2610	use CFClient::OpenGL;	3314	use CFPlus::OpenGL;
2611		3315
2612	sub new {	3316	sub new {
2613	my $class = shift;	3317	my $class = shift;
2614		3318
2615	$class->SUPER::new (	3319	$class->SUPER::new (
…		…
2619	}	3323	}
2620		3324
2621	sub set_tooltip_from {	3325	sub set_tooltip_from {
2622	my ($self, $widget) = @_;	3326	my ($self, $widget) = @_;
2623		3327
		3328	$widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
		3329	if $widget->{tooltip} =~ /^#(.*)$/;
		3330
		3331	my $tooltip = $widget->{tooltip};
		3332
		3333	if ($ENV{CFPLUS_DEBUG} & 2) {
		3334	$tooltip .= "\n\n" . (ref $widget) . "\n"
		3335	. "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
		3336	. "req $widget->{req_w} $widget->{req_h}\n"
		3337	. "visible $widget->{visible}";
		3338	}
		3339
		3340	$tooltip =~ s/^\n+//;
		3341	$tooltip =~ s/\n+$//;
		3342
2624	$self->add (new CFClient::UI::Label	3343	$self->add (new CFPlus::UI::Label
2625	markup => $widget->{tooltip},	3344	markup => $tooltip,
2626	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,	3345	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2627	fontsize => 0.8,	3346	fontsize => 0.8,
2628	fg => [0, 0, 0, 1],	3347	style => 1, # FLAG_INVERSE
2629	ellipsise => 0,	3348	ellipsise => 0,
2630	font => ($widget->{tooltip_font} || $::FONT_PROP),	3349	font => ($widget->{tooltip_font} || $::FONT_PROP),
2631	);	3350	);
2632	}	3351	}
2633		3352
…		…
2637	my ($w, $h) = @{$self->child}{qw(req_w req_h)};	3356	my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2638		3357
2639	($w + 4, $h + 4)	3358	($w + 4, $h + 4)
2640	}	3359	}
2641		3360
2642	sub size_allocate {	3361	sub invoke_size_allocate {
2643	my ($self, $w, $h, $changed) = @_;	3362	my ($self, $w, $h) = @_;
2644		3363
2645	return unless $changed;
2646
2647	$self->SUPER::size_allocate ($w - 4, $h - 4, $changed);	3364	$self->SUPER::invoke_size_allocate ($w - 4, $h - 4)
2648	}	3365	}
2649		3366
2650	sub visibility_change {	3367	sub invoke_visibility_change {
2651	my ($self, $visible) = @_;	3368	my ($self, $visible) = @_;
2652		3369
2653	return unless $visible;	3370	return unless $visible;
2654		3371
2655	$self->{root}->on_post_alloc ("move_$self" => sub {	3372	$self->{root}->on_post_alloc ("move_$self" => sub {
2656	my $widget = $self->{owner}	3373	my $widget = $self->{owner}
2657	or return;	3374	or return;
2658		3375
		3376	if ($widget->{visible}) {
2659	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);	3377	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2660		3378
2661	($x, $y) = $widget->coord2global (-$self->{w}, 0)	3379	($x, $y) = $widget->coord2global (-$self->{w}, 0)
2662	if $x + $self->{w} > $::WIDTH;	3380	if $x + $self->{w} > $self->{root}{w};
2663		3381
2664	$self->move_abs ($x, $y);	3382	$self->move_abs ($x, $y);
		3383	} else {
		3384	$self->hide;
		3385	}
2665	});	3386	});
2666	}	3387	}
2667		3388
2668	sub _draw {	3389	sub _draw {
2669	my ($self) = @_;	3390	my ($self) = @_;
…		…
2693	$self->SUPER::_draw;	3414	$self->SUPER::_draw;
2694	}	3415	}
2695		3416
2696	#############################################################################	3417	#############################################################################
2697		3418
2698	package CFClient::UI::Face;	3419	package CFPlus::UI::Face;
2699		3420
2700	our @ISA = CFClient::UI::Base::;	3421	our @ISA = CFPlus::UI::DrawBG::;
2701		3422
2702	use CFClient::OpenGL;	3423	use CFPlus::OpenGL;
2703		3424
2704	sub new {	3425	sub new {
2705	my $class = shift;	3426	my $class = shift;
2706		3427
2707	my $self = $class->SUPER::new (	3428	my $self = $class->SUPER::new (
		3429	size_w => 32,
		3430	size_h => 8,
2708	aspect => 1,	3431	aspect => 1,
2709	can_events => 0,	3432	can_events => 0,
2710	@_,	3433	@_,
2711	);	3434	);
2712		3435
2713	if ($self->{anim} && $self->{animspeed}) {	3436	if ($self->{anim} && $self->{animspeed}) {
2714	Scalar::Util::weaken (my $widget = $self);	3437	CFPlus::weaken (my $widget = $self);
2715		3438
2716	$self->{timer} = Event->timer (	3439	$self->{timer} = Event->timer (
2717	at => $self->{animspeed} * int $::NOW / $self->{animspeed},	3440	at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2718	hard => 1,	3441	hard => 1,
2719	interval => $self->{animspeed},	3442	interval => $self->{animspeed},
2720	cb => sub {	3443	cb => sub {
		3444	return unless $::CONN;
		3445
2721	++$widget->{frame};	3446	++$widget->{frame};
		3447	$self->update_face;
2722	$widget->update;	3448	$self->update;
2723	},	3449	},
2724	);	3450	);
		3451
		3452	$self->update_face;
2725	}	3453	}
2726		3454
2727	$self	3455	$self
2728	}	3456	}
2729		3457
		3458	sub update_face {
		3459	my ($self) = @_;
		3460
		3461	return unless $::CONN;
		3462
		3463	if (my $anim = $::CONN->{anim}[$self->{anim}]) {
		3464	if ($anim && @$anim) {
		3465	delete $self->{wait_face};
		3466	$self->{face} = $anim->[ $self->{frame} % @$anim ];
		3467	}
		3468	}
		3469	}
		3470
2730	sub size_request {	3471	sub size_request {
2731	(32, 8)	3472	my ($self) = @_;
		3473
		3474	if ($::CONN) {
		3475	if (my $faceid = $::CONN->{faceid}[$self->{face}]) {
		3476	if (my $tex = $::CONN->{texture}[$faceid]) {
		3477	return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
		3478	} else {
		3479	$self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub {
		3480	$self->realloc;
		3481	});
		3482	}
		3483	}
		3484	}
		3485
		3486	($self->{size_w} || 8, $self->{size_h} || 8)
2732	}	3487	}
2733		3488
2734	sub update {	3489	sub update {
2735	my ($self) = @_;	3490	my ($self) = @_;
2736		3491
…		…
2742	sub _draw {	3497	sub _draw {
2743	my ($self) = @_;	3498	my ($self) = @_;
2744		3499
2745	return unless $::CONN;	3500	return unless $::CONN;
2746		3501
2747	my $face;	3502	$self->SUPER::_draw;
2748		3503
2749	if ($self->{frame}) {
2750	my $anim = $::CONN->{anim}[$self->{anim}];	3504	my $faceid = $::CONN->{faceid}[$self->{face}]
2751		3505	or return;
2752	$face = $anim->[ $self->{frame} % @$anim ]
2753	if $anim && @$anim;
2754	}
2755		3506
2756	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];	3507	my $tex = $::CONN->{texture}[$faceid];
2757		3508
2758	if ($tex) {	3509	if ($tex) {
2759	glEnable GL_TEXTURE_2D;	3510	glEnable GL_TEXTURE_2D;
2760	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	3511	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2761	glColor 1, 1, 1, 1;	3512	glColor 0, 0, 0, 1;
2762	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});	3513	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2763	glDisable GL_TEXTURE_2D;	3514	glDisable GL_TEXTURE_2D;
2764	}	3515	}
2765	}	3516	}
2766		3517
2767	sub DESTROY {	3518	sub destroy {
2768	my ($self) = @_;	3519	my ($self) = @_;
2769		3520
2770	$self->{timer}->cancel	3521	$self->{timer}->cancel
2771	if $self->{timer};	3522	if $self->{timer};
2772		3523
2773	$self->SUPER::DESTROY;	3524	$self->SUPER::destroy;
2774	}	3525	}
2775		3526
2776	#############################################################################	3527	#############################################################################
2777		3528
2778	package CFClient::UI::Inventory;	3529	package CFPlus::UI::Buttonbar;
2779		3530
2780	our @ISA = CFClient::UI::ScrolledWindow::;	3531	our @ISA = CFPlus::UI::HBox::;
2781		3532
2782	sub new {	3533	# TODO: should actually wrap buttons and other goodies.
2783	my $class = shift;
2784
2785	my $self = $class->SUPER::new (
2786	scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2787	@_,
2788	);
2789
2790	$self
2791	}
2792
2793	sub set_items {
2794	my ($self, $items) = @_;
2795
2796	$self->{scrolled}->clear;
2797	return unless $items;
2798
2799	my @items = sort {
2800	($a->{type} <=> $b->{type})
2801	or ($a->{name} cmp $b->{name})
2802	} @$items;
2803
2804	$self->{real_items} = \@items;
2805
2806	my $row = 0;
2807	for my $item (@items) {
2808	CFClient::Item::update_widgets $item;
2809
2810	$self->{scrolled}->add (0, $row, $item->{face_widget});
2811	$self->{scrolled}->add (1, $row, $item->{desc_widget});
2812	$self->{scrolled}->add (2, $row, $item->{weight_widget});
2813
2814	$row++;
2815	}
2816	}
2817		3534
2818	#############################################################################	3535	#############################################################################
2819		3536
2820	package CFClient::UI::Menu;	3537	package CFPlus::UI::Menu;
2821		3538
2822	our @ISA = CFClient::UI::FancyFrame::;	3539	our @ISA = CFPlus::UI::Toplevel::;
2823		3540
2824	use CFClient::OpenGL;	3541	use CFPlus::OpenGL;
2825		3542
2826	sub new {	3543	sub new {
2827	my $class = shift;	3544	my $class = shift;
2828		3545
2829	my $self = $class->SUPER::new (	3546	my $self = $class->SUPER::new (
2830	items => [],	3547	items => [],
2831	z => 100,	3548	z => 100,
2832	@_,	3549	@_,
2833	);	3550	);
2834		3551
2835	$self->add ($self->{vbox} = new CFClient::UI::VBox);	3552	$self->add ($self->{vbox} = new CFPlus::UI::VBox);
2836		3553
2837	for my $item (@{ $self->{items} }) {	3554	for my $item (@{ $self->{items} }) {
2838	my ($widget, $cb) = @$item;	3555	my ($widget, $cb, $tooltip) = @$item;
2839		3556
2840	# handle various types of items, only text for now	3557	# handle various types of items, only text for now
2841	if (!ref $widget) {	3558	if (!ref $widget) {
		3559	if ($widget =~ /\t/) {
		3560	my ($left, $right) = split /\t/, $widget, 2;
		3561
2842	$widget = new CFClient::UI::Label	3562	$widget = new CFPlus::UI::HBox
2843	can_hover => 1,	3563	can_hover => 1,
2844	can_events => 1,	3564	can_events => 1,
		3565	tooltip => $tooltip,
		3566	children => [
		3567	(new CFPlus::UI::Label markup => $left, expand => 1),
		3568	(new CFPlus::UI::Label markup => $right, align => +1),
		3569	],
		3570	;
		3571
		3572	} else {
		3573	$widget = new CFPlus::UI::Label
		3574	can_hover => 1,
		3575	can_events => 1,
2845	text => $widget;	3576	markup => $widget,
		3577	tooltip => $tooltip;
		3578	}
2846	}	3579	}
2847		3580
2848	$self->{item}{$widget} = $item;	3581	$self->{item}{$widget} = $item;
2849		3582
2850	$self->{vbox}->add ($widget);	3583	$self->{vbox}->add ($widget);
…		…
2855		3588
2856	# popup given the event (must be a mouse button down event currently)	3589	# popup given the event (must be a mouse button down event currently)
2857	sub popup {	3590	sub popup {
2858	my ($self, $ev) = @_;	3591	my ($self, $ev) = @_;
2859		3592
2860	$self->_emit ("popdown");	3593	$self->emit ("popdown");
2861		3594
2862	# maybe save $GRAB? must be careful about events...	3595	# maybe save $GRAB? must be careful about events...
2863	$GRAB = $self;	3596	$GRAB = $self;
2864	$self->{button} = $ev->{button};	3597	$self->{button} = $ev->{button};
2865		3598
2866	$self->show;	3599	$self->show;
2867	$self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);	3600	$self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2868	}	3601	}
2869		3602
2870	sub mouse_motion {	3603	sub invoke_mouse_motion {
2871	my ($self, $ev, $x, $y) = @_;	3604	my ($self, $ev, $x, $y) = @_;
2872		3605
2873	# TODO: should use vbox->find_widget or so	3606	# TODO: should use vbox->find_widget or so
2874	$HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});	3607	$HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2875	$self->{hover} = $self->{item}{$HOVER};	3608	$self->{hover} = $self->{item}{$HOVER};
2876	}
2877		3609
		3610	0
		3611	}
		3612
2878	sub button_up {	3613	sub invoke_button_up {
2879	my ($self, $ev, $x, $y) = @_;	3614	my ($self, $ev, $x, $y) = @_;
2880		3615
2881	if ($ev->{button} == $self->{button}) {	3616	if ($ev->{button} == $self->{button}) {
2882	undef $GRAB;	3617	undef $GRAB;
2883	$self->hide;	3618	$self->hide;
2884		3619
2885	$self->_emit ("popdown");	3620	$self->emit ("popdown");
2886	$self->{hover}[1]->() if $self->{hover};	3621	$self->{hover}[1]->() if $self->{hover};
		3622	} else {
		3623	return 0
		3624	}
		3625
2887	}	3626	1
2888	}	3627	}
2889		3628
2890	#############################################################################	3629	#############################################################################
2891		3630
2892	package CFClient::UI::Statusbox;	3631	package CFPlus::UI::Multiplexer;
2893		3632
2894	our @ISA = CFClient::UI::VBox::;	3633	our @ISA = CFPlus::UI::Container::;
2895		3634
2896	sub new {	3635	sub new {
2897	my $class = shift;	3636	my $class = shift;
2898		3637
2899	$class->SUPER::new (	3638	my $self = $class->SUPER::new (
		3639	@_,
		3640	);
		3641
		3642	$self->{current} = $self->{children}[0]
		3643	if @{ $self->{children} };
		3644
		3645	$self
		3646	}
		3647
		3648	sub add {
		3649	my ($self, @widgets) = @_;
		3650
		3651	$self->SUPER::add (@widgets);
		3652
		3653	$self->{current} = $self->{children}[0]
		3654	if @{ $self->{children} };
		3655	}
		3656
		3657	sub get_current_page {
		3658	my ($self) = @_;
		3659
		3660	$self->{current}
		3661	}
		3662
		3663	sub set_current_page {
		3664	my ($self, $page_or_widget) = @_;
		3665
		3666	my $widget = ref $page_or_widget
		3667	? $page_or_widget
		3668	: $self->{children}[$page_or_widget];
		3669
		3670	$self->{current} = $widget;
		3671	$self->{current}->configure (0, 0, $self->{w}, $self->{h});
		3672
		3673	$self->emit (page_changed => $self->{current});
		3674
		3675	$self->realloc;
		3676	}
		3677
		3678	sub visible_children {
		3679	$_[0]{current}
		3680	}
		3681
		3682	sub size_request {
		3683	my ($self) = @_;
		3684
		3685	$self->{current}->size_request
		3686	}
		3687
		3688	sub invoke_size_allocate {
		3689	my ($self, $w, $h) = @_;
		3690
		3691	$self->{current}->configure (0, 0, $w, $h);
		3692
		3693	1
		3694	}
		3695
		3696	sub _draw {
		3697	my ($self) = @_;
		3698
		3699	$self->{current}->draw;
		3700	}
		3701
		3702	#############################################################################
		3703
		3704	package CFPlus::UI::Notebook;
		3705
		3706	our @ISA = CFPlus::UI::VBox::;
		3707
		3708	sub new {
		3709	my $class = shift;
		3710
		3711	my $self = $class->SUPER::new (
		3712	buttonbar => (new CFPlus::UI::Buttonbar),
		3713	multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
		3714	# filter => # will be put between multiplexer and $self
		3715	@_,
		3716	);
		3717
		3718	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};
		3719	$self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
		3720
		3721	$self
		3722	}
		3723
		3724	sub add {
		3725	my ($self, $title, $widget, $tooltip) = @_;
		3726
		3727	CFPlus::weaken $self;
		3728
		3729	$self->{buttonbar}->add (new CFPlus::UI::Button
		3730	markup => $title,
		3731	tooltip => $tooltip,
		3732	on_activate => sub { $self->set_current_page ($widget) },
		3733	);
		3734
		3735	$self->{multiplexer}->add ($widget);
		3736	}
		3737
		3738	sub get_current_page {
		3739	my ($self) = @_;
		3740
		3741	$self->{multiplexer}->get_current_page
		3742	}
		3743
		3744	sub set_current_page {
		3745	my ($self, $page) = @_;
		3746
		3747	$self->{multiplexer}->set_current_page ($page);
		3748	$self->emit (page_changed => $self->{multiplexer}{current});
		3749	}
		3750
		3751	#############################################################################
		3752
		3753	package CFPlus::UI::Selector;
		3754
		3755	use utf8;
		3756
		3757	our @ISA = CFPlus::UI::Button::;
		3758
		3759	sub new {
		3760	my $class = shift;
		3761
		3762	my $self = $class->SUPER::new (
		3763	options => [], # [value, title, longdesc], ...
		3764	value => undef,
		3765	@_,
		3766	);
		3767
		3768	$self->_set_value ($self->{value});
		3769
		3770	$self
		3771	}
		3772
		3773	sub invoke_button_down {
		3774	my ($self, $ev) = @_;
		3775
		3776	my @menu_items;
		3777
		3778	for (@{ $self->{options} }) {
		3779	my ($value, $title, $tooltip) = @$_;
		3780
		3781	push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
		3782	}
		3783
		3784	CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
		3785	}
		3786
		3787	sub _set_value {
		3788	my ($self, $value) = @_;
		3789
		3790	my ($item) = grep $_->[0] eq $value, @{ $self->{options} }
		3791	or return;
		3792
		3793	$self->{value} = $item->[0];
		3794	$self->set_markup ("$item->[1] ⇓");
		3795	$self->set_tooltip ($item->[2]);
		3796	}
		3797
		3798	sub set_value {
		3799	my ($self, $value) = @_;
		3800
		3801	return unless $self->{value} ne $value;
		3802
		3803	$self->_set_value ($value);
		3804	$self->emit (changed => $value);
		3805	}
		3806
		3807	#############################################################################
		3808
		3809	package CFPlus::UI::Statusbox;
		3810
		3811	our @ISA = CFPlus::UI::VBox::;
		3812
		3813	sub new {
		3814	my $class = shift;
		3815
		3816	my $self = $class->SUPER::new (
2900	fontsize => 0.8,	3817	fontsize => 0.8,
2901	@_,	3818	@_,
2902	)	3819	);
		3820
		3821	CFPlus::weaken (my $this = $self);
		3822
		3823	$self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
		3824
		3825	$self
2903	}	3826	}
2904		3827
2905	sub reorder {	3828	sub reorder {
2906	my ($self) = @_;	3829	my ($self) = @_;
2907	my $NOW = time;	3830	my $NOW = Time::HiRes::time;
		3831
		3832	# freeze display when hovering over any label
		3833	return if $CFPlus::UI::TOOLTIP->{owner}
		3834	&& grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},
		3835	values %{ $self->{item} };
2908		3836
2909	while (my ($k, $v) = each %{ $self->{item} }) {	3837	while (my ($k, $v) = each %{ $self->{item} }) {
2910	delete $self->{item}{$k} if $v->{timeout} < $NOW;	3838	delete $self->{item}{$k} if $v->{timeout} < $NOW;
2911	}	3839	}
2912		3840
…		…
2915	my @items = sort {	3843	my @items = sort {
2916	$a->{pri} <=> $b->{pri}	3844	$a->{pri} <=> $b->{pri}
2917	or $b->{id} <=> $a->{id}	3845	or $b->{id} <=> $a->{id}
2918	} values %{ $self->{item} };	3846	} values %{ $self->{item} };
2919		3847
		3848	$self->{timer}->interval (1);
		3849
2920	my $count = 10 + 1;	3850	my $count = 10 + 1;
2921	for my $item (@items) {	3851	for my $item (@items) {
2922	last unless --$count;	3852	last unless --$count;
2923		3853
2924	push @widgets, $item->{label} ||= do {	3854	my $label = $item->{label} ||= do {
2925	# TODO: doesn't handle markup well (read as: at all)	3855	# TODO: doesn't handle markup well (read as: at all)
2926	my $short = $item->{count} > 1	3856	my $short = $item->{count} > 1
2927	? "<b>$item->{count} ×</b> $item->{text}"	3857	? "<b>$item->{count} ×</b> $item->{text}"
2928	: $item->{text};	3858	: $item->{text};
2929		3859
2930	for ($short) {	3860	for ($short) {
2931	s/^\s+//;	3861	s/^\s+//;
2932	s/\s+/ /g;	3862	s/\s+/ /g;
2933	}	3863	}
2934		3864
2935	new CFClient::UI::Label	3865	new CFPlus::UI::Label
2936	markup => $short,	3866	markup => $short,
2937	tooltip => $item->{tooltip},	3867	tooltip => $item->{tooltip},
2938	tooltip_font => $::FONT_PROP,	3868	tooltip_font => $::FONT_PROP,
2939	tooltip_width => 0.67,	3869	tooltip_width => 0.67,
2940	fontsize => $item->{fontsize} || $self->{fontsize},	3870	fontsize => $item->{fontsize} || $self->{fontsize},
2941	max_w => $::WIDTH * 0.44,	3871	max_w => $::WIDTH * 0.44,
2942	fg => $item->{fg},	3872	fg => [@{ $item->{fg} }],
2943	can_events => 1,	3873	can_events => 1,
2944	can_hover => 1	3874	can_hover => 1
2945	};	3875	};
		3876
		3877	if ((my $diff = $item->{timeout} - $NOW) < 2) {
		3878	$label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
		3879	$label->update;
		3880	$label->set_max_size (undef, $label->{req_h} * $diff)
		3881	if $diff < 1;
		3882	$self->{timer}->interval (1/30);
		3883	} else {
		3884	$label->{fg}[3] = $item->{fg}[3] || 1;
		3885	}
		3886
		3887	push @widgets, $label;
2946	}	3888	}
2947		3889
2948	$self->clear;	3890	$self->clear;
2949	$self->SUPER::add (reverse @widgets);	3891	$self->SUPER::add (reverse @widgets);
2950	}	3892	}
…		…
2955	$text =~ s/^\s+//;	3897	$text =~ s/^\s+//;
2956	$text =~ s/\s+$//;	3898	$text =~ s/\s+$//;
2957		3899
2958	return unless $text;	3900	return unless $text;
2959		3901
2960	my $timeout = time + ((delete $arg{timeout}) || 60);	3902	my $timeout = (int time) + ((delete $arg{timeout}) || 60);
2961		3903
2962	my $group = exists $arg{group} ? $arg{group} : ++$self->{id};	3904	my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2963		3905
2964	if (my $item = $self->{item}{$group}) {	3906	if (my $item = $self->{item}{$group}) {
2965	if ($item->{text} eq $text) {	3907	if ($item->{text} eq $text) {
2966	$item->{count}++;	3908	$item->{count}++;
2967	} else {	3909	} else {
2968	$item->{count} = 1;	3910	$item->{count} = 1;
2969	$item->{text} = $item->{tooltip} = $text;	3911	$item->{text} = $item->{tooltip} = $text;
2970	}	3912	}
2971	$item->{id} = ++$self->{id};	3913	$item->{id} += 0.2;#d#
2972	$item->{timeout} = $timeout;	3914	$item->{timeout} = $timeout;
2973	delete $item->{label};	3915	delete $item->{label};
2974	} else {	3916	} else {
2975	$self->{item}{$group} = {	3917	$self->{item}{$group} = {
2976	id => ++$self->{id},	3918	id => ++$self->{id},
…		…
2982	count => 1,	3924	count => 1,
2983	%arg,	3925	%arg,
2984	};	3926	};
2985	}	3927	}
2986		3928
		3929	$ROOT->on_refresh (reorder => sub {
2987	$self->reorder;	3930	$self->reorder;
		3931	});
2988	}	3932	}
2989		3933
2990	sub reconfigure {	3934	sub reconfigure {
2991	my ($self) = @_;	3935	my ($self) = @_;
2992		3936
…		…
2995		3939
2996	$self->reorder;	3940	$self->reorder;
2997	$self->SUPER::reconfigure;	3941	$self->SUPER::reconfigure;
2998	}	3942	}
2999		3943
		3944	sub destroy {
		3945	my ($self) = @_;
		3946
		3947	$self->{timer}->cancel;
		3948
		3949	$self->SUPER::destroy;
		3950	}
		3951
3000	#############################################################################	3952	#############################################################################
3001		3953
3002	package CFClient::UI::Root;	3954	package CFPlus::UI::Root;
3003		3955
3004	our @ISA = CFClient::UI::Container::;	3956	our @ISA = CFPlus::UI::Container::;
3005		3957
		3958	use List::Util qw(min max);
		3959
3006	use CFClient::OpenGL;	3960	use CFPlus::OpenGL;
3007		3961
3008	sub new {	3962	sub new {
3009	my $class = shift;	3963	my $class = shift;
3010		3964
3011	my $self = $class->SUPER::new (	3965	my $self = $class->SUPER::new (
3012	visible => 1,	3966	visible => 1,
3013	@_,	3967	@_,
3014	);	3968	);
3015		3969
3016	Scalar::Util::weaken ($self->{root} = $self);	3970	CFPlus::weaken ($self->{root} = $self);
3017		3971
3018	$self	3972	$self
3019	}
3020
3021	sub configure {
3022	my ($self, $x, $y, $w, $h) = @_;
3023
3024	$self->{w} = $w;
3025	$self->{h} = $h;
3026	}
3027
3028	sub reconfigure {
3029	my ($self) = @_;
3030
3031	$self->SUPER::reconfigure;
3032
3033	$self->size_allocate ($self->{w}, $self->{h}, 1)
3034	if $self->{w};
3035	}	3973	}
3036		3974
3037	sub size_request {	3975	sub size_request {
3038	my ($self) = @_;	3976	my ($self) = @_;
3039		3977
…		…
3052	$coord = $max - $size if $coord > $max - $size;	3990	$coord = $max - $size if $coord > $max - $size;
3053		3991
3054	int $coord + 0.5	3992	int $coord + 0.5
3055	}	3993	}
3056		3994
3057	sub size_allocate {	3995	sub invoke_size_allocate {
3058	my ($self, $w, $h, $changed) = @_;	3996	my ($self, $w, $h) = @_;
3059		3997
3060	for my $child ($self->children) {	3998	for my $child ($self->children) {
3061	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};	3999	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3062		4000
3063	$X = $child->{force_x} if exists $child->{force_x};	4001	$X = $child->{force_x} if exists $child->{force_x};
…		…
3066	$X = _to_pixel $X, $W, $self->{w};	4004	$X = _to_pixel $X, $W, $self->{w};
3067	$Y = _to_pixel $Y, $H, $self->{h};	4005	$Y = _to_pixel $Y, $H, $self->{h};
3068		4006
3069	$child->configure ($X, $Y, $W, $H);	4007	$child->configure ($X, $Y, $W, $H);
3070	}	4008	}
		4009
		4010	1
3071	}	4011	}
3072		4012
3073	sub coord2local {	4013	sub coord2local {
3074	my ($self, $x, $y) = @_;	4014	my ($self, $x, $y) = @_;
3075		4015
…		…
3131	$_->()	4071	$_->()
3132	for values %{delete $self->{refresh_hook}};	4072	for values %{delete $self->{refresh_hook}};
3133	}	4073	}
3134		4074
3135	if ($self->{realloc}) {	4075	if ($self->{realloc}) {
		4076	my %queue;
3136	my @queue;	4077	my @queue;
		4078	my $widget;
3137		4079
		4080	outer:
3138	while () {	4081	while () {
3139	if ($self->{realloc}) {	4082	if (my $realloc = delete $self->{realloc}) {
3140	#TODO use array-of-depth approach	4083	for $widget (values %$realloc) {
		4084	$widget->{visible} or next; # do not resize invisible widgets
3141		4085
3142	@queue = sort { $a->{visible} <=> $b->{visible} }	4086	$queue{$widget+0}++ and next; # duplicates are common
3143	@queue, values %{delete $self->{realloc}};	4087
		4088	push @{ $queue[$widget->{visible}] }, $widget;
		4089	}
3144	}	4090	}
3145		4091
		4092	while () {
		4093	@queue or last outer;
		4094
3146	my $widget = pop @queue || last;	4095	$widget = pop @{ $queue[-1] || [] }
		4096	and last;
		4097
		4098	pop @queue;
		4099	}
3147		4100
3148	$widget->{visible} or last; # do not resize invisible widgets	4101	delete $queue{$widget+0};
3149		4102
3150	my ($w, $h) = $widget->size_request;	4103	my ($w, $h) = $widget->size_request;
3151		4104
3152	$w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2;	4105	$w = max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3153	$h = List::Util::max $widget->{min_h}, $h + $widget->{padding_y} * 2;	4106	$h = max $widget->{min_h}, $h + $widget->{padding_y} * 2;
		4107
		4108	$w = min $widget->{max_w}, $w if exists $widget->{max_w};
		4109	$h = min $widget->{max_h}, $h if exists $widget->{max_h};
3154		4110
3155	$w = $widget->{force_w} if exists $widget->{force_w};	4111	$w = $widget->{force_w} if exists $widget->{force_w};
3156	$h = $widget->{force_h} if exists $widget->{force_h};	4112	$h = $widget->{force_h} if exists $widget->{force_h};
3157		4113
		4114	if ($widget->{req_w} != $w || $widget->{req_h} != $h
		4115	|| delete $widget->{force_realloc}) {
3158	$widget->{req_w} = $w;	4116	$widget->{req_w} = $w;
3159	$widget->{req_h} = $h;	4117	$widget->{req_h} = $h;
3160		4118
3161	$self->{size_alloc}{$widget} = [$widget, undef, undef];	4119	$self->{size_alloc}{$widget+0} = $widget;
3162		4120
3163	push @queue, $widget->{parent}	4121	if (my $parent = $widget->{parent}) {
3164	if ($self->{w} != $w || $self->{h} != $h) && $widget->{parent};	4122	$self->{realloc}{$parent+0} = $parent
		4123	unless $queue{$parent+0};
		4124
		4125	$parent->{force_size_alloc} = 1;
		4126	$self->{size_alloc}{$parent+0} = $parent;
		4127	}
		4128	}
		4129
		4130	delete $self->{realloc}{$widget+0};
3165	}	4131	}
3166	}	4132	}
3167		4133
3168	while (my $size_alloc = delete $self->{size_alloc}) {	4134	while (my $size_alloc = delete $self->{size_alloc}) {
3169	my @queue = sort $b->[0]{visible} <=> $a->[0]{visible},	4135	my @queue = sort { $b->{visible} <=> $a->{visible} }
3170	values %$size_alloc;	4136	values %$size_alloc;
3171		4137
3172	while () {	4138	while () {
3173	my ($widget, $w, $h) = @{ pop @queue or last };	4139	my $widget = pop @queue || last;
3174		4140
3175	$w = $widget->{w} || $widget->{req_w} unless defined $w;	4141	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3176	$h = $widget->{h} || $widget->{req_h} unless defined $h;
3177		4142
3178	$w = 0 if $w < 0;	4143	$w = 0 if $w < 0;
3179	$h = 0 if $h < 0;	4144	$h = 0 if $h < 0;
3180		4145
		4146	$w = max $widget->{min_w}, $w;
		4147	$h = max $widget->{min_h}, $h;
		4148
		4149	# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
		4150	# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
		4151
		4152	$w = min $widget->{max_w}, $w if exists $widget->{max_w};
		4153	$h = min $widget->{max_h}, $h if exists $widget->{max_h};
		4154
3181	$w = int $w + 0.5;	4155	$w = int $w + 0.5;
3182	$h = int $h + 0.5;	4156	$h = int $h + 0.5;
3183		4157
3184	my $changed = $widget->{w} != $w || $widget->{h} != $h;	4158	if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
		4159	$widget->{old_w} = $widget->{w};
		4160	$widget->{old_h} = $widget->{h};
3185		4161
3186	$widget->{w} = $w;	4162	$widget->{w} = $w;
3187	$widget->{h} = $h;	4163	$widget->{h} = $h;
3188		4164
3189	$widget->emit (size_allocate => $w, $h, $changed);	4165	$widget->emit (size_allocate => $w, $h);
		4166	}
3190	}	4167	}
3191	}	4168	}
3192		4169
3193	while ($self->{post_alloc_hook}) {	4170	while ($self->{post_alloc_hook}) {
3194	$_->()	4171	$_->()
3195	for values %{delete $self->{post_alloc_hook}};	4172	for values %{delete $self->{post_alloc_hook}};
3196	}	4173	}
		4174
3197		4175
3198	glViewport 0, 0, $::WIDTH, $::HEIGHT;	4176	glViewport 0, 0, $::WIDTH, $::HEIGHT;
3199	glClearColor +($::CFG->{fow_intensity}) x 3, 1;	4177	glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3200	glClear GL_COLOR_BUFFER_BIT;	4178	glClear GL_COLOR_BUFFER_BIT;
3201		4179
…		…
3203	glLoadIdentity;	4181	glLoadIdentity;
3204	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;	4182	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3205	glMatrixMode GL_MODELVIEW;	4183	glMatrixMode GL_MODELVIEW;
3206	glLoadIdentity;	4184	glLoadIdentity;
3207		4185
		4186	{
		4187	package CFPlus::UI::Base;
		4188
		4189	local ($draw_x, $draw_y, $draw_w, $draw_h) =
		4190	(0, 0, $self->{w}, $self->{h});
		4191
3208	$self->_draw;	4192	$self->_draw;
		4193	}
3209	}	4194	}
3210		4195
3211	#############################################################################	4196	#############################################################################
3212		4197
3213	package CFClient::UI;	4198	package CFPlus::UI;
3214		4199
3215	$ROOT = new CFClient::UI::Root;	4200	$ROOT = new CFPlus::UI::Root;
3216	$TOOLTIP = new CFClient::UI::Tooltip z => 900;	4201	$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
3217		4202
3218	1	4203	1
3219		4204

Diff Legend

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