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.269 by root, Fri Jun 2 06:22:55 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 {
…		…
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
		502	0
		503	}
		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
455	sub find_widget {	552	#sub find_widget {
456	my ($self, $x, $y) = @_;	553	# in .xs
457
458	return () unless $self->{can_events};
459
460	return $self
461	if $x >= $self->{x} && $x < $self->{x} + $self->{w}
462	&& $y >= $self->{y} && $y < $self->{y} + $self->{h};
463
464	()
465	}
466		554
467	sub set_parent {	555	sub set_parent {
468	my ($self, $parent) = @_;	556	my ($self, $parent) = @_;
469		557
470	Scalar::Util::weaken ($self->{parent} = $parent);	558	CFPlus::weaken ($self->{parent} = $parent);
471	$self->set_visible if $parent->{visible};	559	$self->set_visible if $parent->{visible};
472	}
473
474	sub connect {
475	my ($self, $signal, $cb) = @_;
476
477	push @{ $self->{signal_cb}{$signal} }, $cb;
478	}
479
480	sub _emit {
481	my ($self, $signal, @args) = @_;
482
483	List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
484	}
485
486	sub emit {
487	my ($self, $signal, @args) = @_;
488
489	$self->_emit ($signal, @args)
490	|| $self->$signal (@args);
491	}
492
493	sub visibility_change {
494	#my ($self, $visible) = @_;
495	}	560	}
496		561
497	sub realloc {	562	sub realloc {
498	my ($self) = @_;	563	my ($self) = @_;
499		564
…		…
532	return unless $self->{h} && $self->{w};	597	return unless $self->{h} && $self->{w};
533		598
534	# update screen rectangle	599	# update screen rectangle
535	local $draw_x = $draw_x + $self->{x};	600	local $draw_x = $draw_x + $self->{x};
536	local $draw_y = $draw_y + $self->{y};	601	local $draw_y = $draw_y + $self->{y};
537	local $draw_w = $draw_x + $self->{w};
538	local $draw_h = $draw_y + $self->{h};
539		602
540	# skip widgets that are entirely outside the drawing area	603	# skip widgets that are entirely outside the drawing area
541	return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)	604	return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
542	|| ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);	605	|| ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
543		606
544	glPushMatrix;	607	glPushMatrix;
545	glTranslate $self->{x}, $self->{y}, 0;	608	glTranslate $self->{x}, $self->{y}, 0;
546	$self->_draw;
547	glPopMatrix;
548		609
549	if ($self == $HOVER && $self->{can_hover}) {	610	if ($self == $HOVER && $self->{can_hover}) {
550	my ($x, $y) = @$self{qw(x y)};
551
552	glColor 1, 0.8, 0.5, 0.2;	611	glColor 1*0.2, 0.8*0.2, 0.5*0.2, 0.2;
553	glEnable GL_BLEND;	612	glEnable GL_BLEND;
554	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	613	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
555	glBegin GL_QUADS;	614	glBegin GL_QUADS;
556	glVertex $x , $y;	615	glVertex 0 , 0;
557	glVertex $x + $self->{w}, $y;	616	glVertex $self->{w}, 0;
558	glVertex $x + $self->{w}, $y + $self->{h};	617	glVertex $self->{w}, $self->{h};
559	glVertex $x , $y + $self->{h};	618	glVertex 0 , $self->{h};
560	glEnd;	619	glEnd;
561	glDisable GL_BLEND;	620	glDisable GL_BLEND;
562	}	621	}
563		622
564	if ($ENV{CFPLUS_DEBUG} & 1) {	623	if ($ENV{CFPLUS_DEBUG} & 1) {
565	glPushMatrix;	624	glPushMatrix;
566	glColor 1, 1, 0, 1;	625	glColor 1, 1, 0, 1;
567	glTranslate $self->{x} + 0.375, $self->{y} + 0.375;	626	glTranslate 0.375, 0.375;
568	glBegin GL_LINE_LOOP;	627	glBegin GL_LINE_LOOP;
569	glVertex 0 , 0;	628	glVertex 0 , 0;
570	glVertex $self->{w} - 1, 0;	629	glVertex $self->{w} - 1, 0;
571	glVertex $self->{w} - 1, $self->{h} - 1;	630	glVertex $self->{w} - 1, $self->{h} - 1;
572	glVertex 0 , $self->{h} - 1;	631	glVertex 0 , $self->{h} - 1;
573	glEnd;	632	glEnd;
574	glPopMatrix;	633	glPopMatrix;
575	#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;
576	}	635	}
		636
		637	$self->_draw;
		638	glPopMatrix;
577	}	639	}
578		640
579	sub _draw {	641	sub _draw {
580	my ($self) = @_;	642	my ($self) = @_;
581		643
582	warn "no draw defined for $self\n";	644	warn "no draw defined for $self\n";
583	}	645	}
584		646
		647	my $cntx;#d#
585	sub DESTROY {	648	sub DESTROY {
586	my ($self) = @_;	649	my ($self) = @_;
587		650
		651	return if CFPlus::in_destruct;
		652
		653	eval { $self->destroy };
		654	warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
		655
588	delete $WIDGET{$self+0};	656	delete $WIDGET{$self+0};
589	#$self->deactivate;
590	}	657	}
591		658
592	#############################################################################	659	#############################################################################
593		660
594	package CFClient::UI::DrawBG;	661	package CFPlus::UI::DrawBG;
595		662
596	our @ISA = CFClient::UI::Base::;	663	our @ISA = CFPlus::UI::Base::;
597		664
598	use strict;	665	use strict;
599	use CFClient::OpenGL;	666	use CFPlus::OpenGL;
600		667
601	sub new {	668	sub new {
602	my $class = shift;	669	my $class = shift;
603		670
604	# range [value, low, high, page]	671	# range [value, low, high, page]
…		…
619		686
620	if ($color && (@$color < 4 || $color->[3])) {	687	if ($color && (@$color < 4 || $color->[3])) {
621	my ($w, $h) = @$self{qw(w h)};	688	my ($w, $h) = @$self{qw(w h)};
622		689
623	glEnable GL_BLEND;	690	glEnable GL_BLEND;
624	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	691	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
625	glColor @$color;	692	glColor_premultiply @$color;
626		693
627	glBegin GL_QUADS;	694	glBegin GL_QUADS;
628	glVertex 0 , 0;	695	glVertex 0 , 0;
629	glVertex 0 , $h;	696	glVertex 0 , $h;
630	glVertex $w, $h;	697	glVertex $w, $h;
…		…
635	}	702	}
636	}	703	}
637		704
638	#############################################################################	705	#############################################################################
639		706
640	package CFClient::UI::Empty;	707	package CFPlus::UI::Empty;
641		708
642	our @ISA = CFClient::UI::Base::;	709	our @ISA = CFPlus::UI::Base::;
643		710
644	sub new {	711	sub new {
645	my ($class, %arg) = @_;	712	my ($class, %arg) = @_;
646	$class->SUPER::new (can_events => 0, %arg);	713	$class->SUPER::new (can_events => 0, %arg);
647	}	714	}
…		…
654		721
655	sub draw { }	722	sub draw { }
656		723
657	#############################################################################	724	#############################################################################
658		725
659	package CFClient::UI::Container;	726	package CFPlus::UI::Container;
660		727
661	our @ISA = CFClient::UI::Base::;	728	our @ISA = CFPlus::UI::Base::;
662		729
663	sub new {	730	sub new {
664	my ($class, %arg) = @_;	731	my ($class, %arg) = @_;
665		732
666	my $children = delete $arg{children} || [];	733	my $children = delete $arg{children};
667		734
668	my $self = $class->SUPER::new (	735	my $self = $class->SUPER::new (
669	children => [],	736	children => [],
670	can_events => 0,	737	can_events => 0,
671	%arg,	738	%arg,
672	);	739	);
		740
673	$self->add ($_) for @$children;	741	$self->add (@$children)
		742	if $children;
674		743
675	$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;
676	}	753	}
677		754
678	sub add {	755	sub add {
679	my ($self, @widgets) = @_;	756	my ($self, @widgets) = @_;
680		757
…		…
726	$x -= $self->{x};	803	$x -= $self->{x};
727	$y -= $self->{y};	804	$y -= $self->{y};
728		805
729	my $res;	806	my $res;
730		807
731	for (reverse @{ $self->{children} }) {	808	for (reverse $self->visible_children) {
732	$res = $_->find_widget ($x, $y)	809	$res = $_->find_widget ($x, $y)
733	and return $res;	810	and return $res;
734	}	811	}
735		812
736	$self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})	813	$self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
…		…
742	$_->draw for @{$self->{children}};	819	$_->draw for @{$self->{children}};
743	}	820	}
744		821
745	#############################################################################	822	#############################################################################
746		823
747	package CFClient::UI::Bin;	824	package CFPlus::UI::Bin;
748		825
749	our @ISA = CFClient::UI::Container::;	826	our @ISA = CFPlus::UI::Container::;
750		827
751	sub new {	828	sub new {
752	my ($class, %arg) = @_;	829	my ($class, %arg) = @_;
753		830
754	my $child = (delete $arg{child}) || new CFClient::UI::Empty::;	831	my $child = (delete $arg{child}) || new CFPlus::UI::Empty::;
755		832
756	$class->SUPER::new (children => [$child], %arg)	833	$class->SUPER::new (children => [$child], %arg)
757	}	834	}
758		835
759	sub add {	836	sub add {
760	my ($self, $child) = @_;	837	my ($self, $child) = @_;
761		838
762	$self->{children} = [];	839	$self->SUPER::remove ($_) for @{ $self->{children} };
763
764	$self->SUPER::add ($child);	840	$self->SUPER::add ($child);
765	}	841	}
766		842
767	sub remove {	843	sub remove {
768	my ($self, $widget) = @_;	844	my ($self, $widget) = @_;
769		845
770	$self->SUPER::remove ($widget);	846	$self->SUPER::remove ($widget);
771		847
772	$self->{children} = [new CFClient::UI::Empty]	848	$self->{children} = [new CFPlus::UI::Empty]
773	unless @{$self->{children}};	849	unless @{$self->{children}};
774	}	850	}
775		851
776	sub child { $_[0]->{children}[0] }	852	sub child { $_[0]->{children}[0] }
777		853
778	sub size_request {	854	sub size_request {
779	$_[0]{children}[0]->size_request	855	$_[0]{children}[0]->size_request
780	}	856	}
781		857
782	sub size_allocate {	858	sub invoke_size_allocate {
783	my ($self, $w, $h) = @_;	859	my ($self, $w, $h) = @_;
784		860
785	$self->{children}[0]->configure (0, 0, $w, $h);	861	$self->{children}[0]->configure (0, 0, $w, $h);
		862
		863	1
786	}	864	}
787		865
788	#############################################################################	866	#############################################################################
789		867
		868	# back-buffered drawing area
		869
790	package CFClient::UI::Window;	870	package CFPlus::UI::Window;
791		871
792	our @ISA = CFClient::UI::Bin::;	872	our @ISA = CFPlus::UI::Bin::;
793		873
794	use CFClient::OpenGL;	874	use CFPlus::OpenGL;
795		875
796	sub new {	876	sub new {
797	my ($class, %arg) = @_;	877	my ($class, %arg) = @_;
798		878
799	my $self = $class->SUPER::new (%arg);	879	my $self = $class->SUPER::new (%arg);
…		…
804		884
805	$ROOT->on_post_alloc ($self => sub { $self->render_child });	885	$ROOT->on_post_alloc ($self => sub { $self->render_child });
806	$self->SUPER::update;	886	$self->SUPER::update;
807	}	887	}
808		888
809	sub size_allocate {	889	sub invoke_size_allocate {
810	my ($self, $w, $h) = @_;	890	my ($self, $w, $h) = @_;
811		891
812	$self->SUPER::size_allocate ($w, $h);
813	$self->update;	892	$self->update;
		893
		894	$self->SUPER::invoke_size_allocate ($w, $h)
814	}	895	}
815		896
816	sub _render {	897	sub _render {
817	my ($self) = @_;	898	my ($self) = @_;
818		899
…		…
820	}	901	}
821		902
822	sub render_child {	903	sub render_child {
823	my ($self) = @_;	904	my ($self) = @_;
824		905
825	$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 {
826	glClearColor 0, 0, 0, 0;	907	glClearColor 0, 0, 0, 0;
827	glClear GL_COLOR_BUFFER_BIT;	908	glClear GL_COLOR_BUFFER_BIT;
828		909
829	{	910	{
830	package CFClient::UI::Base;	911	package CFPlus::UI::Base;
831		912
832	($draw_x, $draw_y, $draw_w, $draw_h) =	913	local ($draw_x, $draw_y, $draw_w, $draw_h) =
833	(0, 0, $self->{w}, $self->{h});	914	(0, 0, $self->{w}, $self->{h});
		915
		916	$self->_render;
834	}	917	}
835
836	$self->_render;
837	};	918	};
838	}	919	}
839		920
840	sub _draw {	921	sub _draw {
841	my ($self) = @_;	922	my ($self) = @_;
842
843	my ($w, $h) = @$self{qw(w h)};
844		923
845	my $tex = $self->{texture}	924	my $tex = $self->{texture}
846	or return;	925	or return;
847		926
848	glEnable GL_TEXTURE_2D;	927	glEnable GL_TEXTURE_2D;
849	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	928	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
850	glColor 1, 1, 1, 1;	929	glColor 0, 0, 0, 1;
851		930
852	$tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);	931	$tex->draw_quad_alpha_premultiplied (0, 0);
853		932
854	glDisable GL_TEXTURE_2D;	933	glDisable GL_TEXTURE_2D;
855	}	934	}
856		935
857	#############################################################################	936	#############################################################################
858		937
859	package CFClient::UI::ViewPort;	938	package CFPlus::UI::ViewPort;
860		939
		940	use List::Util qw(min max);
		941
861	our @ISA = CFClient::UI::Window::;	942	our @ISA = CFPlus::UI::Window::;
862		943
863	sub new {	944	sub new {
864	my $class = shift;	945	my $class = shift;
865		946
866	$class->SUPER::new (	947	$class->SUPER::new (
…		…
879	$h = 10 if $self->{scroll_y};	960	$h = 10 if $self->{scroll_y};
880		961
881	($w, $h)	962	($w, $h)
882	}	963	}
883		964
884	sub size_allocate {	965	sub invoke_size_allocate {
885	my ($self, $w, $h) = @_;	966	my ($self, $w, $h) = @_;
886		967
887	my $child = $self->child;	968	my $child = $self->child;
888		969
889	$w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};	970	$w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
890	$h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};	971	$h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
891		972
892	$self->child->configure (0, 0, $w, $h);	973	$self->child->configure (0, 0, $w, $h);
893	$self->update;	974	$self->update;
		975
		976	1
894	}	977	}
895		978
896	sub set_offset {	979	sub set_offset {
897	my ($self, $x, $y) = @_;	980	my ($self, $x, $y) = @_;
898		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}) {
899	$self->{view_x} = int $x;	986	$self->{view_x} = $x;
900	$self->{view_y} = int $y;	987	$self->{view_y} = $y;
901		988
		989	$self->emit (changed => $x, $y);
902	$self->update;	990	$self->update;
		991	}
