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

Diff Legend

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