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.386 by root, Fri Jul 20 16:33:45 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
		949	use List::Util qw(min max);
		950
840	our @ISA = CFClient::UI::Window::;	951	our @ISA = CFPlus::UI::Window::;
841		952
842	sub new {	953	sub new {
843	my $class = shift;	954	my $class = shift;
844		955
845	$class->SUPER::new (	956	$class->SUPER::new (
…		…
850	}	961	}
851		962
852	sub size_request {	963	sub size_request {
853	my ($self) = @_;	964	my ($self) = @_;
854		965
855	my ($w, $h) = @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};	966	my ($w, $h) = @{$self->child}{qw(req_w req_h)};
856		967
857	$w = 10 if $self->{scroll_x};	968	$w = 10 if $self->{scroll_x};
858	$h = 10 if $self->{scroll_y};	969	$h = 10 if $self->{scroll_y};
859		970
860	($w, $h)	971	($w, $h)
861	}	972	}
862		973
863	sub size_allocate {	974	sub invoke_size_allocate {
864	my ($self, $w, $h, $changed) = @_;	975	my ($self, $w, $h) = @_;
865		976
		977	my $child = $self->child;
		978
866	$w = $self->{child_w} if $self->{scroll_x} && $self->{child_w};	979	$w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
867	$h = $self->{child_h} if $self->{scroll_y} && $self->{child_h};	980	$h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
868		981
869	$self->child->configure (0, 0, $w, $h);	982	$self->child->configure (0, 0, $w, $h);
870	$self->update;	983	$self->update;
		984
		985	1
871	}	986	}
872		987
873	sub set_offset {	988	sub set_offset {
874	my ($self, $x, $y) = @_;	989	my ($self, $x, $y) = @_;
875		990
		991	my $x = max 0, min $self->child->{w} - $self->{w}, int $x;
		992	my $y = max 0, min $self->child->{h} - $self->{h}, int $y;
		993
		994	if ($x != $self->{view_x} or $y != $self->{view_y}) {
876	$self->{view_x} = int $x;	995	$self->{view_x} = $x;
877	$self->{view_y} = int $y;	996	$self->{view_y} = $y;
878		997
		998	$self->emit (changed => $x, $y);
879	$self->update;	999	$self->update;
		1000	}
880	}	1001	}
881		1002
882	# hmm, this does not work for topleft of $self... but we should not ask for that	1003	# hmm, this does not work for topleft of $self... but we should not ask for that
883	sub coord2local {	1004	sub coord2local {
884	my ($self, $x, $y) = @_;	1005	my ($self, $x, $y) = @_;
…		…
901	if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}	1022	if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
902	&& $y >= $self->{y} && $y < $self->{y} + $self->{h}	1023	&& $y >= $self->{y} && $y < $self->{y} + $self->{h}
903	) {	1024	) {
904	$self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})	1025	$self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
905	} else {	1026	} else {
906	$self->CFClient::UI::Base::find_widget ($x, $y)	1027	$self->CFPlus::UI::Base::find_widget ($x, $y)
907	}	1028	}
908	}	1029	}
909		1030
910	sub _render {	1031	sub _render {
911	my ($self) = @_;	1032	my ($self) = @_;
912		1033
		1034	local $CFPlus::UI::Base::draw_x = $CFPlus::UI::Base::draw_x - $self->{view_x};
		1035	local $CFPlus::UI::Base::draw_y = $CFPlus::UI::Base::draw_y - $self->{view_y};
		1036
913	CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};	1037	CFPlus::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
914		1038
915	$self->SUPER::_render;	1039	$self->SUPER::_render;
916	}	1040	}
917		1041
918	#############################################################################	1042	#############################################################################
919		1043
920	package CFClient::UI::ScrolledWindow;	1044	package CFPlus::UI::ScrolledWindow;
921		1045
922	our @ISA = CFClient::UI::HBox::;	1046	our @ISA = CFPlus::UI::Table::;
923		1047
924	sub new {	1048	sub new {
925	my $class = shift;	1049	my ($class, %arg) = @_;
		1050
		1051	my $child = delete $arg{child};
926		1052
927	my $self;	1053	my $self;
928		1054
929	my $slider = new CFClient::UI::Slider	1055	my $hslider = new CFPlus::UI::Slider
		1056	vertical => 0,
		1057	range => [0, 0, 1, 0.01], # HACK fix
		1058	on_changed => sub {
		1059	$self->{hpos} = $_[1];
		1060	$self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
		1061	},
		1062	;
		1063
		1064	my $vslider = new CFPlus::UI::Slider
930	vertical => 1,	1065	vertical => 1,
931	range => [0, 0, 1, 0.01], # HACK fix	1066	range => [0, 0, 1, 0.01], # HACK fix
932	on_changed => sub {	1067	on_changed => sub {
933	$self->{vp}->set_offset (0, $_[1]);	1068	$self->{vpos} = $_[1];
		1069	$self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
934	},	1070	},
935	;	1071	;
936		1072
937	$self = $class->SUPER::new (	1073	$self = $class->SUPER::new (
938	vp => (new CFClient::UI::ViewPort expand => 1),	1074	scroll_x => 0,
		1075	scroll_y => 1,
		1076	can_events => 1,
939	slider => $slider,	1077	hslider => $hslider,
940	@_,	1078	vslider => $vslider,
		1079	col_expand => [1, 0],
		1080	row_expand => [1, 0],
		1081	%arg,
941	);	1082	);
942		1083
943	$self->{vp}->add ($self->{scrolled});	1084	$self->{vp} = new CFPlus::UI::ViewPort
		1085	expand => 1,
		1086	scroll_x => $self->{scroll_x},
		1087	scroll_y => $self->{scroll_y},
		1088	on_changed => sub {
		1089	my ($vp, $x, $y) = @_;
		1090
		1091	$vp->{parent}{hslider}->set_value ($x);
		1092	$vp->{parent}{vslider}->set_value ($y);
		1093
		1094	0
		1095	},
		1096	;
		1097
944	$self->add ($self->{vp});	1098	$self->SUPER::add_at (0, 0, $self->{vp});
945	$self->add ($self->{slider});	1099
		1100	$self->add ($child) if $child;
946		1101
947	$self	1102	$self
948	}	1103	}
949		1104
		1105	#TODO# update range on size_allocate depending on child
		1106
		1107	sub add {
		1108	my ($self, $widget) = @_;
		1109
		1110	$self->{vp}->add ($self->{child} = $widget);
		1111	}
		1112
		1113	sub update_slider {
		1114	my ($self) = @_;
		1115
		1116	my $child = ($self->{vp} or return)->child;
		1117
		1118	my ($w1, $w2) = ($child->{w}, $self->{vp}{w});
		1119	$self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]);
		1120
		1121	my $visible = $w1 > $w2;
		1122	if ($visible != $self->{hslider}{visible}) {
		1123	$visible ? $self->SUPER::add_at (0, 1, $self->{hslider})
		1124	: $self->{hslider}->hide;
		1125	}
		1126
		1127	my ($h1, $h2) = ($child->{h}, $self->{vp}{h});
		1128	$self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]);
		1129
		1130	my $visible = $h1 > $h2;
		1131	if ($visible != $self->{vslider}{visible}) {
		1132	$visible ? $self->SUPER::add_at (1, 0, $self->{vslider})
		1133	: $self->{vslider}->hide;
		1134	}
		1135	}
		1136
950	sub update {	1137	sub update {
951	my ($self) = @_;	1138	my ($self) = @_;
952		1139
		1140	$self->update_slider;
953	$self->SUPER::update;	1141	$self->SUPER::update;
954
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	}	1142	}
959		1143
		1144	sub invoke_mouse_wheel {
		1145	my ($self, $ev) = @_;
		1146
		1147	return 0 unless $ev->{dy}; # only vertical movements for now
		1148
		1149	$self->{vslider}->emit (mouse_wheel => $ev);
		1150
		1151	1
		1152	}
		1153
		1154	sub invoke_button_down {
		1155	my ($self, $ev, $x, $y) = @_;
		1156
		1157	if ($ev->{button} == 2) {
		1158	$self->grab_focus;
		1159
		1160	my $ox = $self->{vp}{view_x} + $ev->{x};
		1161	my $oy = $self->{vp}{view_y} + $ev->{y};
		1162
		1163	$self->{motion} = sub {
		1164	my ($ev, $x, $y) = @_;
		1165
		1166	$self->{vp}->set_offset ($ox - $ev->{x}, $oy - $ev->{y});
		1167	$self->update;
		1168	};
		1169
		1170	return 1;
		1171	}
		1172
		1173	0
		1174	}
		1175
		1176	sub invoke_button_up {
		1177	my ($self, $ev, $x, $y) = @_;
		1178
		1179	if (delete $self->{motion}) {
		1180	return 1;
		1181	}
		1182
		1183	0
		1184	}
		1185
		1186	sub invoke_mouse_motion {
		1187	my ($self, $ev, $x, $y) = @_;
		1188
		1189	if ($self->{motion}) {
		1190	$self->{motion}->($ev, $x, $y);
		1191	return 1;
		1192	}
		1193
		1194	0
		1195	}
		1196
960	sub size_allocate {	1197	sub invoke_size_allocate {
961	my ($self, $w, $h, $changed) = @_;	1198	my ($self, $w, $h) = @_;
962		1199
		1200	$self->update_slider;
963	$self->SUPER::size_allocate ($w, $h, $changed);	1201	$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	}	1202	}
968
969	#TODO# update range on size_allocate depending on child
970	# update viewport offset on scroll
971		1203
972	#############################################################################	1204	#############################################################################
973		1205
974	package CFClient::UI::Frame;	1206	package CFPlus::UI::Frame;
975		1207
976	our @ISA = CFClient::UI::Bin::;	1208	our @ISA = CFPlus::UI::Bin::;
977		1209
978	use CFClient::OpenGL;	1210	use CFPlus::OpenGL;
979		1211
980	sub new {	1212	sub new {
981	my $class = shift;	1213	my $class = shift;
982		1214
983	$class->SUPER::new (	1215	$class->SUPER::new (
…		…
991		1223
992	if ($self->{bg}) {	1224	if ($self->{bg}) {
993	my ($w, $h) = @$self{qw(w h)};	1225	my ($w, $h) = @$self{qw(w h)};
994		1226
995	glEnable GL_BLEND;	1227	glEnable GL_BLEND;
996	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	1228	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
997	glColor @{ $self->{bg} };	1229	glColor_premultiply @{ $self->{bg} };
998		1230
999	glBegin GL_QUADS;	1231	glBegin GL_QUADS;
1000	glVertex 0 , 0;	1232	glVertex 0 , 0;
1001	glVertex 0 , $h;	1233	glVertex 0 , $h;
1002	glVertex $w, $h;	1234	glVertex $w, $h;
…		…
1009	$self->SUPER::_draw;	1241	$self->SUPER::_draw;
1010	}	1242	}
1011		1243
1012	#############################################################################	1244	#############################################################################
1013		1245
1014	package CFClient::UI::FancyFrame;	1246	package CFPlus::UI::FancyFrame;
1015		1247
1016	our @ISA = CFClient::UI::Bin::;	1248	our @ISA = CFPlus::UI::Bin::;
1017		1249
1018	use CFClient::OpenGL;	1250	use CFPlus::OpenGL;
		1251
		1252	sub new {
		1253	my ($class, %arg) = @_;
		1254
		1255	if ((exists $arg{label}) && !ref $arg{label}) {
		1256	$arg{label} = new CFPlus::UI::Label
		1257	align => 1,
		1258	valign => 0,
		1259	text => $arg{label},
		1260	fontsize => ($arg{border} || 0.8) * 0.75;
		1261	}
		1262
		1263	my $self = $class->SUPER::new (
		1264	# label => "",
		1265	fg => [0.6, 0.3, 0.1],
		1266	border => 0.8,
		1267	style => 'single',
		1268	%arg,
		1269	);
		1270
		1271	$self
		1272	}
		1273
		1274	sub add {
		1275	my ($self, @widgets) = @_;
		1276
		1277	$self->SUPER::add (@widgets);
		1278	$self->CFPlus::UI::Container::add ($self->{label}) if $self->{label};
		1279	}
		1280
		1281	sub border {
		1282	int $_[0]{border} * $::FONTSIZE
		1283	}
		1284
		1285	sub size_request {
		1286	my ($self) = @_;
		1287
		1288	($self->{label_w}, undef) = $self->{label}->size_request
		1289	if $self->{label};
		1290
		1291	my ($w, $h) = $self->SUPER::size_request;
		1292
		1293	(
		1294	$w + $self->border * 2,
		1295	$h + $self->border * 2,
		1296	)
		1297	}
		1298
		1299	sub invoke_size_allocate {
		1300	my ($self, $w, $h) = @_;
		1301
		1302	my $border = $self->border;
		1303
		1304	$w -= List::Util::max 0, $border * 2;
		1305	$h -= List::Util::max 0, $border * 2;
		1306
		1307	if (my $label = $self->{label}) {
		1308	$label->{w} = List::Util::max 0, List::Util::min $self->{label_w}, $w - $border * 2;
		1309	$label->{h} = List::Util::min $h, $border;
		1310	$label->invoke_size_allocate ($label->{w}, $label->{h});
		1311	}
		1312
		1313	$self->child->configure ($border, $border, $w, $h);
		1314
		1315	1
		1316	}
		1317
		1318	sub _draw {
		1319	my ($self) = @_;
		1320
		1321	my $child = $self->{children}[0];
		1322
		1323	my $border = $self->border;
		1324	my ($w, $h) = ($self->{w}, $self->{h});
		1325
		1326	$child->draw;
		1327
		1328	glColor @{$self->{fg}};
		1329	glBegin GL_LINE_STRIP;
		1330	glVertex $border * 1.5 , $border * 0.5 + 0.5;
		1331	glVertex $border * 0.5 + 0.5, $border * 0.5 + 0.5;
		1332	glVertex $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
		1333	glVertex $w - $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
		1334	glVertex $w - $border * 0.5 + 0.5, $border * 0.5 + 0.5;
		1335	glVertex $self->{label} ? $border * 2 + $self->{label}{w} : $border * 1.5, $border * 0.5 + 0.5;
		1336	glEnd;
		1337
		1338	if ($self->{label}) {
		1339	glTranslate $border * 2, 0;
		1340	$self->{label}->_draw;
		1341	}
		1342	}
		1343
		1344	#############################################################################
		1345
		1346	package CFPlus::UI::Toplevel;
		1347
		1348	our @ISA = CFPlus::UI::Bin::;
		1349
		1350	use CFPlus::OpenGL;
1019		1351
1020	my $bg =	1352	my $bg =
1021	new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",	1353	new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png",
1022	mipmap => 1, wrap => 1;	1354	mipmap => 1, wrap => 1;
1023		1355
1024	my @border =	1356	my @border =
1025	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	1357	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);	1358	qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1027		1359
		1360	my @icon =
		1361	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
		1362	qw(x1_move.png x1_resize.png);
		1363
1028	sub new {	1364	sub new {
1029	my $class = shift;	1365	my ($class, %arg) = @_;
1030		1366
1031	my $self = $class->SUPER::new (	1367	my $self = $class->SUPER::new (
1032	bg => [1, 1, 1, 1],	1368	bg => [1, 1, 1, 1],
1033	border_bg => [1, 1, 1, 1],	1369	border_bg => [1, 1, 1, 1],
1034	border => 0.6,	1370	border => 0.6,
1035	can_events => 1,	1371	can_events => 1,
1036	min_w => 16,	1372	min_w => 64,
1037	min_h => 16,	1373	min_h => 32,
1038	@_	1374	%arg,
1039	);	1375	);
1040		1376
1041	$self->{title} &&= new CFClient::UI::Label	1377	$self->{title_widget} = new CFPlus::UI::Label
1042	align => 0,	1378	align => 0,
1043	valign => 1,	1379	valign => 1,
1044	text => $self->{title},	1380	text => $self->{title},
1045	fontsize => $self->{border};	1381	fontsize => $self->{border},
		1382	if exists $self->{title};
		1383
		1384	if ($self->{has_close_button}) {
		1385	$self->{close_button} =
		1386	new CFPlus::UI::ImageButton
		1387	path => 'x1_close.png',
		1388	on_activate => sub { $self->emit ("delete") };
		1389
		1390	$self->CFPlus::UI::Container::add ($self->{close_button});
		1391	}
1046		1392
1047	$self	1393	$self
		1394	}
		1395
		1396	sub add {
		1397	my ($self, @widgets) = @_;
		1398
		1399	$self->SUPER::add (@widgets);
		1400	$self->CFPlus::UI::Container::add ($self->{close_button}) if $self->{close_button};
		1401	$self->CFPlus::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1048	}	1402	}
1049		1403
1050	sub border {	1404	sub border {
1051	int $_[0]{border} * $::FONTSIZE	1405	int $_[0]{border} * $::FONTSIZE
1052	}	1406	}
1053		1407
1054	sub size_request {	1408	sub size_request {
1055	my ($self) = @_;	1409	my ($self) = @_;
		1410
		1411	$self->{title_widget}->size_request
		1412	if $self->{title_widget};
		1413
		1414	$self->{close_button}->size_request
		1415	if $self->{close_button};
1056		1416
1057	my ($w, $h) = $self->SUPER::size_request;	1417	my ($w, $h) = $self->SUPER::size_request;
1058		1418
1059	(	1419	(
1060	$w + $self->border * 2,	1420	$w + $self->border * 2,
1061	$h + $self->border * 2,	1421	$h + $self->border * 2,
1062	)	1422	)
1063	}	1423	}
1064		1424
1065	sub size_allocate {	1425	sub invoke_size_allocate {
1066	my ($self, $w, $h, $changed) = @_;	1426	my ($self, $w, $h) = @_;
1067		1427
1068	return unless $changed;	1428	if ($self->{title_widget}) {
		1429	$self->{title_widget}{w} = $w;
		1430	$self->{title_widget}{h} = $h;
		1431	$self->{title_widget}->invoke_size_allocate ($w, $h);
		1432	}
1069		1433
		1434	my $border = $self->border;
		1435
1070	$h -= List::Util::max 0, $self->border * 2;	1436	$h -= List::Util::max 0, $border * 2;
1071	$w -= List::Util::max 0, $self->border * 2;	1437	$w -= List::Util::max 0, $border * 2;
1072		1438
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);	1439	$self->child->configure ($border, $border, $w, $h);
1077	}
1078		1440
		1441	$self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
		1442	if $self->{close_button};
		1443
		1444	1
		1445	}
		1446
		1447	sub invoke_delete {
		1448	my ($self) = @_;
		1449
		1450	$self->hide;
		1451
		1452	1
		1453	}
		1454
1079	sub button_down {	1455	sub invoke_button_down {
1080	my ($self, $ev, $x, $y) = @_;	1456	my ($self, $ev, $x, $y) = @_;
1081		1457
1082	my ($w, $h) = @$self{qw(w h)};	1458	my ($w, $h) = @$self{qw(w h)};
1083	my $border = $self->border;	1459	my $border = $self->border;
1084		1460
…		…
1100	my $dy = $ev->{y} - $oy;	1476	my $dy = $ev->{y} - $oy;
1101		1477
1102	$self->{force_w} = $bw + $dx * ($mx ? -1 : 1);	1478	$self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
1103	$self->{force_h} = $bh + $dy * ($my ? -1 : 1);	1479	$self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1104		1480
		1481	$self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1105	$self->realloc;	1482	$self->realloc;
1106	$self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1107	};	1483	};
1108		1484
1109	} elsif ($lr ^ $td) {	1485	} elsif ($lr ^ $td) {
1110	my ($ox, $oy) = ($ev->{x}, $ev->{y});	1486	my ($ox, $oy) = ($ev->{x}, $ev->{y});
1111	my ($bx, $by) = ($self->{x}, $self->{y});	1487	my ($bx, $by) = ($self->{x}, $self->{y});
…		…
1114	my ($ev, $x, $y) = @_;	1490	my ($ev, $x, $y) = @_;
1115		1491
1116	($x, $y) = ($ev->{x}, $ev->{y});	1492	($x, $y) = ($ev->{x}, $ev->{y});
1117		1493
1118	$self->move_abs ($bx + $x - $ox, $by + $y - $oy);	1494	$self->move_abs ($bx + $x - $ox, $by + $y - $oy);
		1495	# HACK: the next line is required to enforce placement
		1496	$self->{parent}->invoke_size_allocate ($self->{parent}{w}, $self->{parent}{h});
1119	};	1497	};
		1498	} else {
		1499	return 0;
		1500	}
		1501