903	}	992	}
904		993
905	# 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
906	sub coord2local {	995	sub coord2local {
907	my ($self, $x, $y) = @_;	996	my ($self, $x, $y) = @_;
…		…
922	my ($self, $x, $y) = @_;	1011	my ($self, $x, $y) = @_;
923		1012
924	if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}	1013	if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
925	&& $y >= $self->{y} && $y < $self->{y} + $self->{h}	1014	&& $y >= $self->{y} && $y < $self->{y} + $self->{h}
926	) {	1015	) {
927	$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})
928	} else {	1017	} else {
929	$self->CFClient::UI::Base::find_widget ($x, $y)	1018	$self->CFPlus::UI::Base::find_widget ($x, $y)
930	}	1019	}
931	}	1020	}
932		1021
933	sub _render {	1022	sub _render {
934	my ($self) = @_;	1023	my ($self) = @_;
935		1024
936	local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x};	1025	local $CFPlus::UI::Base::draw_x = $CFPlus::UI::Base::draw_x - $self->{view_x};
937	local $CFClient::UI::Base::draw_y = $CFClient::UI::Base::draw_y - $self->{view_y};	1026	local $CFPlus::UI::Base::draw_y = $CFPlus::UI::Base::draw_y - $self->{view_y};
938		1027
939	CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};	1028	CFPlus::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
940		1029
941	$self->SUPER::_render;	1030	$self->SUPER::_render;
942	}	1031	}
943		1032
944	#############################################################################	1033	#############################################################################
945		1034
946	package CFClient::UI::ScrolledWindow;	1035	package CFPlus::UI::ScrolledWindow;
947		1036
948	our @ISA = CFClient::UI::HBox::;	1037	our @ISA = CFPlus::UI::Table::;
949		1038
950	sub new {	1039	sub new {
951	my $class = shift;	1040	my ($class, %arg) = @_;
		1041
		1042	my $child = delete $arg{child};
952		1043
953	my $self;	1044	my $self;
954		1045
955	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
956	vertical => 1,	1056	vertical => 1,
957	range => [0, 0, 1, 0.01], # HACK fix	1057	range => [0, 0, 1, 0.01], # HACK fix
958	on_changed => sub {	1058	on_changed => sub {
959	$self->{vp}->set_offset (0, $_[1]);	1059	$self->{vpos} = $_[1];
		1060	$self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
960	},	1061	},
961	;	1062	;
962		1063
963	$self = $class->SUPER::new (	1064	$self = $class->SUPER::new (
964	vp => (new CFClient::UI::ViewPort expand => 1),	1065	scroll_x => 0,
		1066	scroll_y => 1,
		1067	can_events => 1,
965	slider => $slider,	1068	hslider => $hslider,
966	@_,	1069	vslider => $vslider,
		1070	col_expand => [1, 0],
		1071	row_expand => [1, 0],
		1072	%arg,
967	);	1073	);
968		1074
969	$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
970	$self->add ($self->{vp});	1089	$self->SUPER::add_at (0, 0, $self->{vp});
971	$self->add ($self->{slider});	1090
		1091	$self->add ($child) if $child;
972		1092
973	$self	1093	$self
974	}	1094	}
975		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
976	sub update {	1128	sub update {
977	my ($self) = @_;	1129	my ($self) = @_;
978		1130
		1131	$self->update_slider;
979	$self->SUPER::update;	1132	$self->SUPER::update;
980
981	# todo: overwrite size_allocate of child
982	my $child = $self->{vp}->child;
983	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
984	}	1133	}
985		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
986	sub size_allocate {	1188	sub invoke_size_allocate {
987	my ($self, $w, $h) = @_;	1189	my ($self, $w, $h) = @_;
988		1190
		1191	$self->update_slider;
989	$self->SUPER::size_allocate ($w, $h);	1192	$self->SUPER::invoke_size_allocate ($w, $h)
990
991	my $child = $self->{vp}->child;
992	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
993	}	1193	}
994
995	#TODO# update range on size_allocate depending on child
996	# update viewport offset on scroll
997		1194
998	#############################################################################	1195	#############################################################################
999		1196
1000	package CFClient::UI::Frame;	1197	package CFPlus::UI::Frame;
1001		1198
1002	our @ISA = CFClient::UI::Bin::;	1199	our @ISA = CFPlus::UI::Bin::;
1003		1200
1004	use CFClient::OpenGL;	1201	use CFPlus::OpenGL;
1005		1202
1006	sub new {	1203	sub new {
1007	my $class = shift;	1204	my $class = shift;
1008		1205
1009	$class->SUPER::new (	1206	$class->SUPER::new (
…		…
1017		1214
1018	if ($self->{bg}) {	1215	if ($self->{bg}) {
1019	my ($w, $h) = @$self{qw(w h)};	1216	my ($w, $h) = @$self{qw(w h)};
1020		1217
1021	glEnable GL_BLEND;	1218	glEnable GL_BLEND;
1022	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	1219	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1023	glColor @{ $self->{bg} };	1220	glColor_premultiply @{ $self->{bg} };
1024		1221
1025	glBegin GL_QUADS;	1222	glBegin GL_QUADS;
1026	glVertex 0 , 0;	1223	glVertex 0 , 0;
1027	glVertex 0 , $h;	1224	glVertex 0 , $h;
1028	glVertex $w, $h;	1225	glVertex $w, $h;
…		…
1035	$self->SUPER::_draw;	1232	$self->SUPER::_draw;
1036	}	1233	}
1037		1234
1038	#############################################################################	1235	#############################################################################
1039		1236
1040	package CFClient::UI::FancyFrame;	1237	package CFPlus::UI::FancyFrame;
1041		1238
1042	our @ISA = CFClient::UI::Bin::;	1239	our @ISA = CFPlus::UI::Bin::;
1043		1240
1044	use CFClient::OpenGL;	1241	use CFPlus::OpenGL;
1045
1046	my $bg =
1047	new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
1048	mipmap => 1, wrap => 1;
1049
1050	my @border =
1051	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1052	qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1053		1242
1054	sub new {	1243	sub new {
1055	my ($class, %arg) = @_;	1244	my ($class, %arg) = @_;
1056		1245
1057	my $title = delete $arg{title};	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;
		1342
		1343	my $bg =
		1344	new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png",
		1345	mipmap => 1, wrap => 1;
		1346
		1347	my @border =
		1348	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
		1349	qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
		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
		1355	sub new {
		1356	my ($class, %arg) = @_;
1058		1357
1059	my $self = $class->SUPER::new (	1358	my $self = $class->SUPER::new (
1060	bg => [1, 1, 1, 1],	1359	bg => [1, 1, 1, 1],
1061	border_bg => [1, 1, 1, 1],	1360	border_bg => [1, 1, 1, 1],
1062	border => 0.6,	1361	border => 0.6,
1063	can_events => 1,	1362	can_events => 1,
1064	min_w => 16,	1363	min_w => 64,
1065	min_h => 16,	1364	min_h => 32,
1066	%arg,	1365	%arg,
1067	);	1366	);
1068		1367
1069	$self->{title} = new CFClient::UI::Label	1368	$self->{title_widget} = new CFPlus::UI::Label
1070	align => 0,	1369	align => 0,
1071	valign => 1,	1370	valign => 1,
1072	text => $title,	1371	text => $self->{title},
1073	fontsize => $self->{border}	1372	fontsize => $self->{border},
1074	if defined $title;	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	}
1075		1383
1076	$self	1384	$self
1077	}	1385	}
1078		1386
1079	sub add {	1387	sub add {
1080	my ($self, @widgets) = @_;	1388	my ($self, @widgets) = @_;
1081		1389
1082	$self->SUPER::add (@widgets);	1390	$self->SUPER::add (@widgets);
		1391	$self->CFPlus::UI::Container::add ($self->{close_button}) if $self->{close_button};
1083	$self->CFClient::UI::Container::add ($self->{title}) if $self->{title};	1392	$self->CFPlus::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1084	}	1393	}
1085		1394
1086	sub border {	1395	sub border {
1087	int $_[0]{border} * $::FONTSIZE	1396	int $_[0]{border} * $::FONTSIZE
1088	}	1397	}
1089		1398
1090	sub size_request {	1399	sub size_request {
1091	my ($self) = @_;	1400	my ($self) = @_;
1092		1401
1093	$self->{title}->size_request	1402	$self->{title_widget}->size_request
1094	if $self->{title};	1403	if $self->{title_widget};
		1404
		1405	$self->{close_button}->size_request
		1406	if $self->{close_button};
1095		1407
1096	my ($w, $h) = $self->SUPER::size_request;	1408	my ($w, $h) = $self->SUPER::size_request;
1097		1409
1098	(	1410	(
1099	$w + $self->border * 2,	1411	$w + $self->border * 2,
1100	$h + $self->border * 2,	1412	$h + $self->border * 2,
1101	)	1413	)
1102	}	1414	}
1103		1415
1104	sub size_allocate {	1416	sub invoke_size_allocate {
1105	my ($self, $w, $h) = @_;	1417	my ($self, $w, $h) = @_;
1106		1418
1107	if ($self->{title}) {	1419	if ($self->{title_widget}) {
1108	$self->{title}{w} = $w;	1420	$self->{title_widget}{w} = $w;
1109	$self->{title}{h} = $h;	1421	$self->{title_widget}{h} = $h;
1110	$self->{title}->size_allocate ($w, $h);	1422	$self->{title_widget}->invoke_size_allocate ($w, $h);
1111	}	1423	}
1112		1424
1113	my $border = $self->border;	1425	my $border = $self->border;
1114		1426
1115	$h -= List::Util::max 0, $border * 2;	1427	$h -= List::Util::max 0, $border * 2;
1116	$w -= List::Util::max 0, $border * 2;	1428	$w -= List::Util::max 0, $border * 2;
		1429
		1430	$self->child->configure ($border, $border, $w, $h);
		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;
1117		1442
1118	$self->child->configure ($border, $border, $w, $h);	1443	1
1119	}	1444	}
1120		1445
1121	sub button_down {	1446	sub invoke_button_down {
1122	my ($self, $ev, $x, $y) = @_;	1447	my ($self, $ev, $x, $y) = @_;
1123		1448
1124	my ($w, $h) = @$self{qw(w h)};	1449	my ($w, $h) = @$self{qw(w h)};
1125	my $border = $self->border;	1450	my $border = $self->border;
1126		1451
…		…
1142	my $dy = $ev->{y} - $oy;	1467	my $dy = $ev->{y} - $oy;
1143		1468
1144	$self->{force_w} = $bw + $dx * ($mx ? -1 : 1);	1469	$self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
1145	$self->{force_h} = $bh + $dy * ($my ? -1 : 1);	1470	$self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1146		1471
		1472	$self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1147	$self->realloc;	1473	$self->realloc;
1148	$self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1149	};	1474	};
1150		1475
1151	} elsif ($lr ^ $td) {	1476	} elsif ($lr ^ $td) {
1152	my ($ox, $oy) = ($ev->{x}, $ev->{y});	1477	my ($ox, $oy) = ($ev->{x}, $ev->{y});
1153	my ($bx, $by) = ($self->{x}, $self->{y});	1478	my ($bx, $by) = ($self->{x}, $self->{y});
…		…
1156	my ($ev, $x, $y) = @_;	1481	my ($ev, $x, $y) = @_;
1157		1482
1158	($x, $y) = ($ev->{x}, $ev->{y});	1483	($x, $y) = ($ev->{x}, $ev->{y});
1159		1484
1160	$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});
1161	};	1488	};
		1489	} else {
		1490	return 0;
		1491	}
		1492
1162	}	1493	1
1163	}	1494	}
1164		1495
1165	sub button_up {	1496	sub invoke_button_up {
1166	my ($self, $ev, $x, $y) = @_;	1497	my ($self, $ev, $x, $y) = @_;
1167		1498
1168	delete $self->{motion};	1499	! ! delete $self->{motion}
1169	}	1500	}
1170		1501
1171	sub mouse_motion {	1502	sub invoke_mouse_motion {
1172	my ($self, $ev, $x, $y) = @_;	1503	my ($self, $ev, $x, $y) = @_;
1173		1504
1174	$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
1175	}	1516	}
1176		1517
1177	sub _draw {	1518	sub _draw {
1178	my ($self) = @_;	1519	my ($self) = @_;
1179		1520
…		…
1186	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	1527	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1187		1528
1188	my $border = $self->border;	1529	my $border = $self->border;
1189		1530
1190	glColor @{ $self->{border_bg} };	1531	glColor @{ $self->{border_bg} };
1191	$border[0]->draw_quad_alpha (0, 0, $w, $border);	1532	$border[0]->draw_quad_alpha ( 0, 0, $w, $border);
1192	$border[1]->draw_quad_alpha (0, $border, $border, $ch);	1533	$border[1]->draw_quad_alpha ( 0, $border, $border, $ch);
1193	$border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);	1534	$border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1194	$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);
1195		1550
1196	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {	1551	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1197	glColor @{ $self->{bg} };	1552	glColor @{ $self->{bg} };
1198		1553
1199	# TODO: repeat texture not scale	1554	# TODO: repeat texture not scale
…		…
1205		1560
1206	glDisable GL_TEXTURE_2D;	1561	glDisable GL_TEXTURE_2D;
1207		1562
1208	$child->draw;	1563	$child->draw;
1209		1564
1210	if ($self->{title}) {	1565	if ($self->{title_widget}) {
1211	glTranslate 0, $border - $self->{h};	1566	glTranslate 0, $border - $self->{h};
1212	$self->{title}->_draw;	1567	$self->{title_widget}->_draw;
		1568
		1569	glTranslate 0, - ($border - $self->{h});
1213	}	1570	}
		1571
		1572	$self->{close_button}->draw
		1573	if $self->{close_button};
1214	}	1574	}
1215		1575
1216	#############################################################################	1576	#############################################################################
1217		1577
1218	package CFClient::UI::Table;	1578	package CFPlus::UI::Table;
1219		1579
1220	our @ISA = CFClient::UI::Base::;	1580	our @ISA = CFPlus::UI::Base::;
1221		1581
1222	use List::Util qw(max sum);	1582	use List::Util qw(max sum);
1223		1583
1224	use CFClient::OpenGL;	1584	use CFPlus::OpenGL;
1225		1585
1226	sub new {	1586	sub new {
1227	my $class = shift;	1587	my $class = shift;
1228		1588
1229	$class->SUPER::new (	1589	$class->SUPER::new (
		1590	children => [],
1230	col_expand => [],	1591	col_expand => [],
		1592	row_expand => [],
1231	@_,	1593	@_,
1232	)	1594	)
1233	}	1595	}
1234		1596
1235	sub children {	1597	sub children {
1236	grep $_, map @$_, grep $_, @{ $_[0]{children} }	1598	grep $_, map @$_, grep $_, @{ $_[0]{children} }
1237	}	1599	}
1238		1600
		1601	# TODO: store row/col info in child widget and use standard add/del
