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.268 by root, Thu Jun 1 05:04:41 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;
		1242
		1243	sub new {
		1244	my ($class, %arg) = @_;
		1245
		1246	if ((exists $arg{label}) && !ref $arg{label}) {
		1247	$arg{label} = new CFPlus::UI::Label
		1248	align => 1,
		1249	valign => 0,
		1250	text => $arg{label},
		1251	fontsize => ($arg{border} || 0.8) * 0.75;
		1252	}
		1253
		1254	my $self = $class->SUPER::new (
		1255	# label => "",
		1256	fg => [0.6, 0.3, 0.1],
		1257	border => 0.8,
		1258	style => 'single',
		1259	%arg,
		1260	);
		1261
		1262	$self
		1263	}
		1264
		1265	sub add {
		1266	my ($self, @widgets) = @_;
		1267
		1268	$self->SUPER::add (@widgets);
		1269	$self->CFPlus::UI::Container::add ($self->{label}) if $self->{label};
		1270	}
		1271
		1272	sub border {
		1273	int $_[0]{border} * $::FONTSIZE
		1274	}
		1275
		1276	sub size_request {
		1277	my ($self) = @_;
		1278
		1279	($self->{label_w}, undef) = $self->{label}->size_request
		1280	if $self->{label};
		1281
		1282	my ($w, $h) = $self->SUPER::size_request;
		1283
		1284	(
		1285	$w + $self->border * 2,
		1286	$h + $self->border * 2,
		1287	)
		1288	}
		1289
		1290	sub invoke_size_allocate {
		1291	my ($self, $w, $h) = @_;
		1292
		1293	my $border = $self->border;
		1294
		1295	$w -= List::Util::max 0, $border * 2;
		1296	$h -= List::Util::max 0, $border * 2;
		1297
		1298	if (my $label = $self->{label}) {
		1299	$label->{w} = List::Util::max 0, List::Util::min $self->{label_w}, $w - $border * 2;
		1300	$label->{h} = List::Util::min $h, $border;
		1301	$label->invoke_size_allocate ($label->{w}, $label->{h});
		1302	}
		1303
		1304	$self->child->configure ($border, $border, $w, $h);
		1305
		1306	1
		1307	}
		1308
		1309	sub _draw {
		1310	my ($self) = @_;
		1311
		1312	my $child = $self->{children}[0];
		1313
		1314	my $border = $self->border;
		1315	my ($w, $h) = ($self->{w}, $self->{h});
		1316
		1317	$child->draw;
		1318
		1319	glColor @{$self->{fg}};
		1320	glBegin GL_LINE_STRIP;
		1321	glVertex $border * 1.5 , $border * 0.5 + 0.5;
		1322	glVertex $border * 0.5 + 0.5, $border * 0.5 + 0.5;
		1323	glVertex $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
		1324	glVertex $w - $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
		1325	glVertex $w - $border * 0.5 + 0.5, $border * 0.5 + 0.5;
		1326	glVertex $self->{label} ? $border * 2 + $self->{label}{w} : $border * 1.5, $border * 0.5 + 0.5;
		1327	glEnd;
		1328
		1329	if ($self->{label}) {
		1330	glTranslate $border * 2, 0;
		1331	$self->{label}->_draw;
		1332	}
		1333	}
		1334
		1335	#############################################################################
		1336
		1337	package CFPlus::UI::Toplevel;
		1338
		1339	our @ISA = CFPlus::UI::Bin::;
		1340
		1341	use CFPlus::OpenGL;
1045		1342
1046	my $bg =	1343	my $bg =
1047	new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",	1344	new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png",
1048	mipmap => 1, wrap => 1;	1345	mipmap => 1, wrap => 1;
1049		1346
1050	my @border =	1347	my @border =
1051	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	1348	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1052	qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);	1349	qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1053		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
1054	sub new {	1355	sub new {
1055	my $class = shift;	1356	my ($class, %arg) = @_;
1056		1357
1057	my $self = $class->SUPER::new (	1358	my $self = $class->SUPER::new (
1058	bg => [1, 1, 1, 1],	1359	bg => [1, 1, 1, 1],
1059	border_bg => [1, 1, 1, 1],	1360	border_bg => [1, 1, 1, 1],
1060	border => 0.6,	1361	border => 0.6,
1061	can_events => 1,	1362	can_events => 1,
1062	min_w => 16,	1363	min_w => 64,
1063	min_h => 16,	1364	min_h => 32,
1064	@_	1365	%arg,
1065	);	1366	);
1066		1367
1067	$self->{title} &&= new CFClient::UI::Label	1368	$self->{title_widget} = new CFPlus::UI::Label
1068	align => 0,	1369	align => 0,
1069	valign => 1,	1370	valign => 1,
1070	text => $self->{title},	1371	text => $self->{title},
1071	fontsize => $self->{border};	1372	fontsize => $self->{border},
		1373	if exists $self->{title};
		1374
		1375	if ($self->{has_close_button}) {
		1376	$self->{close_button} =
		1377	new CFPlus::UI::ImageButton
		1378	path => 'x1_close.png',
		1379	on_activate => sub { $self->emit ("delete") };
		1380
		1381	$self->CFPlus::UI::Container::add ($self->{close_button});
		1382	}
1072		1383
1073	$self	1384	$self
		1385	}
		1386
		1387	sub add {
		1388	my ($self, @widgets) = @_;
		1389
		1390	$self->SUPER::add (@widgets);
		1391	$self->CFPlus::UI::Container::add ($self->{close_button}) if $self->{close_button};
		1392	$self->CFPlus::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1074	}	1393	}
1075		1394
1076	sub border {	1395	sub border {
1077	int $_[0]{border} * $::FONTSIZE	1396	int $_[0]{border} * $::FONTSIZE
1078	}	1397	}
1079		1398
1080	sub size_request {	1399	sub size_request {
1081	my ($self) = @_;	1400	my ($self) = @_;
		1401
		1402	$self->{title_widget}->size_request
		1403	if $self->{title_widget};
		1404
		1405	$self->{close_button}->size_request
		1406	if $self->{close_button};
1082		1407
1083	my ($w, $h) = $self->SUPER::size_request;	1408	my ($w, $h) = $self->SUPER::size_request;
1084		1409
1085	(	1410	(
1086	$w + $self->border * 2,	1411	$w + $self->border * 2,
1087	$h + $self->border * 2,	1412	$h + $self->border * 2,
1088	)	1413	)
1089	}	1414	}
1090		1415
1091	sub size_allocate {	1416	sub invoke_size_allocate {
1092	my ($self, $w, $h) = @_;	1417	my ($self, $w, $h) = @_;
1093		1418
		1419	if ($self->{title_widget}) {
		1420	$self->{title_widget}{w} = $w;
		1421	$self->{title_widget}{h} = $h;
		1422	$self->{title_widget}->invoke_size_allocate ($w, $h);
		1423	}
		1424
		1425	my $border = $self->border;
		1426
1094	$h -= List::Util::max 0, $self->border * 2;	1427	$h -= List::Util::max 0, $border * 2;
1095	$w -= List::Util::max 0, $self->border * 2;	1428	$w -= List::Util::max 0, $border * 2;
1096		1429
1097	$self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
1098	if $self->{title};
1099
1100	$self->child->configure ($self->border, $self->border, $w, $h);	1430	$self->child->configure ($border, $border, $w, $h);
1101	}
1102		1431
		1432	$self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
		1433	if $self->{close_button};
		1434
		1435	1
		1436	}
		1437
		1438	sub invoke_delete {
		1439	my ($self) = @_;
		1440
		1441	$self->hide;
		1442
		1443	1
		1444	}
		1445
1103	sub button_down {	1446	sub invoke_button_down {
1104	my ($self, $ev, $x, $y) = @_;	1447	my ($self, $ev, $x, $y) = @_;
1105		1448
1106	my ($w, $h) = @$self{qw(w h)};	1449	my ($w, $h) = @$self{qw(w h)};
1107	my $border = $self->border;	1450	my $border = $self->border;
1108		1451
…		…
1124	my $dy = $ev->{y} - $oy;	1467	my $dy = $ev->{y} - $oy;
1125		1468
1126	$self->{force_w} = $bw + $dx * ($mx ? -1 : 1);	1469	$self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
1127	$self->{force_h} = $bh + $dy * ($my ? -1 : 1);	1470	$self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1128		1471
		1472	$self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1129	$self->realloc;	1473	$self->realloc;
1130	$self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1131	};	1474	};
1132		1475
1133	} elsif ($lr ^ $td) {	1476	} elsif ($lr ^ $td) {
1134	my ($ox, $oy) = ($ev->{x}, $ev->{y});	1477	my ($ox, $oy) = ($ev->{x}, $ev->{y});
1135	my ($bx, $by) = ($self->{x}, $self->{y});	1478	my ($bx, $by) = ($self->{x}, $self->{y});
…		…
1138	my ($ev, $x, $y) = @_;	1481	my ($ev, $x, $y) = @_;
1139		1482
1140	($x, $y) = ($ev->{x}, $ev->{y});	1483	($x, $y) = ($ev->{x}, $ev->{y});
1141		1484
1142	$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});
1143	};	1488	};
		1489	} else {
		1490	return 0;
		1491	}
		1492
1144	}	1493	1
1145	}	1494	}
1146		1495
1147	sub button_up {	1496	sub invoke_button_up {
1148	my ($self, $ev, $x, $y) = @_;	1497	my ($self, $ev, $x, $y) = @_;
1149		1498
1150	delete $self->{motion};	1499	! ! delete $self->{motion}
1151	}	1500	}
1152		1501
1153	sub mouse_motion {	1502	sub invoke_mouse_motion {
1154	my ($self, $ev, $x, $y) = @_;	1503	my ($self, $ev, $x, $y) = @_;
1155		1504
1156	$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
1157	}	1516	}
1158		1517
1159	sub _draw {	1518	sub _draw {
1160	my ($self) = @_;	1519	my ($self) = @_;
1161		1520
		1521	my $child = $self->{children}[0];
		1522
1162	my ($w, $h ) = ($self->{w}, $self->{h});	1523	my ($w, $h ) = ($self->{w}, $self->{h});
1163	my ($cw, $ch) = ($self->child->{w}, $self->child->{h});	1524	my ($cw, $ch) = ($child->{w}, $child->{h});
1164		1525
1165	glEnable GL_TEXTURE_2D;	1526	glEnable GL_TEXTURE_2D;
1166	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	1527	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1167		1528
1168	my $border = $self->border;	1529	my $border = $self->border;
1169		1530
1170	glColor @{ $self->{border_bg} };	1531	glColor @{ $self->{border_bg} };
1171	$border[0]->draw_quad_alpha (0, 0, $w, $border);	1532	$border[0]->draw_quad_alpha ( 0, 0, $w, $border);
1172	$border[1]->draw_quad_alpha (0, $border, $border, $ch);	1533	$border[1]->draw_quad_alpha ( 0, $border, $border, $ch);
1173	$border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);	1534	$border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1174	$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);
1175		1550
1176	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {	1551	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1177	glColor @{ $self->{bg} };	1552	glColor @{ $self->{bg} };
1178		1553
1179	# TODO: repeat texture not scale	1554	# TODO: repeat texture not scale
…		…
1183	$bg->draw_quad_alpha ($border, $border, $cw, $ch);	1558	$bg->draw_quad_alpha ($border, $border, $cw, $ch);
1184	}	1559	}
1185		1560
1186	glDisable GL_TEXTURE_2D;	1561	glDisable GL_TEXTURE_2D;
1187		1562
1188	$self->{title}->draw if $self->{title};
1189
1190	$self->child->draw;	1563	$child->draw;
		1564
		1565	if ($self->{title_widget}) {
		1566	glTranslate 0, $border - $self->{h};
		1567	$self->{title_widget}->_draw;
		1568
		1569	glTranslate 0, - ($border - $self->{h});
		1570	}
		1571
		1572	$self->{close_button}->draw
		1573	if $self->{close_button};
