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

Diff Legend

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