1239	sub add {	1602	sub add {
1240	my ($self, $x, $y, $child) = @_;	1603	my $self = shift;
1241		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
1242	$child->set_parent ($self);	1615	$child->set_parent ($self);
1243	$self->{children}[$y][$x] = $child;	1616	$self->{children}[$row][$col] = $child;
		1617	}
1244		1618
		1619	$self->{force_realloc} = 1;
		1620	$self->{force_size_alloc} = 1;
1245	$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	}
1246	}	1632	}
1247		1633
1248	# 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?
1249	sub clear {	1635	sub clear {
1250	my ($self) = @_;	1636	my ($self) = @_;
…		…
1291	(sum @$ws),	1677	(sum @$ws),
1292	(sum @$hs),	1678	(sum @$hs),
1293	)	1679	)
1294	}	1680	}
1295		1681
1296	sub size_allocate {	1682	sub invoke_size_allocate {
1297	my ($self, $w, $h) = @_;	1683	my ($self, $w, $h) = @_;
1298		1684
1299	my ($ws, $hs) = $self->get_wh;	1685	my ($ws, $hs) = $self->get_wh;
1300		1686
1301	my $req_w = (sum @$ws) || 1;	1687	my $req_w = (sum @$ws) || 1;
1302	my $req_h = (sum @$hs) || 1;	1688	my $req_h = (sum @$hs) || 1;
1303		1689
1304	# TODO: nicer code && do row_expand	1690	# TODO: nicer code
1305	my @col_expand = @{$self->{col_expand}};	1691	my @col_expand = @{$self->{col_expand}};
1306	@col_expand = (1) x @$ws unless @col_expand;	1692	@col_expand = (1) x @$ws unless @col_expand;
1307	my $col_expand = (sum @col_expand) || 1;	1693	my $col_expand = (sum @col_expand) || 1;
1308		1694
1309	# linearly scale sizes
1310	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;	1695	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1311	$hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1312		1696
1313	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
1314	CFClient::UI::harmonize $hs;	1705	CFPlus::UI::harmonize $hs;
1315		1706
1316	my $y;	1707	my $y;
1317		1708
1318	for my $r (0 .. $#{$self->{children}}) {	1709	for my $r (0 .. $#{$self->{children}}) {
1319	my $row = $self->{children}[$r]	1710	my $row = $self->{children}[$r]
…		…
1333	}	1724	}
1334		1725
1335	$y += $row_h;	1726	$y += $row_h;
1336	}	1727	}
1337		1728
		1729	1
1338	}	1730	}
1339		1731
1340	sub find_widget {	1732	sub find_widget {
1341	my ($self, $x, $y) = @_;	1733	my ($self, $x, $y) = @_;
1342		1734
…		…
1361	}	1753	}
1362	}	1754	}
1363		1755
1364	#############################################################################	1756	#############################################################################
1365		1757
1366	package CFClient::UI::Box;	1758	package CFPlus::UI::Fixed;
1367		1759
		1760	use List::Util qw(min max);
		1761
1368	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::;
1369		1843
1370	sub size_request {	1844	sub size_request {
1371	my ($self) = @_;	1845	my ($self) = @_;
1372		1846
1373	$self->{vertical}	1847	$self->{vertical}
…		…
1379	(List::Util::sum map $_->{req_w}, @{$self->{children}}),	1853	(List::Util::sum map $_->{req_w}, @{$self->{children}}),
1380	(List::Util::max map $_->{req_h}, @{$self->{children}}),	1854	(List::Util::max map $_->{req_h}, @{$self->{children}}),
1381	)	1855	)
1382	}	1856	}
1383		1857
1384	sub size_allocate {	1858	sub invoke_size_allocate {
1385	my ($self, $w, $h) = @_;	1859	my ($self, $w, $h) = @_;
1386		1860
1387	my $space = $self->{vertical} ? $h : $w;	1861	my $space = $self->{vertical} ? $h : $w;
1388	my $children = $self->{children};	1862	my @children = $self->visible_children;
1389		1863
1390	my @req;	1864	my @req;
1391		1865
1392	if ($self->{homogeneous}) {	1866	if ($self->{homogeneous}) {
1393	@req = ($space / (@$children || 1)) x @$children;	1867	@req = ($space / (@children || 1)) x @children;
1394	} else {	1868	} else {
1395	@req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children;	1869	@req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @children;
1396	my $req = List::Util::sum @req;	1870	my $req = List::Util::sum @req;
1397		1871
1398	if ($req > $space) {	1872	if ($req > $space) {
1399	# ah well, not enough space	1873	# ah well, not enough space
1400	$_ *= $space / $req for @req;	1874	$_ *= $space / $req for @req;
1401	} else {	1875	} else {
1402	my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;	1876	my $expand = (List::Util::sum map $_->{expand}, @children) || 1;
1403		1877
1404	$space = ($space - $req) / $expand; # remaining space to give away	1878	$space = ($space - $req) / $expand; # remaining space to give away
1405		1879
1406	$req[$_] += $space * $children->[$_]{expand}	1880	$req[$_] += $space * $children[$_]{expand}
1407	for 0 .. $#$children;	1881	for 0 .. $#children;
1408	}	1882	}
1409	}	1883	}
1410		1884
1411	CFClient::UI::harmonize \@req;	1885	CFPlus::UI::harmonize \@req;
1412		1886
1413	my $pos = 0;	1887	my $pos = 0;
1414	for (0 .. $#$children) {	1888	for (0 .. $#children) {
1415	my $alloc = $req[$_];	1889	my $alloc = $req[$_];
1416	$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));
1417		1891
1418	$pos += $alloc;	1892	$pos += $alloc;
1419	}	1893	}
1420		1894
1421	1	1895	1
1422	}	1896	}
1423		1897
1424	#############################################################################	1898	#############################################################################
1425		1899
1426	package CFClient::UI::HBox;	1900	package CFPlus::UI::HBox;
1427		1901
1428	our @ISA = CFClient::UI::Box::;	1902	our @ISA = CFPlus::UI::Box::;
1429		1903
1430	sub new {	1904	sub new {
1431	my $class = shift;	1905	my $class = shift;
1432		1906
1433	$class->SUPER::new (	1907	$class->SUPER::new (
…		…
1436	)	1910	)
1437	}	1911	}
1438		1912
1439	#############################################################################	1913	#############################################################################
1440		1914
1441	package CFClient::UI::VBox;	1915	package CFPlus::UI::VBox;
1442		1916
1443	our @ISA = CFClient::UI::Box::;	1917	our @ISA = CFPlus::UI::Box::;
1444		1918
1445	sub new {	1919	sub new {
1446	my $class = shift;	1920	my $class = shift;
1447		1921
1448	$class->SUPER::new (	1922	$class->SUPER::new (
…		…
1451	)	1925	)
1452	}	1926	}
1453		1927
1454	#############################################################################	1928	#############################################################################
1455		1929
1456	package CFClient::UI::Label;	1930	package CFPlus::UI::Label;
1457		1931
1458	our @ISA = CFClient::UI::DrawBG::;	1932	our @ISA = CFPlus::UI::DrawBG::;
1459		1933
1460	use CFClient::OpenGL;	1934	use CFPlus::OpenGL;
1461		1935
1462	sub new {	1936	sub new {
1463	my ($class, %arg) = @_;	1937	my ($class, %arg) = @_;
1464		1938
1465	my $self = $class->SUPER::new (	1939	my $self = $class->SUPER::new (
…		…
1468	#active_bg => none	1942	#active_bg => none
1469	#font => default_font	1943	#font => default_font
1470	#text => initial text	1944	#text => initial text
1471	#markup => initial narkup	1945	#markup => initial narkup
1472	#max_w => maximum pixel width	1946	#max_w => maximum pixel width
		1947	#style => 0, # render flags
1473	ellipsise => 3, # end	1948	ellipsise => 3, # end
1474	layout => (new CFClient::Layout),	1949	layout => (new CFPlus::Layout),
1475	fontsize => 1,	1950	fontsize => 1,
1476	align => -1,	1951	align => -1,
1477	valign => -1,	1952	valign => -1,
1478	padding_x => 2,	1953	padding_x => 2,
1479	padding_y => 2,	1954	padding_y => 2,
1480	can_events => 0,	1955	can_events => 0,
1481	%arg	1956	%arg
1482	);	1957	);
1483		1958
1484	if (exists $self->{template}) {	1959	if (exists $self->{template}) {
1485	my $layout = new CFClient::Layout;	1960	my $layout = new CFPlus::Layout;
1486	$layout->set_text (delete $self->{template});	1961	$layout->set_text (delete $self->{template});
1487	$self->{template} = $layout;	1962	$self->{template} = $layout;
1488	}	1963	}
1489		1964
1490	if (exists $self->{markup}) {	1965	if (exists $self->{markup}) {
…		…
1494	}	1969	}
1495		1970
1496	$self	1971	$self
1497	}	1972	}
1498		1973
1499	sub escape($) {
1500	local $_ = $_[0];
1501
1502	s/&/&amp;/g;
1503	s/>/&gt;/g;
1504	s/</&lt;/g;
1505
1506	$_
1507	}
1508
1509	sub update {	1974	sub update {
1510	my ($self) = @_;	1975	my ($self) = @_;
1511		1976
1512	delete $self->{texture};	1977	delete $self->{texture};
1513	$self->SUPER::update;	1978	$self->SUPER::update;
1514	}	1979	}
1515		1980
		1981	sub realloc {
		1982	my ($self) = @_;
		1983
		1984	delete $self->{ox};
		1985	$self->SUPER::realloc;
		1986	}
		1987
1516	sub set_text {	1988	sub set_text {
1517	my ($self, $text) = @_;	1989	my ($self, $text) = @_;
1518		1990
1519	return if $self->{text} eq "T$text";	1991	return if $self->{text} eq "T$text";
1520	$self->{text} = "T$text";	1992	$self->{text} = "T$text";
1521		1993
1522	$self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1523	$self->{layout}->set_text ($text);	1994	$self->{layout}->set_text ($text);
1524		1995
		1996	delete $self->{size_req};
1525	$self->realloc;	1997	$self->realloc;
1526	$self->update;	1998	$self->update;
1527	}	1999	}
1528		2000
1529	sub set_markup {	2001	sub set_markup {
…		…
1532	return if $self->{text} eq "M$markup";	2004	return if $self->{text} eq "M$markup";
1533	$self->{text} = "M$markup";	2005	$self->{text} = "M$markup";
1534		2006
1535	my $rgba = $markup =~ /span.*(?:foreground|background)/;	2007	my $rgba = $markup =~ /span.*(?:foreground|background)/;
1536		2008
1537	$self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1538	$self->{layout}->set_markup ($markup);	2009	$self->{layout}->set_markup ($markup);
1539		2010
		2011	delete $self->{size_req};
1540	$self->realloc;	2012	$self->realloc;
1541	$self->update;	2013	$self->update;
1542	}	2014	}
1543		2015
1544	sub size_request {	2016	sub size_request {
1545	my ($self) = @_;	2017	my ($self) = @_;
1546		2018
		2019	$self->{size_req} ||= do {
1547	$self->{layout}->set_font ($self->{font}) if $self->{font};	2020	$self->{layout}->set_font ($self->{font}) if $self->{font};
1548	$self->{layout}->set_width ($self->{max_w} || -1);	2021	$self->{layout}->set_width ($self->{max_w} || -1);
1549	$self->{layout}->set_ellipsise ($self->{ellipsise});	2022	$self->{layout}->set_ellipsise ($self->{ellipsise});
1550	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});	2023	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1551	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	2024	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1552		2025
1553	my ($w, $h) = $self->{layout}->size;	2026	my ($w, $h) = $self->{layout}->size;
1554		2027
1555	if (exists $self->{template}) {	2028	if (exists $self->{template}) {
1556	$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);
1557	$self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);	2031	$self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1558		2032
1559	my ($w2, $h2) = $self->{template}->size;	2033	my ($w2, $h2) = $self->{template}->size;
1560		2034
1561	$w = List::Util::max $w, $w2;	2035	$w = List::Util::max $w, $w2;
1562	$h = List::Util::max $h, $h2;	2036	$h = List::Util::max $h, $h2;
		2037	}
		2038
		2039	[$w, $h]
1563	}	2040	};
1564		2041
1565	($w, $h)	2042	@{ $self->{size_req} }
1566	}	2043	}
1567		2044
		2045	sub baseline_shift {
		2046	$_[0]{layout}->descent
		2047	}
		2048
1568	sub size_allocate {	2049	sub invoke_size_allocate {
1569	my ($self, $w, $h) = @_;	2050	my ($self, $w, $h) = @_;
1570		2051
1571	delete $self->{ox};	2052	delete $self->{ox};
1572		2053
1573	delete $self->{texture}	2054	delete $self->{texture}
1574	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
1575	}	2058	}
1576		2059
1577	sub set_fontsize {	2060	sub set_fontsize {
1578	my ($self, $fontsize) = @_;	2061	my ($self, $fontsize) = @_;
1579		2062
1580	$self->{fontsize} = $fontsize;	2063	$self->{fontsize} = $fontsize;
		2064	delete $self->{size_req};
1581	delete $self->{texture};	2065	delete $self->{texture};
1582		2066
1583	$self->realloc;	2067	$self->realloc;
1584	}	2068	}
1585		2069
		2070	sub reconfigure {
		2071	my ($self) = @_;
		2072
		2073	delete $self->{size_req};
		2074	delete $self->{texture};
		2075
		2076	$self->SUPER::reconfigure;
		2077	}
		2078