1191	}	1574	}
1192		1575
1193	#############################################################################	1576	#############################################################################
1194		1577
1195	package CFClient::UI::Table;	1578	package CFPlus::UI::Table;
1196		1579
1197	our @ISA = CFClient::UI::Base::;	1580	our @ISA = CFPlus::UI::Base::;
1198		1581
1199	use List::Util qw(max sum);	1582	use List::Util qw(max sum);
1200		1583
1201	use CFClient::OpenGL;	1584	use CFPlus::OpenGL;
1202		1585
1203	sub new {	1586	sub new {
1204	my $class = shift;	1587	my $class = shift;
1205		1588
1206	$class->SUPER::new (	1589	$class->SUPER::new (
		1590	children => [],
1207	col_expand => [],	1591	col_expand => [],
		1592	row_expand => [],
1208	@_,	1593	@_,
1209	)	1594	)
1210	}	1595	}
1211		1596
1212	sub children {	1597	sub children {
1213	grep $_, map @$_, grep $_, @{ $_[0]{children} }	1598	grep $_, map @$_, grep $_, @{ $_[0]{children} }
1214	}	1599	}
1215		1600
		1601	# TODO: store row/col info in child widget and use standard add/del
1216	sub add {	1602	sub add {
1217	my ($self, $x, $y, $child) = @_;	1603	my $self = shift;
1218		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
1219	$child->set_parent ($self);	1615	$child->set_parent ($self);
1220	$self->{children}[$y][$x] = $child;	1616	$self->{children}[$row][$col] = $child;
		1617	}
1221		1618
		1619	$self->{force_realloc} = 1;
		1620	$self->{force_size_alloc} = 1;
1222	$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	}
1223	}	1632	}
1224		1633
1225	# 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?
1226	sub clear {	1635	sub clear {
1227	my ($self) = @_;	1636	my ($self) = @_;
…		…
1268	(sum @$ws),	1677	(sum @$ws),
1269	(sum @$hs),	1678	(sum @$hs),
1270	)	1679	)
1271	}	1680	}
1272		1681
1273	sub size_allocate {	1682	sub invoke_size_allocate {
1274	my ($self, $w, $h) = @_;	1683	my ($self, $w, $h) = @_;
1275		1684
1276	my ($ws, $hs) = $self->get_wh;	1685	my ($ws, $hs) = $self->get_wh;
1277		1686
1278	my $req_w = (sum @$ws) || 1;	1687	my $req_w = (sum @$ws) || 1;
1279	my $req_h = (sum @$hs) || 1;	1688	my $req_h = (sum @$hs) || 1;
1280		1689
1281	# TODO: nicer code && do row_expand	1690	# TODO: nicer code
1282	my @col_expand = @{$self->{col_expand}};	1691	my @col_expand = @{$self->{col_expand}};
1283	@col_expand = (1) x @$ws unless @col_expand;	1692	@col_expand = (1) x @$ws unless @col_expand;
1284	my $col_expand = (sum @col_expand) || 1;	1693	my $col_expand = (sum @col_expand) || 1;
1285		1694
1286	# linearly scale sizes
1287	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;	1695	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1288	$hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1289		1696
1290	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
1291	CFClient::UI::harmonize $hs;	1705	CFPlus::UI::harmonize $hs;
1292		1706
1293	my $y;	1707	my $y;
1294		1708
1295	for my $r (0 .. $#{$self->{children}}) {	1709	for my $r (0 .. $#{$self->{children}}) {
1296	my $row = $self->{children}[$r]	1710	my $row = $self->{children}[$r]
…		…
1310	}	1724	}
1311		1725
1312	$y += $row_h;	1726	$y += $row_h;
1313	}	1727	}
1314		1728
		1729	1
1315	}	1730	}
1316		1731
1317	sub find_widget {	1732	sub find_widget {
1318	my ($self, $x, $y) = @_;	1733	my ($self, $x, $y) = @_;
1319		1734
…		…
1338	}	1753	}
1339	}	1754	}
1340		1755
1341	#############################################################################	1756	#############################################################################
1342		1757
1343	package CFClient::UI::Box;	1758	package CFPlus::UI::Fixed;
1344		1759
		1760	use List::Util qw(min max);
		1761
1345	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::;
1346		1843
1347	sub size_request {	1844	sub size_request {
1348	my ($self) = @_;	1845	my ($self) = @_;
1349		1846
1350	$self->{vertical}	1847	$self->{vertical}
…		…
1356	(List::Util::sum map $_->{req_w}, @{$self->{children}}),	1853	(List::Util::sum map $_->{req_w}, @{$self->{children}}),
1357	(List::Util::max map $_->{req_h}, @{$self->{children}}),	1854	(List::Util::max map $_->{req_h}, @{$self->{children}}),
1358	)	1855	)
1359	}	1856	}
1360		1857
1361	sub size_allocate {	1858	sub invoke_size_allocate {
1362	my ($self, $w, $h) = @_;	1859	my ($self, $w, $h) = @_;
1363		1860
1364	my $space = $self->{vertical} ? $h : $w;	1861	my $space = $self->{vertical} ? $h : $w;
1365	my $children = $self->{children};	1862	my @children = $self->visible_children;
1366		1863
1367	my @req;	1864	my @req;
1368		1865
1369	if ($self->{homogeneous}) {	1866	if ($self->{homogeneous}) {
1370	@req = ($space / (@$children || 1)) x @$children;	1867	@req = ($space / (@children || 1)) x @children;
1371	} else {	1868	} else {
1372	@req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children;	1869	@req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @children;
1373	my $req = List::Util::sum @req;	1870	my $req = List::Util::sum @req;
1374		1871
1375	if ($req > $space) {	1872	if ($req > $space) {
1376	# ah well, not enough space	1873	# ah well, not enough space
1377	$_ *= $space / $req for @req;	1874	$_ *= $space / $req for @req;
1378	} else {	1875	} else {
1379	my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;	1876	my $expand = (List::Util::sum map $_->{expand}, @children) || 1;
1380		1877
1381	$space = ($space - $req) / $expand; # remaining space to give away	1878	$space = ($space - $req) / $expand; # remaining space to give away
1382		1879
1383	$req[$_] += $space * $children->[$_]{expand}	1880	$req[$_] += $space * $children[$_]{expand}
1384	for 0 .. $#$children;	1881	for 0 .. $#children;
1385	}	1882	}
1386	}	1883	}
1387		1884
1388	CFClient::UI::harmonize \@req;	1885	CFPlus::UI::harmonize \@req;
1389		1886
1390	my $pos = 0;	1887	my $pos = 0;
1391	for (0 .. $#$children) {	1888	for (0 .. $#children) {
1392	my $alloc = $req[$_];	1889	my $alloc = $req[$_];
1393	$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));
1394		1891
1395	$pos += $alloc;	1892	$pos += $alloc;
1396	}	1893	}
1397		1894
1398	1	1895	1
1399	}	1896	}
1400		1897
1401	#############################################################################	1898	#############################################################################
1402		1899
1403	package CFClient::UI::HBox;	1900	package CFPlus::UI::HBox;
1404		1901
1405	our @ISA = CFClient::UI::Box::;	1902	our @ISA = CFPlus::UI::Box::;
1406		1903
1407	sub new {	1904	sub new {
1408	my $class = shift;	1905	my $class = shift;
1409		1906
1410	$class->SUPER::new (	1907	$class->SUPER::new (
…		…
1413	)	1910	)
1414	}	1911	}
1415		1912
1416	#############################################################################	1913	#############################################################################
1417		1914
1418	package CFClient::UI::VBox;	1915	package CFPlus::UI::VBox;
1419		1916
1420	our @ISA = CFClient::UI::Box::;	1917	our @ISA = CFPlus::UI::Box::;
1421		1918
1422	sub new {	1919	sub new {
1423	my $class = shift;	1920	my $class = shift;
1424		1921
1425	$class->SUPER::new (	1922	$class->SUPER::new (
…		…
1428	)	1925	)
1429	}	1926	}
1430		1927
1431	#############################################################################	1928	#############################################################################
1432		1929
1433	package CFClient::UI::Label;	1930	package CFPlus::UI::Label;
1434		1931
1435	our @ISA = CFClient::UI::DrawBG::;	1932	our @ISA = CFPlus::UI::DrawBG::;
1436		1933
1437	use CFClient::OpenGL;	1934	use CFPlus::OpenGL;
1438		1935
1439	sub new {	1936	sub new {
1440	my ($class, %arg) = @_;	1937	my ($class, %arg) = @_;
1441		1938
1442	my $self = $class->SUPER::new (	1939	my $self = $class->SUPER::new (
…		…
1445	#active_bg => none	1942	#active_bg => none
1446	#font => default_font	1943	#font => default_font
1447	#text => initial text	1944	#text => initial text
1448	#markup => initial narkup	1945	#markup => initial narkup
1449	#max_w => maximum pixel width	1946	#max_w => maximum pixel width
		1947	#style => 0, # render flags
1450	ellipsise => 3, # end	1948	ellipsise => 3, # end
1451	layout => (new CFClient::Layout),	1949	layout => (new CFPlus::Layout),
1452	fontsize => 1,	1950	fontsize => 1,
1453	align => -1,	1951	align => -1,
1454	valign => -1,	1952	valign => -1,
1455	padding_x => 2,	1953	padding_x => 2,
1456	padding_y => 2,	1954	padding_y => 2,
1457	can_events => 0,	1955	can_events => 0,
1458	%arg	1956	%arg
1459	);	1957	);
1460		1958
1461	if (exists $self->{template}) {	1959	if (exists $self->{template}) {
1462	my $layout = new CFClient::Layout;	1960	my $layout = new CFPlus::Layout;
1463	$layout->set_text (delete $self->{template});	1961	$layout->set_text (delete $self->{template});
1464	$self->{template} = $layout;	1962	$self->{template} = $layout;
1465	}	1963	}
1466		1964
1467	if (exists $self->{markup}) {	1965	if (exists $self->{markup}) {
…		…
1471	}	1969	}
1472		1970
1473	$self	1971	$self
1474	}	1972	}
1475		1973
1476	sub escape($) {
1477	local $_ = $_[0];
1478
1479	s/&/&amp;/g;
1480	s/>/&gt;/g;
1481	s/</&lt;/g;
1482
1483	$_
1484	}
1485
1486	sub update {	1974	sub update {
1487	my ($self) = @_;	1975	my ($self) = @_;
1488		1976
1489	delete $self->{texture};	1977	delete $self->{texture};
1490	$self->SUPER::update;	1978	$self->SUPER::update;
1491	}	1979	}
1492		1980
		1981	sub realloc {
		1982	my ($self) = @_;
		1983
		1984	delete $self->{ox};
		1985	$self->SUPER::realloc;
		1986	}
		1987
1493	sub set_text {	1988	sub set_text {
1494	my ($self, $text) = @_;	1989	my ($self, $text) = @_;
1495		1990
1496	return if $self->{text} eq "T$text";	1991	return if $self->{text} eq "T$text";
1497	$self->{text} = "T$text";	1992	$self->{text} = "T$text";
1498		1993
1499	$self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1500	$self->{layout}->set_text ($text);	1994	$self->{layout}->set_text ($text);
1501		1995
		1996	delete $self->{size_req};
1502	$self->realloc;	1997	$self->realloc;
1503	$self->update;	1998	$self->update;
1504	}	1999	}
1505		2000
1506	sub set_markup {	2001	sub set_markup {
…		…
1509	return if $self->{text} eq "M$markup";	2004	return if $self->{text} eq "M$markup";
1510	$self->{text} = "M$markup";	2005	$self->{text} = "M$markup";
1511		2006
1512	my $rgba = $markup =~ /span.*(?:foreground|background)/;	2007	my $rgba = $markup =~ /span.*(?:foreground|background)/;
1513		2008
1514	$self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1515	$self->{layout}->set_markup ($markup);	2009	$self->{layout}->set_markup ($markup);
1516		2010
		2011	delete $self->{size_req};
1517	$self->realloc;	2012	$self->realloc;
1518	$self->update;	2013	$self->update;
1519	}	2014	}
1520		2015
1521	sub size_request {	2016	sub size_request {
1522	my ($self) = @_;	2017	my ($self) = @_;
1523		2018
		2019	$self->{size_req} ||= do {
1524	$self->{layout}->set_font ($self->{font}) if $self->{font};	2020	$self->{layout}->set_font ($self->{font}) if $self->{font};
1525	$self->{layout}->set_width ($self->{max_w} || -1);	2021	$self->{layout}->set_width ($self->{max_w} || -1);
1526	$self->{layout}->set_ellipsise ($self->{ellipsise});	2022	$self->{layout}->set_ellipsise ($self->{ellipsise});
1527	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});	2023	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1528	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	2024	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1529		2025
1530	my ($w, $h) = $self->{layout}->size;	2026	my ($w, $h) = $self->{layout}->size;
1531		2027
1532	if (exists $self->{template}) {	2028	if (exists $self->{template}) {
1533	$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);
1534	$self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);	2031	$self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1535		2032
1536	my ($w2, $h2) = $self->{template}->size;	2033	my ($w2, $h2) = $self->{template}->size;
1537		2034
1538	$w = List::Util::max $w, $w2;	2035	$w = List::Util::max $w, $w2;
1539	$h = List::Util::max $h, $h2;	2036	$h = List::Util::max $h, $h2;
		2037	}
		2038
		2039	[$w, $h]
