ViewVC Help

View File | Revision Log | Show Annotations | Download File

/cvs/deliantra/Deliantra-Client/DC/UI.pm

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.271 by root, Fri Jun 2 22:13:47 2006 UTC vs.
Revision 1.376 by root, Mon Jul 16 20:20:23 2007 UTC

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

Diff Legend

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