1586	sub _draw {	2079	sub _draw {
1587	my ($self) = @_;	2080	my ($self) = @_;
1588		2081
1589	$self->SUPER::_draw; # draw background, if applicable	2082	$self->SUPER::_draw; # draw background, if applicable
1590		2083
1591	my $tex = $self->{texture} ||= do {	2084	my $size = $self->{texture} ||= do {
1592	$self->{layout}->set_foreground (@{$self->{fg}});	2085	$self->{layout}->set_foreground (@{$self->{fg}});
1593	$self->{layout}->set_font ($self->{font}) if $self->{font};	2086	$self->{layout}->set_font ($self->{font}) if $self->{font};
1594	$self->{layout}->set_width ($self->{w});	2087	$self->{layout}->set_width ($self->{w});
1595	$self->{layout}->set_ellipsise ($self->{ellipsise});	2088	$self->{layout}->set_ellipsise ($self->{ellipsise});
1596	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});	2089	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1597	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	2090	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1598		2091
1599	new_from_layout CFClient::Texture $self->{layout}	2092	[$self->{layout}->size]
1600	};	2093	};
1601		2094
1602	unless (exists $self->{ox}) {	2095	unless (exists $self->{ox}) {
1603	$self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}	2096	$self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1604	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}	2097	: $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
1605	: ($self->{w} - $tex->{w}) * 0.5);	2098	: ($self->{w} - $size->[0]) * 0.5);
1606		2099
1607	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}	2100	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1608	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}	2101	: $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1609	: ($self->{h} - $tex->{h}) * 0.5);	2102	: ($self->{h} - $size->[1]) * 0.5);
1610	};	2103	};
1611		2104
1612	glEnable GL_TEXTURE_2D;	2105	my $w = List::Util::min $self->{w} + 4, $size->[0];
1613	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2106	my $h = List::Util::min $self->{h} + 2, $size->[1];
1614		2107
1615	if ($tex->{format} == GL_ALPHA) {	2108	$self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1616	glColor @{$self->{fg}};
1617	$tex->draw_quad_alpha ($self->{ox}, $self->{oy});
1618	} else {
1619	$tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1620	}
1621
1622	glDisable GL_TEXTURE_2D;
1623	}	2109	}
1624		2110
1625	#############################################################################	2111	#############################################################################
1626		2112
1627	package CFClient::UI::EntryBase;	2113	package CFPlus::UI::EntryBase;
1628		2114
1629	our @ISA = CFClient::UI::Label::;	2115	our @ISA = CFPlus::UI::Label::;
1630		2116
1631	use CFClient::OpenGL;	2117	use CFPlus::OpenGL;
1632		2118
1633	sub new {	2119	sub new {
1634	my $class = shift;	2120	my $class = shift;
1635		2121
1636	$class->SUPER::new (	2122	$class->SUPER::new (
…		…
1640	active_fg => [0, 0, 0],	2126	active_fg => [0, 0, 0],
1641	can_hover => 1,	2127	can_hover => 1,
1642	can_focus => 1,	2128	can_focus => 1,
1643	valign => 0,	2129	valign => 0,
1644	can_events => 1,	2130	can_events => 1,
		2131	ellipsise => 0,
1645	#text => ...	2132	#text => ...
		2133	#hidden => "*",
1646	@_	2134	@_
1647	)	2135	)
1648	}	2136	}
1649		2137
1650	sub _set_text {	2138	sub _set_text {
…		…
1652		2140
1653	delete $self->{cur_h};	2141	delete $self->{cur_h};
1654		2142
1655	return if $self->{text} eq $text;	2143	return if $self->{text} eq $text;
1656		2144
1657	delete $self->{texture};
1658
1659	$self->{last_activity} = $::NOW;	2145	$self->{last_activity} = $::NOW;
1660	$self->{text} = $text;	2146	$self->{text} = $text;
1661		2147
1662	$text =~ s/./*/g if $self->{hidden};	2148	$text =~ s/./*/g if $self->{hidden};
1663	$self->{layout}->set_text ("$text ");	2149	$self->{layout}->set_text ("$text ");
		2150	delete $self->{size_req};
1664		2151
1665	$self->_emit (changed => $self->{text});	2152	$self->emit (changed => $self->{text});
		2153
		2154	$self->realloc;
		2155	$self->update;
1666	}	2156	}
1667		2157
1668	sub set_text {	2158	sub set_text {
1669	my ($self, $text) = @_;	2159	my ($self, $text) = @_;
1670		2160
1671	$self->{cursor} = length $text;	2161	$self->{cursor} = length $text;
1672	$self->_set_text ($text);	2162	$self->_set_text ($text);
1673
1674	$self->realloc;
1675	}	2163	}
1676		2164
1677	sub get_text {	2165	sub get_text {
1678	$_[0]{text}	2166	$_[0]{text}
1679	}	2167	}
…		…
1684	my ($w, $h) = $self->SUPER::size_request;	2172	my ($w, $h) = $self->SUPER::size_request;
1685		2173
1686	($w + 1, $h) # add 1 for cursor	2174	($w + 1, $h) # add 1 for cursor
1687	}	2175	}
1688		2176
1689	sub key_down {	2177	sub invoke_key_down {
1690	my ($self, $ev) = @_;	2178	my ($self, $ev) = @_;
1691		2179
1692	my $mod = $ev->{mod};	2180	my $mod = $ev->{mod};
1693	my $sym = $ev->{sym};	2181	my $sym = $ev->{sym};
1694	my $uni = $ev->{unicode};	2182	my $uni = $ev->{unicode};
1695		2183
1696	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;
1697		2187
1698	if ($uni == 8) {	2188	if ($uni == 8) {
1699	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};	2189	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1700	} elsif ($uni == 127) {	2190	} elsif ($uni == 127) {
1701	substr $text, $self->{cursor}, 1, "";	2191	substr $text, $self->{cursor}, 1, "";
1702	} elsif ($sym == CFClient::SDLK_LEFT) {	2192	} elsif ($sym == CFPlus::SDLK_LEFT) {
1703	--$self->{cursor} if $self->{cursor};	2193	--$self->{cursor} if $self->{cursor};
1704	} elsif ($sym == CFClient::SDLK_RIGHT) {	2194	} elsif ($sym == CFPlus::SDLK_RIGHT) {
1705	++$self->{cursor} if $self->{cursor} < length $self->{text};	2195	++$self->{cursor} if $self->{cursor} < length $self->{text};
1706	} 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 = "";
1707	$self->{cursor} = 0;	2210	$self->{cursor} = 0;
1708	} elsif ($sym == CFClient::SDLK_END) {
1709	$self->{cursor} = length $text;
1710	} elsif ($uni == 27) {	2211	} elsif ($uni == 27) {
1711	$self->_emit ('escape');	2212	$self->emit ('escape');
1712	} elsif ($uni) {	2213	} elsif ($uni == 0x0d) {
		2214	substr $text, $self->{cursor}++, 0, "\012";
		2215	} elsif ($uni >= 0x20) {
1713	substr $text, $self->{cursor}++, 0, chr $uni;	2216	substr $text, $self->{cursor}++, 0, chr $uni;
		2217	} else {
		2218	return 0;
1714	}	2219	}
1715		2220
1716	$self->_set_text ($text);	2221	$self->_set_text ($text);
1717		2222
1718	$self->realloc;	2223	$self->realloc;
1719	}	2224	$self->update;
1720		2225
		2226	1
		2227	}
		2228
1721	sub focus_in {	2229	sub invoke_focus_in {
1722	my ($self) = @_;	2230	my ($self) = @_;
1723		2231
1724	$self->{last_activity} = $::NOW;	2232	$self->{last_activity} = $::NOW;
1725		2233
1726	$self->SUPER::focus_in;	2234	$self->SUPER::invoke_focus_in
1727	}	2235	}
1728		2236
1729	sub button_down {	2237	sub invoke_button_down {
1730	my ($self, $ev, $x, $y) = @_;	2238	my ($self, $ev, $x, $y) = @_;
1731		2239
1732	$self->SUPER::button_down ($ev, $x, $y);	2240	$self->SUPER::invoke_button_down ($ev, $x, $y);
1733		2241
1734	my $idx = $self->{layout}->xy_to_index ($x, $y);	2242	my $idx = $self->{layout}->xy_to_index ($x, $y);
1735		2243
1736	# byte-index to char-index	2244	# byte-index to char-index
1737	my $text = $self->{text};	2245	my $text = $self->{text};
1738	utf8::encode $text;	2246	utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1739	$self->{cursor} = length substr $text, 0, $idx;	2247	$self->{cursor} = length $text;
1740		2248
1741	$self->_set_text ($self->{text});	2249	$self->_set_text ($self->{text});
1742	$self->update;	2250	$self->update;
		2251
		2252	1
1743	}	2253	}
1744		2254
1745	sub mouse_motion {	2255	sub invoke_mouse_motion {
1746	my ($self, $ev, $x, $y) = @_;	2256	my ($self, $ev, $x, $y) = @_;
1747	# 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
1748	}	2260	}
1749		2261
1750	sub _draw {	2262	sub _draw {
1751	my ($self) = @_;	2263	my ($self) = @_;
1752		2264
1753	local $self->{fg} = $self->{fg};	2265	local $self->{fg} = $self->{fg};
1754		2266
1755	if ($FOCUS == $self) {	2267	if ($FOCUS == $self) {
1756	glColor @{$self->{active_bg}};	2268	glColor_premultiply @{$self->{active_bg}};
1757	$self->{fg} = $self->{active_fg};	2269	$self->{fg} = $self->{active_fg};
1758	} else {	2270	} else {
1759	glColor @{$self->{bg}};	2271	glColor_premultiply @{$self->{bg}};
1760	}	2272	}
1761		2273
1762	glEnable GL_BLEND;	2274	glEnable GL_BLEND;
1763	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	2275	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1764	glBegin GL_QUADS;	2276	glBegin GL_QUADS;
1765	glVertex 0 , 0;	2277	glVertex 0 , 0;
1766	glVertex 0 , $self->{h};	2278	glVertex 0 , $self->{h};
1767	glVertex $self->{w}, $self->{h};	2279	glVertex $self->{w}, $self->{h};
1768	glVertex $self->{w}, 0;	2280	glVertex $self->{w}, 0;
…		…
1779	utf8::encode $text;	2291	utf8::encode $text;
1780		2292
1781	@$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)
1782	}	2294	}
1783		2295
1784	glColor @{$self->{fg}};
1785	glBegin GL_LINES;	2296	glBegin GL_LINES;
1786	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};
1787	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};
1788	glEnd;	2299	glEnd;
1789	}	2300	}
1790	}	2301	}
1791		2302
		2303	#############################################################################
		2304