1540	}	2040	};
1541		2041
1542	($w, $h)	2042	@{ $self->{size_req} }
1543	}	2043	}
1544		2044
		2045	sub baseline_shift {
		2046	$_[0]{layout}->descent
		2047	}
		2048
1545	sub size_allocate {	2049	sub invoke_size_allocate {
1546	my ($self, $w, $h) = @_;	2050	my ($self, $w, $h) = @_;
		2051
		2052	delete $self->{ox};
1547		2053
1548	delete $self->{texture}	2054	delete $self->{texture}
1549	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
1550	}	2058	}
1551		2059
1552	sub set_fontsize {	2060	sub set_fontsize {
1553	my ($self, $fontsize) = @_;	2061	my ($self, $fontsize) = @_;
1554		2062
1555	$self->{fontsize} = $fontsize;	2063	$self->{fontsize} = $fontsize;
		2064	delete $self->{size_req};
1556	delete $self->{texture};	2065	delete $self->{texture};
1557		2066
1558	$self->realloc;	2067	$self->realloc;
1559	}	2068	}
1560		2069
		2070	sub reconfigure {
		2071	my ($self) = @_;
		2072
		2073	delete $self->{size_req};
		2074	delete $self->{texture};
		2075
		2076	$self->SUPER::reconfigure;
		2077	}
		2078
1561	sub _draw {	2079	sub _draw {
1562	my ($self) = @_;	2080	my ($self) = @_;
1563		2081
1564	$self->SUPER::_draw; # draw background, if applicable	2082	$self->SUPER::_draw; # draw background, if applicable
1565		2083
1566	my $tex = $self->{texture} ||= do {	2084	my $size = $self->{texture} ||= do {
1567	$self->{layout}->set_foreground (@{$self->{fg}});	2085	$self->{layout}->set_foreground (@{$self->{fg}});
1568	$self->{layout}->set_font ($self->{font}) if $self->{font};	2086	$self->{layout}->set_font ($self->{font}) if $self->{font};
1569	$self->{layout}->set_width ($self->{w});	2087	$self->{layout}->set_width ($self->{w});
1570	$self->{layout}->set_ellipsise ($self->{ellipsise});	2088	$self->{layout}->set_ellipsise ($self->{ellipsise});
1571	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});	2089	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1572	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	2090	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1573		2091
1574	my $tex = new_from_layout CFClient::Texture $self->{layout};	2092	[$self->{layout}->size]
		2093	};
1575		2094
		2095	unless (exists $self->{ox}) {
1576	$self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}	2096	$self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1577	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}	2097	: $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
1578	: ($self->{w} - $tex->{w}) * 0.5);	2098	: ($self->{w} - $size->[0]) * 0.5);
1579		2099
1580	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}	2100	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1581	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}	2101	: $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1582	: ($self->{h} - $tex->{h}) * 0.5);	2102	: ($self->{h} - $size->[1]) * 0.5);
1583
1584	$tex
1585	};	2103	};
1586		2104
1587	glEnable GL_TEXTURE_2D;	2105	my $w = List::Util::min $self->{w} + 4, $size->[0];
1588	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2106	my $h = List::Util::min $self->{h} + 2, $size->[1];
1589		2107
1590	if ($tex->{format} == GL_ALPHA) {	2108	$self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1591	glColor @{$self->{fg}};
1592	$tex->draw_quad_alpha ($self->{ox}, $self->{oy});
1593	} else {
1594	$tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1595	}
1596
1597	glDisable GL_TEXTURE_2D;
1598	}	2109	}
1599		2110
1600	#############################################################################	2111	#############################################################################
1601		2112
1602	package CFClient::UI::EntryBase;	2113	package CFPlus::UI::EntryBase;
1603		2114
1604	our @ISA = CFClient::UI::Label::;	2115	our @ISA = CFPlus::UI::Label::;
1605		2116
1606	use CFClient::OpenGL;	2117	use CFPlus::OpenGL;
1607		2118
1608	sub new {	2119	sub new {
1609	my $class = shift;	2120	my $class = shift;
1610		2121
1611	$class->SUPER::new (	2122	$class->SUPER::new (
…		…
1615	active_fg => [0, 0, 0],	2126	active_fg => [0, 0, 0],
1616	can_hover => 1,	2127	can_hover => 1,
1617	can_focus => 1,	2128	can_focus => 1,
1618	valign => 0,	2129	valign => 0,
1619	can_events => 1,	2130	can_events => 1,
		2131	ellipsise => 0,
1620	#text => ...	2132	#text => ...
		2133	#hidden => "*",
1621	@_	2134	@_
1622	)	2135	)
1623	}	2136	}
1624		2137
1625	sub _set_text {	2138	sub _set_text {
…		…
1627		2140
1628	delete $self->{cur_h};	2141	delete $self->{cur_h};
1629		2142
1630	return if $self->{text} eq $text;	2143	return if $self->{text} eq $text;
1631		2144
1632	delete $self->{texture};
1633
1634	$self->{last_activity} = $::NOW;	2145	$self->{last_activity} = $::NOW;
1635	$self->{text} = $text;	2146	$self->{text} = $text;
1636		2147
1637	$text =~ s/./*/g if $self->{hidden};	2148	$text =~ s/./*/g if $self->{hidden};
1638	$self->{layout}->set_text ("$text ");	2149	$self->{layout}->set_text ("$text ");
		2150	delete $self->{size_req};
1639		2151
1640	$self->_emit (changed => $self->{text});	2152	$self->emit (changed => $self->{text});
		2153
		2154	$self->realloc;
		2155	$self->update;
1641	}	2156	}
1642		2157
1643	sub set_text {	2158	sub set_text {
1644	my ($self, $text) = @_;	2159	my ($self, $text) = @_;
1645		2160
1646	$self->{cursor} = length $text;	2161	$self->{cursor} = length $text;
1647	$self->_set_text ($text);	2162	$self->_set_text ($text);
1648
1649	$self->realloc;
1650	}	2163	}
1651		2164
1652	sub get_text {	2165	sub get_text {
1653	$_[0]{text}	2166	$_[0]{text}
1654	}	2167	}
…		…
1659	my ($w, $h) = $self->SUPER::size_request;	2172	my ($w, $h) = $self->SUPER::size_request;
1660		2173
1661	($w + 1, $h) # add 1 for cursor	2174	($w + 1, $h) # add 1 for cursor
1662	}	2175	}
1663		2176
1664	sub key_down {	2177	sub invoke_key_down {
1665	my ($self, $ev) = @_;	2178	my ($self, $ev) = @_;
1666		2179
1667	my $mod = $ev->{mod};	2180	my $mod = $ev->{mod};
1668	my $sym = $ev->{sym};	2181	my $sym = $ev->{sym};
1669	my $uni = $ev->{unicode};	2182	my $uni = $ev->{unicode};
1670		2183
1671	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;
1672		2187
1673	if ($uni == 8) {	2188	if ($uni == 8) {
1674	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};	2189	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1675	} elsif ($uni == 127) {	2190	} elsif ($uni == 127) {
1676	substr $text, $self->{cursor}, 1, "";	2191	substr $text, $self->{cursor}, 1, "";
1677	} elsif ($sym == CFClient::SDLK_LEFT) {	2192	} elsif ($sym == CFPlus::SDLK_LEFT) {
1678	--$self->{cursor} if $self->{cursor};	2193	--$self->{cursor} if $self->{cursor};
1679	} elsif ($sym == CFClient::SDLK_RIGHT) {	2194	} elsif ($sym == CFPlus::SDLK_RIGHT) {
1680	++$self->{cursor} if $self->{cursor} < length $self->{text};	2195	++$self->{cursor} if $self->{cursor} < length $self->{text};
1681	} 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 = "";
1682	$self->{cursor} = 0;	2210	$self->{cursor} = 0;
1683	} elsif ($sym == CFClient::SDLK_END) {
1684	$self->{cursor} = length $text;
1685	} elsif ($uni == 27) {	2211	} elsif ($uni == 27) {
1686	$self->_emit ('escape');	2212	$self->emit ('escape');
1687	} elsif ($uni) {	2213	} elsif ($uni == 0x0d) {
		2214	substr $text, $self->{cursor}++, 0, "\012";
		2215	} elsif ($uni >= 0x20) {
1688	substr $text, $self->{cursor}++, 0, chr $uni;	2216	substr $text, $self->{cursor}++, 0, chr $uni;
		2217	} else {
		2218	return 0;
1689	}	2219	}
1690		2220
1691	$self->_set_text ($text);	2221	$self->_set_text ($text);
1692		2222
1693	$self->realloc;	2223	$self->realloc;
1694	}	2224	$self->update;
1695		2225
		2226	1
		2227	}
		2228
1696	sub focus_in {	2229	sub invoke_focus_in {
1697	my ($self) = @_;	2230	my ($self) = @_;
1698		2231
1699	$self->{last_activity} = $::NOW;	2232	$self->{last_activity} = $::NOW;
1700		2233
1701	$self->SUPER::focus_in;	2234	$self->SUPER::invoke_focus_in
1702	}	2235	}
1703		2236
1704	sub button_down {	2237	sub invoke_button_down {
1705	my ($self, $ev, $x, $y) = @_;	2238	my ($self, $ev, $x, $y) = @_;
1706		2239
1707	$self->SUPER::button_down ($ev, $x, $y);	2240	$self->SUPER::invoke_button_down ($ev, $x, $y);
1708		2241
1709	my $idx = $self->{layout}->xy_to_index ($x, $y);	2242	my $idx = $self->{layout}->xy_to_index ($x, $y);
1710		2243
1711	# byte-index to char-index	2244	# byte-index to char-index
1712	my $text = $self->{text};	2245	my $text = $self->{text};
1713	utf8::encode $text;	2246	utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1714	$self->{cursor} = length substr $text, 0, $idx;	2247	$self->{cursor} = length $text;
1715		2248
1716	$self->_set_text ($self->{text});	2249	$self->_set_text ($self->{text});
1717	$self->update;	2250	$self->update;
		2251
		2252	1
1718	}	2253	}
1719		2254
1720	sub mouse_motion {	2255	sub invoke_mouse_motion {
1721	my ($self, $ev, $x, $y) = @_;	2256	my ($self, $ev, $x, $y) = @_;
1722	# 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
1723	}	2260	}
1724		2261
1725	sub _draw {	2262	sub _draw {
1726	my ($self) = @_;	2263	my ($self) = @_;
1727		2264
1728	local $self->{fg} = $self->{fg};	2265	local $self->{fg} = $self->{fg};
1729		2266
1730	if ($FOCUS == $self) {	2267	if ($FOCUS == $self) {
1731	glColor @{$self->{active_bg}};	2268	glColor_premultiply @{$self->{active_bg}};
1732	$self->{fg} = $self->{active_fg};	2269	$self->{fg} = $self->{active_fg};
1733	} else {	2270	} else {
1734	glColor @{$self->{bg}};	2271	glColor_premultiply @{$self->{bg}};
1735	}	2272	}
1736		2273
1737	glEnable GL_BLEND;	2274	glEnable GL_BLEND;
1738	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	2275	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1739	glBegin GL_QUADS;	2276	glBegin GL_QUADS;
1740	glVertex 0 , 0;	2277	glVertex 0 , 0;
1741	glVertex 0 , $self->{h};	2278	glVertex 0 , $self->{h};
1742	glVertex $self->{w}, $self->{h};	2279	glVertex $self->{w}, $self->{h};
1743	glVertex $self->{w}, 0;	2280	glVertex $self->{w}, 0;
…		…
1754	utf8::encode $text;	2291	utf8::encode $text;
1755		2292
1756	@$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)
1757	}	2294	}
1758		2295
1759	glColor @{$self->{fg}};
1760	glBegin GL_LINES;	2296	glBegin GL_LINES;
1761	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};
1762	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};
1763	glEnd;	2299	glEnd;
1764	}	2300	}
1765	}	2301	}
1766		2302
		2303	#############################################################################
		2304