1120	}	1502	1
1121	}	1503	}
1122		1504
1123	sub button_up {	1505	sub invoke_button_up {
1124	my ($self, $ev, $x, $y) = @_;	1506	my ($self, $ev, $x, $y) = @_;
1125		1507
1126	delete $self->{motion};	1508	! ! delete $self->{motion}
1127	}	1509	}
1128		1510
1129	sub mouse_motion {	1511	sub invoke_mouse_motion {
1130	my ($self, $ev, $x, $y) = @_;	1512	my ($self, $ev, $x, $y) = @_;
1131		1513
1132	$self->{motion}->($ev, $x, $y) if $self->{motion};	1514	$self->{motion}->($ev, $x, $y) if $self->{motion};
		1515
		1516	! ! $self->{motion}
		1517	}
		1518
		1519	sub invoke_visibility_change {
		1520	my ($self, $visible) = @_;
		1521
		1522	delete $self->{motion} unless $visible;
		1523
		1524	0
1133	}	1525	}
1134		1526
1135	sub _draw {	1527	sub _draw {
1136	my ($self) = @_;	1528	my ($self) = @_;
1137		1529
		1530	my $child = $self->{children}[0];
		1531
1138	my ($w, $h ) = ($self->{w}, $self->{h});	1532	my ($w, $h ) = ($self->{w}, $self->{h});
1139	my ($cw, $ch) = ($self->child->{w}, $self->child->{h});	1533	my ($cw, $ch) = ($child->{w}, $child->{h});
1140		1534
1141	glEnable GL_TEXTURE_2D;	1535	glEnable GL_TEXTURE_2D;
1142	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	1536	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1143		1537
1144	my $border = $self->border;	1538	my $border = $self->border;
1145		1539
1146	glColor @{ $self->{border_bg} };	1540	glColor @{ $self->{border_bg} };
1147	$border[0]->draw_quad_alpha (0, 0, $w, $border);	1541	$border[0]->draw_quad_alpha ( 0, 0, $w, $border);
1148	$border[1]->draw_quad_alpha (0, $border, $border, $ch);	1542	$border[1]->draw_quad_alpha ( 0, $border, $border, $ch);
1149	$border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);	1543	$border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1150	$border[3]->draw_quad_alpha (0, $h - $border, $w, $border);	1544	$border[3]->draw_quad_alpha ( 0, $h - $border, $w, $border);
		1545
		1546	# move
		1547	my $w2 = ($w - $border) * .5;
		1548	my $h2 = ($h - $border) * .5;
		1549	$icon[0]->draw_quad_alpha ( 0, $h2, $border, $border);
		1550	$icon[0]->draw_quad_alpha ($w - $border, $h2, $border, $border);
		1551	$icon[0]->draw_quad_alpha ($w2 , $h - $border, $border, $border);
		1552
		1553	# resize
		1554	$icon[1]->draw_quad_alpha ( 0, 0, $border, $border);
		1555	$icon[1]->draw_quad_alpha ($w - $border, 0, $border, $border)
		1556	unless $self->{has_close_button};
		1557	$icon[1]->draw_quad_alpha ( 0, $h - $border, $border, $border);
		1558	$icon[1]->draw_quad_alpha ($w - $border, $h - $border, $border, $border);
1151		1559
1152	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {	1560	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1153	glColor @{ $self->{bg} };	1561	glColor @{ $self->{bg} };
1154		1562
1155	# TODO: repeat texture not scale	1563	# TODO: repeat texture not scale
…		…
1159	$bg->draw_quad_alpha ($border, $border, $cw, $ch);	1567	$bg->draw_quad_alpha ($border, $border, $cw, $ch);
1160	}	1568	}
1161		1569
1162	glDisable GL_TEXTURE_2D;	1570	glDisable GL_TEXTURE_2D;
1163		1571
1164	$self->{title}->draw if $self->{title};
1165
1166	$self->child->draw;	1572	$child->draw;
		1573
		1574	if ($self->{title_widget}) {
		1575	glTranslate 0, $border - $self->{h};
		1576	$self->{title_widget}->_draw;
		1577
		1578	glTranslate 0, - ($border - $self->{h});
		1579	}
		1580
		1581	$self->{close_button}->draw
		1582	if $self->{close_button};
1167	}	1583	}
1168		1584
1169	#############################################################################	1585	#############################################################################
1170		1586
1171	package CFClient::UI::Table;	1587	package CFPlus::UI::Table;
1172		1588
1173	our @ISA = CFClient::UI::Base::;	1589	our @ISA = CFPlus::UI::Base::;
1174		1590
1175	use List::Util qw(max sum);	1591	use List::Util qw(max sum);
1176		1592
1177	use CFClient::OpenGL;	1593	use CFPlus::OpenGL;
1178		1594
1179	sub new {	1595	sub new {
1180	my $class = shift;	1596	my $class = shift;
1181		1597
1182	$class->SUPER::new (	1598	$class->SUPER::new (
		1599	children => [],
1183	col_expand => [],	1600	col_expand => [],
		1601	row_expand => [],
1184	@_,	1602	@_,
1185	)	1603	)
1186	}	1604	}
1187		1605
1188	sub children {	1606	sub children {
1189	grep $_, map @$_, grep $_, @{ $_[0]{children} }	1607	grep $_, map @$_, grep $_, @{ $_[0]{children} }
1190	}	1608	}
1191		1609
		1610	# TODO: store row/col info in child widget and use standard add/del
1192	sub add {	1611	sub add {
1193	my ($self, $x, $y, $child) = @_;	1612	my $self = shift;
1194		1613
		1614	Carp::cluck "please use the add_at method instead of calling add, thank you.\n";#d#
		1615	$self->add_at (@_);
		1616	}
		1617
		1618	sub add_at {
		1619	my $self = shift;
		1620
		1621	while (@_) {
		1622	my ($col, $row, $child) = splice @_, 0, 3, ();
		1623
1195	$child->set_parent ($self);	1624	$child->set_parent ($self);
1196	$self->{children}[$y][$x] = $child;	1625	$self->{children}[$row][$col] = $child;
		1626	}
1197		1627
		1628	$self->{force_realloc} = 1;
		1629	$self->{force_size_alloc} = 1;
1198	$self->realloc;	1630	$self->realloc;
		1631	}
		1632
		1633	sub remove {
		1634	my ($self, $child) = @_;
		1635
		1636	for (@{ $self->{children} }) {
		1637	for (@{ $_ || [] }) {
		1638	$_ = undef if $_ == $child;
		1639	}
		1640	}
1199	}	1641	}
1200		1642
1201	# TODO: move to container class maybe? send children a signal on removal?	1643	# TODO: move to container class maybe? send children a signal on removal?
1202	sub clear {	1644	sub clear {
1203	my ($self) = @_;	1645	my ($self) = @_;
…		…
1244	(sum @$ws),	1686	(sum @$ws),
1245	(sum @$hs),	1687	(sum @$hs),
1246	)	1688	)
1247	}	1689	}
1248		1690
1249	sub size_allocate {	1691	sub invoke_size_allocate {
1250	my ($self, $w, $h, $changed) = @_;	1692	my ($self, $w, $h) = @_;
1251		1693
1252	my ($ws, $hs) = $self->get_wh;	1694	my ($ws, $hs) = $self->get_wh;
1253		1695
1254	my $req_w = (sum @$ws) || 1;	1696	my $req_w = (sum @$ws) || 1;
1255	my $req_h = (sum @$hs) || 1;	1697	my $req_h = (sum @$hs) || 1;
1256		1698
1257	# TODO: nicer code && do row_expand	1699	# TODO: nicer code
1258	my @col_expand = @{$self->{col_expand}};	1700	my @col_expand = @{$self->{col_expand}};
1259	@col_expand = (1) x @$ws unless @col_expand;	1701	@col_expand = (1) x @$ws unless @col_expand;
1260	my $col_expand = (sum @col_expand) || 1;	1702	my $col_expand = (sum @col_expand) || 1;
1261		1703
1262	# linearly scale sizes
1263	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;	1704	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1264	$hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1265		1705
1266	CFClient::UI::harmonize $ws;	1706	CFPlus::UI::harmonize $ws;
		1707
		1708	my @row_expand = @{$self->{row_expand}};
		1709	@row_expand = (1) x @$ws unless @row_expand;
		1710	my $row_expand = (sum @row_expand) || 1;
		1711
		1712	$hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
		1713
1267	CFClient::UI::harmonize $hs;	1714	CFPlus::UI::harmonize $hs;
1268		1715
1269	my $y;	1716	my $y;
1270		1717
1271	for my $r (0 .. $#{$self->{children}}) {	1718	for my $r (0 .. $#{$self->{children}}) {
1272	my $row = $self->{children}[$r]	1719	my $row = $self->{children}[$r]
…		…
1286	}	1733	}
1287		1734
1288	$y += $row_h;	1735	$y += $row_h;
1289	}	1736	}
1290		1737
		1738	1
1291	}	1739	}
1292		1740
1293	sub find_widget {	1741	sub find_widget {
1294	my ($self, $x, $y) = @_;	1742	my ($self, $x, $y) = @_;
1295		1743
…		…
1314	}	1762	}
1315	}	1763	}
1316		1764
1317	#############################################################################	1765	#############################################################################
1318		1766
1319	package CFClient::UI::Box;	1767	package CFPlus::UI::Fixed;
1320		1768
		1769	use List::Util qw(min max);
		1770
1321	our @ISA = CFClient::UI::Container::;	1771	our @ISA = CFPlus::UI::Container::;
		1772
		1773	sub add {
		1774	my ($self, $child, $posmode, $x, $y, $sizemode, $w, $h) = @_;
		1775
		1776	$child->{_fixed} = [$posmode, $x, $y, $sizemode, $w, $h];
		1777	$self->SUPER::add ($child);
		1778	}
		1779
		1780	sub _scale($$$) {
		1781	my ($mode, $val, $max) = @_;
		1782
		1783	$mode eq "abs" ? $val
		1784	: $mode eq "rel" ? $val * $max
		1785	: 0
		1786	}
		1787
		1788	sub size_request {
		1789	my ($self) = @_;
		1790
		1791	my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0);
		1792
		1793	# determine overall size by querying abs widgets
		1794	for my $child ($self->visible_children) {
		1795	my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
		1796
		1797	if ($pos eq "abs") {
		1798	$w = _scale $size, $w, $child->{req_w};
		1799	$h = _scale $size, $h, $child->{req_h};
		1800
		1801	$x1 = min $x1, $x; $x2 = max $x2, $x + $w;
		1802	$y1 = min $y1, $y; $y2 = max $y2, $y + $h;
		1803	}
		1804	}
		1805
		1806	my $W = $x2 - $x1;
		1807	my $H = $y2 - $y1;
		1808
		1809	# now layout remaining widgets
		1810	for my $child ($self->visible_children) {
		1811	my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
		1812
		1813	if ($pos ne "abs") {
		1814	$x = _scale $pos, $x, $W;
		1815	$y = _scale $pos, $x, $H;
		1816	$w = _scale $size, $w, $child->{req_w};
		1817	$h = _scale $size, $h, $child->{req_h};
		1818
		1819	$x1 = min $x1, $x; $x2 = max $x2, $x + $w;
		1820	$y1 = min $y1, $y; $y2 = max $y2, $y + $h;
		1821	}
		1822	}
		1823
		1824	my $W = $x2 - $x1;
		1825	my $H = $y2 - $y1;
		1826
		1827	($W, $H)
		1828	}
		1829
		1830	sub invoke_size_allocate {
		1831	my ($self, $W, $H) = @_;
		1832
		1833	for my $child ($self->visible_children) {
		1834	my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
		1835
		1836	$x = _scale $pos, $x, $W;
		1837	$y = _scale $pos, $x, $H;
		1838	$w = _scale $size, $w, $child->{req_w};
		1839	$h = _scale $size, $h, $child->{req_h};
		1840
		1841	$child->configure ($x, $y, $w, $h);
		1842	}
		1843
		1844	1
		1845	}
		1846
		1847	#############################################################################
		1848
		1849	package CFPlus::UI::Box;
		1850
		1851	our @ISA = CFPlus::UI::Container::;