1792	package CFClient::UI::Entry;	2305	package CFPlus::UI::Entry;
1793		2306
1794	our @ISA = CFClient::UI::EntryBase::;	2307	our @ISA = CFPlus::UI::EntryBase::;
1795		2308
1796	use CFClient::OpenGL;	2309	use CFPlus::OpenGL;
1797		2310
1798	sub key_down {	2311	sub invoke_key_down {
1799	my ($self, $ev) = @_;	2312	my ($self, $ev) = @_;
1800		2313
1801	my $sym = $ev->{sym};	2314	my $sym = $ev->{sym};
1802		2315
1803	if ($sym == 13) {	2316	if ($ev->{uni} == 0x0d || $sym == 13) {
1804	unshift @{$self->{history}},	2317	unshift @{$self->{history}},
1805	my $txt = $self->get_text;	2318	my $txt = $self->get_text;
		2319
1806	$self->{history_pointer} = -1;	2320	$self->{history_pointer} = -1;
1807	$self->{history_saveback} = '';	2321	$self->{history_saveback} = '';
1808	$self->_emit (activate => $txt);	2322	$self->emit (activate => $txt);
1809	$self->update;	2323	$self->update;
1810		2324
1811	} elsif ($sym == CFClient::SDLK_UP) {	2325	} elsif ($sym == CFPlus::SDLK_UP) {
1812	if ($self->{history_pointer} < 0) {	2326	if ($self->{history_pointer} < 0) {
1813	$self->{history_saveback} = $self->get_text;	2327	$self->{history_saveback} = $self->get_text;
1814	}	2328	}
1815	if (@{$self->{history} || []} > 0) {	2329	if (@{$self->{history} || []} > 0) {
1816	$self->{history_pointer}++;	2330	$self->{history_pointer}++;
…		…
1818	$self->{history_pointer} = @{$self->{history} || []} - 1;	2332	$self->{history_pointer} = @{$self->{history} || []} - 1;
1819	}	2333	}
1820	$self->set_text ($self->{history}->[$self->{history_pointer}]);	2334	$self->set_text ($self->{history}->[$self->{history_pointer}]);
1821	}	2335	}
1822		2336
1823	} elsif ($sym == CFClient::SDLK_DOWN) {	2337	} elsif ($sym == CFPlus::SDLK_DOWN) {
1824	$self->{history_pointer}--;	2338	$self->{history_pointer}--;
1825	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;	2339	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1826		2340
1827	if ($self->{history_pointer} >= 0) {	2341	if ($self->{history_pointer} >= 0) {
1828	$self->set_text ($self->{history}->[$self->{history_pointer}]);	2342	$self->set_text ($self->{history}->[$self->{history_pointer}]);
1829	} else {	2343	} else {
1830	$self->set_text ($self->{history_saveback});	2344	$self->set_text ($self->{history_saveback});
1831	}	2345	}
1832		2346
1833	} else {	2347	} else {
1834	$self->SUPER::key_down ($ev);	2348	return $self->SUPER::invoke_key_down ($ev)
		2349	}
		2350
1835	}	2351	1
1836
1837	}	2352	}
1838		2353
1839	#############################################################################	2354	#############################################################################
1840		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
1841	package CFClient::UI::Button;	2395	package CFPlus::UI::Button;
1842		2396
1843	our @ISA = CFClient::UI::Label::;	2397	our @ISA = CFPlus::UI::Label::;
1844		2398
1845	use CFClient::OpenGL;	2399	use CFPlus::OpenGL;
1846		2400
1847	my @tex =	2401	my @tex =
1848	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2402	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1849	qw(b1_button_active.png);	2403	qw(b1_button_inactive.png b1_button_active.png);
1850		2404
1851	sub new {	2405	sub new {
1852	my $class = shift;	2406	my $class = shift;
1853		2407
1854	$class->SUPER::new (	2408	$class->SUPER::new (
1855	padding_x => 4,	2409	padding_x => 4,
1856	padding_y => 4,	2410	padding_y => 4,
1857	fg => [1, 1, 1],	2411	fg => [1.0, 1.0, 1.0],
1858	active_fg => [0, 0, 1],	2412	active_fg => [0.8, 0.8, 0.8],
1859	can_hover => 1,	2413	can_hover => 1,
1860	align => 0,	2414	align => 0,
1861	valign => 0,	2415	valign => 0,
1862	can_events => 1,	2416	can_events => 1,
1863	@_	2417	@_
1864	)	2418	)
1865	}	2419	}
1866		2420
1867	sub activate { }
1868
1869	sub button_up {	2421	sub invoke_button_up {
1870	my ($self, $ev, $x, $y) = @_;	2422	my ($self, $ev, $x, $y) = @_;
1871		2423
1872	$self->emit ("activate")	2424	$self->emit ("activate")
1873	if $x >= 0 && $x < $self->{w}	2425	if $x >= 0 && $x < $self->{w}
1874	&& $y >= 0 && $y < $self->{h};	2426	&& $y >= 0 && $y < $self->{h};
		2427
		2428	1
1875	}	2429	}
1876		2430
1877	sub _draw {	2431	sub _draw {
1878	my ($self) = @_;	2432	my ($self) = @_;
1879		2433
1880	local $self->{fg} = $self->{fg};	2434	local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1881
1882	if ($GRAB == $self) {
1883	$self->{fg} = $self->{active_fg};
1884	}
1885		2435
1886	glEnable GL_TEXTURE_2D;	2436	glEnable GL_TEXTURE_2D;
1887	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2437	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1888	glColor 0, 0, 0, 1;	2438	glColor 0, 0, 0, 1;
1889		2439
		2440	my $tex = $tex[$GRAB == $self];
1890	$tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});	2441	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1891		2442
1892	glDisable GL_TEXTURE_2D;	2443	glDisable GL_TEXTURE_2D;
1893		2444
1894	$self->SUPER::_draw;	2445	$self->SUPER::_draw;
1895	}	2446	}
1896		2447
1897	#############################################################################	2448	#############################################################################
1898		2449
1899	package CFClient::UI::CheckBox;	2450	package CFPlus::UI::CheckBox;
1900		2451
1901	our @ISA = CFClient::UI::DrawBG::;	2452	our @ISA = CFPlus::UI::DrawBG::;
1902		2453
1903	my @tex =	2454	my @tex =
1904	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2455	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1905	qw(c1_checkbox_bg.png c1_checkbox_active.png);	2456	qw(c1_checkbox_bg.png c1_checkbox_active.png);
1906		2457
1907	use CFClient::OpenGL;	2458	use CFPlus::OpenGL;
1908		2459
1909	sub new {	2460	sub new {
1910	my $class = shift;	2461	my $class = shift;
1911		2462
1912	$class->SUPER::new (	2463	$class->SUPER::new (
…		…
1926	my ($self) = @_;	2477	my ($self) = @_;
1927		2478
1928	(6) x 2	2479	(6) x 2
1929	}	2480	}
1930		2481
		2482	sub toggle {
		2483	my ($self) = @_;
		2484
		2485	$self->{state} = !$self->{state};
		2486	$self->emit (changed => $self->{state});
		2487	$self->update;
		2488	}
		2489
1931	sub button_down {	2490	sub invoke_button_down {
1932	my ($self, $ev, $x, $y) = @_;	2491	my ($self, $ev, $x, $y) = @_;
1933		2492
1934	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}	2493	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1935	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {	2494	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1936	$self->{state} = !$self->{state};	2495	$self->toggle;
1937	$self->_emit (changed => $self->{state});	2496	} else {
		2497	return 0
		2498	}
		2499
1938	}	2500	1
1939	}	2501	}
1940		2502
1941	sub _draw {	2503	sub _draw {
1942	my ($self) = @_;	2504	my ($self) = @_;
1943		2505
…		…
1958	glDisable GL_TEXTURE_2D;	2520	glDisable GL_TEXTURE_2D;
1959	}	2521	}
1960		2522
1961	#############################################################################	2523	#############################################################################
1962		2524
1963	package CFClient::UI::Image;	2525	package CFPlus::UI::Image;
1964		2526
1965	our @ISA = CFClient::UI::Base::;	2527	our @ISA = CFPlus::UI::Base::;
1966		2528
1967	use CFClient::OpenGL;	2529	use CFPlus::OpenGL;
1968	use Carp qw/confess/;
1969		2530
1970	our %loaded_images;	2531	our %texture_cache;
1971		2532
1972	sub new {	2533	sub new {
1973	my $class = shift;	2534	my $class = shift;
1974		2535
1975	my $self = $class->SUPER::new (can_events => 0, @_);	2536	my $self = $class->SUPER::new (
		2537	can_events => 0,
		2538	@_,
		2539	);
1976		2540
1977	$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";
1978		2543
1979	$loaded_images{$self->{image}} ||=	2544	$self->{tex} ||= $texture_cache{$self->{path}} ||=
1980	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;
1981		2546
1982	my $tex = $self->{tex} = $loaded_images{$self->{image}};	2547	CFPlus::weaken $texture_cache{$self->{path}};
1983		2548
1984	Scalar::Util::weaken $loaded_images{$self->{image}};	2549	$self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
1985
1986	$self->{aspect} = $tex->{w} / $tex->{h};
1987		2550
1988	$self	2551	$self
1989	}	2552	}
1990		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
1991	sub size_request {	2569	sub size_request {
1992	my ($self) = @_;	2570	my ($self) = @_;
1993		2571
1994	($self->{tex}->{w}, $self->{tex}->{h})	2572	($self->{tex}{w}, $self->{tex}{h})
1995	}	2573	}
1996		2574
1997	sub _draw {	2575	sub _draw {
1998	my ($self) = @_;	2576	my ($self) = @_;
1999		2577
…		…
2009	}	2587	}
2010		2588
2011	glEnable GL_TEXTURE_2D;	2589	glEnable GL_TEXTURE_2D;
2012	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2590	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2013		2591
2014	$tex->draw_quad_alpha (0, 0, $w, $h);	2592	$tex->draw_quad (0, 0, $w, $h);
2015		2593
2016	glDisable GL_TEXTURE_2D;	2594	glDisable GL_TEXTURE_2D;
2017	}	2595	}
2018		2596
2019	#############################################################################	2597	#############################################################################
2020		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
2021	package CFClient::UI::VGauge;	2635	package CFPlus::UI::VGauge;
2022		2636
2023	our @ISA = CFClient::UI::Base::;	2637	our @ISA = CFPlus::UI::Base::;
2024		2638
2025	use List::Util qw(min max);	2639	use List::Util qw(min max);
2026		2640
2027	use CFClient::OpenGL;	2641	use CFPlus::OpenGL;
2028		2642
2029	my %tex = (	2643	my %tex = (
2030	food => [	2644	food => [
2031	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2645	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2032	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/	2646	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2033	],	2647	],
2034	grace => [	2648	grace => [
2035	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2649	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2036	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/
2037	],	2651	],
2038	hp => [	2652	hp => [
2039	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2653	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2040	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/	2654	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2041	],	2655	],
2042	mana => [	2656	mana => [
2043	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2657	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2044	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/
2045	],	2659	],
2046	);	2660	);
2047		2661
2048	# eg. VGauge->new (gauge => 'food'), default gauge: food	2662	# eg. VGauge->new (gauge => 'food'), default gauge: food
…		…
2108	my $ycut1 = max 0, min 1, $ycut;	2722	my $ycut1 = max 0, min 1, $ycut;
2109	my $ycut2 = max 0, min 1, $ycut - 1;	2723	my $ycut2 = max 0, min 1, $ycut - 1;
2110		2724
2111	my $h1 = $self->{h} * (1 - $ycut1);	2725	my $h1 = $self->{h} * (1 - $ycut1);
2112	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);
2113		2730
2114	glEnable GL_BLEND;	2731	glEnable GL_BLEND;
2115	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;
2116	glEnable GL_TEXTURE_2D;	2734	glEnable GL_TEXTURE_2D;
2117	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2735	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2118		2736
2119	glBindTexture GL_TEXTURE_2D, $t1->{name};	2737	glBindTexture GL_TEXTURE_2D, $t1->{name};
2120	glBegin GL_QUADS;	2738	glBegin GL_QUADS;
…		…
2135		2753
2136	if ($t3) {	2754	if ($t3) {
2137	glBindTexture GL_TEXTURE_2D, $t3->{name};	2755	glBindTexture GL_TEXTURE_2D, $t3->{name};
2138	glBegin GL_QUADS;	2756	glBegin GL_QUADS;
2139	glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;	2757	glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2140	glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h};	2758	glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2141	glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h};	2759	glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2142	glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;	2760	glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2143	glEnd;	2761	glEnd;
2144	}	2762	}
2145		2763
2146	glDisable GL_BLEND;	2764	glDisable GL_BLEND;
2147	glDisable GL_TEXTURE_2D;	2765	glDisable GL_TEXTURE_2D;
2148	}	2766	}
2149		2767
2150	#############################################################################	2768	#############################################################################
2151		2769
2152	package CFClient::UI::Gauge;	2770	package CFPlus::UI::Gauge;
2153		2771
2154	our @ISA = CFClient::UI::VBox::;	2772	our @ISA = CFPlus::UI::VBox::;
2155		2773
2156	sub new {	2774	sub new {
2157	my ($class, %arg) = @_;	2775	my ($class, %arg) = @_;
2158		2776
2159	my $self = $class->SUPER::new (	2777	my $self = $class->SUPER::new (
…		…
2161	can_hover => 1,	2779	can_hover => 1,
2162	can_events => 1,	2780	can_events => 1,
2163	%arg,	2781	%arg,
2164	);	2782	);
2165		2783
2166	$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");
2167	$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);
2168	$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");
2169		2787
2170	$self	2788	$self
2171	}	2789	}
2172		2790
2173	sub set_fontsize {	2791	sub set_fontsize {
…		…
2194	$self->{value}->set_text ($val);	2812	$self->{value}->set_text ($val);
2195	}	2813	}
2196		2814
2197	#############################################################################	2815	#############################################################################
2198		2816
2199	package CFClient::UI::Slider;	2817	package CFPlus::UI::Slider;
2200		2818
2201	use strict;	2819	use strict;
2202		2820
2203	use CFClient::OpenGL;	2821	use CFPlus::OpenGL;
2204		2822
2205	our @ISA = CFClient::UI::DrawBG::;	2823	our @ISA = CFPlus::UI::DrawBG::;
2206		2824
2207	my @tex =	2825	my @tex =
2208	map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }	2826	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
2209	qw(s1_slider.png s1_slider_bg.png);	2827	qw(s1_slider.png s1_slider_bg.png);
2210		2828
2211	sub new {	2829	sub new {
2212	my $class = shift;	2830	my $class = shift;
2213		2831
…		…
2234	$self->update;	2852	$self->update;
2235		2853
2236	$self	2854	$self
2237	}	2855	}
2238		2856
2239	sub changed { }
2240
2241	sub set_range {	2857	sub set_range {
2242	my ($self, $range) = @_;	2858	my ($self, $range) = @_;
2243		2859
2244	($range, $self->{range}) = ($self->{range}, $range);	2860	($range, $self->{range}) = ($self->{range}, $range);
2245		2861
2246	$self->update
2247	if "@$range" ne "@{$self->{range}}";	2862	if ("@$range" ne "@{$self->{range}}") {
		2863	$self->update;
		2864	$self->set_value ($self->{range}[0]);
		2865	}
2248	}	2866	}
2249		2867
2250	sub set_value {	2868	sub set_value {
2251	my ($self, $value) = @_;	2869	my ($self, $value) = @_;
2252		2870
…		…
2263	if $unit;	2881	if $unit;
2264		2882
2265	@{$self->{range}} = ($value, $lo, $hi, $page, $unit);	2883	@{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2266		2884
2267	if ($value != $old_value) {	2885	if ($value != $old_value) {
2268	$self->_emit (changed => $value);	2886	$self->emit (changed => $value);
2269	$self->update;	2887	$self->update;
2270	}	2888	}
2271	}	2889	}
2272		2890
2273	sub size_request {	2891	sub size_request {
2274	my ($self) = @_;	2892	my ($self) = @_;
2275		2893
2276	($self->{req_w}, $self->{req_h})	2894	($self->{req_w}, $self->{req_h})
2277	}	2895	}
2278		2896
2279	sub button_down {	2897	sub invoke_button_down {
2280	my ($self, $ev, $x, $y) = @_;	2898	my ($self, $ev, $x, $y) = @_;
2281		2899
2282	$self->SUPER::button_down ($ev, $x, $y);	2900	$self->SUPER::invoke_button_down ($ev, $x, $y);
2283		2901
2284	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];	2902	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2285		2903
2286	$self->mouse_motion ($ev, $x, $y);	2904	$self->invoke_mouse_motion ($ev, $x, $y)
2287	}	2905	}
2288		2906
2289	sub mouse_motion {	2907	sub invoke_mouse_motion {
2290	my ($self, $ev, $x, $y) = @_;	2908	my ($self, $ev, $x, $y) = @_;
2291		2909
2292	if ($GRAB == $self) {	2910	if ($GRAB == $self) {
2293	my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});	2911	my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2294		2912
2295	my (undef, $lo, $hi, $page) = @{$self->{range}};	2913	my (undef, $lo, $hi, $page) = @{$self->{range}};
2296		2914
2297	$x = ($x - $self->{click}[1]) / ($w * $self->{scale});	2915	$x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2298		2916
2299	$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
2300	}	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
2301	}	2935	}
2302		2936
2303	sub update {	2937	sub update {
2304	my ($self) = @_;	2938	my ($self) = @_;
2305		2939
2306	$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}) {
2307	$self->set_value ($self->{range}[0]);	2948	$self->set_value ($self->{range}[0]);
2308		2949
2309	my ($value, $lo, $hi, $page) = @{$self->{range}};	2950	my ($value, $lo, $hi, $page) = @{$self->{range}};
2310	my $range = ($hi - $page - $lo) || 1e-100;	2951	my $range = ($hi - $page - $lo) || 1e-100;
2311		2952
…		…
2317	$value = ($value - $lo) / $range;	2958	$value = ($value - $lo) / $range;
2318	$value = $value * $self->{scale} + $self->{offset};	2959	$value = $value * $self->{scale} + $self->{offset};
2319		2960
2320	$self->{knob_x} = $value - $knob_w * 0.5;	2961	$self->{knob_x} = $value - $knob_w * 0.5;
2321	$self->{knob_w} = $knob_w;	2962	$self->{knob_w} = $knob_w;
2322	});	2963	}
2323
2324	$self->SUPER::update;
2325	}
2326
2327	sub _draw {
2328	my ($self) = @_;
2329		2964
2330	$self->SUPER::_draw ();	2965	$self->SUPER::_draw ();
2331		2966
2332	glScale $self->{w}, $self->{h};	2967	glScale $self->{w}, $self->{h};
2333		2968
…		…
2353	glDisable GL_TEXTURE_2D;	2988	glDisable GL_TEXTURE_2D;
2354	}	2989	}
2355		2990
2356	#############################################################################	2991	#############################################################################
2357		2992
2358	package CFClient::UI::ValSlider;	2993	package CFPlus::UI::ValSlider;
2359		2994
2360	our @ISA = CFClient::UI::HBox::;	2995	our @ISA = CFPlus::UI::HBox::;
2361		2996
2362	sub new {	2997	sub new {
2363	my ($class, %arg) = @_;	2998	my ($class, %arg) = @_;
2364		2999
2365	my $range = delete $arg{range};	3000	my $range = delete $arg{range};
2366		3001
2367	my $self = $class->SUPER::new (	3002	my $self = $class->SUPER::new (
2368	slider => (new CFClient::UI::Slider expand => 1, range => $range),	3003	slider => (new CFPlus::UI::Slider expand => 1, range => $range),
2369	entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),	3004	entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
2370	to_value => sub { shift },	3005	to_value => sub { shift },
2371	from_value => sub { shift },	3006	from_value => sub { shift },
2372	%arg,	3007	%arg,
2373	);	3008	);
2374		3009
…		…
2394	sub set_range { shift->{slider}->set_range (@_) }	3029	sub set_range { shift->{slider}->set_range (@_) }
2395	sub set_value { shift->{slider}->set_value (@_) }	3030	sub set_value { shift->{slider}->set_value (@_) }
2396		3031
2397	#############################################################################	3032	#############################################################################
2398		3033
2399	package CFClient::UI::TextView;	3034	package CFPlus::UI::TextScroller;
2400		3035
2401	our @ISA = CFClient::UI::HBox::;	3036	our @ISA = CFPlus::UI::HBox::;
2402		3037
2403	use CFClient::OpenGL;	3038	use CFPlus::OpenGL;
2404		3039
2405	sub new {	3040	sub new {
2406	my $class = shift;	3041	my $class = shift;
2407		3042
2408	my $self = $class->SUPER::new (	3043	my $self = $class->SUPER::new (
2409	fontsize => 1,	3044	fontsize => 1,
2410	can_events => 0,	3045	can_events => 1,
		3046	indent => 0,
2411	#font => default_font	3047	#font => default_font
2412	@_,	3048	@_,
2413		3049
2414	layout => (new CFClient::Layout 1),	3050	layout => (new CFPlus::Layout),
2415	par => [],	3051	par => [],
		3052	max_par => 0,
2416	height => 0,	3053	height => 0,
2417	children => [	3054	children => [
2418	(new CFClient::UI::Empty expand => 1),	3055	(new CFPlus::UI::Empty expand => 1),
2419	(new CFClient::UI::Slider vertical => 1),	3056	(new CFPlus::UI::Slider vertical => 1),
2420	],	3057	],
2421	);	3058	);
2422		3059
2423	$self->{children}[1]->connect (changed => sub { $self->update });	3060	$self->{children}[1]->connect (changed => sub { $self->update });
2424		3061
…		…
2430		3067
2431	$self->{fontsize} = $fontsize;	3068	$self->{fontsize} = $fontsize;
2432	$self->reflow;	3069	$self->reflow;
2433	}	3070	}
2434		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
2435	sub size_allocate {	3081	sub invoke_size_allocate {
2436	my ($self, $w, $h) = @_;	3082	my ($self, $w, $h) = @_;
2437		3083
2438	$self->SUPER::size_allocate ($w, $h);	3084	my ($empty, $slider, @other) = @{ $self->{children} };
		3085	$_->configure (@$_{qw(x y req_w req_h)}) for @other;
2439		3086
2440	$self->{layout}->set_font ($self->{font}) if $self->{font};	3087	$self->{layout}->set_font ($self->{font}) if $self->{font};
2441	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	3088	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2442	$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});
2443		3091
2444	$self->reflow;	3092	$self->reflow;
2445	}
2446		3093
2447	sub text_size {	3094	local $self->{children} = [$empty, $slider];
		3095	$self->SUPER::invoke_size_allocate ($w, $h)
		3096	}
		3097
		3098	sub invoke_mouse_wheel {
2448	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) = @_;
2449		3110
2450	my $layout = $self->{layout};	3111	my $layout = $self->{layout};
2451		3112
		3113	$layout->set_font ($self->{font}) if $self->{font};
		3114	$layout->set_foreground (@{$para->{fg}});