1767	package CFClient::UI::Entry;	2305	package CFPlus::UI::Entry;
1768		2306
1769	our @ISA = CFClient::UI::EntryBase::;	2307	our @ISA = CFPlus::UI::EntryBase::;
1770		2308
1771	use CFClient::OpenGL;	2309	use CFPlus::OpenGL;
1772		2310
1773	sub key_down {	2311	sub invoke_key_down {
1774	my ($self, $ev) = @_;	2312	my ($self, $ev) = @_;
1775		2313
1776	my $sym = $ev->{sym};	2314	my $sym = $ev->{sym};
1777		2315
1778	if ($sym == 13) {	2316	if ($ev->{uni} == 0x0d || $sym == 13) {
1779	unshift @{$self->{history}},	2317	unshift @{$self->{history}},
1780	my $txt = $self->get_text;	2318	my $txt = $self->get_text;
		2319
1781	$self->{history_pointer} = -1;	2320	$self->{history_pointer} = -1;
1782	$self->{history_saveback} = '';	2321	$self->{history_saveback} = '';
1783	$self->_emit (activate => $txt);	2322	$self->emit (activate => $txt);
1784	$self->update;	2323	$self->update;
1785		2324
1786	} elsif ($sym == CFClient::SDLK_UP) {	2325	} elsif ($sym == CFPlus::SDLK_UP) {
1787	if ($self->{history_pointer} < 0) {	2326	if ($self->{history_pointer} < 0) {
1788	$self->{history_saveback} = $self->get_text;	2327	$self->{history_saveback} = $self->get_text;
1789	}	2328	}
1790	if (@{$self->{history} || []} > 0) {	2329	if (@{$self->{history} || []} > 0) {
1791	$self->{history_pointer}++;	2330	$self->{history_pointer}++;
…		…
1793	$self->{history_pointer} = @{$self->{history} || []} - 1;	2332	$self->{history_pointer} = @{$self->{history} || []} - 1;
1794	}	2333	}
1795	$self->set_text ($self->{history}->[$self->{history_pointer}]);	2334	$self->set_text ($self->{history}->[$self->{history_pointer}]);
1796	}	2335	}
1797		2336
1798	} elsif ($sym == CFClient::SDLK_DOWN) {	2337	} elsif ($sym == CFPlus::SDLK_DOWN) {
1799	$self->{history_pointer}--;	2338	$self->{history_pointer}--;
1800	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;	2339	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1801		2340
1802	if ($self->{history_pointer} >= 0) {	2341	if ($self->{history_pointer} >= 0) {
1803	$self->set_text ($self->{history}->[$self->{history_pointer}]);	2342	$self->set_text ($self->{history}->[$self->{history_pointer}]);
1804	} else {	2343	} else {
1805	$self->set_text ($self->{history_saveback});	2344	$self->set_text ($self->{history_saveback});
1806	}	2345	}
1807		2346
1808	} else {	2347	} else {
1809	$self->SUPER::key_down ($ev);	2348	return $self->SUPER::invoke_key_down ($ev)
		2349	}
		2350
1810	}	2351	1
1811
1812	}	2352	}
1813		2353
1814	#############################################################################	2354	#############################################################################
1815		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
1816	package CFClient::UI::Button;	2395	package CFPlus::UI::Button;
1817		2396
1818	our @ISA = CFClient::UI::Label::;	2397	our @ISA = CFPlus::UI::Label::;
1819		2398
1820	use CFClient::OpenGL;	2399	use CFPlus::OpenGL;
1821		2400
1822	my @tex =	2401	my @tex =
1823	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2402	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1824	qw(b1_button_active.png);	2403	qw(b1_button_inactive.png b1_button_active.png);
1825		2404
1826	sub new {	2405	sub new {
1827	my $class = shift;	2406	my $class = shift;
1828		2407
1829	$class->SUPER::new (	2408	$class->SUPER::new (
1830	padding_x => 4,	2409	padding_x => 4,
1831	padding_y => 4,	2410	padding_y => 4,
1832	fg => [1, 1, 1],	2411	fg => [1.0, 1.0, 1.0],
1833	active_fg => [0, 0, 1],	2412	active_fg => [0.8, 0.8, 0.8],
1834	can_hover => 1,	2413	can_hover => 1,
1835	align => 0,	2414	align => 0,
1836	valign => 0,	2415	valign => 0,
1837	can_events => 1,	2416	can_events => 1,
1838	@_	2417	@_
1839	)	2418	)
1840	}	2419	}
1841		2420
1842	sub activate { }
1843
1844	sub button_up {	2421	sub invoke_button_up {
1845	my ($self, $ev, $x, $y) = @_;	2422	my ($self, $ev, $x, $y) = @_;
1846		2423
1847	$self->emit ("activate")	2424	$self->emit ("activate")
1848	if $x >= 0 && $x < $self->{w}	2425	if $x >= 0 && $x < $self->{w}
1849	&& $y >= 0 && $y < $self->{h};	2426	&& $y >= 0 && $y < $self->{h};
		2427
		2428	1
1850	}	2429	}
1851		2430
1852	sub _draw {	2431	sub _draw {
1853	my ($self) = @_;	2432	my ($self) = @_;
1854		2433
1855	local $self->{fg} = $self->{fg};	2434	local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1856
1857	if ($GRAB == $self) {
1858	$self->{fg} = $self->{active_fg};
1859	}
1860		2435
1861	glEnable GL_TEXTURE_2D;	2436	glEnable GL_TEXTURE_2D;
1862	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2437	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1863	glColor 0, 0, 0, 1;	2438	glColor 0, 0, 0, 1;
1864		2439
		2440	my $tex = $tex[$GRAB == $self];
1865	$tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});	2441	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1866		2442
1867	glDisable GL_TEXTURE_2D;	2443	glDisable GL_TEXTURE_2D;
1868		2444
1869	$self->SUPER::_draw;	2445	$self->SUPER::_draw;
1870	}	2446	}
1871		2447
1872	#############################################################################	2448	#############################################################################
1873		2449
1874	package CFClient::UI::CheckBox;	2450	package CFPlus::UI::CheckBox;
1875		2451
1876	our @ISA = CFClient::UI::DrawBG::;	2452	our @ISA = CFPlus::UI::DrawBG::;
1877		2453
1878	my @tex =	2454	my @tex =
1879	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2455	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1880	qw(c1_checkbox_bg.png c1_checkbox_active.png);	2456	qw(c1_checkbox_bg.png c1_checkbox_active.png);
1881		2457
1882	use CFClient::OpenGL;	2458	use CFPlus::OpenGL;
1883		2459
1884	sub new {	2460	sub new {
1885	my $class = shift;	2461	my $class = shift;
1886		2462
1887	$class->SUPER::new (	2463	$class->SUPER::new (
…		…
1901	my ($self) = @_;	2477	my ($self) = @_;
1902		2478
1903	(6) x 2	2479	(6) x 2
1904	}	2480	}
1905		2481
		2482	sub toggle {
		2483	my ($self) = @_;
		2484
		2485	$self->{state} = !$self->{state};
		2486	$self->emit (changed => $self->{state});
		2487	$self->update;
		2488	}
		2489
1906	sub button_down {	2490	sub invoke_button_down {
1907	my ($self, $ev, $x, $y) = @_;	2491	my ($self, $ev, $x, $y) = @_;
1908		2492
1909	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}	2493	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1910	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {	2494	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1911	$self->{state} = !$self->{state};	2495	$self->toggle;
1912	$self->_emit (changed => $self->{state});	2496	} else {
		2497	return 0
		2498	}
		2499
1913	}	2500	1
1914	}	2501	}
1915		2502
1916	sub _draw {	2503	sub _draw {
1917	my ($self) = @_;	2504	my ($self) = @_;
1918		2505
…		…
1933	glDisable GL_TEXTURE_2D;	2520	glDisable GL_TEXTURE_2D;
1934	}	2521	}
1935		2522
1936	#############################################################################	2523	#############################################################################
1937		2524
1938	package CFClient::UI::Image;	2525	package CFPlus::UI::Image;
1939		2526
1940	our @ISA = CFClient::UI::Base::;	2527	our @ISA = CFPlus::UI::Base::;
1941		2528
1942	use CFClient::OpenGL;	2529	use CFPlus::OpenGL;
1943	use Carp qw/confess/;
1944		2530
1945	our %loaded_images;	2531	our %texture_cache;
1946		2532
1947	sub new {	2533	sub new {
1948	my $class = shift;	2534	my $class = shift;
1949		2535
1950	my $self = $class->SUPER::new (can_events => 0, @_);	2536	my $self = $class->SUPER::new (
		2537	can_events => 0,
		2538	@_,
		2539	);
1951		2540
1952	$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";
1953		2543
1954	$loaded_images{$self->{image}} ||=	2544	$self->{tex} ||= $texture_cache{$self->{path}} ||=
1955	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;
1956		2546
1957	my $tex = $self->{tex} = $loaded_images{$self->{image}};	2547	CFPlus::weaken $texture_cache{$self->{path}};
1958		2548
1959	Scalar::Util::weaken $loaded_images{$self->{image}};	2549	$self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
1960
1961	$self->{aspect} = $tex->{w} / $tex->{h};
1962		2550
1963	$self	2551	$self
1964	}	2552	}
1965		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
1966	sub size_request {	2569	sub size_request {
1967	my ($self) = @_;	2570	my ($self) = @_;
1968		2571
1969	($self->{tex}->{w}, $self->{tex}->{h})	2572	($self->{tex}{w}, $self->{tex}{h})
1970	}	2573	}
1971		2574
1972	sub _draw {	2575	sub _draw {
1973	my ($self) = @_;	2576	my ($self) = @_;
1974		2577
…		…
1984	}	2587	}
1985		2588
1986	glEnable GL_TEXTURE_2D;	2589	glEnable GL_TEXTURE_2D;
1987	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2590	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1988		2591
1989	$tex->draw_quad_alpha (0, 0, $w, $h);	2592	$tex->draw_quad (0, 0, $w, $h);
1990		2593
1991	glDisable GL_TEXTURE_2D;	2594	glDisable GL_TEXTURE_2D;
1992	}	2595	}
1993		2596
1994	#############################################################################	2597	#############################################################################
1995		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
1996	package CFClient::UI::VGauge;	2635	package CFPlus::UI::VGauge;
1997		2636
1998	our @ISA = CFClient::UI::Base::;	2637	our @ISA = CFPlus::UI::Base::;
1999		2638
2000	use List::Util qw(min max);	2639	use List::Util qw(min max);
2001		2640
2002	use CFClient::OpenGL;	2641	use CFPlus::OpenGL;
2003		2642
2004	my %tex = (	2643	my %tex = (
2005	food => [	2644	food => [
2006	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2645	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2007	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/	2646	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2008	],	2647	],
2009	grace => [	2648	grace => [
2010	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2649	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2011	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/
2012	],	2651	],
2013	hp => [	2652	hp => [
2014	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2653	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2015	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/	2654	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2016	],	2655	],
2017	mana => [	2656	mana => [
2018	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2657	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2019	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/
2020	],	2659	],
2021	);	2660	);
2022		2661
2023	# eg. VGauge->new (gauge => 'food'), default gauge: food	2662	# eg. VGauge->new (gauge => 'food'), default gauge: food
…		…
2083	my $ycut1 = max 0, min 1, $ycut;	2722	my $ycut1 = max 0, min 1, $ycut;
2084	my $ycut2 = max 0, min 1, $ycut - 1;	2723	my $ycut2 = max 0, min 1, $ycut - 1;
2085		2724
2086	my $h1 = $self->{h} * (1 - $ycut1);	2725	my $h1 = $self->{h} * (1 - $ycut1);
2087	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);
2088		2730
2089	glEnable GL_BLEND;	2731	glEnable GL_BLEND;
2090	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;
2091	glEnable GL_TEXTURE_2D;	2734	glEnable GL_TEXTURE_2D;
2092	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2735	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2093		2736
2094	glBindTexture GL_TEXTURE_2D, $t1->{name};	2737	glBindTexture GL_TEXTURE_2D, $t1->{name};
2095	glBegin GL_QUADS;	2738	glBegin GL_QUADS;
…		…
2110		2753
2111	if ($t3) {	2754	if ($t3) {
2112	glBindTexture GL_TEXTURE_2D, $t3->{name};	2755	glBindTexture GL_TEXTURE_2D, $t3->{name};
2113	glBegin GL_QUADS;	2756	glBegin GL_QUADS;
2114	glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;	2757	glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2115	glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h};	2758	glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2116	glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h};	2759	glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2117	glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;	2760	glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2118	glEnd;	2761	glEnd;
2119	}	2762	}
2120		2763
2121	glDisable GL_BLEND;	2764	glDisable GL_BLEND;
2122	glDisable GL_TEXTURE_2D;	2765	glDisable GL_TEXTURE_2D;
2123	}	2766	}
2124		2767
2125	#############################################################################	2768	#############################################################################
2126		2769
2127	package CFClient::UI::Gauge;	2770	package CFPlus::UI::Gauge;
2128		2771
2129	our @ISA = CFClient::UI::VBox::;	2772	our @ISA = CFPlus::UI::VBox::;
2130		2773
2131	sub new {	2774	sub new {
2132	my ($class, %arg) = @_;	2775	my ($class, %arg) = @_;
2133		2776
2134	my $self = $class->SUPER::new (	2777	my $self = $class->SUPER::new (
…		…
2136	can_hover => 1,	2779	can_hover => 1,
2137	can_events => 1,	2780	can_events => 1,
2138	%arg,	2781	%arg,
2139	);	2782	);
2140		2783
2141	$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");
2142	$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);
2143	$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");
2144		2787
2145	$self	2788	$self
2146	}	2789	}
2147		2790
2148	sub set_fontsize {	2791	sub set_fontsize {
…		…
2169	$self->{value}->set_text ($val);	2812	$self->{value}->set_text ($val);
2170	}	2813	}
2171		2814
2172	#############################################################################	2815	#############################################################################
2173		2816
2174	package CFClient::UI::Slider;	2817	package CFPlus::UI::Slider;
2175		2818
2176	use strict;	2819	use strict;
2177		2820
2178	use CFClient::OpenGL;	2821	use CFPlus::OpenGL;
2179		2822
2180	our @ISA = CFClient::UI::DrawBG::;	2823	our @ISA = CFPlus::UI::DrawBG::;
2181		2824
2182	my @tex =	2825	my @tex =
2183	map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }	2826	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
2184	qw(s1_slider.png s1_slider_bg.png);	2827	qw(s1_slider.png s1_slider_bg.png);
2185		2828
2186	sub new {	2829	sub new {
2187	my $class = shift;	2830	my $class = shift;
2188		2831
…		…
2209	$self->update;	2852	$self->update;
2210		2853
2211	$self	2854	$self
2212	}	2855	}
2213		2856
2214	sub changed { }
2215
2216	sub set_range {	2857	sub set_range {
2217	my ($self, $range) = @_;	2858	my ($self, $range) = @_;
2218		2859
2219	($range, $self->{range}) = ($self->{range}, $range);	2860	($range, $self->{range}) = ($self->{range}, $range);
2220		2861
2221	$self->update
2222	if "@$range" ne "@{$self->{range}}";	2862	if ("@$range" ne "@{$self->{range}}") {
		2863	$self->update;
		2864	$self->set_value ($self->{range}[0]);
		2865	}
2223	}	2866	}
2224		2867
2225	sub set_value {	2868	sub set_value {
2226	my ($self, $value) = @_;	2869	my ($self, $value) = @_;
2227		2870
…		…
2238	if $unit;	2881	if $unit;
2239		2882
2240	@{$self->{range}} = ($value, $lo, $hi, $page, $unit);	2883	@{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2241		2884
2242	if ($value != $old_value) {	2885	if ($value != $old_value) {
2243	$self->_emit (changed => $value);	2886	$self->emit (changed => $value);
2244	$self->update;	2887	$self->update;
2245	}	2888	}
2246	}	2889	}
2247		2890
2248	sub size_request {	2891	sub size_request {
2249	my ($self) = @_;	2892	my ($self) = @_;
2250		2893
2251	($self->{req_w}, $self->{req_h})	2894	($self->{req_w}, $self->{req_h})
2252	}	2895	}
2253		2896
2254	sub button_down {	2897	sub invoke_button_down {
2255	my ($self, $ev, $x, $y) = @_;	2898	my ($self, $ev, $x, $y) = @_;
2256		2899
2257	$self->SUPER::button_down ($ev, $x, $y);	2900	$self->SUPER::invoke_button_down ($ev, $x, $y);
2258		2901
2259	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];	2902	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2260		2903
2261	$self->mouse_motion ($ev, $x, $y);	2904	$self->invoke_mouse_motion ($ev, $x, $y)
2262	}	2905	}
2263		2906
2264	sub mouse_motion {	2907	sub invoke_mouse_motion {
2265	my ($self, $ev, $x, $y) = @_;	2908	my ($self, $ev, $x, $y) = @_;
2266		2909
2267	if ($GRAB == $self) {	2910	if ($GRAB == $self) {
2268	my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});	2911	my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2269		2912
2270	my (undef, $lo, $hi, $page) = @{$self->{range}};	2913	my (undef, $lo, $hi, $page) = @{$self->{range}};
2271		2914
2272	$x = ($x - $self->{click}[1]) / ($w * $self->{scale});	2915	$x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2273		2916
2274	$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
2275	}	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
2276	}	2935	}
2277		2936
2278	sub update {	2937	sub update {
2279	my ($self) = @_;	2938	my ($self) = @_;
2280		2939
2281	$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}) {
2282	$self->set_value ($self->{range}[0]);	2948	$self->set_value ($self->{range}[0]);
2283		2949
2284	my ($value, $lo, $hi, $page) = @{$self->{range}};	2950	my ($value, $lo, $hi, $page) = @{$self->{range}};
2285	my $range = ($hi - $page - $lo) || 1e-100;	2951	my $range = ($hi - $page - $lo) || 1e-100;
2286		2952
…		…
2292	$value = ($value - $lo) / $range;	2958	$value = ($value - $lo) / $range;
2293	$value = $value * $self->{scale} + $self->{offset};	2959	$value = $value * $self->{scale} + $self->{offset};
2294		2960
2295	$self->{knob_x} = $value - $knob_w * 0.5;	2961	$self->{knob_x} = $value - $knob_w * 0.5;
2296	$self->{knob_w} = $knob_w;	2962	$self->{knob_w} = $knob_w;
2297	});	2963	}
2298
2299	$self->SUPER::update;
2300	}
2301
2302	sub _draw {
2303	my ($self) = @_;
2304		2964
2305	$self->SUPER::_draw ();	2965	$self->SUPER::_draw ();
2306		2966
2307	glScale $self->{w}, $self->{h};	2967	glScale $self->{w}, $self->{h};
2308		2968
…		…
2328	glDisable GL_TEXTURE_2D;	2988	glDisable GL_TEXTURE_2D;
2329	}	2989	}
2330		2990
2331	#############################################################################	2991	#############################################################################
2332		2992
2333	package CFClient::UI::ValSlider;	2993	package CFPlus::UI::ValSlider;
2334		2994
2335	our @ISA = CFClient::UI::HBox::;	2995	our @ISA = CFPlus::UI::HBox::;
2336		2996
2337	sub new {	2997	sub new {
2338	my ($class, %arg) = @_;	2998	my ($class, %arg) = @_;
2339		2999
2340	my $range = delete $arg{range};	3000	my $range = delete $arg{range};
2341		3001
2342	my $self = $class->SUPER::new (	3002	my $self = $class->SUPER::new (
2343	slider => (new CFClient::UI::Slider expand => 1, range => $range),	3003	slider => (new CFPlus::UI::Slider expand => 1, range => $range),
2344	entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),	3004	entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
2345	to_value => sub { shift },	3005	to_value => sub { shift },
2346	from_value => sub { shift },	3006	from_value => sub { shift },
2347	%arg,	3007	%arg,
2348	);	3008	);
2349		3009
…		…
2369	sub set_range { shift->{slider}->set_range (@_) }	3029	sub set_range { shift->{slider}->set_range (@_) }
2370	sub set_value { shift->{slider}->set_value (@_) }	3030	sub set_value { shift->{slider}->set_value (@_) }
2371		3031
2372	#############################################################################	3032	#############################################################################
2373		3033
2374	package CFClient::UI::TextView;	3034	package CFPlus::UI::TextScroller;
2375		3035
2376	our @ISA = CFClient::UI::HBox::;	3036	our @ISA = CFPlus::UI::HBox::;
2377		3037
2378	use CFClient::OpenGL;	3038	use CFPlus::OpenGL;
2379		3039
2380	sub new {	3040	sub new {
2381	my $class = shift;	3041	my $class = shift;
2382		3042
2383	my $self = $class->SUPER::new (	3043	my $self = $class->SUPER::new (
2384	fontsize => 1,	3044	fontsize => 1,
2385	can_events => 0,	3045	can_events => 1,
		3046	indent => 0,
2386	#font => default_font	3047	#font => default_font
2387	@_,	3048	@_,
2388		3049
2389	layout => (new CFClient::Layout 1),	3050	layout => (new CFPlus::Layout),
2390	par => [],	3051	par => [],
		3052	max_par => 0,
2391	height => 0,	3053	height => 0,
2392	children => [	3054	children => [
2393	(new CFClient::UI::Empty expand => 1),	3055	(new CFPlus::UI::Empty expand => 1),
2394	(new CFClient::UI::Slider vertical => 1),	3056	(new CFPlus::UI::Slider vertical => 1),
2395	],	3057	],
2396	);	3058	);
2397		3059
2398	$self->{children}[1]->connect (changed => sub { $self->update });	3060	$self->{children}[1]->connect (changed => sub { $self->update });
2399		3061
…		…
2405		3067
2406	$self->{fontsize} = $fontsize;	3068	$self->{fontsize} = $fontsize;
2407	$self->reflow;	3069	$self->reflow;
2408	}	3070	}
2409		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
2410	sub size_allocate {	3081	sub invoke_size_allocate {
2411	my ($self, $w, $h) = @_;	3082	my ($self, $w, $h) = @_;
2412		3083
2413	$self->SUPER::size_allocate ($w, $h);	3084	my ($empty, $slider, @other) = @{ $self->{children} };
		3085	$_->configure (@$_{qw(x y req_w req_h)}) for @other;
2414		3086
2415	$self->{layout}->set_font ($self->{font}) if $self->{font};	3087	$self->{layout}->set_font ($self->{font}) if $self->{font};
2416	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	3088	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2417	$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});
2418		3091
2419	$self->reflow;	3092	$self->reflow;
2420	}
2421		3093
2422	sub text_size {	3094	local $self->{children} = [$empty, $slider];
		3095	$self->SUPER::invoke_size_allocate ($w, $h)
		3096	}
		3097
		3098	sub invoke_mouse_wheel {
2423	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) = @_;
2424		3110
2425	my $layout = $self->{layout};	3111	my $layout = $self->{layout};
2426		3112
		3113	$layout->set_font ($self->{font}) if $self->{font};
		3114	$layout->set_foreground (@{$para->{fg}});