1322		1852
1323	sub size_request {	1853	sub size_request {
1324	my ($self) = @_;	1854	my ($self) = @_;
1325		1855
1326	$self->{vertical}	1856	$self->{vertical}
…		…
1332	(List::Util::sum map $_->{req_w}, @{$self->{children}}),	1862	(List::Util::sum map $_->{req_w}, @{$self->{children}}),
1333	(List::Util::max map $_->{req_h}, @{$self->{children}}),	1863	(List::Util::max map $_->{req_h}, @{$self->{children}}),
1334	)	1864	)
1335	}	1865	}
1336		1866
1337	sub size_allocate {	1867	sub invoke_size_allocate {
1338	my ($self, $w, $h, $changed) = @_;	1868	my ($self, $w, $h) = @_;
1339		1869
1340	my $space = $self->{vertical} ? $h : $w;	1870	my $space = $self->{vertical} ? $h : $w;
1341	my $children = $self->{children};	1871	my @children = $self->visible_children;
1342		1872
1343	my @req;	1873	my @req;
1344		1874
1345	if ($self->{homogeneous}) {	1875	if ($self->{homogeneous}) {
1346	@req = ($space / (@$children || 1)) x @$children;	1876	@req = ($space / (@children || 1)) x @children;
1347	} else {	1877	} else {
1348	@req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children;	1878	@req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @children;
1349	my $req = List::Util::sum @req;	1879	my $req = List::Util::sum @req;
1350		1880
1351	if ($req > $space) {	1881	if ($req > $space) {
1352	# ah well, not enough space	1882	# ah well, not enough space
1353	$_ *= $space / $req for @req;	1883	$_ *= $space / $req for @req;
1354	} else {	1884	} else {
1355	my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;	1885	my $expand = (List::Util::sum map $_->{expand}, @children) || 1;
1356		1886
1357	$space = ($space - $req) / $expand; # remaining space to give away	1887	$space = ($space - $req) / $expand; # remaining space to give away
1358		1888
1359	$req[$_] += $space * $children->[$_]{expand}	1889	$req[$_] += $space * $children[$_]{expand}
1360	for 0 .. $#$children;	1890	for 0 .. $#children;
1361	}	1891	}
1362	}	1892	}
1363		1893
1364	CFClient::UI::harmonize \@req;	1894	CFPlus::UI::harmonize \@req;
1365		1895
1366	my $pos = 0;	1896	my $pos = 0;
1367	for (0 .. $#$children) {	1897	for (0 .. $#children) {
1368	my $alloc = $req[$_];	1898	my $alloc = $req[$_];
1369	$children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));	1899	$children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1370		1900
1371	$pos += $alloc;	1901	$pos += $alloc;
1372	}	1902	}
1373		1903
1374	1	1904	1
1375	}	1905	}
1376		1906
1377	#############################################################################	1907	#############################################################################
1378		1908
1379	package CFClient::UI::HBox;	1909	package CFPlus::UI::HBox;
1380		1910
1381	our @ISA = CFClient::UI::Box::;	1911	our @ISA = CFPlus::UI::Box::;
1382		1912
1383	sub new {	1913	sub new {
1384	my $class = shift;	1914	my $class = shift;
1385		1915
1386	$class->SUPER::new (	1916	$class->SUPER::new (
…		…
1389	)	1919	)
1390	}	1920	}
1391		1921
1392	#############################################################################	1922	#############################################################################
1393		1923
1394	package CFClient::UI::VBox;	1924	package CFPlus::UI::VBox;
1395		1925
1396	our @ISA = CFClient::UI::Box::;	1926	our @ISA = CFPlus::UI::Box::;
1397		1927
1398	sub new {	1928	sub new {
1399	my $class = shift;	1929	my $class = shift;
1400		1930
1401	$class->SUPER::new (	1931	$class->SUPER::new (
…		…
1404	)	1934	)
1405	}	1935	}
1406		1936
1407	#############################################################################	1937	#############################################################################
1408		1938
1409	package CFClient::UI::Label;	1939	package CFPlus::UI::Label;
1410		1940
1411	our @ISA = CFClient::UI::DrawBG::;	1941	our @ISA = CFPlus::UI::DrawBG::;
1412		1942
1413	use CFClient::OpenGL;	1943	use CFPlus::OpenGL;
1414		1944
1415	sub new {	1945	sub new {
1416	my ($class, %arg) = @_;	1946	my ($class, %arg) = @_;
1417		1947
1418	my $self = $class->SUPER::new (	1948	my $self = $class->SUPER::new (
…		…
1421	#active_bg => none	1951	#active_bg => none
1422	#font => default_font	1952	#font => default_font
1423	#text => initial text	1953	#text => initial text
1424	#markup => initial narkup	1954	#markup => initial narkup
1425	#max_w => maximum pixel width	1955	#max_w => maximum pixel width
		1956	#style => 0, # render flags
1426	ellipsise => 3, # end	1957	ellipsise => 3, # end
1427	layout => (new CFClient::Layout),	1958	layout => (new CFPlus::Layout),
1428	fontsize => 1,	1959	fontsize => 1,
1429	align => -1,	1960	align => -1,
1430	valign => -1,	1961	valign => -1,
1431	padding_x => 2,	1962	padding_x => 2,
1432	padding_y => 2,	1963	padding_y => 2,
1433	can_events => 0,	1964	can_events => 0,
1434	%arg	1965	%arg
1435	);	1966	);
1436		1967
1437	if (exists $self->{template}) {	1968	if (exists $self->{template}) {
1438	my $layout = new CFClient::Layout;	1969	my $layout = new CFPlus::Layout;
1439	$layout->set_text (delete $self->{template});	1970	$layout->set_text (delete $self->{template});
1440	$self->{template} = $layout;	1971	$self->{template} = $layout;
1441	}	1972	}
1442		1973
1443	if (exists $self->{markup}) {	1974	if (exists $self->{markup}) {
…		…
1447	}	1978	}
1448		1979
1449	$self	1980	$self
1450	}	1981	}
1451		1982
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 {	1983	sub update {
1463	my ($self) = @_;	1984	my ($self) = @_;
1464		1985
1465	delete $self->{texture};	1986	delete $self->{texture};
1466	$self->SUPER::update;	1987	$self->SUPER::update;
1467	}	1988	}
1468		1989
		1990	sub realloc {
		1991	my ($self) = @_;
		1992
		1993	delete $self->{ox};
		1994	$self->SUPER::realloc;
		1995	}
		1996
1469	sub set_text {	1997	sub set_text {
1470	my ($self, $text) = @_;	1998	my ($self, $text) = @_;
1471		1999
1472	return if $self->{text} eq "T$text";	2000	return if $self->{text} eq "T$text";
1473	$self->{text} = "T$text";	2001	$self->{text} = "T$text";
1474		2002
1475	$self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1476	$self->{layout}->set_text ($text);	2003	$self->{layout}->set_text ($text);
1477		2004
		2005	delete $self->{size_req};
1478	$self->realloc;	2006	$self->realloc;
1479	$self->update;	2007	$self->update;
1480	}	2008	}
1481		2009
1482	sub set_markup {	2010	sub set_markup {
…		…
1485	return if $self->{text} eq "M$markup";	2013	return if $self->{text} eq "M$markup";
1486	$self->{text} = "M$markup";	2014	$self->{text} = "M$markup";
1487		2015
1488	my $rgba = $markup =~ /span.*(?:foreground|background)/;	2016	my $rgba = $markup =~ /span.*(?:foreground|background)/;
1489		2017
1490	$self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1491	$self->{layout}->set_markup ($markup);	2018	$self->{layout}->set_markup ($markup);
1492		2019
		2020	delete $self->{size_req};
1493	$self->realloc;	2021	$self->realloc;
1494	$self->update;	2022	$self->update;
1495	}	2023	}
1496		2024
1497	sub size_request {	2025	sub size_request {
1498	my ($self) = @_;	2026	my ($self) = @_;
1499		2027
		2028	$self->{size_req} ||= do {
1500	$self->{layout}->set_font ($self->{font}) if $self->{font};	2029	$self->{layout}->set_font ($self->{font}) if $self->{font};
1501	$self->{layout}->set_width ($self->{max_w} || -1);	2030	$self->{layout}->set_width ($self->{max_w} || -1);
1502	$self->{layout}->set_ellipsise ($self->{ellipsise});	2031	$self->{layout}->set_ellipsise ($self->{ellipsise});
1503	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});	2032	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1504	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	2033	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1505		2034
1506	my ($w, $h) = $self->{layout}->size;	2035	my ($w, $h) = $self->{layout}->size;
1507		2036
1508	if (exists $self->{template}) {	2037	if (exists $self->{template}) {
1509	$self->{template}->set_font ($self->{font}) if $self->{font};	2038	$self->{template}->set_font ($self->{font}) if $self->{font};
		2039	$self->{template}->set_width ($self->{max_w} || -1);
1510	$self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);	2040	$self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1511		2041
1512	my ($w2, $h2) = $self->{template}->size;	2042	my ($w2, $h2) = $self->{template}->size;
1513		2043
1514	$w = List::Util::max $w, $w2;	2044	$w = List::Util::max $w, $w2;
1515	$h = List::Util::max $h, $h2;	2045	$h = List::Util::max $h, $h2;
		2046	}
		2047
		2048	[$w, $h]
1516	}	2049	};
1517		2050
1518	($w, $h)	2051	@{ $self->{size_req} }
1519	}	2052	}
1520		2053
		2054	sub baseline_shift {
		2055	$_[0]{layout}->descent
		2056	}
		2057
1521	sub size_allocate {	2058	sub invoke_size_allocate {
1522	my ($self, $w, $h, $changed) = @_;	2059	my ($self, $w, $h) = @_;
		2060
		2061	delete $self->{ox};
1523		2062
1524	delete $self->{texture}	2063	delete $self->{texture}
1525	if $changed;	2064	unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
		2065
		2066	1
1526	}	2067	}
1527		2068
1528	sub set_fontsize {	2069	sub set_fontsize {
1529	my ($self, $fontsize) = @_;	2070	my ($self, $fontsize) = @_;
1530		2071
1531	$self->{fontsize} = $fontsize;	2072	$self->{fontsize} = $fontsize;
		2073	delete $self->{size_req};
1532	delete $self->{texture};	2074	delete $self->{texture};
1533		2075
1534	$self->realloc;	2076	$self->realloc;
1535	}	2077	}
1536		2078
		2079	sub reconfigure {
		2080	my ($self) = @_;
		2081
		2082	delete $self->{size_req};
		2083	delete $self->{texture};
		2084
		2085	$self->SUPER::reconfigure;
		2086	}
		2087