2452	$layout->set_height ($self->{fontsize} * $::FONTSIZE);	3115	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
2453	$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});
2454	$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}}
2455		3124	);
		3125
2456	$layout->size	3126	$layout
2457	}	3127	}
2458		3128
2459	sub reflow {	3129	sub reflow {
2460	my ($self) = @_;	3130	my ($self) = @_;
2461		3131
…		…
2468		3138
2469	# todo: base offset on lines or so, not on pixels	3139	# todo: base offset on lines or so, not on pixels
2470	$self->{children}[1]->set_value ($offset);	3140	$self->{children}[1]->set_value ($offset);
2471	}	3141	}
2472		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
2473	sub clear {	3158	sub clear {
2474	my ($self) = @_;	3159	my ($self) = @_;
		3160
		3161	my (undef, undef, @other) = @{ $self->{children} };
		3162	$self->remove ($_) for @other;
2475		3163
2476	$self->{par} = [];	3164	$self->{par} = [];
2477	$self->{height} = 0;	3165	$self->{height} = 0;
2478	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);	3166	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2479	}	3167	}
2480		3168
2481	sub add_paragraph {	3169	sub add_paragraph {
2482	my ($self, $color, $text, $indent) = @_;	3170	my $self = shift;
2483		3171
2484	for my $line (split /\n/, $text) {	3172	for my $para (@_) {
2485	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
2486	$self->{height} += $h;	3224	$self->{height} = $height;
2487	push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];	3225	$self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2488	}
2489		3226
2490	$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	}
2491	}	3233	}
2492		3234
2493	sub update {	3235	sub update {
2494	my ($self) = @_;	3236	my ($self) = @_;
2495		3237
…		…
2497		3239
2498	return unless $self->{h} > 0;	3240	return unless $self->{h} > 0;
2499		3241
2500	delete $self->{texture};	3242	delete $self->{texture};
2501		3243
2502	$ROOT->on_post_alloc ($self, sub {	3244	$ROOT->on_post_alloc ($self => sub {
		3245	$self->force_uptodate;
		3246
2503	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};	3247	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2504		3248
2505	if (delete $self->{need_reflow}) {
2506	my $height = 0;
2507
2508	my $layout = $self->{layout};
2509
2510	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
2511
2512	for (@{$self->{par}}) {
2513	if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2514	$layout->set_width ($W - $_->[3]);
2515	$layout->set_markup ($_->[4]);
2516	my ($w, $h) = $layout->size;
2517	$_->[0] = $w + $_->[3];
2518	$_->[1] = $h;
2519	}
2520
2521	$height += $_->[1];
2522	}
2523
2524	$self->{height} = $height;
2525
2526	$self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2527
2528	delete $self->{texture};
2529	}
2530
2531	$self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {	3249	$self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2532	glClearColor 0.5, 0.5, 0.5, 0;	3250	glClearColor 0, 0, 0, 0;
2533	glClear GL_COLOR_BUFFER_BIT;	3251	glClear GL_COLOR_BUFFER_BIT;
2534		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;
2535	my $top = int $self->{children}[1]{range}[0];	3261	my $top = int $self->{children}[1]{range}[0];
2536		3262
2537	my $y0 = $top;	3263	my $y0 = $top;
2538	my $y1 = $top + $H;	3264	my $y1 = $top + $H;
2539		3265
2540	my $y = 0;
2541
2542	my $layout = $self->{layout};
2543
2544	$layout->set_font ($self->{font}) if $self->{font};
2545
2546	glEnable GL_BLEND;
2547	#TODO# not correct in windows where rgba is forced off
2548	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2549
2550	for my $par (@{$self->{par}}) {	3266	for my $para (@{$self->{par}}) {
2551	my $h = $par->[1];	3267	my $h = $para->{h};
		3268	my $y = $para->{y};
2552		3269
2553	if ($y0 < $y + $h && $y < $y1) {	3270	if ($y0 < $y + $h && $y < $y1) {
2554	$layout->set_foreground (@{ $par->[2] });	3271	my $layout = $self->get_layout ($para);
2555	$layout->set_width ($W - $par->[3]);
2556	$layout->set_markup ($par->[4]);
2557		3272
2558	my ($w, $h, $data, $format, $internalformat) = $layout->render;	3273	$layout->render ($para->{indent}, $y - $y0);
2559		3274
2560	glRasterPos $par->[3], $y - $y0;	3275	if (my @w = @{ $para->{widget} }) {
2561	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	}
2562	}	3287	}
2563		3288
2564	$y += $h;	3289	$paridx++;
		3290	$top_paragraph ||= $paridx if $y >= $top;
2565	}	3291	}
2566		3292
2567	glDisable GL_BLEND;	3293	$self->{top_paragraph} = $top_paragraph;
2568	};	3294	};
2569	});	3295	});
2570	}	3296	}
2571		3297
		3298	sub reconfigure {
		3299	my ($self) = @_;
		3300
		3301	$self->SUPER::reconfigure;
		3302
		3303	$_->{w} = 1e10 for @{ $self->{par} };
		3304	$self->reflow;
		3305	}
		3306
2572	sub _draw {	3307	sub _draw {
2573	my ($self) = @_;	3308	my ($self) = @_;
2574		3309
2575	glEnable GL_TEXTURE_2D;	3310	glEnable GL_TEXTURE_2D;
2576	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	3311	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2577	glColor 1, 1, 1, 1;	3312	glColor 0, 0, 0, 1;
2578	$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});
2579	glDisable GL_TEXTURE_2D;	3314	glDisable GL_TEXTURE_2D;
2580		3315
2581	$self->{children}[1]->draw;	3316	$self->{children}[1]->draw;
2582
2583	}	3317	}
2584		3318
2585	#############################################################################	3319	#############################################################################
2586		3320
2587	package CFClient::UI::Animator;	3321	package CFPlus::UI::Animator;
2588		3322
2589	use CFClient::OpenGL;	3323	use CFPlus::OpenGL;
2590		3324
2591	our @ISA = CFClient::UI::Bin::;	3325	our @ISA = CFPlus::UI::Bin::;
2592		3326
2593	sub moveto {	3327	sub moveto {
2594	my ($self, $x, $y) = @_;	3328	my ($self, $x, $y) = @_;
2595		3329
2596	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];	3330	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
…		…
2624	glPopMatrix;	3358	glPopMatrix;
2625	}	3359	}
2626		3360
2627	#############################################################################	3361	#############################################################################
2628		3362
2629	package CFClient::UI::Flopper;	3363	package CFPlus::UI::Flopper;
2630		3364
2631	our @ISA = CFClient::UI::Button::;	3365	our @ISA = CFPlus::UI::Button::;
2632		3366
2633	sub new {	3367	sub new {
2634	my $class = shift;	3368	my $class = shift;
2635		3369
2636	my $self = $class->SUPER::new (	3370	my $self = $class->SUPER::new (
…		…
2648	$self->{other}->toggle_visibility;	3382	$self->{other}->toggle_visibility;
2649	}	3383	}
2650		3384
2651	#############################################################################	3385	#############################################################################
2652		3386
2653	package CFClient::UI::Tooltip;	3387	package CFPlus::UI::Tooltip;
2654		3388
2655	our @ISA = CFClient::UI::Bin::;	3389	our @ISA = CFPlus::UI::Bin::;
2656		3390
2657	use CFClient::OpenGL;	3391	use CFPlus::OpenGL;
2658		3392
2659	sub new {	3393	sub new {
2660	my $class = shift;	3394	my $class = shift;
2661		3395
2662	$class->SUPER::new (	3396	$class->SUPER::new (
…		…
2665	)	3399	)
2666	}	3400	}
2667		3401
2668	sub set_tooltip_from {	3402	sub set_tooltip_from {
2669	my ($self, $widget) = @_;	3403	my ($self, $widget) = @_;
		3404
		3405	$widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
		3406	if $widget->{tooltip} =~ /^#(.*)$/;
2670		3407
2671	my $tooltip = $widget->{tooltip};	3408	my $tooltip = $widget->{tooltip};
2672		3409
2673	if ($ENV{CFPLUS_DEBUG} & 2) {	3410	if ($ENV{CFPLUS_DEBUG} & 2) {
2674	$tooltip .= "\n\n" . (ref $widget) . "\n"	3411	$tooltip .= "\n\n" . (ref $widget) . "\n"
2675	. "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"	3412	. "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2676	. "req $widget->{req_w} $widget->{req_h}\n"	3413	. "req $widget->{req_w} $widget->{req_h}\n"
2677	. "visible $widget->{visible}";	3414	. "visible $widget->{visible}";
2678	}	3415	}
2679		3416
		3417	$tooltip =~ s/^\n+//;
		3418	$tooltip =~ s/\n+$//;
		3419
2680	$self->add (new CFClient::UI::Label	3420	$self->add (new CFPlus::UI::Label
2681	markup => $tooltip,	3421	markup => $tooltip,
2682	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,	3422	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2683	fontsize => 0.8,	3423	fontsize => 0.8,
2684	fg => [0, 0, 0, 1],	3424	style => 1, # FLAG_INVERSE
2685	ellipsise => 0,	3425	ellipsise => 0,
2686	font => ($widget->{tooltip_font} || $::FONT_PROP),	3426	font => ($widget->{tooltip_font} || $::FONT_PROP),
2687	);	3427	);
2688	}	3428	}
2689		3429
…		…
2693	my ($w, $h) = @{$self->child}{qw(req_w req_h)};	3433	my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2694		3434
2695	($w + 4, $h + 4)	3435	($w + 4, $h + 4)
2696	}	3436	}
2697		3437
2698	sub size_allocate {	3438	sub invoke_size_allocate {
2699	my ($self, $w, $h) = @_;	3439	my ($self, $w, $h) = @_;
2700		3440
2701	$self->SUPER::size_allocate ($w - 4, $h - 4);	3441	$self->SUPER::invoke_size_allocate ($w - 4, $h - 4)
2702	}	3442	}
2703		3443
2704	sub visibility_change {	3444	sub invoke_visibility_change {
2705	my ($self, $visible) = @_;	3445	my ($self, $visible) = @_;
2706		3446
2707	return unless $visible;	3447	return unless $visible;
2708		3448
2709	$self->{root}->on_post_alloc ("move_$self" => sub {	3449	$self->{root}->on_post_alloc ("move_$self" => sub {
2710	my $widget = $self->{owner}	3450	my $widget = $self->{owner}
2711	or return;	3451	or return;
2712		3452
		3453	if ($widget->{visible}) {
2713	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);	3454	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2714		3455
2715	($x, $y) = $widget->coord2global (-$self->{w}, 0)	3456	($x, $y) = $widget->coord2global (-$self->{w}, 0)
2716	if $x + $self->{w} > $::WIDTH;	3457	if $x + $self->{w} > $self->{root}{w};
2717		3458
2718	$self->move_abs ($x, $y);	3459	$self->move_abs ($x, $y);
		3460	} else {
		3461	$self->hide;
		3462	}
2719	});	3463	});
2720	}	3464	}
2721		3465
2722	sub _draw {	3466	sub _draw {
2723	my ($self) = @_;	3467	my ($self) = @_;
…		…
2747	$self->SUPER::_draw;	3491	$self->SUPER::_draw;
2748	}	3492	}
2749		3493
2750	#############################################################################	3494	#############################################################################
2751		3495
2752	package CFClient::UI::Face;	3496	package CFPlus::UI::Face;
2753		3497
2754	our @ISA = CFClient::UI::Base::;	3498	our @ISA = CFPlus::UI::DrawBG::;
2755		3499
2756	use CFClient::OpenGL;	3500	use CFPlus::OpenGL;
2757		3501
2758	sub new {	3502	sub new {
2759	my $class = shift;	3503	my $class = shift;
2760		3504
2761	my $self = $class->SUPER::new (	3505	my $self = $class->SUPER::new (
		3506	size_w => 32,
		3507	size_h => 8,
2762	aspect => 1,	3508	aspect => 1,
2763	can_events => 0,	3509	can_events => 0,
2764	@_,	3510	@_,
2765	);	3511	);
2766		3512
2767	if ($self->{anim} && $self->{animspeed}) {	3513	if ($self->{anim} && $self->{animspeed}) {
2768	Scalar::Util::weaken (my $widget = $self);	3514	CFPlus::weaken (my $widget = $self);
2769		3515
		3516	$widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed};
		3517	$widget->{anim_start} = $self->{animspeed} * Event::time / $self->{animspeed};
2770	$self->{timer} = Event->timer (	3518	$self->{timer} = Event->timer (
2771	at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2772	hard => 1,	3519	parked => 1,
2773	interval => $self->{animspeed},
2774	cb => sub {	3520	cb => sub {
		3521	return unless $::CONN && $widget;
		3522
2775	++$widget->{frame};	3523	++$widget->{frame};
		3524	$widget->update_face;
2776	$widget->update;	3525	$widget->update;
		3526
		3527	$widget->update_timer;
2777	},	3528	},
2778	);	3529	);
		3530
		3531	$self->update_face;
		3532	$self->update_timer;
2779	}	3533	}
2780		3534
2781	$self	3535	$self
2782	}	3536	}
2783		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
2784	sub size_request {	3568	sub size_request {
2785	(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)
2786	}	3584	}
2787		3585
2788	sub update {	3586	sub update {
2789	my ($self) = @_;	3587	my ($self) = @_;
2790		3588
2791	return unless $self->{visible};	3589	return unless $self->{visible};
2792		3590
2793	$self->SUPER::update;	3591	$self->SUPER::update;
2794	}	3592	}
2795		3593
		3594	sub invoke_visibility_change {
		3595	my ($self) = @_;
		3596
		3597	$self->update_timer;
		3598
		3599	0
		3600	}
		3601