2427	$layout->set_height ($self->{fontsize} * $::FONTSIZE);	3115	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
2428	$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});
2429	$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}}
2430		3124	);
		3125
2431	$layout->size	3126	$layout
2432	}	3127	}
2433		3128
2434	sub reflow {	3129	sub reflow {
2435	my ($self) = @_;	3130	my ($self) = @_;
2436		3131
…		…
2443		3138
2444	# todo: base offset on lines or so, not on pixels	3139	# todo: base offset on lines or so, not on pixels
2445	$self->{children}[1]->set_value ($offset);	3140	$self->{children}[1]->set_value ($offset);
2446	}	3141	}
2447		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
2448	sub clear {	3158	sub clear {
2449	my ($self) = @_;	3159	my ($self) = @_;
		3160
		3161	my (undef, undef, @other) = @{ $self->{children} };
		3162	$self->remove ($_) for @other;
2450		3163
2451	$self->{par} = [];	3164	$self->{par} = [];
2452	$self->{height} = 0;	3165	$self->{height} = 0;
2453	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);	3166	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2454	}	3167	}
2455		3168
2456	sub add_paragraph {	3169	sub add_paragraph {
2457	my ($self, $color, $text, $indent) = @_;	3170	my $self = shift;
2458		3171
2459	for my $line (split /\n/, $text) {	3172	for my $para (@_) {
2460	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
2461	$self->{height} += $h;	3224	$self->{height} = $height;
2462	push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];	3225	$self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2463	}
2464		3226
2465	$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	}
2466	}	3233	}
2467		3234
2468	sub update {	3235	sub update {
2469	my ($self) = @_;	3236	my ($self) = @_;
2470		3237
…		…
2472		3239
2473	return unless $self->{h} > 0;	3240	return unless $self->{h} > 0;
2474		3241
2475	delete $self->{texture};	3242	delete $self->{texture};
2476		3243
2477	$ROOT->on_post_alloc ($self, sub {	3244	$ROOT->on_post_alloc ($self => sub {
		3245	$self->force_uptodate;
		3246
2478	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};	3247	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2479		3248
2480	if (delete $self->{need_reflow}) {
2481	my $height = 0;
2482
2483	my $layout = $self->{layout};
2484
2485	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
2486
2487	for (@{$self->{par}}) {
2488	if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2489	$layout->set_width ($W - $_->[3]);
2490	$layout->set_markup ($_->[4]);
2491	my ($w, $h) = $layout->size;
2492	$_->[0] = $w + $_->[3];
2493	$_->[1] = $h;
2494	}
2495
2496	$height += $_->[1];
2497	}
2498
2499	$self->{height} = $height;
2500
2501	$self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2502
2503	delete $self->{texture};
2504	}
2505
2506	$self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {	3249	$self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2507	glClearColor 0.5, 0.5, 0.5, 0;	3250	glClearColor 0, 0, 0, 0;
2508	glClear GL_COLOR_BUFFER_BIT;	3251	glClear GL_COLOR_BUFFER_BIT;
2509		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;
2510	my $top = int $self->{children}[1]{range}[0];	3261	my $top = int $self->{children}[1]{range}[0];
2511		3262
2512	my $y0 = $top;	3263	my $y0 = $top;
2513	my $y1 = $top + $H;	3264	my $y1 = $top + $H;
2514		3265
2515	my $y = 0;
2516
2517	my $layout = $self->{layout};
2518
2519	$layout->set_font ($self->{font}) if $self->{font};
2520
2521	glEnable GL_BLEND;
2522	#TODO# not correct in windows where rgba is forced off
2523	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2524
2525	for my $par (@{$self->{par}}) {	3266	for my $para (@{$self->{par}}) {
2526	my $h = $par->[1];	3267	my $h = $para->{h};
		3268	my $y = $para->{y};
2527		3269
2528	if ($y0 < $y + $h && $y < $y1) {	3270	if ($y0 < $y + $h && $y < $y1) {
2529	$layout->set_foreground (@{ $par->[2] });	3271	my $layout = $self->get_layout ($para);
2530	$layout->set_width ($W - $par->[3]);
2531	$layout->set_markup ($par->[4]);
2532		3272
2533	my ($w, $h, $data, $format, $internalformat) = $layout->render;	3273	$layout->render ($para->{indent}, $y - $y0);
2534		3274
2535	glRasterPos $par->[3], $y - $y0;	3275	if (my @w = @{ $para->{widget} }) {
2536	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	}
2537	}	3287	}
2538		3288
2539	$y += $h;	3289	$paridx++;
		3290	$top_paragraph ||= $paridx if $y >= $top;
2540	}	3291	}
2541		3292
2542	glDisable GL_BLEND;	3293	$self->{top_paragraph} = $top_paragraph;
2543	};	3294	};
2544	});	3295	});
2545	}	3296	}
2546		3297
		3298	sub reconfigure {
		3299	my ($self) = @_;
		3300
		3301	$self->SUPER::reconfigure;
		3302
		3303	$_->{w} = 1e10 for @{ $self->{par} };
		3304	$self->reflow;
		3305	}
		3306