1537	sub _draw {	2088	sub _draw {
1538	my ($self) = @_;	2089	my ($self) = @_;
1539		2090
1540	$self->SUPER::_draw; # draw background, if applicable	2091	$self->SUPER::_draw; # draw background, if applicable
1541		2092
1542	my $tex = $self->{texture} ||= do {	2093	my $size = $self->{texture} ||= do {
1543	$self->{layout}->set_foreground (@{$self->{fg}});	2094	$self->{layout}->set_foreground (@{$self->{fg}});
1544	$self->{layout}->set_font ($self->{font}) if $self->{font};	2095	$self->{layout}->set_font ($self->{font}) if $self->{font};
1545	$self->{layout}->set_width ($self->{w});	2096	$self->{layout}->set_width ($self->{w});
1546	$self->{layout}->set_ellipsise ($self->{ellipsise});	2097	$self->{layout}->set_ellipsise ($self->{ellipsise});
1547	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});	2098	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1548	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	2099	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1549		2100
1550	my $tex = new_from_layout CFClient::Texture $self->{layout};	2101	[$self->{layout}->size]
		2102	};
1551		2103
		2104	unless (exists $self->{ox}) {
1552	$self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}	2105	$self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1553	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}	2106	: $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
1554	: ($self->{w} - $tex->{w}) * 0.5);	2107	: ($self->{w} - $size->[0]) * 0.5);
1555		2108
1556	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}	2109	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1557	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}	2110	: $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1558	: ($self->{h} - $tex->{h}) * 0.5);	2111	: ($self->{h} - $size->[1]) * 0.5);
1559
1560	$tex
1561	};	2112	};
1562		2113
1563	glEnable GL_TEXTURE_2D;	2114	my $w = List::Util::min $self->{w} + 4, $size->[0];
1564	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2115	my $h = List::Util::min $self->{h} + 2, $size->[1];
1565		2116
1566	if ($tex->{format} == GL_ALPHA) {	2117	$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	}	2118	}
1575		2119
1576	#############################################################################	2120	#############################################################################
1577		2121
1578	package CFClient::UI::EntryBase;	2122	package CFPlus::UI::EntryBase;
1579		2123
1580	our @ISA = CFClient::UI::Label::;	2124	our @ISA = CFPlus::UI::Label::;
1581		2125
1582	use CFClient::OpenGL;	2126	use CFPlus::OpenGL;
1583		2127
1584	sub new {	2128	sub new {
1585	my $class = shift;	2129	my $class = shift;
1586		2130
1587	$class->SUPER::new (	2131	$class->SUPER::new (
…		…
1591	active_fg => [0, 0, 0],	2135	active_fg => [0, 0, 0],
1592	can_hover => 1,	2136	can_hover => 1,
1593	can_focus => 1,	2137	can_focus => 1,
1594	valign => 0,	2138	valign => 0,
1595	can_events => 1,	2139	can_events => 1,
		2140	ellipsise => 0,
1596	#text => ...	2141	#text => ...
		2142	#hidden => "*",
1597	@_	2143	@_
1598	)	2144	)
1599	}	2145	}
1600		2146
1601	sub _set_text {	2147	sub _set_text {
…		…
1603		2149
1604	delete $self->{cur_h};	2150	delete $self->{cur_h};
1605		2151
1606	return if $self->{text} eq $text;	2152	return if $self->{text} eq $text;
1607		2153
1608	delete $self->{texture};
1609
1610	$self->{last_activity} = $::NOW;	2154	$self->{last_activity} = $::NOW;
1611	$self->{text} = $text;	2155	$self->{text} = $text;
1612		2156
1613	$text =~ s/./*/g if $self->{hidden};	2157	$text =~ s/./*/g if $self->{hidden};
1614	$self->{layout}->set_text ("$text ");	2158	$self->{layout}->set_text ("$text ");
		2159	delete $self->{size_req};
1615		2160
1616	$self->_emit (changed => $self->{text});	2161	$self->emit (changed => $self->{text});
		2162
		2163	$self->realloc;
		2164	$self->update;
1617	}	2165	}
1618		2166
1619	sub set_text {	2167	sub set_text {
1620	my ($self, $text) = @_;	2168	my ($self, $text) = @_;
1621		2169
1622	$self->{cursor} = length $text;	2170	$self->{cursor} = length $text;
1623	$self->_set_text ($text);	2171	$self->_set_text ($text);
1624
1625	$self->realloc;
1626	}	2172	}
1627		2173
1628	sub get_text {	2174	sub get_text {
1629	$_[0]{text}	2175	$_[0]{text}
1630	}	2176	}
…		…
1635	my ($w, $h) = $self->SUPER::size_request;	2181	my ($w, $h) = $self->SUPER::size_request;
1636		2182
1637	($w + 1, $h) # add 1 for cursor	2183	($w + 1, $h) # add 1 for cursor
1638	}	2184	}
1639		2185
1640	sub key_down {	2186	sub invoke_key_down {
1641	my ($self, $ev) = @_;	2187	my ($self, $ev) = @_;
1642		2188
1643	my $mod = $ev->{mod};	2189	my $mod = $ev->{mod};
1644	my $sym = $ev->{sym};	2190	my $sym = $ev->{sym};
1645	my $uni = $ev->{unicode};	2191	my $uni = $ev->{unicode};
1646		2192
1647	my $text = $self->get_text;	2193	my $text = $self->get_text;
		2194
		2195	$self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;
1648		2196
1649	if ($uni == 8) {	2197	if ($uni == 8) {
1650	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};	2198	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1651	} elsif ($uni == 127) {	2199	} elsif ($uni == 127) {
1652	substr $text, $self->{cursor}, 1, "";	2200	substr $text, $self->{cursor}, 1, "";
1653	} elsif ($sym == CFClient::SDLK_LEFT) {	2201	} elsif ($sym == CFPlus::SDLK_LEFT) {
1654	--$self->{cursor} if $self->{cursor};	2202	--$self->{cursor} if $self->{cursor};
1655	} elsif ($sym == CFClient::SDLK_RIGHT) {	2203	} elsif ($sym == CFPlus::SDLK_RIGHT) {
1656	++$self->{cursor} if $self->{cursor} < length $self->{text};	2204	++$self->{cursor} if $self->{cursor} < length $self->{text};
1657	} elsif ($sym == CFClient::SDLK_HOME) {	2205	} elsif ($sym == CFPlus::SDLK_HOME) {
		2206	# what a hack
		2207	$self->{cursor} =
		2208	(substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/
		2209	? length $1
		2210	: 0;
		2211	} elsif ($sym == CFPlus::SDLK_END) {
		2212	# uh, again
		2213	$self->{cursor} =
		2214	(substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/
		2215	? $self->{cursor} + length $1
		2216	: length $self->{text};
		2217	} elsif ($uni == 21) { # ctrl-u
		2218	$text = "";
1658	$self->{cursor} = 0;	2219	$self->{cursor} = 0;
1659	} elsif ($sym == CFClient::SDLK_END) {
1660	$self->{cursor} = length $text;
1661	} elsif ($uni == 27) {	2220	} elsif ($uni == 27) {
1662	$self->_emit ('escape');	2221	$self->emit ('escape');
1663	} elsif ($uni) {	2222	} elsif ($uni == 0x0d) {
		2223	substr $text, $self->{cursor}++, 0, "\012";
		2224	} elsif ($uni >= 0x20) {
1664	substr $text, $self->{cursor}++, 0, chr $uni;	2225	substr $text, $self->{cursor}++, 0, chr $uni;
		2226	} else {
		2227	return 0;
1665	}	2228	}
1666		2229
1667	$self->_set_text ($text);	2230	$self->_set_text ($text);
1668		2231
1669	$self->realloc;	2232	$self->realloc;
1670	}	2233	$self->update;
1671		2234
		2235	1
		2236	}
		2237
1672	sub focus_in {	2238	sub invoke_focus_in {
1673	my ($self) = @_;	2239	my ($self) = @_;
1674		2240
1675	$self->{last_activity} = $::NOW;	2241	$self->{last_activity} = $::NOW;
1676		2242
1677	$self->SUPER::focus_in;	2243	$self->SUPER::invoke_focus_in
1678	}	2244	}
1679		2245
1680	sub button_down {	2246	sub invoke_button_down {
1681	my ($self, $ev, $x, $y) = @_;	2247	my ($self, $ev, $x, $y) = @_;
1682		2248
1683	$self->SUPER::button_down ($ev, $x, $y);	2249	$self->SUPER::invoke_button_down ($ev, $x, $y);
1684		2250
1685	my $idx = $self->{layout}->xy_to_index ($x, $y);	2251	my $idx = $self->{layout}->xy_to_index ($x, $y);
1686		2252
1687	# byte-index to char-index	2253	# byte-index to char-index
1688	my $text = $self->{text};	2254	my $text = $self->{text};
1689	utf8::encode $text;	2255	utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1690	$self->{cursor} = length substr $text, 0, $idx;	2256	$self->{cursor} = length $text;
1691		2257
1692	$self->_set_text ($self->{text});	2258	$self->_set_text ($self->{text});
1693	$self->update;	2259	$self->update;
		2260
		2261	1
1694	}	2262	}
1695		2263
1696	sub mouse_motion {	2264	sub invoke_mouse_motion {
1697	my ($self, $ev, $x, $y) = @_;	2265	my ($self, $ev, $x, $y) = @_;
1698	# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#	2266	# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
		2267
		2268	1
1699	}	2269	}
1700		2270
1701	sub _draw {	2271	sub _draw {
1702	my ($self) = @_;	2272	my ($self) = @_;
1703		2273
1704	local $self->{fg} = $self->{fg};	2274	local $self->{fg} = $self->{fg};
1705		2275
1706	if ($FOCUS == $self) {	2276	if ($FOCUS == $self) {
1707	glColor @{$self->{active_bg}};	2277	glColor_premultiply @{$self->{active_bg}};
1708	$self->{fg} = $self->{active_fg};	2278	$self->{fg} = $self->{active_fg};
1709	} else {	2279	} else {
1710	glColor @{$self->{bg}};	2280	glColor_premultiply @{$self->{bg}};
1711	}	2281	}
1712		2282
1713	glEnable GL_BLEND;	2283	glEnable GL_BLEND;
1714	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	2284	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1715	glBegin GL_QUADS;	2285	glBegin GL_QUADS;
1716	glVertex 0 , 0;	2286	glVertex 0 , 0;
1717	glVertex 0 , $self->{h};	2287	glVertex 0 , $self->{h};
1718	glVertex $self->{w}, $self->{h};	2288	glVertex $self->{w}, $self->{h};
1719	glVertex $self->{w}, 0;	2289	glVertex $self->{w}, 0;
…		…
1730	utf8::encode $text;	2300	utf8::encode $text;
1731		2301
1732	@$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)	2302	@$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)
1733	}	2303	}
1734		2304
1735	glColor @{$self->{fg}};
1736	glBegin GL_LINES;	2305	glBegin GL_LINES;
1737	glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};	2306	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};	2307	glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1739	glEnd;	2308	glEnd;
1740	}	2309	}
1741	}	2310	}
1742		2311
		2312	#############################################################################
		2313
1743	package CFClient::UI::Entry;	2314	package CFPlus::UI::Entry;
1744		2315
1745	our @ISA = CFClient::UI::EntryBase::;	2316	our @ISA = CFPlus::UI::EntryBase::;
1746		2317
1747	use CFClient::OpenGL;	2318	use CFPlus::OpenGL;
1748		2319
1749	sub key_down {	2320	sub invoke_key_down {
1750	my ($self, $ev) = @_;	2321	my ($self, $ev) = @_;
1751		2322
1752	my $sym = $ev->{sym};	2323	my $sym = $ev->{sym};
1753		2324
1754	if ($sym == 13) {	2325	if ($ev->{uni} == 0x0d || $sym == 13) {
1755	unshift @{$self->{history}},	2326	unshift @{$self->{history}},
1756	my $txt = $self->get_text;	2327	my $txt = $self->get_text;
		2328
1757	$self->{history_pointer} = -1;	2329	$self->{history_pointer} = -1;
1758	$self->{history_saveback} = '';	2330	$self->{history_saveback} = '';
1759	$self->_emit (activate => $txt);	2331	$self->emit (activate => $txt);
1760	$self->update;	2332	$self->update;
1761		2333
1762	} elsif ($sym == CFClient::SDLK_UP) {	2334	} elsif ($sym == CFPlus::SDLK_UP) {
1763	if ($self->{history_pointer} < 0) {	2335	if ($self->{history_pointer} < 0) {
1764	$self->{history_saveback} = $self->get_text;	2336	$self->{history_saveback} = $self->get_text;
1765	}	2337	}
1766	if (@{$self->{history} || []} > 0) {	2338	if (@{$self->{history} || []} > 0) {
1767	$self->{history_pointer}++;	2339	$self->{history_pointer}++;
…		…
1769	$self->{history_pointer} = @{$self->{history} || []} - 1;	2341	$self->{history_pointer} = @{$self->{history} || []} - 1;
1770	}	2342	}
1771	$self->set_text ($self->{history}->[$self->{history_pointer}]);	2343	$self->set_text ($self->{history}->[$self->{history_pointer}]);
1772	}	2344	}
1773		2345
1774	} elsif ($sym == CFClient::SDLK_DOWN) {	2346	} elsif ($sym == CFPlus::SDLK_DOWN) {
1775	$self->{history_pointer}--;	2347	$self->{history_pointer}--;
1776	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;	2348	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1777		2349
1778	if ($self->{history_pointer} >= 0) {	2350	if ($self->{history_pointer} >= 0) {
1779	$self->set_text ($self->{history}->[$self->{history_pointer}]);	2351	$self->set_text ($self->{history}->[$self->{history_pointer}]);
1780	} else {	2352	} else {
1781	$self->set_text ($self->{history_saveback});	2353	$self->set_text ($self->{history_saveback});
1782	}	2354	}
1783		2355
1784	} else {	2356	} else {
1785	$self->SUPER::key_down ($ev);	2357	return $self->SUPER::invoke_key_down ($ev)
		2358	}
		2359
1786	}	2360	1
1787
1788	}	2361	}
1789		2362
1790	#############################################################################	2363	#############################################################################
1791		2364
		2365	package CFPlus::UI::TextEdit;
		2366
		2367	our @ISA = CFPlus::UI::EntryBase::;
		2368
		2369	use CFPlus::OpenGL;
		2370
		2371	sub move_cursor_ver {
		2372	my ($self, $dy) = @_;
		2373
		2374	my ($y, $x) = $self->{layout}->index_to_line_x ($self->{cursor});
		2375
		2376	$y += $dy;
		2377
		2378	if (defined (my $index = $self->{layout}->line_x_to_index ($y, $x))) {
		2379	$self->{cursor} = $index;
		2380	delete $self->{cur_h};
		2381	$self->update;
		2382	return;
		2383	}
		2384	}
		2385
		2386	sub invoke_key_down {
		2387	my ($self, $ev) = @_;
		2388
		2389	my $sym = $ev->{sym};
		2390
		2391	if ($sym == CFPlus::SDLK_UP) {
		2392	$self->move_cursor_ver (-1);
		2393	} elsif ($sym == CFPlus::SDLK_DOWN) {
		2394	$self->move_cursor_ver (+1);
		2395	} else {
		2396	return $self->SUPER::invoke_key_down ($ev)
		2397	}
		2398
		2399	1
		2400	}
		2401
		2402	#############################################################################
		2403
1792	package CFClient::UI::Button;	2404	package CFPlus::UI::Button;
1793		2405
1794	our @ISA = CFClient::UI::Label::;	2406	our @ISA = CFPlus::UI::Label::;
1795		2407
1796	use CFClient::OpenGL;	2408	use CFPlus::OpenGL;
1797		2409
1798	my @tex =	2410	my @tex =
1799	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2411	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1800	qw(b1_button_active.png);	2412	qw(b1_button_inactive.png b1_button_active.png);
1801		2413
1802	sub new {	2414	sub new {
1803	my $class = shift;	2415	my $class = shift;
1804		2416
1805	$class->SUPER::new (	2417	$class->SUPER::new (
1806	padding_x => 4,	2418	padding_x => 4,
1807	padding_y => 4,	2419	padding_y => 4,
1808	fg => [1, 1, 1],	2420	fg => [1.0, 1.0, 1.0],
1809	active_fg => [0, 0, 1],	2421	active_fg => [0.8, 0.8, 0.8],
1810	can_hover => 1,	2422	can_hover => 1,
1811	align => 0,	2423	align => 0,
1812	valign => 0,	2424	valign => 0,
1813	can_events => 1,	2425	can_events => 1,
1814	@_	2426	@_
1815	)	2427	)
1816	}	2428	}
1817		2429
1818	sub activate { }
1819
1820	sub button_up {	2430	sub invoke_button_up {
1821	my ($self, $ev, $x, $y) = @_;	2431	my ($self, $ev, $x, $y) = @_;
1822		2432
1823	$self->emit ("activate")	2433	$self->emit ("activate")
1824	if $x >= 0 && $x < $self->{w}	2434	if $x >= 0 && $x < $self->{w}
1825	&& $y >= 0 && $y < $self->{h};	2435	&& $y >= 0 && $y < $self->{h};
		2436
		2437	1
1826	}	2438	}
1827		2439
1828	sub _draw {	2440	sub _draw {
1829	my ($self) = @_;	2441	my ($self) = @_;
1830		2442
1831	local $self->{fg} = $self->{fg};	2443	local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1832
1833	if ($GRAB == $self) {
1834	$self->{fg} = $self->{active_fg};
1835	}
1836		2444
1837	glEnable GL_TEXTURE_2D;	2445	glEnable GL_TEXTURE_2D;
1838	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2446	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1839	glColor 0, 0, 0, 1;	2447	glColor 0, 0, 0, 1;
1840		2448
		2449	my $tex = $tex[$GRAB == $self];
1841	$tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});	2450	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1842		2451
1843	glDisable GL_TEXTURE_2D;	2452	glDisable GL_TEXTURE_2D;
1844		2453
1845	$self->SUPER::_draw;	2454	$self->SUPER::_draw;
1846	}	2455	}
1847		2456
1848	#############################################################################	2457	#############################################################################
1849		2458
1850	package CFClient::UI::CheckBox;	2459	package CFPlus::UI::CheckBox;
1851		2460
1852	our @ISA = CFClient::UI::DrawBG::;	2461	our @ISA = CFPlus::UI::DrawBG::;
1853		2462
1854	my @tex =	2463	my @tex =
1855	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2464	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1856	qw(c1_checkbox_bg.png c1_checkbox_active.png);	2465	qw(c1_checkbox_bg.png c1_checkbox_active.png);
1857		2466
1858	use CFClient::OpenGL;	2467	use CFPlus::OpenGL;
1859		2468
1860	sub new {	2469	sub new {
1861	my $class = shift;	2470	my $class = shift;
1862		2471
1863	$class->SUPER::new (	2472	$class->SUPER::new (
…		…
1877	my ($self) = @_;	2486	my ($self) = @_;
1878		2487
1879	(6) x 2	2488	(6) x 2
1880	}	2489	}
1881		2490
		2491	sub toggle {
		2492	my ($self) = @_;
		2493
		2494	$self->{state} = !$self->{state};
		2495	$self->emit (changed => $self->{state});
		2496	$self->update;
		2497	}
		2498
1882	sub button_down {	2499	sub invoke_button_down {
1883	my ($self, $ev, $x, $y) = @_;	2500	my ($self, $ev, $x, $y) = @_;
1884		2501
1885	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}	2502	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1886	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {	2503	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1887	$self->{state} = !$self->{state};	2504	$self->toggle;
1888	$self->_emit (changed => $self->{state});	2505	} else {
		2506	return 0
		2507	}
		2508
1889	}	2509	1
1890	}	2510	}
1891		2511
1892	sub _draw {	2512	sub _draw {
1893	my ($self) = @_;	2513	my ($self) = @_;
1894		2514
…		…
1909	glDisable GL_TEXTURE_2D;	2529	glDisable GL_TEXTURE_2D;
1910	}	2530	}
1911		2531
1912	#############################################################################	2532	#############################################################################
1913		2533
1914	package CFClient::UI::Image;	2534	package CFPlus::UI::Image;
1915		2535
1916	our @ISA = CFClient::UI::Base::;	2536	our @ISA = CFPlus::UI::Base::;
1917		2537
1918	use CFClient::OpenGL;	2538	use CFPlus::OpenGL;
1919	use Carp qw/confess/;
1920		2539
1921	our %loaded_images;	2540	our %texture_cache;
1922		2541
1923	sub new {	2542	sub new {
1924	my $class = shift;	2543	my $class = shift;
1925		2544
1926	my $self = $class->SUPER::new (can_events => 0, @_);	2545	my $self = $class->SUPER::new (
		2546	can_events => 0,
		2547	@_,
		2548	);
1927		2549
1928	$self->{image} or confess "Image has 'image' not set. This is a fatal error!";	2550	$self->{path} || $self->{tex}
		2551	or Carp::croak "'path' or 'tex' attributes required";
1929		2552
1930	$loaded_images{$self->{image}} ||=	2553	$self->{tex} ||= $texture_cache{$self->{path}} ||=
1931	new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1;	2554	new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;
1932		2555
1933	my $tex = $self->{tex} = $loaded_images{$self->{image}};	2556	CFPlus::weaken $texture_cache{$self->{path}};
1934		2557
1935	Scalar::Util::weaken $loaded_images{$self->{image}};	2558	$self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
1936
1937	$self->{aspect} = $tex->{w} / $tex->{h};
1938		2559
1939	$self	2560	$self
1940	}	2561	}
1941		2562
		2563	sub STORABLE_freeze {
		2564	my ($self, $cloning) = @_;
		2565
		2566	$self->{path}
		2567	or die "cannot serialise CFPlus::UI::Image on non-loadable images\n";
		2568
		2569	$self->{path}
		2570	}
		2571
		2572	sub STORABLE_attach {
		2573	my ($self, $cloning, $path) = @_;
		2574
		2575	$self->new (path => $path)
		2576	}
		2577