2796	sub _draw {	3602	sub _draw {
2797	my ($self) = @_;	3603	my ($self) = @_;
2798		3604
2799	return unless $::CONN;	3605	return unless $::CONN;
2800		3606
2801	my $face;	3607	$self->SUPER::_draw;
2802		3608
2803	if ($self->{frame}) {
2804	my $anim = $::CONN->{anim}[$self->{anim}];	3609	my $faceid = $::CONN->{faceid}[$self->{face}]
2805		3610	or return;
2806	$face = $anim->[ $self->{frame} % @$anim ]
2807	if $anim && @$anim;
2808	}
2809		3611
2810	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];	3612	my $tex = $::CONN->{texture}[$faceid];
2811		3613
2812	if ($tex) {	3614	if ($tex) {
2813	glEnable GL_TEXTURE_2D;	3615	glEnable GL_TEXTURE_2D;
2814	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	3616	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2815	glColor 1, 1, 1, 1;	3617	glColor 0, 0, 0, 1;
2816	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});	3618	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2817	glDisable GL_TEXTURE_2D;	3619	glDisable GL_TEXTURE_2D;
2818	}	3620	}
2819	}	3621	}
2820		3622
2821	sub DESTROY {	3623	sub destroy {
2822	my ($self) = @_;	3624	my ($self) = @_;
2823		3625
2824	$self->{timer}->cancel	3626	(delete $self->{timer})->cancel
2825	if $self->{timer};	3627	if $self->{timer};
2826		3628
2827	$self->SUPER::DESTROY;	3629	$self->SUPER::destroy;
2828	}	3630	}
2829		3631
2830	#############################################################################	3632	#############################################################################
2831		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
2832	package CFClient::UI::Menu;	3642	package CFPlus::UI::Menu;
2833		3643
2834	our @ISA = CFClient::UI::FancyFrame::;	3644	our @ISA = CFPlus::UI::Toplevel::;
2835		3645
2836	use CFClient::OpenGL;	3646	use CFPlus::OpenGL;
2837		3647
2838	sub new {	3648	sub new {
2839	my $class = shift;	3649	my $class = shift;
2840		3650
2841	my $self = $class->SUPER::new (	3651	my $self = $class->SUPER::new (
2842	items => [],	3652	items => [],
2843	z => 100,	3653	z => 100,
2844	@_,	3654	@_,
2845	);	3655	);
2846		3656
2847	$self->add ($self->{vbox} = new CFClient::UI::VBox);	3657	$self->add ($self->{vbox} = new CFPlus::UI::VBox);
2848		3658
2849	for my $item (@{ $self->{items} }) {	3659	for my $item (@{ $self->{items} }) {
2850	my ($widget, $cb) = @$item;	3660	my ($widget, $cb, $tooltip) = @$item;
2851		3661
2852	# handle various types of items, only text for now	3662	# handle various types of items, only text for now
2853	if (!ref $widget) {	3663	if (!ref $widget) {
		3664	if ($widget =~ /\t/) {
		3665	my ($left, $right) = split /\t/, $widget, 2;
		3666
2854	$widget = new CFClient::UI::Label	3667	$widget = new CFPlus::UI::HBox
2855	can_hover => 1,	3668	can_hover => 1,
2856	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,
2857	text => $widget;	3681	markup => $widget,
		3682	tooltip => $tooltip;
		3683	}
2858	}	3684	}
2859		3685
2860	$self->{item}{$widget} = $item;	3686	$self->{item}{$widget} = $item;
2861		3687
2862	$self->{vbox}->add ($widget);	3688	$self->{vbox}->add ($widget);
…		…
2867		3693
2868	# 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)
2869	sub popup {	3695	sub popup {
2870	my ($self, $ev) = @_;	3696	my ($self, $ev) = @_;
2871		3697
2872	$self->_emit ("popdown");	3698	$self->emit ("popdown");
2873		3699
2874	# maybe save $GRAB? must be careful about events...	3700	# maybe save $GRAB? must be careful about events...
2875	$GRAB = $self;	3701	$GRAB = $self;
2876	$self->{button} = $ev->{button};	3702	$self->{button} = $ev->{button};
2877		3703
2878	$self->show;	3704	$self->show;
2879	$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);
2880	}	3706	}
2881		3707
2882	sub mouse_motion {	3708	sub invoke_mouse_motion {
2883	my ($self, $ev, $x, $y) = @_;	3709	my ($self, $ev, $x, $y) = @_;
2884		3710
2885	# TODO: should use vbox->find_widget or so	3711	# TODO: should use vbox->find_widget or so
2886	$HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});	3712	$HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2887	$self->{hover} = $self->{item}{$HOVER};	3713	$self->{hover} = $self->{item}{$HOVER};
2888	}
2889		3714
		3715	0
		3716	}
		3717
2890	sub button_up {	3718	sub invoke_button_up {
2891	my ($self, $ev, $x, $y) = @_;	3719	my ($self, $ev, $x, $y) = @_;
2892		3720
2893	if ($ev->{button} == $self->{button}) {	3721	if ($ev->{button} == $self->{button}) {
2894	undef $GRAB;	3722	undef $GRAB;
2895	$self->hide;	3723	$self->hide;
2896		3724
2897	$self->_emit ("popdown");	3725	$self->emit ("popdown");
2898	$self->{hover}[1]->() if $self->{hover};	3726	$self->{hover}[1]->() if $self->{hover};
		3727	} else {
		3728	return 0
		3729	}
		3730
2899	}	3731	1
2900	}	3732	}
2901		3733
2902	#############################################################################	3734	#############################################################################
2903		3735
2904	package CFClient::UI::Statusbox;	3736	package CFPlus::UI::Multiplexer;
2905		3737
2906	our @ISA = CFClient::UI::VBox::;	3738	our @ISA = CFPlus::UI::Container::;
2907		3739
2908	sub new {	3740	sub new {
2909	my $class = shift;	3741	my $class = shift;
2910		3742
2911	$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 (
2912	fontsize => 0.8,	3922	fontsize => 0.8,
2913	@_,	3923	@_,
2914	)	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
2915	}	3931	}
2916		3932
2917	sub reorder {	3933	sub reorder {
2918	my ($self) = @_;	3934	my ($self) = @_;
2919	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} };
2920		3941
2921	while (my ($k, $v) = each %{ $self->{item} }) {	3942	while (my ($k, $v) = each %{ $self->{item} }) {
2922	delete $self->{item}{$k} if $v->{timeout} < $NOW;	3943	delete $self->{item}{$k} if $v->{timeout} < $NOW;
2923	}	3944	}
2924		3945
…		…
2927	my @items = sort {	3948	my @items = sort {
2928	$a->{pri} <=> $b->{pri}	3949	$a->{pri} <=> $b->{pri}
2929	or $b->{id} <=> $a->{id}	3950	or $b->{id} <=> $a->{id}
2930	} values %{ $self->{item} };	3951	} values %{ $self->{item} };
2931		3952
		3953	$self->{timer}->interval (1);
		3954
2932	my $count = 10 + 1;	3955	my $count = 10 + 1;
2933	for my $item (@items) {	3956	for my $item (@items) {
2934	last unless --$count;	3957	last unless --$count;
2935		3958
2936	push @widgets, $item->{label} ||= do {	3959	my $label = $item->{label} ||= do {
2937	# TODO: doesn't handle markup well (read as: at all)	3960	# TODO: doesn't handle markup well (read as: at all)
2938	my $short = $item->{count} > 1	3961	my $short = $item->{count} > 1
2939	? "<b>$item->{count} ×</b> $item->{text}"	3962	? "<b>$item->{count} ×</b> $item->{text}"
2940	: $item->{text};	3963	: $item->{text};
2941		3964
2942	for ($short) {	3965	for ($short) {
2943	s/^\s+//;	3966	s/^\s+//;
2944	s/\s+/ /g;	3967	s/\s+/ /g;
2945	}	3968	}
2946		3969
2947	new CFClient::UI::Label	3970	new CFPlus::UI::Label
2948	markup => $short,	3971	markup => $short,
2949	tooltip => $item->{tooltip},	3972	tooltip => $item->{tooltip},
2950	tooltip_font => $::FONT_PROP,	3973	tooltip_font => $::FONT_PROP,
2951	tooltip_width => 0.67,	3974	tooltip_width => 0.67,
2952	fontsize => $item->{fontsize} || $self->{fontsize},	3975	fontsize => $item->{fontsize} || $self->{fontsize},
2953	max_w => $::WIDTH * 0.44,	3976	max_w => $::WIDTH * 0.44,
2954	fg => $item->{fg},	3977	fg => [@{ $item->{fg} }],
2955	can_events => 1,	3978	can_events => 1,
2956	can_hover => 1	3979	can_hover => 1
2957	};	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;
2958	}	3993	}
2959		3994
2960	$self->clear;	3995	$self->clear;
2961	$self->SUPER::add (reverse @widgets);	3996	$self->SUPER::add (reverse @widgets);
2962	}	3997	}
…		…
2967	$text =~ s/^\s+//;	4002	$text =~ s/^\s+//;
2968	$text =~ s/\s+$//;	4003	$text =~ s/\s+$//;
2969		4004
2970	return unless $text;	4005	return unless $text;
2971		4006
2972	my $timeout = time + ((delete $arg{timeout}) || 60);	4007	my $timeout = (int time) + ((delete $arg{timeout}) || 60);
2973		4008
2974	my $group = exists $arg{group} ? $arg{group} : ++$self->{id};	4009	my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2975		4010
2976	if (my $item = $self->{item}{$group}) {	4011	if (my $item = $self->{item}{$group}) {
2977	if ($item->{text} eq $text) {	4012	if ($item->{text} eq $text) {
2978	$item->{count}++;	4013	$item->{count}++;
2979	} else {	4014	} else {
2980	$item->{count} = 1;	4015	$item->{count} = 1;
2981	$item->{text} = $item->{tooltip} = $text;	4016	$item->{text} = $item->{tooltip} = $text;
2982	}	4017	}
2983	$item->{id} = ++$self->{id};	4018	$item->{id} += 0.2;#d#
2984	$item->{timeout} = $timeout;	4019	$item->{timeout} = $timeout;
2985	delete $item->{label};	4020	delete $item->{label};
2986	} else {	4021	} else {
2987	$self->{item}{$group} = {	4022	$self->{item}{$group} = {
2988	id => ++$self->{id},	4023	id => ++$self->{id},
…		…
2994	count => 1,	4029	count => 1,
2995	%arg,	4030	%arg,
2996	};	4031	};
2997	}	4032	}
2998		4033
		4034	$ROOT->on_refresh (reorder => sub {
2999	$self->reorder;	4035	$self->reorder;
		4036	});