2547	sub _draw {	3307	sub _draw {
2548	my ($self) = @_;	3308	my ($self) = @_;
2549		3309
2550	glEnable GL_TEXTURE_2D;	3310	glEnable GL_TEXTURE_2D;
2551	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	3311	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2552	glColor 1, 1, 1, 1;	3312	glColor 0, 0, 0, 1;
2553	$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});
2554	glDisable GL_TEXTURE_2D;	3314	glDisable GL_TEXTURE_2D;
2555		3315
2556	$self->{children}[1]->draw;	3316	$self->{children}[1]->draw;
2557
2558	}	3317	}
2559		3318
2560	#############################################################################	3319	#############################################################################
2561		3320
2562	package CFClient::UI::Animator;	3321	package CFPlus::UI::Animator;
2563		3322
2564	use CFClient::OpenGL;	3323	use CFPlus::OpenGL;
2565		3324
2566	our @ISA = CFClient::UI::Bin::;	3325	our @ISA = CFPlus::UI::Bin::;
2567		3326
2568	sub moveto {	3327	sub moveto {
2569	my ($self, $x, $y) = @_;	3328	my ($self, $x, $y) = @_;
2570		3329
2571	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];	3330	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
…		…
2599	glPopMatrix;	3358	glPopMatrix;
2600	}	3359	}
2601		3360
2602	#############################################################################	3361	#############################################################################
2603		3362
2604	package CFClient::UI::Flopper;	3363	package CFPlus::UI::Flopper;
2605		3364
2606	our @ISA = CFClient::UI::Button::;	3365	our @ISA = CFPlus::UI::Button::;
2607		3366
2608	sub new {	3367	sub new {
2609	my $class = shift;	3368	my $class = shift;
2610		3369
2611	my $self = $class->SUPER::new (	3370	my $self = $class->SUPER::new (
…		…
2623	$self->{other}->toggle_visibility;	3382	$self->{other}->toggle_visibility;
2624	}	3383	}
2625		3384
2626	#############################################################################	3385	#############################################################################
2627		3386
2628	package CFClient::UI::Tooltip;	3387	package CFPlus::UI::Tooltip;
2629		3388
2630	our @ISA = CFClient::UI::Bin::;	3389	our @ISA = CFPlus::UI::Bin::;
2631		3390
2632	use CFClient::OpenGL;	3391	use CFPlus::OpenGL;
2633		3392
2634	sub new {	3393	sub new {
2635	my $class = shift;	3394	my $class = shift;
2636		3395
2637	$class->SUPER::new (	3396	$class->SUPER::new (
…		…
2640	)	3399	)
2641	}	3400	}
2642		3401
2643	sub set_tooltip_from {	3402	sub set_tooltip_from {
2644	my ($self, $widget) = @_;	3403	my ($self, $widget) = @_;
		3404
		3405	$widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
		3406	if $widget->{tooltip} =~ /^#(.*)$/;
2645		3407
2646	my $tooltip = $widget->{tooltip};	3408	my $tooltip = $widget->{tooltip};
2647		3409
2648	if ($ENV{CFPLUS_DEBUG} & 2) {	3410	if ($ENV{CFPLUS_DEBUG} & 2) {
2649	$tooltip .= "\n\n" . (ref $widget) . "\n"	3411	$tooltip .= "\n\n" . (ref $widget) . "\n"
2650	. "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"	3412	. "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2651	. "req $widget->{req_w} $widget->{req_h}\n"	3413	. "req $widget->{req_w} $widget->{req_h}\n"
2652	. "visible $widget->{visible}";	3414	. "visible $widget->{visible}";
2653	}	3415	}
2654		3416
		3417	$tooltip =~ s/^\n+//;
		3418	$tooltip =~ s/\n+$//;
		3419
2655	$self->add (new CFClient::UI::Label	3420	$self->add (new CFPlus::UI::Label
2656	markup => $tooltip,	3421	markup => $tooltip,
2657	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,	3422	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2658	fontsize => 0.8,	3423	fontsize => 0.8,
2659	fg => [0, 0, 0, 1],	3424	style => 1, # FLAG_INVERSE
2660	ellipsise => 0,	3425	ellipsise => 0,
2661	font => ($widget->{tooltip_font} || $::FONT_PROP),	3426	font => ($widget->{tooltip_font} || $::FONT_PROP),
2662	);	3427	);
2663	}	3428	}
2664		3429
…		…
2668	my ($w, $h) = @{$self->child}{qw(req_w req_h)};	3433	my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2669		3434
2670	($w + 4, $h + 4)	3435	($w + 4, $h + 4)
2671	}	3436	}
2672		3437
2673	sub size_allocate {	3438	sub invoke_size_allocate {
2674	my ($self, $w, $h) = @_;	3439	my ($self, $w, $h) = @_;
2675		3440
2676	$self->SUPER::size_allocate ($w - 4, $h - 4);	3441	$self->SUPER::invoke_size_allocate ($w - 4, $h - 4)
2677	}	3442	}
2678		3443
2679	sub visibility_change {	3444	sub invoke_visibility_change {
2680	my ($self, $visible) = @_;	3445	my ($self, $visible) = @_;
2681		3446
2682	return unless $visible;	3447	return unless $visible;
2683		3448
2684	$self->{root}->on_post_alloc ("move_$self" => sub {	3449	$self->{root}->on_post_alloc ("move_$self" => sub {
2685	my $widget = $self->{owner}	3450	my $widget = $self->{owner}
2686	or return;	3451	or return;
2687		3452
		3453	if ($widget->{visible}) {
2688	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);	3454	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2689		3455
2690	($x, $y) = $widget->coord2global (-$self->{w}, 0)	3456	($x, $y) = $widget->coord2global (-$self->{w}, 0)
2691	if $x + $self->{w} > $::WIDTH;	3457	if $x + $self->{w} > $self->{root}{w};
2692		3458
2693	$self->move_abs ($x, $y);	3459	$self->move_abs ($x, $y);
		3460	} else {
		3461	$self->hide;
		3462	}
2694	});	3463	});
2695	}	3464	}
2696		3465
2697	sub _draw {	3466	sub _draw {
2698	my ($self) = @_;	3467	my ($self) = @_;
…		…
2722	$self->SUPER::_draw;	3491	$self->SUPER::_draw;
2723	}	3492	}
2724		3493
2725	#############################################################################	3494	#############################################################################
2726		3495
2727	package CFClient::UI::Face;	3496	package CFPlus::UI::Face;
2728		3497
2729	our @ISA = CFClient::UI::Base::;	3498	our @ISA = CFPlus::UI::DrawBG::;
2730		3499
2731	use CFClient::OpenGL;	3500	use CFPlus::OpenGL;
2732		3501
2733	sub new {	3502	sub new {
2734	my $class = shift;	3503	my $class = shift;
2735		3504
2736	my $self = $class->SUPER::new (	3505	my $self = $class->SUPER::new (
		3506	size_w => 32,
		3507	size_h => 8,
2737	aspect => 1,	3508	aspect => 1,
2738	can_events => 0,	3509	can_events => 0,
2739	@_,	3510	@_,
2740	);	3511	);
2741		3512
2742	if ($self->{anim} && $self->{animspeed}) {	3513	if ($self->{anim} && $self->{animspeed}) {
2743	Scalar::Util::weaken (my $widget = $self);	3514	CFPlus::weaken (my $widget = $self);
2744		3515
		3516	$widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed};
		3517	$widget->{anim_start} = $self->{animspeed} * Event::time / $self->{animspeed};
2745	$self->{timer} = Event->timer (	3518	$self->{timer} = Event->timer (
2746	at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2747	hard => 1,	3519	parked => 1,
2748	interval => $self->{animspeed},
2749	cb => sub {	3520	cb => sub {
		3521	return unless $::CONN && $widget;
		3522
2750	++$widget->{frame};	3523	++$widget->{frame};
		3524	$widget->update_face;
2751	$widget->update;	3525	$widget->update;
		3526
		3527	$widget->update_timer;
2752	},	3528	},
2753	);	3529	);
		3530
		3531	$self->update_face;
		3532	$self->update_timer;
2754	}	3533	}
2755		3534
2756	$self	3535	$self
2757	}	3536	}
2758		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
2759	sub size_request {	3568	sub size_request {
2760	(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)
2761	}	3584	}
2762		3585
2763	sub update {	3586	sub update {
2764	my ($self) = @_;	3587	my ($self) = @_;
2765		3588
2766	return unless $self->{visible};	3589	return unless $self->{visible};
2767		3590
2768	$self->SUPER::update;	3591	$self->SUPER::update;
2769	}	3592	}
2770		3593
		3594	sub invoke_visibility_change {
		3595	my ($self) = @_;
		3596
		3597	$self->update_timer;
		3598
		3599	0
		3600	}
		3601