1942	sub size_request {	2578	sub size_request {
1943	my ($self) = @_;	2579	my ($self) = @_;
1944		2580
1945	($self->{tex}->{w}, $self->{tex}->{h})	2581	($self->{tex}{w}, $self->{tex}{h})
1946	}	2582	}
1947		2583
1948	sub _draw {	2584	sub _draw {
1949	my ($self) = @_;	2585	my ($self) = @_;
1950		2586
…		…
1960	}	2596	}
1961		2597
1962	glEnable GL_TEXTURE_2D;	2598	glEnable GL_TEXTURE_2D;
1963	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2599	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1964		2600
1965	$tex->draw_quad_alpha (0, 0, $w, $h);	2601	$tex->draw_quad (0, 0, $w, $h);
1966		2602
1967	glDisable GL_TEXTURE_2D;	2603	glDisable GL_TEXTURE_2D;
1968	}	2604	}
1969		2605
1970	#############################################################################	2606	#############################################################################
1971		2607
		2608	package CFPlus::UI::ImageButton;
		2609
		2610	our @ISA = CFPlus::UI::Image::;
		2611
		2612	use CFPlus::OpenGL;
		2613
		2614	my %textures;
		2615
		2616	sub new {
		2617	my $class = shift;
		2618
		2619	my $self = $class->SUPER::new (
		2620	padding_x => 4,
		2621	padding_y => 4,
		2622	fg => [1, 1, 1],
		2623	active_fg => [0, 0, 1],
		2624	can_hover => 1,
		2625	align => 0,
		2626	valign => 0,
		2627	can_events => 1,
		2628	@_
		2629	);
		2630	}
		2631
		2632	sub invoke_button_up {
		2633	my ($self, $ev, $x, $y) = @_;
		2634
		2635	$self->emit ("activate")
		2636	if $x >= 0 && $x < $self->{w}
		2637	&& $y >= 0 && $y < $self->{h};
		2638
		2639	1
		2640	}
		2641
		2642	#############################################################################
		2643
1972	package CFClient::UI::VGauge;	2644	package CFPlus::UI::VGauge;
1973		2645
1974	our @ISA = CFClient::UI::Base::;	2646	our @ISA = CFPlus::UI::Base::;
1975		2647
1976	use List::Util qw(min max);	2648	use List::Util qw(min max);
1977		2649
1978	use CFClient::OpenGL;	2650	use CFPlus::OpenGL;
1979		2651
1980	my %tex = (	2652	my %tex = (
1981	food => [	2653	food => [
1982	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2654	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1983	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/	2655	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
1984	],	2656	],
1985	grace => [	2657	grace => [
1986	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2658	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/	2659	qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
1988	],	2660	],
1989	hp => [	2661	hp => [
1990	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2662	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1991	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/	2663	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
1992	],	2664	],
1993	mana => [	2665	mana => [
1994	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2666	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/	2667	qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
1996	],	2668	],
1997	);	2669	);
1998		2670
1999	# eg. VGauge->new (gauge => 'food'), default gauge: food	2671	# eg. VGauge->new (gauge => 'food'), default gauge: food
…		…
2059	my $ycut1 = max 0, min 1, $ycut;	2731	my $ycut1 = max 0, min 1, $ycut;
2060	my $ycut2 = max 0, min 1, $ycut - 1;	2732	my $ycut2 = max 0, min 1, $ycut - 1;
2061		2733
2062	my $h1 = $self->{h} * (1 - $ycut1);	2734	my $h1 = $self->{h} * (1 - $ycut1);
2063	my $h2 = $self->{h} * (1 - $ycut2);	2735	my $h2 = $self->{h} * (1 - $ycut2);
		2736	my $h3 = $self->{h};
		2737
		2738	$_ = $_ * (284-4)/288 + 4/288 for ($h1, $h2, $h3);
2064		2739
2065	glEnable GL_BLEND;	2740	glEnable GL_BLEND;
2066	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	2741	glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
		2742	GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2067	glEnable GL_TEXTURE_2D;	2743	glEnable GL_TEXTURE_2D;
2068	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2744	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2069		2745
2070	glBindTexture GL_TEXTURE_2D, $t1->{name};	2746	glBindTexture GL_TEXTURE_2D, $t1->{name};
2071	glBegin GL_QUADS;	2747	glBegin GL_QUADS;
…		…
2086		2762
2087	if ($t3) {	2763	if ($t3) {
2088	glBindTexture GL_TEXTURE_2D, $t3->{name};	2764	glBindTexture GL_TEXTURE_2D, $t3->{name};
2089	glBegin GL_QUADS;	2765	glBegin GL_QUADS;
2090	glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;	2766	glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2091	glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h};	2767	glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2092	glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h};	2768	glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2093	glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;	2769	glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2094	glEnd;	2770	glEnd;
2095	}	2771	}
2096		2772
2097	glDisable GL_BLEND;	2773	glDisable GL_BLEND;
2098	glDisable GL_TEXTURE_2D;	2774	glDisable GL_TEXTURE_2D;
2099	}	2775	}
2100		2776
2101	#############################################################################	2777	#############################################################################
2102		2778
2103	package CFClient::UI::Gauge;	2779	package CFPlus::UI::Gauge;
2104		2780
2105	our @ISA = CFClient::UI::VBox::;	2781	our @ISA = CFPlus::UI::VBox::;
2106		2782
2107	sub new {	2783	sub new {
2108	my ($class, %arg) = @_;	2784	my ($class, %arg) = @_;
2109		2785
2110	my $self = $class->SUPER::new (	2786	my $self = $class->SUPER::new (
…		…
2112	can_hover => 1,	2788	can_hover => 1,
2113	can_events => 1,	2789	can_events => 1,
2114	%arg,	2790	%arg,
2115	);	2791	);
2116		2792
2117	$self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999");	2793	$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);	2794	$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");	2795	$self->add ($self->{max} = new CFPlus::UI::Label valign => -1, align => 0, template => "999");
2120		2796
2121	$self	2797	$self
2122	}	2798	}
2123		2799
2124	sub set_fontsize {	2800	sub set_fontsize {
…		…
2145	$self->{value}->set_text ($val);	2821	$self->{value}->set_text ($val);
2146	}	2822	}
2147		2823
2148	#############################################################################	2824	#############################################################################
2149		2825
2150	package CFClient::UI::Slider;	2826	package CFPlus::UI::Slider;
2151		2827
2152	use strict;	2828	use strict;
2153		2829
2154	use CFClient::OpenGL;	2830	use CFPlus::OpenGL;
2155		2831
2156	our @ISA = CFClient::UI::DrawBG::;	2832	our @ISA = CFPlus::UI::DrawBG::;
2157		2833
2158	my @tex =	2834	my @tex =
2159	map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }	2835	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
2160	qw(s1_slider.png s1_slider_bg.png);	2836	qw(s1_slider.png s1_slider_bg.png);
2161		2837
2162	sub new {	2838	sub new {
2163	my $class = shift;	2839	my $class = shift;
2164		2840
…		…
2185	$self->update;	2861	$self->update;
2186		2862
2187	$self	2863	$self
2188	}	2864	}
2189		2865
2190	sub changed { }
2191
2192	sub set_range {	2866	sub set_range {
2193	my ($self, $range) = @_;	2867	my ($self, $range) = @_;
2194		2868
2195	($range, $self->{range}) = ($self->{range}, $range);	2869	($range, $self->{range}) = ($self->{range}, $range);
2196		2870
2197	$self->update
2198	if "@$range" ne "@{$self->{range}}";	2871	if ("@$range" ne "@{$self->{range}}") {
		2872	$self->update;
		2873	$self->set_value ($self->{range}[0]);
		2874	}
2199	}	2875	}
2200		2876
2201	sub set_value {	2877	sub set_value {
2202	my ($self, $value) = @_;	2878	my ($self, $value) = @_;
2203		2879
…		…
2214	if $unit;	2890	if $unit;
2215		2891
2216	@{$self->{range}} = ($value, $lo, $hi, $page, $unit);	2892	@{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2217		2893
2218	if ($value != $old_value) {	2894	if ($value != $old_value) {
2219	$self->_emit (changed => $value);	2895	$self->emit (changed => $value);
2220	$self->update;	2896	$self->update;
2221	}	2897	}
2222	}	2898	}
2223		2899
2224	sub size_request {	2900	sub size_request {
2225	my ($self) = @_;	2901	my ($self) = @_;
2226		2902
2227	($self->{req_w}, $self->{req_h})	2903	($self->{req_w}, $self->{req_h})
2228	}	2904	}
2229		2905
2230	sub button_down {	2906	sub invoke_button_down {
2231	my ($self, $ev, $x, $y) = @_;	2907	my ($self, $ev, $x, $y) = @_;
2232		2908
2233	$self->SUPER::button_down ($ev, $x, $y);	2909	$self->SUPER::invoke_button_down ($ev, $x, $y);
2234		2910
2235	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];	2911	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2236		2912
2237	$self->mouse_motion ($ev, $x, $y);	2913	$self->invoke_mouse_motion ($ev, $x, $y)
2238	}	2914	}
2239		2915
2240	sub mouse_motion {	2916	sub invoke_mouse_motion {
2241	my ($self, $ev, $x, $y) = @_;	2917	my ($self, $ev, $x, $y) = @_;
2242		2918
2243	if ($GRAB == $self) {	2919	if ($GRAB == $self) {
2244	my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});	2920	my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2245		2921
2246	my (undef, $lo, $hi, $page) = @{$self->{range}};	2922	my (undef, $lo, $hi, $page) = @{$self->{range}};
2247		2923
2248	$x = ($x - $self->{click}[1]) / ($w * $self->{scale});	2924	$x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2249		2925
2250	$self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));	2926	$self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
		2927	} else {
		2928	return 0;
		2929	}
		2930