3000	}	4037	}
3001		4038
3002	sub reconfigure {	4039	sub reconfigure {
3003	my ($self) = @_;	4040	my ($self) = @_;
3004		4041
…		…
3007		4044
3008	$self->reorder;	4045	$self->reorder;
3009	$self->SUPER::reconfigure;	4046	$self->SUPER::reconfigure;
3010	}	4047	}
3011		4048
		4049	sub destroy {
		4050	my ($self) = @_;
		4051
		4052	$self->{timer}->cancel;
		4053
		4054	$self->SUPER::destroy;
		4055	}
		4056
3012	#############################################################################	4057	#############################################################################
3013		4058
3014	package CFClient::UI::Inventory;
3015
3016	our @ISA = CFClient::UI::ScrolledWindow::;
3017
3018	sub new {
3019	my $class = shift;
3020
3021	my $self = $class->SUPER::new (
3022	scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
3023	@_,
3024	);
3025
3026	$self
3027	}
3028
3029	sub set_items {
3030	my ($self, $items) = @_;
3031
3032	$self->{scrolled}->clear;
3033	return unless $items;
3034
3035	my @items = sort {
3036	($a->{type} <=> $b->{type})
3037	or ($a->{name} cmp $b->{name})
3038	} @$items;
3039
3040	$self->{real_items} = \@items;
3041
3042	my $row = 0;
3043	for my $item (@items) {
3044	CFClient::Item::update_widgets $item;
3045
3046	$self->{scrolled}->add (0, $row, $item->{face_widget});
3047	$self->{scrolled}->add (1, $row, $item->{desc_widget});
3048	$self->{scrolled}->add (2, $row, $item->{weight_widget});
3049
3050	$row++;
3051	}
3052	}
3053
3054	#############################################################################
3055
3056	package CFClient::UI::BindEditor;
3057
3058	our @ISA = CFClient::UI::FancyFrame::;
3059
3060	sub new {
3061	my $class = shift;
3062
3063	my $self = $class->SUPER::new (binding => [], commands => [], @_);
3064
3065	$self->add (my $vb = new CFClient::UI::VBox);
3066
3067
3068	$vb->add ($self->{rec_btn} = new CFClient::UI::Button
3069	text => "start recording",
3070	tooltip => "Start/Stops recording of actions."
3071	."All subsequent actions after the recording started will be captured."
3072	."The actions are displayed after the record was stopped."
3073	."To bind the action you have to click on the 'Bind' button",
3074	on_activate => sub {
3075	unless ($self->{recording}) {
3076	$self->start;
3077	} else {
3078	$self->stop;
3079	}
3080	});
3081
3082	$vb->add (new CFClient::UI::Label text => "Actions:");
3083	$vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3084
3085	$vb->add (new CFClient::UI::Label text => "Bound to: ");
3086	$vb->add (my $hb = new CFClient::UI::HBox);
3087	$hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3088	$hb->add (new CFClient::UI::Button
3089	text => "bind",
3090	tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3091	on_activate => sub {
3092	$self->ask_for_bind;
3093	});
3094
3095	$vb->add (my $hb = new CFClient::UI::HBox);
3096	$hb->add (new CFClient::UI::Button
3097	text => "ok",
3098	expand => 1,
3099	tooltip => "This closes the binding editor and saves the binding",
3100	on_activate => sub {
3101	$self->hide;
3102	$self->commit;
3103	});
3104
3105	$hb->add (new CFClient::UI::Button
3106	text => "cancel",
3107	expand => 1,
3108	tooltip => "This closes the binding editor without saving",
3109	on_activate => sub {
3110	$self->hide;
3111	$self->{binding_cancel}->()
3112	if $self->{binding_cancel};
3113	});
3114
3115	$self->update_binding_widgets;
3116
3117	$self
3118	}
3119
3120	sub commit {
3121	my ($self) = @_;
3122	my ($mod, $sym, $cmds) = $self->get_binding;
3123	if ($sym != 0 && @$cmds > 0) {
3124	$::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3125	."'. Don't forget 'Save Config'!");
3126	$self->{binding_change}->($mod, $sym, $cmds)
3127	if $self->{binding_change};
3128	} else {
3129	$::STATUSBOX->add ("No action bound, no key or action specified!");
3130	$self->{binding_cancel}->()
3131	if $self->{binding_cancel};
3132	}
3133	}
3134
3135	sub start {
3136	my ($self) = @_;
3137
3138	$self->{rec_btn}->set_text ("stop recording");
3139	$self->{recording} = 1;
3140	$self->clear_command_list;
3141	$::CONN->start_record if $::CONN;
3142	}
3143
3144	sub stop {
3145	my ($self) = @_;
3146
3147	$self->{rec_btn}->set_text ("start recording");
3148	$self->{recording} = 0;
3149
3150	my $rec;
3151	$rec = $::CONN->stop_record if $::CONN;
3152	return unless ref $rec eq 'ARRAY';
3153	$self->set_command_list ($rec);
3154	}
3155
3156	# if $commit is true, the binding will be set after the user entered a key combo
3157	sub ask_for_bind {
3158	my ($self, $commit) = @_;
3159
3160	CFClient::Binder::open_binding_dialog (sub {
3161	my ($mod, $sym) = @_;
3162	$self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3163	$self->update_binding_widgets;
3164	$self->commit if $commit;
3165	});
3166	}
3167
3168	# $mod and $sym are the modifiers and key symbol
3169	# $cmds is a array ref of strings (the commands)
3170	# $cb is the callback that is executed on OK
3171	# $ccb is the callback that is executed on CANCEL and
3172	# when the binding was unsuccessful on OK
3173	sub set_binding {
3174	my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3175
3176	$self->clear_command_list;
3177	$self->{recording} = 0;
3178	$self->{rec_btn}->set_text ("start recording");
3179
3180	$self->{binding} = [$mod, $sym];
3181	$self->{commands} = $cmds;
3182
3183	$self->{binding_change} = $cb;
3184	$self->{binding_cancel} = $ccb;
3185
3186	$self->update_binding_widgets;
3187	}
3188
3189	# this is a shortcut method that asks for a binding
3190	# and then just binds it.
3191	sub do_quick_binding {
3192	my ($self, $cmds) = @_;
3193	$self->set_binding (undef, undef, $cmds, sub {
3194	$::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3195	});
3196	$self->ask_for_bind (1);
3197	}
3198
3199	sub update_binding_widgets {
3200	my ($self) = @_;
3201	my ($mod, $sym, $cmds) = $self->get_binding;
3202	$self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3203	$self->set_command_list ($cmds);
3204	}
3205
3206	sub get_binding {
3207	my ($self) = @_;
3208	return (
3209	$self->{binding}->[0],
3210	$self->{binding}->[1],
3211	[ grep { defined $_ } @{$self->{commands}} ]
3212	);
3213	}
3214
3215	sub clear_command_list {
3216	my ($self) = @_;
3217	$self->{cmdbox}->clear ();
3218	}
3219
3220	sub set_command_list {
3221	my ($self, $cmds) = @_;
3222
3223	$self->{cmdbox}->clear ();
3224	$self->{commands} = $cmds;
3225
3226	my $idx = 0;
3227
3228	for (@$cmds) {
3229	$self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3230
3231	my $i = $idx;
3232	$hb->add (new CFClient::UI::Label text => $_);
3233	$hb->add (new CFClient::UI::Button
3234	text => "delete",
3235	tooltip => "Deletes the action from the record",
3236	on_activate => sub {
3237	$self->{cmdbox}->remove ($hb);
3238	$cmds->[$i] = undef;
3239	});
3240
3241
3242	$idx++
3243	}
3244	}
3245
3246	#############################################################################
3247
3248	package CFClient::UI::SpellList;
3249
3250	our @ISA = CFClient::UI::FancyFrame::;
3251
3252	sub new {
3253	my $class = shift;
3254
3255	my $self = $class->SUPER::new (binding => [], commands => [], @_);
3256
3257	$self->add (new CFClient::UI::ScrolledWindow
3258	scrolled => $self->{spellbox} = new CFClient::UI::Table);
3259
3260	$self;
3261	}
3262
3263	# XXX: Do sorting? Argl...
3264	sub add_spell {
3265	my ($self, $spell) = @_;
3266	$self->{spells}->{$spell->{name}} = $spell;
3267
3268	$self->{spellbox}->add (0, $self->{tbl_idx}, new CFClient::UI::Face
3269	face => $spell->{face},
3270	can_hover => 1,
3271	can_events => 1,
3272	tooltip => $spell->{message});
3273
3274	$self->{spellbox}->add (1, $self->{tbl_idx}, new CFClient::UI::Label
3275	text => $spell->{name},
3276	can_hover => 1,
3277	can_events => 1,
3278	tooltip => $spell->{message},
3279	expand => 1);
3280
3281	$self->{spellbox}->add (2, $self->{tbl_idx}, new CFClient::UI::Label
3282	text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
3283	$spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
3284	expand => 1);
3285
3286	$self->{spellbox}->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
3287	text => "bind to key",
3288	on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
3289	}
3290
3291	sub rebuild_spell_list {
3292	my ($self) = @_;
3293	$self->{tbl_idx} = 0;
3294	$self->add_spell ($_) for values %{$self->{spells}};
3295	}
3296
3297	sub remove_spell {
3298	my ($self, $spell) = @_;
3299	delete $self->{spells}->{$spell->{name}};
3300	$self->rebuild_spell_list;
3301	}
3302
3303	#############################################################################
3304
3305	package CFClient::UI::Root;	4059	package CFPlus::UI::Root;
3306		4060
3307	our @ISA = CFClient::UI::Container::;	4061	our @ISA = CFPlus::UI::Container::;
3308		4062
		4063	use List::Util qw(min max);
		4064
3309	use CFClient::OpenGL;	4065	use CFPlus::OpenGL;
3310		4066
3311	sub new {	4067	sub new {
3312	my $class = shift;	4068	my $class = shift;
3313		4069
3314	my $self = $class->SUPER::new (	4070	my $self = $class->SUPER::new (
3315	visible => 1,	4071	visible => 1,
3316	@_,	4072	@_,
3317	);	4073	);
3318		4074
3319	Scalar::Util::weaken ($self->{root} = $self);	4075	CFPlus::weaken ($self->{root} = $self);
3320		4076
3321	$self	4077	$self
3322	}	4078	}
3323		4079
3324	sub size_request {	4080	sub size_request {
…		…
3339	$coord = $max - $size if $coord > $max - $size;	4095	$coord = $max - $size if $coord > $max - $size;
3340		4096
3341	int $coord + 0.5	4097	int $coord + 0.5
3342	}	4098	}
3343		4099
3344	sub size_allocate {	4100	sub invoke_size_allocate {
3345	my ($self, $w, $h) = @_;	4101	my ($self, $w, $h) = @_;
3346		4102
3347	for my $child ($self->children) {	4103	for my $child ($self->children) {
3348	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)};
3349		4105
…		…
3353	$X = _to_pixel $X, $W, $self->{w};	4109	$X = _to_pixel $X, $W, $self->{w};
3354	$Y = _to_pixel $Y, $H, $self->{h};	4110	$Y = _to_pixel $Y, $H, $self->{h};
3355		4111
3356	$child->configure ($X, $Y, $W, $H);	4112	$child->configure ($X, $Y, $W, $H);
3357	}	4113	}
		4114
		4115	1
3358	}	4116	}
3359		4117
3360	sub coord2local {	4118	sub coord2local {
3361	my ($self, $x, $y) = @_;	4119	my ($self, $x, $y) = @_;
3362		4120
…		…
3447		4205
3448	delete $queue{$widget+0};	4206	delete $queue{$widget+0};
3449		4207
3450	my ($w, $h) = $widget->size_request;	4208	my ($w, $h) = $widget->size_request;
3451		4209
3452	$w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2;	4210	$w = max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3453	$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};
3454		4215
3455	$w = $widget->{force_w} if exists $widget->{force_w};	4216	$w = $widget->{force_w} if exists $widget->{force_w};
3456	$h = $widget->{force_h} if exists $widget->{force_h};	4217	$h = $widget->{force_h} if exists $widget->{force_h};
3457		4218
3458	if ($widget->{req_w} != $w || $widget->{req_h} != $h	4219	if ($widget->{req_w} != $w || $widget->{req_h} != $h
…		…
3485	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};	4246	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3486		4247
3487	$w = 0 if $w < 0;	4248	$w = 0 if $w < 0;
3488	$h = 0 if $h < 0;	4249	$h = 0 if $h < 0;
3489		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
3490	$w = int $w + 0.5;	4260	$w = int $w + 0.5;
3491	$h = int $h + 0.5;	4261	$h = int $h + 0.5;
3492		4262
3493	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}) {
3494	$widget->{old_w} = $widget->{w};	4264	$widget->{old_w} = $widget->{w};
…		…
3504		4274
3505	while ($self->{post_alloc_hook}) {	4275	while ($self->{post_alloc_hook}) {
3506	$_->()	4276	$_->()
3507	for values %{delete $self->{post_alloc_hook}};	4277	for values %{delete $self->{post_alloc_hook}};
3508	}	4278	}
3509
3510		4279
3511	glViewport 0, 0, $::WIDTH, $::HEIGHT;	4280	glViewport 0, 0, $::WIDTH, $::HEIGHT;
3512	glClearColor +($::CFG->{fow_intensity}) x 3, 1;	4281	glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3513	glClear GL_COLOR_BUFFER_BIT;	4282	glClear GL_COLOR_BUFFER_BIT;
3514		4283
…		…
3517	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;	4286	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3518	glMatrixMode GL_MODELVIEW;	4287	glMatrixMode GL_MODELVIEW;
3519	glLoadIdentity;	4288	glLoadIdentity;
3520		4289
3521	{	4290	{
3522	package CFClient::UI::Base;	4291	package CFPlus::UI::Base;
3523		4292
3524	($draw_x, $draw_y, $draw_w, $draw_h) =	4293	local ($draw_x, $draw_y, $draw_w, $draw_h) =
3525	(0, 0, $self->{w}, $self->{h});	4294	(0, 0, $self->{w}, $self->{h});
3526	}
3527		4295
3528	$self->_draw;	4296	$self->_draw;
		4297	}
3529	}	4298	}
3530		4299
3531	#############################################################################	4300	#############################################################################
3532		4301
3533	package CFClient::UI;	4302	package CFPlus::UI;
3534		4303
3535	$ROOT = new CFClient::UI::Root;	4304	$ROOT = new CFPlus::UI::Root;
3536	$TOOLTIP = new CFClient::UI::Tooltip z => 900;	4305	$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
3537		4306
3538	1	4307	1
3539		4308

Diff Legend

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