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

Diff Legend

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