2251	}	2931	1
		2932	}
		2933
		2934	sub invoke_mouse_wheel {
		2935	my ($self, $ev) = @_;
		2936
		2937	my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
		2938
		2939	my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
		2940
		2941	$self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
		2942
		2943	! ! $delta
2252	}	2944	}
2253		2945
2254	sub update {	2946	sub update {
2255	my ($self) = @_;	2947	my ($self) = @_;
2256		2948
2257	$CFClient::UI::ROOT->on_post_alloc ($self => sub {	2949	delete $self->{knob_w};
		2950	$self->SUPER::update;
		2951	}
		2952
		2953	sub _draw {
		2954	my ($self) = @_;
		2955
		2956	unless ($self->{knob_w}) {
2258	$self->set_value ($self->{range}[0]);	2957	$self->set_value ($self->{range}[0]);
2259		2958
2260	my ($value, $lo, $hi, $page) = @{$self->{range}};	2959	my ($value, $lo, $hi, $page) = @{$self->{range}};
2261	my $range = ($hi - $page - $lo) || 1e-100;	2960	my $range = ($hi - $page - $lo) || 1e-100;
2262		2961
…		…
2268	$value = ($value - $lo) / $range;	2967	$value = ($value - $lo) / $range;
2269	$value = $value * $self->{scale} + $self->{offset};	2968	$value = $value * $self->{scale} + $self->{offset};
2270		2969
2271	$self->{knob_x} = $value - $knob_w * 0.5;	2970	$self->{knob_x} = $value - $knob_w * 0.5;
2272	$self->{knob_w} = $knob_w;	2971	$self->{knob_w} = $knob_w;
2273	});	2972	}
2274
2275	$self->SUPER::update;
2276	}
2277
2278	sub _draw {
2279	my ($self) = @_;
2280		2973
2281	$self->SUPER::_draw ();	2974	$self->SUPER::_draw ();
2282		2975
2283	glScale $self->{w}, $self->{h};	2976	glScale $self->{w}, $self->{h};
2284		2977
…		…
2304	glDisable GL_TEXTURE_2D;	2997	glDisable GL_TEXTURE_2D;
2305	}	2998	}
2306		2999
2307	#############################################################################	3000	#############################################################################
2308		3001
2309	package CFClient::UI::ValSlider;	3002	package CFPlus::UI::ValSlider;
2310		3003
2311	our @ISA = CFClient::UI::HBox::;	3004	our @ISA = CFPlus::UI::HBox::;
2312		3005
2313	sub new {	3006	sub new {
2314	my ($class, %arg) = @_;	3007	my ($class, %arg) = @_;
2315		3008
2316	my $range = delete $arg{range};	3009	my $range = delete $arg{range};
2317		3010
2318	my $self = $class->SUPER::new (	3011	my $self = $class->SUPER::new (
2319	slider => (new CFClient::UI::Slider expand => 1, range => $range),	3012	slider => (new CFPlus::UI::Slider expand => 1, range => $range),
2320	entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),	3013	entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
2321	to_value => sub { shift },	3014	to_value => sub { shift },
2322	from_value => sub { shift },	3015	from_value => sub { shift },
2323	%arg,	3016	%arg,
2324	);	3017	);
2325		3018
…		…
2345	sub set_range { shift->{slider}->set_range (@_) }	3038	sub set_range { shift->{slider}->set_range (@_) }
2346	sub set_value { shift->{slider}->set_value (@_) }	3039	sub set_value { shift->{slider}->set_value (@_) }
2347		3040
2348	#############################################################################	3041	#############################################################################
2349		3042
2350	package CFClient::UI::TextView;	3043	package CFPlus::UI::TextScroller;
2351		3044
2352	our @ISA = CFClient::UI::HBox::;	3045	our @ISA = CFPlus::UI::HBox::;
2353		3046
2354	use CFClient::OpenGL;	3047	use CFPlus::OpenGL;
2355		3048
2356	sub new {	3049	sub new {
2357	my $class = shift;	3050	my $class = shift;
2358		3051
2359	my $self = $class->SUPER::new (	3052	my $self = $class->SUPER::new (
2360	fontsize => 1,	3053	fontsize => 1,
2361	can_events => 0,	3054	can_events => 1,
		3055	indent => 0,
2362	#font => default_font	3056	#font => default_font
2363	@_,	3057	@_,
2364		3058
2365	layout => (new CFClient::Layout 1),	3059	layout => (new CFPlus::Layout),
2366	par => [],	3060	par => [],
		3061	max_par => 0,
2367	height => 0,	3062	height => 0,
2368	children => [	3063	children => [
2369	(new CFClient::UI::Empty expand => 1),	3064	(new CFPlus::UI::Empty expand => 1),
2370	(new CFClient::UI::Slider vertical => 1),	3065	(new CFPlus::UI::Slider vertical => 1),
2371	],	3066	],
2372	);	3067	);
2373		3068
2374	$self->{children}[1]->connect (changed => sub { $self->update });	3069	$self->{children}[1]->connect (changed => sub { $self->update });
2375		3070
…		…
2381		3076
2382	$self->{fontsize} = $fontsize;	3077	$self->{fontsize} = $fontsize;
2383	$self->reflow;	3078	$self->reflow;
2384	}	3079	}
2385		3080
		3081	sub size_request {
		3082	my ($self) = @_;
		3083
		3084	my ($empty, $slider) = @{ $self->{children} };
		3085
		3086	local $self->{children} = [$empty, $slider];
		3087	$self->SUPER::size_request
		3088	}
		3089
2386	sub size_allocate {	3090	sub invoke_size_allocate {
2387	my ($self, $w, $h, $changed) = @_;	3091	my ($self, $w, $h) = @_;
2388		3092
2389	$self->SUPER::size_allocate ($w, $h, $changed);	3093	my ($empty, $slider, @other) = @{ $self->{children} };
2390		3094	$_->configure (@$_{qw(x y req_w req_h)}) for @other;
2391	return unless $changed;
2392		3095
2393	$self->{layout}->set_font ($self->{font}) if $self->{font};	3096	$self->{layout}->set_font ($self->{font}) if $self->{font};
2394	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	3097	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2395	$self->{layout}->set_width ($self->{children}[0]{w});	3098	$self->{layout}->set_width ($empty->{w});
		3099	$self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2396		3100
2397	$self->reflow;	3101	$self->reflow;
2398	}
2399		3102
2400	sub text_size {	3103	local $self->{children} = [$empty, $slider];
		3104	$self->SUPER::invoke_size_allocate ($w, $h)
		3105	}
		3106
		3107	sub invoke_mouse_wheel {
2401	my ($self, $text, $indent) = @_;	3108	my ($self, $ev) = @_;
		3109
		3110	return 0 unless $ev->{dy}; # only vertical movements
		3111
		3112	$self->{children}[1]->emit (mouse_wheel => $ev);
		3113
		3114	1
		3115	}
		3116
		3117	sub get_layout {
		3118	my ($self, $para) = @_;
2402		3119
2403	my $layout = $self->{layout};	3120	my $layout = $self->{layout};
2404		3121
		3122	$layout->set_font ($self->{font}) if $self->{font};
		3123	$layout->set_foreground (@{$para->{fg}});
2405	$layout->set_height ($self->{fontsize} * $::FONTSIZE);	3124	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
2406	$layout->set_width ($self->{children}[0]{w} - $indent);	3125	$layout->set_width ($self->{children}[0]{w} - $para->{indent});
		3126	$layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2407	$layout->set_markup ($text);	3127	$layout->set_markup ($para->{markup});
		3128
		3129	$layout->set_shapes (
		3130	map
		3131	+(0, $_->baseline_shift +$_->{padding_y} - $_->{h}, $_->{w}, $_->{h}),
		3132	@{$para->{widget}}
2408		3133	);
		3134
2409	$layout->size	3135	$layout
2410	}	3136	}
2411		3137
2412	sub reflow {	3138	sub reflow {
2413	my ($self) = @_;	3139	my ($self) = @_;
2414		3140
…		…
2421		3147
2422	# todo: base offset on lines or so, not on pixels	3148	# todo: base offset on lines or so, not on pixels
2423	$self->{children}[1]->set_value ($offset);	3149	$self->{children}[1]->set_value ($offset);
2424	}	3150	}
2425		3151
		3152	sub current_paragraph {
		3153	my ($self) = @_;
		3154
		3155	$self->{top_paragraph} - 1
		3156	}
		3157
		3158	sub scroll_to {
		3159	my ($self, $para) = @_;
		3160
		3161	$para = List::Util::max 0, List::Util::min $#{$self->{par}}, $para;
		3162
		3163	$self->{scroll_to} = $para;
		3164	$self->update;
		3165	}
		3166
2426	sub clear {	3167	sub clear {
2427	my ($self) = @_;	3168	my ($self) = @_;
		3169
		3170	my (undef, undef, @other) = @{ $self->{children} };
		3171	$self->remove ($_) for @other;
2428		3172
2429	$self->{par} = [];	3173	$self->{par} = [];
2430	$self->{height} = 0;	3174	$self->{height} = 0;
2431	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);	3175	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2432	}	3176	}
2433		3177
2434	sub add_paragraph {	3178	sub add_paragraph {
2435	my ($self, $color, $text, $indent) = @_;	3179	my $self = shift;
2436		3180
2437	for my $line (split /\n/, $text) {	3181	for my $para (@_) {
2438	my ($w, $h) = $self->text_size ($line);	3182	$para = {
		3183	fg => [1, 1, 1, 1],
		3184	indent => 0,
		3185	markup => "",
		3186	widget => [],
		3187	ref $para ? %$para : (markup => $para),
		3188	w => 1e10,
		3189	wrapped => 1,
		3190	};
		3191
		3192	$self->add (@{ $para->{widget} }) if @{ $para->{widget} };
		3193	push @{$self->{par}}, $para;
		3194	}
		3195
		3196	if (my $max = $self->{max_par}) {
		3197	shift @{$self->{par}} while @{$self->{par}} > $max;
		3198	}
		3199
		3200	$self->{need_reflow}++;
		3201	$self->update;
		3202	}
		3203
		3204	sub scroll_to_bottom {
		3205	my ($self) = @_;
		3206
		3207	$self->{scroll_to} = $#{$self->{par}};
		3208	$self->update;
		3209	}
		3210
		3211	sub force_uptodate {
		3212	my ($self) = @_;
		3213
		3214	if (delete $self->{need_reflow}) {
		3215	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
		3216
		3217	my $height = 0;
		3218
		3219	for my $para (@{$self->{par}}) {
		3220	if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
		3221	my $layout = $self->get_layout ($para);
		3222	my ($w, $h) = $layout->size;
		3223
		3224	$para->{w} = $w + $para->{indent};
		3225	$para->{h} = $h;
		3226	$para->{wrapped} = $layout->has_wrapped;
		3227	}
		3228
		3229	$para->{y} = $height;
		3230	$height += $para->{h};
		3231	}
		3232
2439	$self->{height} += $h;	3233	$self->{height} = $height;
2440	push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];	3234	$self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2441	}
2442		3235
2443	$self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]);	3236	delete $self->{texture};
		3237	}
		3238
		3239	if (my $paridx = delete $self->{scroll_to}) {
		3240	$self->{children}[1]->set_value ($self->{par}[$paridx]{y});
		3241	}
2444	}	3242	}
2445		3243
2446	sub update {	3244	sub update {
2447	my ($self) = @_;	3245	my ($self) = @_;
2448		3246
…		…
2450		3248
2451	return unless $self->{h} > 0;	3249	return unless $self->{h} > 0;
2452		3250
2453	delete $self->{texture};	3251	delete $self->{texture};
2454		3252
2455	$ROOT->on_post_alloc ($self, sub {	3253	$ROOT->on_post_alloc ($self => sub {
		3254	$self->force_uptodate;
		3255
2456	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};	3256	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2457		3257
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 {	3258	$self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2485	glClearColor 0.5, 0.5, 0.5, 0;	3259	glClearColor 0, 0, 0, 0;
2486	glClear GL_COLOR_BUFFER_BIT;	3260	glClear GL_COLOR_BUFFER_BIT;
2487		3261
		3262	package CFPlus::UI::Base;
		3263	local ($draw_x, $draw_y, $draw_w, $draw_h) =
		3264	(0, 0, $self->{w}, $self->{h});
		3265
		3266	my $top = int $self->{children}[1]{range}[0];
		3267
		3268	my $paridx = 0;
		3269	my $top_paragraph;
2488	my $top = int $self->{children}[1]{range}[0];	3270	my $top = int $self->{children}[1]{range}[0];
2489		3271
2490	my $y0 = $top;	3272	my $y0 = $top;
2491	my $y1 = $top + $H;	3273	my $y1 = $top + $H;
2492		3274
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}}) {	3275	for my $para (@{$self->{par}}) {
2504	my $h = $par->[1];	3276	my $h = $para->{h};
		3277	my $y = $para->{y};
2505		3278
2506	if ($y0 < $y + $h && $y < $y1) {	3279	if ($y0 < $y + $h && $y < $y1) {
2507	$layout->set_foreground (@{ $par->[2] });	3280	my $layout = $self->get_layout ($para);
2508	$layout->set_width ($W - $par->[3]);
2509	$layout->set_markup ($par->[4]);
2510		3281
2511	my ($w, $h, $data, $format, $internalformat) = $layout->render;	3282	$layout->render ($para->{indent}, $y - $y0);
2512		3283
2513	glRasterPos $par->[3], $y - $y0;	3284	if (my @w = @{ $para->{widget} }) {
2514	glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;	3285	my @s = $layout->get_shapes;
		3286
		3287	for (@w) {
		3288	my ($dx, $dy) = splice @s, 0, 2, ();
		3289
		3290	$_->{x} = $dx + $para->{indent};
		3291	$_->{y} = $dy + $y - $y0;
		3292
		3293	$_->draw;
		3294	}
		3295	}
2515	}	3296	}
2516		3297
2517	$y += $h;	3298	$paridx++;
		3299	$top_paragraph ||= $paridx if $y >= $top;
2518	}	3300	}
2519		3301
2520	glDisable GL_BLEND;	3302	$self->{top_paragraph} = $top_paragraph;
2521	};	3303	};
2522	});	3304	});
2523	}	3305	}
2524		3306
		3307	sub reconfigure {
		3308	my ($self) = @_;
		3309
		3310	$self->SUPER::reconfigure;
		3311
		3312	$_->{w} = 1e10 for @{ $self->{par} };
		3313	$self->reflow;
		3314	}
		3315
2525	sub _draw {	3316	sub _draw {
2526	my ($self) = @_;	3317	my ($self) = @_;
2527		3318
2528	glEnable GL_TEXTURE_2D;	3319	glEnable GL_TEXTURE_2D;
2529	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	3320	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2530	glColor 1, 1, 1, 1;	3321	glColor 0, 0, 0, 1;
2531	$self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});	3322	$self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2532	glDisable GL_TEXTURE_2D;	3323	glDisable GL_TEXTURE_2D;
2533		3324
2534	$self->{children}[1]->draw;	3325	$self->{children}[1]->draw;
2535
2536	}	3326	}
2537		3327
2538	#############################################################################	3328	#############################################################################
2539		3329
2540	package CFClient::UI::Animator;	3330	package CFPlus::UI::Animator;
2541		3331
2542	use CFClient::OpenGL;	3332	use CFPlus::OpenGL;
2543		3333
2544	our @ISA = CFClient::UI::Bin::;	3334	our @ISA = CFPlus::UI::Bin::;
2545		3335
2546	sub moveto {	3336	sub moveto {
2547	my ($self, $x, $y) = @_;	3337	my ($self, $x, $y) = @_;
2548		3338
2549	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];	3339	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
…		…
2577	glPopMatrix;	3367	glPopMatrix;
2578	}	3368	}
2579		3369
2580	#############################################################################	3370	#############################################################################
2581		3371
2582	package CFClient::UI::Flopper;	3372	package CFPlus::UI::Flopper;
2583		3373
2584	our @ISA = CFClient::UI::Button::;	3374	our @ISA = CFPlus::UI::Button::;
2585		3375
2586	sub new {	3376	sub new {
2587	my $class = shift;	3377	my $class = shift;
2588		3378
2589	my $self = $class->SUPER::new (	3379	my $self = $class->SUPER::new (
…		…
2601	$self->{other}->toggle_visibility;	3391	$self->{other}->toggle_visibility;
2602	}	3392	}
2603		3393
2604	#############################################################################	3394	#############################################################################
2605		3395
2606	package CFClient::UI::Tooltip;	3396	package CFPlus::UI::Tooltip;
2607		3397
2608	our @ISA = CFClient::UI::Bin::;	3398	our @ISA = CFPlus::UI::Bin::;
2609		3399
2610	use CFClient::OpenGL;	3400	use CFPlus::OpenGL;
2611		3401
2612	sub new {	3402	sub new {
2613	my $class = shift;	3403	my $class = shift;
2614		3404
2615	$class->SUPER::new (	3405	$class->SUPER::new (
…		…
2619	}	3409	}
2620		3410
2621	sub set_tooltip_from {	3411	sub set_tooltip_from {
2622	my ($self, $widget) = @_;	3412	my ($self, $widget) = @_;
2623		3413
		3414	$widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
		3415	if $widget->{tooltip} =~ /^#(.*)$/;
		3416
		3417	my $tooltip = $widget->{tooltip};
		3418
		3419	if ($ENV{CFPLUS_DEBUG} & 2) {
		3420	$tooltip .= "\n\n" . (ref $widget) . "\n"
		3421	. "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
		3422	. "req $widget->{req_w} $widget->{req_h}\n"
		3423	. "visible $widget->{visible}";
		3424	}
		3425
		3426	$tooltip =~ s/^\n+//;
		3427	$tooltip =~ s/\n+$//;
		3428
2624	$self->add (new CFClient::UI::Label	3429	$self->add (new CFPlus::UI::Label
2625	markup => $widget->{tooltip},	3430	markup => $tooltip,
2626	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,	3431	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2627	fontsize => 0.8,	3432	fontsize => 0.8,
2628	fg => [0, 0, 0, 1],	3433	style => 1, # FLAG_INVERSE
2629	ellipsise => 0,	3434	ellipsise => 0,
2630	font => ($widget->{tooltip_font} || $::FONT_PROP),	3435	font => ($widget->{tooltip_font} || $::FONT_PROP),
2631	);	3436	);
2632	}	3437	}
2633		3438
…		…
2637	my ($w, $h) = @{$self->child}{qw(req_w req_h)};	3442	my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2638		3443
2639	($w + 4, $h + 4)	3444	($w + 4, $h + 4)
2640	}	3445	}
2641		3446
2642	sub size_allocate {	3447	sub invoke_size_allocate {
2643	my ($self, $w, $h, $changed) = @_;	3448	my ($self, $w, $h) = @_;
2644		3449
2645	return unless $changed;
2646
2647	$self->SUPER::size_allocate ($w - 4, $h - 4, $changed);	3450	$self->SUPER::invoke_size_allocate ($w - 4, $h - 4)
2648	}	3451	}
2649		3452
2650	sub visibility_change {	3453	sub invoke_visibility_change {
2651	my ($self, $visible) = @_;	3454	my ($self, $visible) = @_;
2652		3455
2653	return unless $visible;	3456	return unless $visible;
2654		3457
2655	$self->{root}->on_post_alloc ("move_$self" => sub {	3458	$self->{root}->on_post_alloc ("move_$self" => sub {
2656	my $widget = $self->{owner}	3459	my $widget = $self->{owner}
2657	or return;	3460	or return;
2658		3461
		3462	if ($widget->{visible}) {
2659	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);	3463	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2660		3464
2661	($x, $y) = $widget->coord2global (-$self->{w}, 0)	3465	($x, $y) = $widget->coord2global (-$self->{w}, 0)
2662	if $x + $self->{w} > $::WIDTH;	3466	if $x + $self->{w} > $self->{root}{w};
2663		3467
2664	$self->move_abs ($x, $y);	3468	$self->move_abs ($x, $y);
		3469	} else {
		3470	$self->hide;
		3471	}
2665	});	3472	});
2666	}	3473	}
2667		3474
2668	sub _draw {	3475	sub _draw {
2669	my ($self) = @_;	3476	my ($self) = @_;
…		…
2693	$self->SUPER::_draw;	3500	$self->SUPER::_draw;
2694	}	3501	}
2695		3502
2696	#############################################################################	3503	#############################################################################
2697		3504
2698	package CFClient::UI::Face;	3505	package CFPlus::UI::Face;
2699		3506
2700	our @ISA = CFClient::UI::Base::;	3507	our @ISA = CFPlus::UI::DrawBG::;
2701		3508
2702	use CFClient::OpenGL;	3509	use CFPlus::OpenGL;
2703		3510
2704	sub new {	3511	sub new {
2705	my $class = shift;	3512	my $class = shift;
2706		3513
2707	my $self = $class->SUPER::new (	3514	my $self = $class->SUPER::new (
		3515	size_w => 32,
		3516	size_h => 8,
2708	aspect => 1,	3517	aspect => 1,
2709	can_events => 0,	3518	can_events => 0,
2710	@_,	3519	@_,
2711	);	3520	);
2712		3521
2713	if ($self->{anim} && $self->{animspeed}) {	3522	if ($self->{anim} && $self->{animspeed}) {
2714	Scalar::Util::weaken (my $widget = $self);	3523	CFPlus::weaken (my $widget = $self);
2715		3524
		3525	$widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed};
		3526	$widget->{anim_start} = $self->{animspeed} * Event::time / $self->{animspeed};
2716	$self->{timer} = Event->timer (	3527	$self->{timer} = Event->timer (
2717	at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2718	hard => 1,	3528	parked => 1,
2719	interval => $self->{animspeed},
2720	cb => sub {	3529	cb => sub {
		3530	return unless $::CONN && $widget;
		3531
2721	++$widget->{frame};	3532	++$widget->{frame};
		3533	$widget->update_face;
2722	$widget->update;	3534	$widget->update;
		3535
		3536	$widget->update_timer;
2723	},	3537	},
2724	);	3538	);
		3539
		3540	$self->update_face;
		3541	$self->update_timer;
2725	}	3542	}
2726		3543
2727	$self	3544	$self
2728	}	3545	}
2729		3546
		3547	sub update_timer {
		3548	my ($self) = @_;
		3549
		3550	return unless $self->{timer};
		3551
		3552	if ($self->{visible}) {
		3553	$self->{timer}->at (
		3554	$self->{anim_start}
		3555	+ $self->{animspeed}
		3556	* int 1.5 + (Event::time - $self->{anim_start}) / $self->{animspeed}
		3557	);
		3558	$self->{timer}->start;
		3559	} else {
		3560	$self->{timer}->stop;
		3561	}
		3562	}
		3563
		3564	sub update_face {
		3565	my ($self) = @_;
		3566
		3567	return unless $::CONN;
		3568
		3569	if (my $anim = $::CONN->{anim}[$self->{anim}]) {
		3570	if ($anim && @$anim) {
		3571	delete $self->{wait_face};
		3572	$self->{face} = $anim->[ $self->{frame} % @$anim ];
		3573	}
		3574	}
		3575	}
		3576