2771	sub _draw {	3602	sub _draw {
2772	my ($self) = @_;	3603	my ($self) = @_;
2773		3604
2774	return unless $::CONN;	3605	return unless $::CONN;
2775		3606
2776	my $face;	3607	$self->SUPER::_draw;
2777		3608
2778	if ($self->{frame}) {
2779	my $anim = $::CONN->{anim}[$self->{anim}];	3609	my $faceid = $::CONN->{faceid}[$self->{face}]
2780		3610	or return;
2781	$face = $anim->[ $self->{frame} % @$anim ]
2782	if $anim && @$anim;
2783	}
2784		3611
2785	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];	3612	my $tex = $::CONN->{texture}[$faceid];
2786		3613
2787	if ($tex) {	3614	if ($tex) {
2788	glEnable GL_TEXTURE_2D;	3615	glEnable GL_TEXTURE_2D;
2789	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	3616	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2790	glColor 1, 1, 1, 1;	3617	glColor 0, 0, 0, 1;
2791	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});	3618	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2792	glDisable GL_TEXTURE_2D;	3619	glDisable GL_TEXTURE_2D;
2793	}	3620	}
2794	}	3621	}
2795		3622
2796	sub DESTROY {	3623	sub destroy {
2797	my ($self) = @_;	3624	my ($self) = @_;
2798		3625
2799	$self->{timer}->cancel	3626	(delete $self->{timer})->cancel
2800	if $self->{timer};	3627	if $self->{timer};
2801		3628
2802	$self->SUPER::DESTROY;	3629	$self->SUPER::destroy;
2803	}	3630	}
2804		3631
2805	#############################################################################	3632	#############################################################################
2806		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
2807	package CFClient::UI::Menu;	3642	package CFPlus::UI::Menu;
2808		3643
2809	our @ISA = CFClient::UI::FancyFrame::;	3644	our @ISA = CFPlus::UI::Toplevel::;
2810		3645
2811	use CFClient::OpenGL;	3646	use CFPlus::OpenGL;
2812		3647
2813	sub new {	3648	sub new {
2814	my $class = shift;	3649	my $class = shift;
2815		3650
2816	my $self = $class->SUPER::new (	3651	my $self = $class->SUPER::new (
2817	items => [],	3652	items => [],
2818	z => 100,	3653	z => 100,
2819	@_,	3654	@_,
2820	);	3655	);
2821		3656
2822	$self->add ($self->{vbox} = new CFClient::UI::VBox);	3657	$self->add ($self->{vbox} = new CFPlus::UI::VBox);
2823		3658
2824	for my $item (@{ $self->{items} }) {	3659	for my $item (@{ $self->{items} }) {
2825	my ($widget, $cb) = @$item;	3660	my ($widget, $cb, $tooltip) = @$item;
2826		3661
2827	# handle various types of items, only text for now	3662	# handle various types of items, only text for now
2828	if (!ref $widget) {	3663	if (!ref $widget) {
		3664	if ($widget =~ /\t/) {
		3665	my ($left, $right) = split /\t/, $widget, 2;
		3666
2829	$widget = new CFClient::UI::Label	3667	$widget = new CFPlus::UI::HBox
2830	can_hover => 1,	3668	can_hover => 1,
2831	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,
2832	text => $widget;	3681	markup => $widget,
		3682	tooltip => $tooltip;
		3683	}
2833	}	3684	}
2834		3685
2835	$self->{item}{$widget} = $item;	3686	$self->{item}{$widget} = $item;
2836		3687
2837	$self->{vbox}->add ($widget);	3688	$self->{vbox}->add ($widget);
…		…
2842		3693
2843	# 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)
2844	sub popup {	3695	sub popup {
2845	my ($self, $ev) = @_;	3696	my ($self, $ev) = @_;
2846		3697
2847	$self->_emit ("popdown");	3698	$self->emit ("popdown");
2848		3699
2849	# maybe save $GRAB? must be careful about events...	3700	# maybe save $GRAB? must be careful about events...
2850	$GRAB = $self;	3701	$GRAB = $self;
2851	$self->{button} = $ev->{button};	3702	$self->{button} = $ev->{button};
2852		3703
2853	$self->show;	3704	$self->show;
2854	$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);
2855	}	3706	}
2856		3707
2857	sub mouse_motion {	3708	sub invoke_mouse_motion {
2858	my ($self, $ev, $x, $y) = @_;	3709	my ($self, $ev, $x, $y) = @_;
2859		3710
2860	# TODO: should use vbox->find_widget or so	3711	# TODO: should use vbox->find_widget or so
2861	$HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});	3712	$HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2862	$self->{hover} = $self->{item}{$HOVER};	3713	$self->{hover} = $self->{item}{$HOVER};
2863	}
2864		3714
		3715	0
		3716	}
		3717
2865	sub button_up {	3718	sub invoke_button_up {
2866	my ($self, $ev, $x, $y) = @_;	3719	my ($self, $ev, $x, $y) = @_;
2867		3720
2868	if ($ev->{button} == $self->{button}) {	3721	if ($ev->{button} == $self->{button}) {
2869	undef $GRAB;	3722	undef $GRAB;
2870	$self->hide;	3723	$self->hide;
2871		3724
2872	$self->_emit ("popdown");	3725	$self->emit ("popdown");
2873	$self->{hover}[1]->() if $self->{hover};	3726	$self->{hover}[1]->() if $self->{hover};
		3727	} else {
		3728	return 0
		3729	}
		3730
2874	}	3731	1
2875	}	3732	}
2876		3733
2877	#############################################################################	3734	#############################################################################
2878		3735
2879	package CFClient::UI::Statusbox;	3736	package CFPlus::UI::Multiplexer;
2880		3737
2881	our @ISA = CFClient::UI::VBox::;	3738	our @ISA = CFPlus::UI::Container::;
2882		3739
2883	sub new {	3740	sub new {
2884	my $class = shift;	3741	my $class = shift;
2885		3742
2886	$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 (
2887	fontsize => 0.8,	3922	fontsize => 0.8,
2888	@_,	3923	@_,
2889	)	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
2890	}	3931	}
2891		3932
2892	sub reorder {	3933	sub reorder {
2893	my ($self) = @_;	3934	my ($self) = @_;
2894	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} };
2895		3941
2896	while (my ($k, $v) = each %{ $self->{item} }) {	3942	while (my ($k, $v) = each %{ $self->{item} }) {
2897	delete $self->{item}{$k} if $v->{timeout} < $NOW;	3943	delete $self->{item}{$k} if $v->{timeout} < $NOW;
2898	}	3944	}
2899		3945
…		…
2902	my @items = sort {	3948	my @items = sort {
2903	$a->{pri} <=> $b->{pri}	3949	$a->{pri} <=> $b->{pri}
2904	or $b->{id} <=> $a->{id}	3950	or $b->{id} <=> $a->{id}
2905	} values %{ $self->{item} };	3951	} values %{ $self->{item} };
2906		3952
		3953	$self->{timer}->interval (1);
		3954
2907	my $count = 10 + 1;	3955	my $count = 10 + 1;
2908	for my $item (@items) {	3956	for my $item (@items) {
2909	last unless --$count;	3957	last unless --$count;
2910		3958
2911	push @widgets, $item->{label} ||= do {	3959	my $label = $item->{label} ||= do {
2912	# TODO: doesn't handle markup well (read as: at all)	3960	# TODO: doesn't handle markup well (read as: at all)
2913	my $short = $item->{count} > 1	3961	my $short = $item->{count} > 1
2914	? "<b>$item->{count} ×</b> $item->{text}"	3962	? "<b>$item->{count} ×</b> $item->{text}"
2915	: $item->{text};	3963	: $item->{text};
2916		3964
2917	for ($short) {	3965	for ($short) {
2918	s/^\s+//;	3966	s/^\s+//;
2919	s/\s+/ /g;	3967	s/\s+/ /g;
2920	}	3968	}
2921		3969
2922	new CFClient::UI::Label	3970	new CFPlus::UI::Label
2923	markup => $short,	3971	markup => $short,
2924	tooltip => $item->{tooltip},	3972	tooltip => $item->{tooltip},
2925	tooltip_font => $::FONT_PROP,	3973	tooltip_font => $::FONT_PROP,
2926	tooltip_width => 0.67,	3974	tooltip_width => 0.67,
2927	fontsize => $item->{fontsize} || $self->{fontsize},	3975	fontsize => $item->{fontsize} || $self->{fontsize},
2928	max_w => $::WIDTH * 0.44,	3976	max_w => $::WIDTH * 0.44,
2929	fg => $item->{fg},	3977	fg => [@{ $item->{fg} }],
2930	can_events => 1,	3978	can_events => 1,
2931	can_hover => 1	3979	can_hover => 1
2932	};	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;
2933	}	3993	}
2934		3994
2935	$self->clear;	3995	$self->clear;
2936	$self->SUPER::add (reverse @widgets);	3996	$self->SUPER::add (reverse @widgets);
2937	}	3997	}
…		…
2942	$text =~ s/^\s+//;	4002	$text =~ s/^\s+//;
2943	$text =~ s/\s+$//;	4003	$text =~ s/\s+$//;
2944		4004
2945	return unless $text;	4005	return unless $text;
2946		4006
2947	my $timeout = time + ((delete $arg{timeout}) || 60);	4007	my $timeout = (int time) + ((delete $arg{timeout}) || 60);
2948		4008
2949	my $group = exists $arg{group} ? $arg{group} : ++$self->{id};	4009	my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2950		4010
2951	if (my $item = $self->{item}{$group}) {	4011	if (my $item = $self->{item}{$group}) {
2952	if ($item->{text} eq $text) {	4012	if ($item->{text} eq $text) {
2953	$item->{count}++;	4013	$item->{count}++;
2954	} else {	4014	} else {
2955	$item->{count} = 1;	4015	$item->{count} = 1;
2956	$item->{text} = $item->{tooltip} = $text;	4016	$item->{text} = $item->{tooltip} = $text;
2957	}	4017	}
2958	$item->{id} = ++$self->{id};	4018	$item->{id} += 0.2;#d#
2959	$item->{timeout} = $timeout;	4019	$item->{timeout} = $timeout;
2960	delete $item->{label};	4020	delete $item->{label};
2961	} else {	4021	} else {
2962	$self->{item}{$group} = {	4022	$self->{item}{$group} = {
2963	id => ++$self->{id},	4023	id => ++$self->{id},
…		…
2969	count => 1,	4029	count => 1,
2970	%arg,	4030	%arg,
2971	};	4031	};
2972	}	4032	}
2973		4033
		4034	$ROOT->on_refresh (reorder => sub {
2974	$self->reorder;	4035	$self->reorder;
		4036	});
2975	}	4037	}
2976		4038
2977	sub reconfigure {	4039	sub reconfigure {
2978	my ($self) = @_;	4040	my ($self) = @_;
2979		4041
…		…
2982		4044
2983	$self->reorder;	4045	$self->reorder;
2984	$self->SUPER::reconfigure;	4046	$self->SUPER::reconfigure;
2985	}	4047	}
2986		4048
		4049	sub destroy {
		4050	my ($self) = @_;
		4051
		4052	$self->{timer}->cancel;
		4053
		4054	$self->SUPER::destroy;
		4055	}
		4056