2730	sub size_request {	3577	sub size_request {
2731	(32, 8)	3578	my ($self) = @_;
		3579
		3580	if ($::CONN) {
		3581	if (my $faceid = $::CONN->{faceid}[$self->{face}]) {
		3582	if (my $tex = $::CONN->{texture}[$faceid]) {
		3583	return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
		3584	} else {
		3585	$self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub {
		3586	$self->realloc;
		3587	});
		3588	}
		3589	}
		3590	}
		3591
		3592	($self->{size_w} || 8, $self->{size_h} || 8)
2732	}	3593	}
2733		3594
2734	sub update {	3595	sub update {
2735	my ($self) = @_;	3596	my ($self) = @_;
2736		3597
2737	return unless $self->{visible};	3598	return unless $self->{visible};
2738		3599
2739	$self->SUPER::update;	3600	$self->SUPER::update;
2740	}	3601	}
2741		3602
		3603	sub invoke_visibility_change {
		3604	my ($self) = @_;
		3605
		3606	$self->update_timer;
		3607
		3608	0
		3609	}
		3610
2742	sub _draw {	3611	sub _draw {
2743	my ($self) = @_;	3612	my ($self) = @_;
2744		3613
2745	return unless $::CONN;	3614	return unless $::CONN;
2746		3615
2747	my $face;	3616	$self->SUPER::_draw;
2748		3617
2749	if ($self->{frame}) {
2750	my $anim = $::CONN->{anim}[$self->{anim}];	3618	my $faceid = $::CONN->{faceid}[$self->{face}]
2751		3619	or return;
2752	$face = $anim->[ $self->{frame} % @$anim ]
2753	if $anim && @$anim;
2754	}
2755		3620
2756	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];	3621	my $tex = $::CONN->{texture}[$faceid];
2757		3622
2758	if ($tex) {	3623	if ($tex) {
2759	glEnable GL_TEXTURE_2D;	3624	glEnable GL_TEXTURE_2D;
2760	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	3625	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2761	glColor 1, 1, 1, 1;	3626	glColor 0, 0, 0, 1;
2762	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});	3627	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2763	glDisable GL_TEXTURE_2D;	3628	glDisable GL_TEXTURE_2D;
2764	}	3629	}
2765	}	3630	}
2766		3631
2767	sub DESTROY {	3632	sub destroy {
2768	my ($self) = @_;	3633	my ($self) = @_;
2769		3634
2770	$self->{timer}->cancel	3635	(delete $self->{timer})->cancel
2771	if $self->{timer};	3636	if $self->{timer};
2772		3637
2773	$self->SUPER::DESTROY;	3638	$self->SUPER::destroy;
2774	}	3639	}
2775		3640
2776	#############################################################################	3641	#############################################################################
2777		3642
2778	package CFClient::UI::Inventory;	3643	package CFPlus::UI::Buttonbar;
2779		3644
2780	our @ISA = CFClient::UI::ScrolledWindow::;	3645	our @ISA = CFPlus::UI::HBox::;
2781		3646
2782	sub new {	3647	# 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		3648
2818	#############################################################################	3649	#############################################################################
2819		3650
2820	package CFClient::UI::Menu;	3651	package CFPlus::UI::Menu;
2821		3652
2822	our @ISA = CFClient::UI::FancyFrame::;	3653	our @ISA = CFPlus::UI::Toplevel::;
2823		3654
2824	use CFClient::OpenGL;	3655	use CFPlus::OpenGL;
2825		3656
2826	sub new {	3657	sub new {
2827	my $class = shift;	3658	my $class = shift;
2828		3659
2829	my $self = $class->SUPER::new (	3660	my $self = $class->SUPER::new (
2830	items => [],	3661	items => [],
2831	z => 100,	3662	z => 100,
2832	@_,	3663	@_,
2833	);	3664	);
2834		3665
2835	$self->add ($self->{vbox} = new CFClient::UI::VBox);	3666	$self->add ($self->{vbox} = new CFPlus::UI::VBox);
2836		3667
2837	for my $item (@{ $self->{items} }) {	3668	for my $item (@{ $self->{items} }) {
2838	my ($widget, $cb) = @$item;	3669	my ($widget, $cb, $tooltip) = @$item;
2839		3670
2840	# handle various types of items, only text for now	3671	# handle various types of items, only text for now
2841	if (!ref $widget) {	3672	if (!ref $widget) {
		3673	if ($widget =~ /\t/) {
		3674	my ($left, $right) = split /\t/, $widget, 2;
		3675
2842	$widget = new CFClient::UI::Label	3676	$widget = new CFPlus::UI::HBox
2843	can_hover => 1,	3677	can_hover => 1,
2844	can_events => 1,	3678	can_events => 1,
		3679	tooltip => $tooltip,
		3680	children => [
		3681	(new CFPlus::UI::Label markup => $left, expand => 1),
		3682	(new CFPlus::UI::Label markup => $right, align => +1),
		3683	],
		3684	;
		3685
		3686	} else {
		3687	$widget = new CFPlus::UI::Label
		3688	can_hover => 1,
		3689	can_events => 1,
2845	text => $widget;	3690	markup => $widget,
		3691	tooltip => $tooltip;
		3692	}
2846	}	3693	}
2847		3694
2848	$self->{item}{$widget} = $item;	3695	$self->{item}{$widget} = $item;
2849		3696
2850	$self->{vbox}->add ($widget);	3697	$self->{vbox}->add ($widget);
…		…
2855		3702
2856	# popup given the event (must be a mouse button down event currently)	3703	# popup given the event (must be a mouse button down event currently)
2857	sub popup {	3704	sub popup {
2858	my ($self, $ev) = @_;	3705	my ($self, $ev) = @_;
2859		3706
2860	$self->_emit ("popdown");	3707	$self->emit ("popdown");
2861		3708
2862	# maybe save $GRAB? must be careful about events...	3709	# maybe save $GRAB? must be careful about events...
2863	$GRAB = $self;	3710	$GRAB = $self;
2864	$self->{button} = $ev->{button};	3711	$self->{button} = $ev->{button};
2865		3712
2866	$self->show;	3713	$self->show;
2867	$self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);	3714	$self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2868	}	3715	}
2869		3716
2870	sub mouse_motion {	3717	sub invoke_mouse_motion {
2871	my ($self, $ev, $x, $y) = @_;	3718	my ($self, $ev, $x, $y) = @_;
2872		3719
2873	# TODO: should use vbox->find_widget or so	3720	# TODO: should use vbox->find_widget or so
2874	$HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});	3721	$HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2875	$self->{hover} = $self->{item}{$HOVER};	3722	$self->{hover} = $self->{item}{$HOVER};
2876	}
2877		3723
		3724	0
		3725	}
		3726
2878	sub button_up {	3727	sub invoke_button_up {
2879	my ($self, $ev, $x, $y) = @_;	3728	my ($self, $ev, $x, $y) = @_;
2880		3729
2881	if ($ev->{button} == $self->{button}) {	3730	if ($ev->{button} == $self->{button}) {
2882	undef $GRAB;	3731	undef $GRAB;
2883	$self->hide;	3732	$self->hide;
2884		3733
2885	$self->_emit ("popdown");	3734	$self->emit ("popdown");
2886	$self->{hover}[1]->() if $self->{hover};	3735	$self->{hover}[1]->() if $self->{hover};
		3736	} else {
		3737	return 0
		3738	}
		3739
2887	}	3740	1
2888	}	3741	}
2889		3742
2890	#############################################################################	3743	#############################################################################
2891		3744
2892	package CFClient::UI::Statusbox;	3745	package CFPlus::UI::Multiplexer;
2893		3746
2894	our @ISA = CFClient::UI::VBox::;	3747	our @ISA = CFPlus::UI::Container::;
2895		3748
2896	sub new {	3749	sub new {
2897	my $class = shift;	3750	my $class = shift;
2898		3751
2899	$class->SUPER::new (	3752	my $self = $class->SUPER::new (
		3753	@_,
		3754	);
		3755
		3756	$self->{current} = $self->{children}[0]
		3757	if @{ $self->{children} };
		3758
		3759	$self
		3760	}
		3761
		3762	sub add {
		3763	my ($self, @widgets) = @_;
		3764
		3765	$self->SUPER::add (@widgets);
		3766
		3767	$self->{current} = $self->{children}[0]
		3768	if @{ $self->{children} };
		3769	}
		3770
		3771	sub get_current_page {
		3772	my ($self) = @_;
		3773
		3774	$self->{current}
		3775	}
		3776
		3777	sub set_current_page {
		3778	my ($self, $page_or_widget) = @_;
		3779
		3780	my $widget = ref $page_or_widget
		3781	? $page_or_widget
		3782	: $self->{children}[$page_or_widget];
		3783
		3784	$self->{current} = $widget;
		3785	$self->{current}->configure (0, 0, $self->{w}, $self->{h});
		3786
		3787	$self->emit (page_changed => $self->{current});
		3788
		3789	$self->realloc;
		3790	}
		3791
		3792	sub visible_children {
		3793	$_[0]{current}
		3794	}
		3795
		3796	sub size_request {
		3797	my ($self) = @_;
		3798
		3799	$self->{current}->size_request
		3800	}
		3801
		3802	sub invoke_size_allocate {
		3803	my ($self, $w, $h) = @_;
		3804
		3805	$self->{current}->configure (0, 0, $w, $h);
		3806
		3807	1
		3808	}
		3809
		3810	sub _draw {
		3811	my ($self) = @_;
		3812
		3813	$self->{current}->draw;
		3814	}
		3815
		3816	#############################################################################
		3817
		3818	package CFPlus::UI::Notebook;
		3819
		3820	our @ISA = CFPlus::UI::VBox::;
		3821
		3822	sub new {
		3823	my $class = shift;
		3824
		3825	my $self = $class->SUPER::new (
		3826	buttonbar => (new CFPlus::UI::Buttonbar),
		3827	multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
		3828	# filter => # will be put between multiplexer and $self
		3829	@_,
		3830	);
		3831
		3832	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};
		3833	$self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
		3834
		3835	$self
		3836	}
		3837
		3838	sub add {
		3839	my ($self, $title, $widget, $tooltip) = @_;
		3840
		3841	CFPlus::weaken $self;
		3842
		3843	$self->{buttonbar}->add (new CFPlus::UI::Button
		3844	markup => $title,
		3845	tooltip => $tooltip,
		3846	on_activate => sub { $self->set_current_page ($widget) },
		3847	);
		3848
		3849	$self->{multiplexer}->add ($widget);
		3850	}
		3851
		3852	sub get_current_page {
		3853	my ($self) = @_;
		3854
		3855	$self->{multiplexer}->get_current_page
		3856	}
		3857
		3858	sub set_current_page {
		3859	my ($self, $page) = @_;
		3860
		3861	$self->{multiplexer}->set_current_page ($page);
		3862	$self->emit (page_changed => $self->{multiplexer}{current});
		3863	}
		3864
		3865	#############################################################################
		3866
		3867	package CFPlus::UI::Selector;
		3868
		3869	use utf8;
		3870
		3871	our @ISA = CFPlus::UI::Button::;
		3872
		3873	sub new {
		3874	my $class = shift;
		3875
		3876	my $self = $class->SUPER::new (
		3877	options => [], # [value, title, longdesc], ...
		3878	value => undef,
		3879	@_,
		3880	);
		3881
		3882	$self->_set_value ($self->{value});
		3883
		3884	$self
		3885	}
		3886
		3887	sub invoke_button_down {
		3888	my ($self, $ev) = @_;
		3889
		3890	my @menu_items;
		3891
		3892	for (@{ $self->{options} }) {
		3893	my ($value, $title, $tooltip) = @$_;
		3894
		3895	push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
		3896	}
		3897
		3898	CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
		3899	}
		3900
		3901	sub _set_value {
		3902	my ($self, $value) = @_;
		3903
		3904	my ($item) = grep $_->[0] eq $value, @{ $self->{options} }
		3905	or return;
		3906
		3907	$self->{value} = $item->[0];
		3908	$self->set_markup ("$item->[1] ⇓");
		3909	$self->set_tooltip ($item->[2]);
		3910	}
		3911
		3912	sub set_value {
		3913	my ($self, $value) = @_;
		3914
		3915	return unless $self->{value} ne $value;
		3916
		3917	$self->_set_value ($value);
		3918	$self->emit (changed => $value);
		3919	}
		3920
		3921	#############################################################################
		3922
		3923	package CFPlus::UI::Statusbox;
		3924
		3925	our @ISA = CFPlus::UI::VBox::;
		3926
		3927	sub new {
		3928	my $class = shift;
		3929
		3930	my $self = $class->SUPER::new (
2900	fontsize => 0.8,	3931	fontsize => 0.8,
2901	@_,	3932	@_,
2902	)	3933	);
		3934
		3935	CFPlus::weaken (my $this = $self);
		3936
		3937	$self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
		3938
		3939	$self
2903	}	3940	}
2904		3941
2905	sub reorder {	3942	sub reorder {
2906	my ($self) = @_;	3943	my ($self) = @_;
2907	my $NOW = time;	3944	my $NOW = Time::HiRes::time;
		3945
		3946	# freeze display when hovering over any label
		3947	return if $CFPlus::UI::TOOLTIP->{owner}
		3948	&& grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},
		3949	values %{ $self->{item} };
2908		3950
2909	while (my ($k, $v) = each %{ $self->{item} }) {	3951	while (my ($k, $v) = each %{ $self->{item} }) {
2910	delete $self->{item}{$k} if $v->{timeout} < $NOW;	3952	delete $self->{item}{$k} if $v->{timeout} < $NOW;
2911	}	3953	}
2912		3954
…		…
2915	my @items = sort {	3957	my @items = sort {
2916	$a->{pri} <=> $b->{pri}	3958	$a->{pri} <=> $b->{pri}
2917	or $b->{id} <=> $a->{id}	3959	or $b->{id} <=> $a->{id}
2918	} values %{ $self->{item} };	3960	} values %{ $self->{item} };
2919		3961
		3962	$self->{timer}->interval (1);
		3963
2920	my $count = 10 + 1;	3964	my $count = 10 + 1;
2921	for my $item (@items) {	3965	for my $item (@items) {
2922	last unless --$count;	3966	last unless --$count;
2923		3967
2924	push @widgets, $item->{label} ||= do {	3968	my $label = $item->{label} ||= do {
2925	# TODO: doesn't handle markup well (read as: at all)	3969	# TODO: doesn't handle markup well (read as: at all)
2926	my $short = $item->{count} > 1	3970	my $short = $item->{count} > 1
2927	? "<b>$item->{count} ×</b> $item->{text}"	3971	? "<b>$item->{count} ×</b> $item->{text}"
2928	: $item->{text};	3972	: $item->{text};
2929		3973
2930	for ($short) {	3974	for ($short) {
2931	s/^\s+//;	3975	s/^\s+//;
2932	s/\s+/ /g;	3976	s/\s+/ /g;
2933	}	3977	}
2934		3978
2935	new CFClient::UI::Label	3979	new CFPlus::UI::Label
2936	markup => $short,	3980	markup => $short,
2937	tooltip => $item->{tooltip},	3981	tooltip => $item->{tooltip},
2938	tooltip_font => $::FONT_PROP,	3982	tooltip_font => $::FONT_PROP,
2939	tooltip_width => 0.67,	3983	tooltip_width => 0.67,
2940	fontsize => $item->{fontsize} || $self->{fontsize},	3984	fontsize => $item->{fontsize} || $self->{fontsize},
2941	max_w => $::WIDTH * 0.44,	3985	max_w => $::WIDTH * 0.44,
2942	fg => $item->{fg},	3986	fg => [@{ $item->{fg} }],
2943	can_events => 1,	3987	can_events => 1,
2944	can_hover => 1	3988	can_hover => 1
2945	};	3989	};
		3990
		3991	if ((my $diff = $item->{timeout} - $NOW) < 2) {
		3992	$label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
		3993	$label->update;
		3994	$label->set_max_size (undef, $label->{req_h} * $diff)
		3995	if $diff < 1;
		3996	$self->{timer}->interval (1/30);
		3997	} else {
		3998	$label->{fg}[3] = $item->{fg}[3] || 1;
		3999	}
		4000
		4001	push @widgets, $label;
2946	}	4002	}
2947		4003
2948	$self->clear;	4004	$self->clear;
2949	$self->SUPER::add (reverse @widgets);	4005	$self->SUPER::add (reverse @widgets);
2950	}	4006	}
…		…
2955	$text =~ s/^\s+//;	4011	$text =~ s/^\s+//;
2956	$text =~ s/\s+$//;	4012	$text =~ s/\s+$//;
2957		4013
2958	return unless $text;	4014	return unless $text;
2959		4015
2960	my $timeout = time + ((delete $arg{timeout}) || 60);	4016	my $timeout = (int time) + ((delete $arg{timeout}) || 60);
2961		4017
2962	my $group = exists $arg{group} ? $arg{group} : ++$self->{id};	4018	my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2963		4019
2964	if (my $item = $self->{item}{$group}) {	4020	if (my $item = $self->{item}{$group}) {
2965	if ($item->{text} eq $text) {	4021	if ($item->{text} eq $text) {
2966	$item->{count}++;	4022	$item->{count}++;
2967	} else {	4023	} else {
2968	$item->{count} = 1;	4024	$item->{count} = 1;
2969	$item->{text} = $item->{tooltip} = $text;	4025	$item->{text} = $item->{tooltip} = $text;
2970	}	4026	}
2971	$item->{id} = ++$self->{id};	4027	$item->{id} += 0.2;#d#
2972	$item->{timeout} = $timeout;	4028	$item->{timeout} = $timeout;
2973	delete $item->{label};	4029	delete $item->{label};
2974	} else {	4030	} else {
2975	$self->{item}{$group} = {	4031	$self->{item}{$group} = {
2976	id => ++$self->{id},	4032	id => ++$self->{id},
…		…
2982	count => 1,	4038	count => 1,
2983	%arg,	4039	%arg,
2984	};	4040	};
2985	}	4041	}
2986		4042
		4043	$ROOT->on_refresh (reorder => sub {
2987	$self->reorder;	4044	$self->reorder;
		4045	});
2988	}	4046	}
2989		4047
2990	sub reconfigure {	4048	sub reconfigure {
2991	my ($self) = @_;	4049	my ($self) = @_;
2992		4050
…		…
2995		4053
2996	$self->reorder;	4054	$self->reorder;
2997	$self->SUPER::reconfigure;	4055	$self->SUPER::reconfigure;
2998	}	4056	}
2999		4057
		4058	sub destroy {
		4059	my ($self) = @_;
		4060
		4061	$self->{timer}->cancel;
		4062
		4063	$self->SUPER::destroy;
		4064	}
		4065
3000	#############################################################################	4066	#############################################################################
3001		4067
3002	package CFClient::UI::Root;	4068	package CFPlus::UI::Root;
3003		4069
3004	our @ISA = CFClient::UI::Container::;	4070	our @ISA = CFPlus::UI::Container::;
3005		4071
		4072	use List::Util qw(min max);
		4073
3006	use CFClient::OpenGL;	4074	use CFPlus::OpenGL;
3007		4075
3008	sub new {	4076	sub new {
3009	my $class = shift;	4077	my $class = shift;
3010		4078
3011	my $self = $class->SUPER::new (	4079	my $self = $class->SUPER::new (
3012	visible => 1,	4080	visible => 1,
3013	@_,	4081	@_,
3014	);	4082	);
3015		4083
3016	Scalar::Util::weaken ($self->{root} = $self);	4084	CFPlus::weaken ($self->{root} = $self);
3017		4085
3018	$self	4086	$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	}	4087	}
3036		4088
3037	sub size_request {	4089	sub size_request {
3038	my ($self) = @_;	4090	my ($self) = @_;
3039		4091
…		…
3052	$coord = $max - $size if $coord > $max - $size;	4104	$coord = $max - $size if $coord > $max - $size;
3053		4105
3054	int $coord + 0.5	4106	int $coord + 0.5
3055	}	4107	}
3056		4108
3057	sub size_allocate {	4109	sub invoke_size_allocate {
3058	my ($self, $w, $h, $changed) = @_;	4110	my ($self, $w, $h) = @_;
3059		4111
3060	for my $child ($self->children) {	4112	for my $child ($self->children) {
3061	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};	4113	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3062		4114
3063	$X = $child->{force_x} if exists $child->{force_x};	4115	$X = $child->{force_x} if exists $child->{force_x};
…		…
3066	$X = _to_pixel $X, $W, $self->{w};	4118	$X = _to_pixel $X, $W, $self->{w};
3067	$Y = _to_pixel $Y, $H, $self->{h};	4119	$Y = _to_pixel $Y, $H, $self->{h};
3068		4120
3069	$child->configure ($X, $Y, $W, $H);	4121	$child->configure ($X, $Y, $W, $H);
3070	}	4122	}
		4123
		4124	1
3071	}	4125	}
3072		4126
3073	sub coord2local {	4127	sub coord2local {
3074	my ($self, $x, $y) = @_;	4128	my ($self, $x, $y) = @_;
3075		4129
…		…
3131	$_->()	4185	$_->()
3132	for values %{delete $self->{refresh_hook}};	4186	for values %{delete $self->{refresh_hook}};
3133	}	4187	}
3134		4188
3135	if ($self->{realloc}) {	4189	if ($self->{realloc}) {
		4190	my %queue;
3136	my @queue;	4191	my @queue;
		4192	my $widget;
3137		4193
		4194	outer:
3138	while () {	4195	while () {
3139	if ($self->{realloc}) {	4196	if (my $realloc = delete $self->{realloc}) {
3140	#TODO use array-of-depth approach	4197	for $widget (values %$realloc) {
		4198	$widget->{visible} or next; # do not resize invisible widgets
3141		4199
3142	@queue = sort { $a->{visible} <=> $b->{visible} }	4200	$queue{$widget+0}++ and next; # duplicates are common
3143	@queue, values %{delete $self->{realloc}};	4201
		4202	push @{ $queue[$widget->{visible}] }, $widget;
		4203	}
3144	}	4204	}
3145		4205
		4206	while () {
		4207	@queue or last outer;
		4208
3146	my $widget = pop @queue || last;	4209	$widget = pop @{ $queue[-1] || [] }
		4210	and last;
		4211
		4212	pop @queue;
		4213	}
3147		4214
3148	$widget->{visible} or last; # do not resize invisible widgets	4215	delete $queue{$widget+0};
3149		4216
3150	my ($w, $h) = $widget->size_request;	4217	my ($w, $h) = $widget->size_request;
3151		4218
3152	$w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2;	4219	$w = max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3153	$h = List::Util::max $widget->{min_h}, $h + $widget->{padding_y} * 2;	4220	$h = max $widget->{min_h}, $h + $widget->{padding_y} * 2;
		4221
		4222	$w = min $widget->{max_w}, $w if exists $widget->{max_w};
		4223	$h = min $widget->{max_h}, $h if exists $widget->{max_h};
3154		4224
3155	$w = $widget->{force_w} if exists $widget->{force_w};	4225	$w = $widget->{force_w} if exists $widget->{force_w};
3156	$h = $widget->{force_h} if exists $widget->{force_h};	4226	$h = $widget->{force_h} if exists $widget->{force_h};
3157		4227
		4228	if ($widget->{req_w} != $w || $widget->{req_h} != $h
		4229	|| delete $widget->{force_realloc}) {
3158	$widget->{req_w} = $w;	4230	$widget->{req_w} = $w;
3159	$widget->{req_h} = $h;	4231	$widget->{req_h} = $h;
3160		4232
3161	$self->{size_alloc}{$widget} = [$widget, undef, undef];	4233	$self->{size_alloc}{$widget+0} = $widget;
3162		4234
3163	push @queue, $widget->{parent}	4235	if (my $parent = $widget->{parent}) {
3164	if ($self->{w} != $w || $self->{h} != $h) && $widget->{parent};	4236	$self->{realloc}{$parent+0} = $parent
		4237	unless $queue{$parent+0};
		4238
		4239	$parent->{force_size_alloc} = 1;
		4240	$self->{size_alloc}{$parent+0} = $parent;
		4241	}
		4242	}
		4243
		4244	delete $self->{realloc}{$widget+0};
3165	}	4245	}
3166	}	4246	}
3167		4247
3168	while (my $size_alloc = delete $self->{size_alloc}) {	4248	while (my $size_alloc = delete $self->{size_alloc}) {
3169	my @queue = sort $b->[0]{visible} <=> $a->[0]{visible},	4249	my @queue = sort { $b->{visible} <=> $a->{visible} }
3170	values %$size_alloc;	4250	values %$size_alloc;
3171		4251
3172	while () {	4252	while () {
3173	my ($widget, $w, $h) = @{ pop @queue or last };	4253	my $widget = pop @queue || last;
3174		4254
3175	$w = $widget->{w} || $widget->{req_w} unless defined $w;	4255	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3176	$h = $widget->{h} || $widget->{req_h} unless defined $h;
3177		4256
3178	$w = 0 if $w < 0;	4257	$w = 0 if $w < 0;
3179	$h = 0 if $h < 0;	4258	$h = 0 if $h < 0;
3180		4259
		4260	$w = max $widget->{min_w}, $w;
		4261	$h = max $widget->{min_h}, $h;
		4262
		4263	# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
		4264	# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
		4265
		4266	$w = min $widget->{max_w}, $w if exists $widget->{max_w};
		4267	$h = min $widget->{max_h}, $h if exists $widget->{max_h};
		4268
3181	$w = int $w + 0.5;	4269	$w = int $w + 0.5;
3182	$h = int $h + 0.5;	4270	$h = int $h + 0.5;
3183		4271
3184	my $changed = $widget->{w} != $w || $widget->{h} != $h;	4272	if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
		4273	$widget->{old_w} = $widget->{w};
		4274	$widget->{old_h} = $widget->{h};
3185		4275
3186	$widget->{w} = $w;	4276	$widget->{w} = $w;
3187	$widget->{h} = $h;	4277	$widget->{h} = $h;
3188		4278
3189	$widget->emit (size_allocate => $w, $h, $changed);	4279	$widget->emit (size_allocate => $w, $h);
		4280	}
3190	}	4281	}
3191	}	4282	}
3192		4283
3193	while ($self->{post_alloc_hook}) {	4284	while ($self->{post_alloc_hook}) {
3194	$_->()	4285	$_->()
…		…
3203	glLoadIdentity;	4294	glLoadIdentity;
3204	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;	4295	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3205	glMatrixMode GL_MODELVIEW;	4296	glMatrixMode GL_MODELVIEW;
3206	glLoadIdentity;	4297	glLoadIdentity;
3207		4298
		4299	{
		4300	package CFPlus::UI::Base;
		4301
		4302	local ($draw_x, $draw_y, $draw_w, $draw_h) =
		4303	(0, 0, $self->{w}, $self->{h});
		4304
3208	$self->_draw;	4305	$self->_draw;
		4306	}
3209	}	4307	}
3210		4308
3211	#############################################################################	4309	#############################################################################
3212		4310
3213	package CFClient::UI;	4311	package CFPlus::UI;
3214		4312
3215	$ROOT = new CFClient::UI::Root;	4313	$ROOT = new CFPlus::UI::Root;
3216	$TOOLTIP = new CFClient::UI::Tooltip z => 900;	4314	$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
3217		4315
3218	1	4316	1
3219		4317

Diff Legend

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