2987	#############################################################################	4057	#############################################################################
2988		4058
2989	package CFClient::UI::Inventory;
2990
2991	our @ISA = CFClient::UI::ScrolledWindow::;
2992
2993	sub new {
2994	my $class = shift;
2995
2996	my $self = $class->SUPER::new (
2997	scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2998	@_,
2999	);
3000
3001	$self
3002	}
3003
3004	sub set_items {
3005	my ($self, $items) = @_;
3006
3007	$self->{scrolled}->clear;
3008	return unless $items;
3009
3010	my @items = sort {
3011	($a->{type} <=> $b->{type})
3012	or ($a->{name} cmp $b->{name})
3013	} @$items;
3014
3015	$self->{real_items} = \@items;
3016
3017	my $row = 0;
3018	for my $item (@items) {
3019	CFClient::Item::update_widgets $item;
3020
3021	$self->{scrolled}->add (0, $row, $item->{face_widget});
3022	$self->{scrolled}->add (1, $row, $item->{desc_widget});
3023	$self->{scrolled}->add (2, $row, $item->{weight_widget});
3024
3025	$row++;
3026	}
3027	}
3028
3029	#############################################################################
3030
3031	package CFClient::UI::BindEditor;
3032
3033	our @ISA = CFClient::UI::FancyFrame::;
3034
3035	sub new {
3036	my $class = shift;
3037
3038	my $self = $class->SUPER::new (binding => [], commands => [], @_);
3039
3040	$self->add (my $vb = new CFClient::UI::VBox);
3041
3042
3043	$vb->add ($self->{rec_btn} = new CFClient::UI::Button
3044	text => "start recording",
3045	tooltip => "Start/Stops recording of actions."
3046	."All subsequent actions after the recording started will be captured."
3047	."The actions are displayed after the record was stopped."
3048	."To bind the action you have to click on the 'Bind' button",
3049	on_activate => sub {
3050	unless ($self->{recording}) {
3051	$self->start;
3052	} else {
3053	$self->stop;
3054	}
3055	});
3056
3057	$vb->add (new CFClient::UI::Label text => "Actions:");
3058	$vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3059
3060	$vb->add (new CFClient::UI::Label text => "Bound to: ");
3061	$vb->add (my $hb = new CFClient::UI::HBox);
3062	$hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3063	$hb->add (new CFClient::UI::Button
3064	text => "bind",
3065	tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3066	on_activate => sub {
3067	$self->ask_for_bind;
3068	});
3069
3070	$vb->add (my $hb = new CFClient::UI::HBox);
3071	$hb->add (new CFClient::UI::Button
3072	text => "ok",
3073	expand => 1,
3074	tooltip => "This closes the binding editor and saves the binding",
3075	on_activate => sub {
3076	$self->hide;
3077	$self->commit;
3078	});
3079
3080	$hb->add (new CFClient::UI::Button
3081	text => "cancel",
3082	expand => 1,
3083	tooltip => "This closes the binding editor without saving",
3084	on_activate => sub {
3085	$self->hide;
3086	$self->{binding_cancel}->()
3087	if $self->{binding_cancel};
3088	});
3089
3090	$self->update_binding_widgets;
3091
3092	$self
3093	}
3094
3095	sub commit {
3096	my ($self) = @_;
3097	my ($mod, $sym, $cmds) = $self->get_binding;
3098	if ($sym != 0 && @$cmds > 0) {
3099	$::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3100	."'. Don't forget 'Save Config'!");
3101	$self->{binding_change}->($mod, $sym, $cmds)
3102	if $self->{binding_change};
3103	} else {
3104	$::STATUSBOX->add ("No action bound, no key or action specified!");
3105	$self->{binding_cancel}->()
3106	if $self->{binding_cancel};
3107	}
3108	}
3109
3110	sub start {
3111	my ($self) = @_;
3112
3113	$self->{rec_btn}->set_text ("stop recording");
3114	$self->{recording} = 1;
3115	$self->clear_command_list;
3116	$::CONN->start_record if $::CONN;
3117	}
3118
3119	sub stop {
3120	my ($self) = @_;
3121
3122	$self->{rec_btn}->set_text ("start recording");
3123	$self->{recording} = 0;
3124
3125	my $rec;
3126	$rec = $::CONN->stop_record if $::CONN;
3127	return unless ref $rec eq 'ARRAY';
3128	$self->set_command_list ($rec);
3129	}
3130
3131	# if $commit is true, the binding will be set after the user entered a key combo
3132	sub ask_for_bind {
3133	my ($self, $commit) = @_;
3134
3135	CFClient::Binder::open_binding_dialog (sub {
3136	my ($mod, $sym) = @_;
3137	$self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3138	$self->update_binding_widgets;
3139	$self->commit if $commit;
3140	});
3141	}
3142
3143	# $mod and $sym are the modifiers and key symbol
3144	# $cmds is a array ref of strings (the commands)
3145	# $cb is the callback that is executed on OK
3146	# $ccb is the callback that is executed on CANCEL and
3147	# when the binding was unsuccessful on OK
3148	sub set_binding {
3149	my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3150
3151	$self->clear_command_list;
3152	$self->{recording} = 0;
3153	$self->{rec_btn}->set_text ("start recording");
3154
3155	$self->{binding} = [$mod, $sym];
3156	$self->{commands} = $cmds;
3157
3158	$self->{binding_change} = $cb;
3159	$self->{binding_cancel} = $ccb;
3160
3161	$self->update_binding_widgets;
3162	}
3163
3164	# this is a shortcut method that asks for a binding
3165	# and then just binds it.
3166	sub do_quick_binding {
3167	my ($self, $cmds) = @_;
3168	$self->set_binding (undef, undef, $cmds, sub {
3169	$::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3170	});
3171	$self->ask_for_bind (1);
3172	}
3173
3174	sub update_binding_widgets {
3175	my ($self) = @_;
3176	my ($mod, $sym, $cmds) = $self->get_binding;
3177	$self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3178	$self->set_command_list ($cmds);
3179	}
3180
3181	sub get_binding {
3182	my ($self) = @_;
3183	return (
3184	$self->{binding}->[0],
3185	$self->{binding}->[1],
3186	[ grep { defined $_ } @{$self->{commands}} ]
3187	);
3188	}
3189
3190	sub clear_command_list {
3191	my ($self) = @_;
3192	$self->{cmdbox}->clear ();
3193	}
3194
3195	sub set_command_list {
3196	my ($self, $cmds) = @_;
3197
3198	$self->{cmdbox}->clear ();
3199	$self->{commands} = $cmds;
3200
3201	my $idx = 0;
3202
3203	for (@$cmds) {
3204	$self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3205
3206	my $i = $idx;
3207	$hb->add (new CFClient::UI::Label text => $_);
3208	$hb->add (new CFClient::UI::Button
3209	text => "delete",
3210	tooltip => "Deletes the action from the record",
3211	on_activate => sub {
3212	$self->{cmdbox}->remove ($hb);
3213	$cmds->[$i] = undef;
3214	});
3215
3216
3217	$idx++
3218	}
3219	}
3220
3221	#############################################################################
3222
3223	package CFClient::UI::SpellList;
3224
3225	our @ISA = CFClient::UI::FancyFrame::;
3226
3227	sub new {
3228	my $class = shift;
3229
3230	my $self = $class->SUPER::new (binding => [], commands => [], @_);
3231
3232	$self->add (new CFClient::UI::ScrolledWindow
3233	scrolled => $self->{spellbox} = new CFClient::UI::Table);
3234
3235	$self;
3236	}
3237
3238	# XXX: Do sorting? Argl...
3239	sub add_spell {
3240	my ($self, $spell) = @_;
3241	$self->{spells}->{$spell->{name}} = $spell;
3242
3243	$self->{spellbox}->add (0, $self->{tbl_idx}, new CFClient::UI::Face
3244	face => $spell->{face},
3245	can_hover => 1,
3246	can_events => 1,
3247	tooltip => $spell->{message});
3248
3249	$self->{spellbox}->add (1, $self->{tbl_idx}, new CFClient::UI::Label
3250	text => $spell->{name},
3251	can_hover => 1,
3252	can_events => 1,
3253	tooltip => $spell->{message},
3254	expand => 1);
3255
3256	$self->{spellbox}->add (2, $self->{tbl_idx}, new CFClient::UI::Label
3257	text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
3258	$spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
3259	expand => 1);
3260
3261	$self->{spellbox}->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
3262	text => "bind to key",
3263	on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
3264	}
3265
3266	sub rebuild_spell_list {
3267	my ($self) = @_;
3268	$self->{tbl_idx} = 0;
3269	$self->add_spell ($_) for values %{$self->{spells}};
3270	}
3271
3272	sub remove_spell {
3273	my ($self, $spell) = @_;
3274	delete $self->{spells}->{$spell->{name}};
3275	$self->rebuild_spell_list;
3276	}
3277
3278	#############################################################################
3279
3280	package CFClient::UI::Root;	4059	package CFPlus::UI::Root;
3281		4060
3282	our @ISA = CFClient::UI::Container::;	4061	our @ISA = CFPlus::UI::Container::;
3283		4062
		4063	use List::Util qw(min max);
		4064
3284	use CFClient::OpenGL;	4065	use CFPlus::OpenGL;
3285		4066
3286	sub new {	4067	sub new {
3287	my $class = shift;	4068	my $class = shift;
3288		4069
3289	my $self = $class->SUPER::new (	4070	my $self = $class->SUPER::new (
3290	visible => 1,	4071	visible => 1,
3291	@_,	4072	@_,
3292	);	4073	);
3293		4074
3294	Scalar::Util::weaken ($self->{root} = $self);	4075	CFPlus::weaken ($self->{root} = $self);
3295		4076
3296	$self	4077	$self
3297	}	4078	}
3298		4079
3299	sub size_request {	4080	sub size_request {
…		…
3314	$coord = $max - $size if $coord > $max - $size;	4095	$coord = $max - $size if $coord > $max - $size;
3315		4096
3316	int $coord + 0.5	4097	int $coord + 0.5
3317	}	4098	}
3318		4099
3319	sub size_allocate {	4100	sub invoke_size_allocate {
3320	my ($self, $w, $h) = @_;	4101	my ($self, $w, $h) = @_;
3321		4102
3322	for my $child ($self->children) {	4103	for my $child ($self->children) {
3323	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)};
3324		4105
…		…
3328	$X = _to_pixel $X, $W, $self->{w};	4109	$X = _to_pixel $X, $W, $self->{w};
3329	$Y = _to_pixel $Y, $H, $self->{h};	4110	$Y = _to_pixel $Y, $H, $self->{h};
3330		4111
3331	$child->configure ($X, $Y, $W, $H);	4112	$child->configure ($X, $Y, $W, $H);
3332	}	4113	}
		4114
		4115	1
3333	}	4116	}
3334		4117
3335	sub coord2local {	4118	sub coord2local {
3336	my ($self, $x, $y) = @_;	4119	my ($self, $x, $y) = @_;
3337		4120
…		…
3422		4205
3423	delete $queue{$widget+0};	4206	delete $queue{$widget+0};
3424		4207
3425	my ($w, $h) = $widget->size_request;	4208	my ($w, $h) = $widget->size_request;
3426		4209
3427	$w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2;	4210	$w = max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3428	$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};
3429		4215
3430	$w = $widget->{force_w} if exists $widget->{force_w};	4216	$w = $widget->{force_w} if exists $widget->{force_w};
3431	$h = $widget->{force_h} if exists $widget->{force_h};	4217	$h = $widget->{force_h} if exists $widget->{force_h};
3432		4218
3433	if ($widget->{req_w} != $w || $widget->{req_h} != $h	4219	if ($widget->{req_w} != $w || $widget->{req_h} != $h
…		…
3460	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};	4246	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3461		4247
3462	$w = 0 if $w < 0;	4248	$w = 0 if $w < 0;
3463	$h = 0 if $h < 0;	4249	$h = 0 if $h < 0;
3464		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
3465	$w = int $w + 0.5;	4260	$w = int $w + 0.5;
3466	$h = int $h + 0.5;	4261	$h = int $h + 0.5;
3467		4262
3468	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}) {
3469	$widget->{old_w} = $widget->{w};	4264	$widget->{old_w} = $widget->{w};
…		…
3479		4274
3480	while ($self->{post_alloc_hook}) {	4275	while ($self->{post_alloc_hook}) {
3481	$_->()	4276	$_->()
3482	for values %{delete $self->{post_alloc_hook}};	4277	for values %{delete $self->{post_alloc_hook}};
3483	}	4278	}
3484
3485		4279
3486	glViewport 0, 0, $::WIDTH, $::HEIGHT;	4280	glViewport 0, 0, $::WIDTH, $::HEIGHT;
3487	glClearColor +($::CFG->{fow_intensity}) x 3, 1;	4281	glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3488	glClear GL_COLOR_BUFFER_BIT;	4282	glClear GL_COLOR_BUFFER_BIT;
3489		4283
…		…
3492	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;	4286	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3493	glMatrixMode GL_MODELVIEW;	4287	glMatrixMode GL_MODELVIEW;
3494	glLoadIdentity;	4288	glLoadIdentity;
3495		4289
3496	{	4290	{
3497	package CFClient::UI::Base;	4291	package CFPlus::UI::Base;
3498		4292
3499	($draw_x, $draw_y, $draw_w, $draw_h) =	4293	local ($draw_x, $draw_y, $draw_w, $draw_h) =
3500	(0, 0, $self->{w}, $self->{h});	4294	(0, 0, $self->{w}, $self->{h});
3501	}
3502		4295
3503	$self->_draw;	4296	$self->_draw;
		4297	}
3504	}	4298	}
3505		4299
3506	#############################################################################	4300	#############################################################################
3507		4301
3508	package CFClient::UI;	4302	package CFPlus::UI;
3509		4303
3510	$ROOT = new CFClient::UI::Root;	4304	$ROOT = new CFPlus::UI::Root;
3511	$TOOLTIP = new CFClient::UI::Tooltip z => 900;	4305	$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
3512		4306
3513	1	4307	1
3514		4308

Diff Legend

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