ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/DC/UI.pm
(Generate patch)

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.133 by root, Tue Apr 18 21:39:31 2006 UTC vs.
Revision 1.261 by elmex, Tue May 30 14:45:56 2006 UTC

1package CFClient::UI; 1package CFClient::UI;
2 2
3use utf8;
3use strict; 4use strict;
4 5
5use Scalar::Util (); 6use Scalar::Util ();
6use List::Util (); 7use List::Util ();
7 8
8use CFClient; 9use CFClient;
10use CFClient::Texture;
9 11
10our ($FOCUS, $HOVER, $GRAB); # various widgets 12our ($FOCUS, $HOVER, $GRAB); # various widgets
11 13
14our $LAYOUT;
12our $ROOT; 15our $ROOT;
16our $TOOLTIP;
13our $BUTTON_STATE; 17our $BUTTON_STATE;
18
19our %WIDGET; # all widgets, weak-referenced
20
21sub get_layout {
22 my $layout;
23
24 for (grep { $_->{name} } values %WIDGET) {
25 my $win = $layout->{$_->{name}} = { };
26
27 $win->{x} = ($_->{x} + $_->{w} * 0.5) / $::WIDTH if $_->{x} =~ /^[0-9.]+$/;
28 $win->{y} = ($_->{y} + $_->{h} * 0.5) / $::HEIGHT if $_->{y} =~ /^[0-9.]+$/;
29 $win->{w} = $_->{w} / $::WIDTH if defined $_->{w};
30 $win->{h} = $_->{h} / $::HEIGHT if defined $_->{h};
31
32 $win->{show} = $_->{visible} && $_->{is_toplevel};
33 }
34
35 $layout
36}
37
38sub set_layout {
39 my ($layout) = @_;
40
41 $LAYOUT = $layout;
42}
43
44sub check_tooltip {
45 if (!$GRAB) {
46 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
47 if (length $widget->{tooltip}) {
48
49 if ($TOOLTIP->{owner} != $widget) {
50 $TOOLTIP->hide;
51
52 $TOOLTIP->{owner} = $widget;
53
54 my $tip = $widget->{tooltip};
55
56 $tip = $tip->($widget) if CODE:: eq ref $tip;
57
58 $TOOLTIP->set_tooltip_from ($widget);
59 $TOOLTIP->show;
60 }
61
62 return;
63 }
64 }
65 }
66
67 $TOOLTIP->hide;
68 delete $TOOLTIP->{owner};
69}
14 70
15# class methods for events 71# class methods for events
16sub feed_sdl_key_down_event { 72sub feed_sdl_key_down_event {
17 $FOCUS->key_down ($_[0]) if $FOCUS; 73 $FOCUS->emit (key_down => $_[0])
74 if $FOCUS;
18} 75}
19 76
20sub feed_sdl_key_up_event { 77sub feed_sdl_key_up_event {
21 $FOCUS->key_up ($_[0]) if $FOCUS; 78 $FOCUS->emit (key_up => $_[0])
79 if $FOCUS;
22} 80}
23 81
24sub feed_sdl_button_down_event { 82sub feed_sdl_button_down_event {
25 my ($ev) = @_; 83 my ($ev) = @_;
26 my ($x, $y) = ($ev->motion_x, $ev->motion_y); 84 my ($x, $y) = ($ev->{x}, $ev->{y});
27 85
28 if (!$BUTTON_STATE) { 86 if (!$BUTTON_STATE) {
29 my $widget = $ROOT->find_widget ($x, $y); 87 my $widget = $ROOT->find_widget ($x, $y);
30 88
31 $GRAB = $widget; 89 $GRAB = $widget;
32 $GRAB->update if $GRAB; 90 $GRAB->update if $GRAB;
33 }
34 91
92 check_tooltip;
93 }
94
35 $BUTTON_STATE |= 1 << ($ev->button - 1); 95 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
36 96
37 $GRAB->button_down ($ev, $GRAB->coord2local ($x, $y)) if $GRAB; 97 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))
98 if $GRAB;
38} 99}
39 100
40sub feed_sdl_button_up_event { 101sub feed_sdl_button_up_event {
41 my ($ev) = @_; 102 my ($ev) = @_;
42 my ($x, $y) = ($ev->motion_x, $ev->motion_y); 103 my ($x, $y) = ($ev->{x}, $ev->{y});
43 104
44 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 105 my $widget = $GRAB || $ROOT->find_widget ($x, $y);
45 106
46 $BUTTON_STATE &= ~(1 << ($ev->button - 1)); 107 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
47 108
48 $GRAB->button_up ($ev, $GRAB->coord2local ($x, $y)) if $GRAB; 109 $GRAB->emit (button_up => $ev, $GRAB->coord2local ($x, $y))
110 if $GRAB;
49 111
50 if (!$BUTTON_STATE) { 112 if (!$BUTTON_STATE) {
51 my $grab = $GRAB; undef $GRAB; 113 my $grab = $GRAB; undef $GRAB;
52 $grab->update if $grab; 114 $grab->update if $grab;
53 $GRAB->update if $GRAB; 115 $GRAB->update if $GRAB;
116
117 check_tooltip;
54 } 118 }
55} 119}
56 120
57sub feed_sdl_motion_event { 121sub feed_sdl_motion_event {
58 my ($ev) = @_; 122 my ($ev) = @_;
59 my ($x, $y) = ($ev->motion_x, $ev->motion_y); 123 my ($x, $y) = ($ev->{x}, $ev->{y});
60 124
61 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 125 my $widget = $GRAB || $ROOT->find_widget ($x, $y);
62 126
63 if ($widget != $HOVER) { 127 if ($widget != $HOVER) {
64 my $hover = $HOVER; $HOVER = $widget; 128 my $hover = $HOVER; $HOVER = $widget;
65 129
66 $hover->update if $hover && $hover->{can_hover}; 130 $hover->update if $hover && $hover->{can_hover};
67 $HOVER->update if $HOVER && $HOVER->{can_hover}; 131 $HOVER->update if $HOVER && $HOVER->{can_hover};
68 }
69 132
133 check_tooltip;
134 }
135
70 $HOVER->mouse_motion ($ev, $HOVER->coord2local ($x, $y)) if $HOVER; 136 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
137 if $HOVER;
71} 138}
72 139
73# convert position array to integers 140# convert position array to integers
74sub harmonize { 141sub harmonize {
75 my ($vals) = @_; 142 my ($vals) = @_;
… …
81 $rem += $_ - $i; 148 $rem += $_ - $i;
82 $_ = $i; 149 $_ = $i;
83 } 150 }
84} 151}
85 152
153sub full_refresh {
154 # make a copy, otherwise for complains about freed values.
155 my @widgets = values %WIDGET;
156
157 $_->update
158 for @widgets;
159}
160
161sub reconfigure_widgets {
162 # make a copy, otherwise C<for> complains about freed values.
163 my @widgets = values %WIDGET;
164
165 $_->reconfigure
166 for @widgets;
167}
168
169# call when resolution changes etc.
170sub rescale_widgets {
171 my ($sx, $sy) = @_;
172
173 for my $widget (values %WIDGET) {
174 if ($widget->{is_toplevel}) {
175 $widget->{x} += $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
176 $widget->{y} += $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
177
178 $widget->{x} = int 0.5 + $widget->{x} * $sx if $widget->{x} =~ /^[0-9.]+$/;
179 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};
180 $widget->{force_w} = int 0.5 + $widget->{force_w} * $sx if exists $widget->{force_w};
181 $widget->{y} = int 0.5 + $widget->{y} * $sy if $widget->{y} =~ /^[0-9.]+$/;
182 $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};
183 $widget->{force_h} = int 0.5 + $widget->{force_h} * $sy if exists $widget->{force_h};
184
185 $widget->{x} -= $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
186 $widget->{y} -= $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
187
188 }
189 }
190
191 reconfigure_widgets;
192}
193
86############################################################################# 194#############################################################################
87 195
88package CFClient::UI::Base; 196package CFClient::UI::Base;
89 197
90use strict; 198use strict;
91 199
92use SDL::OpenGL; 200use CFClient::OpenGL;
93 201
94sub new { 202sub new {
95 my $class = shift; 203 my $class = shift;
96 204
97 my $self = bless { 205 my $self = bless {
98 x => 0, 206 x => "center",
99 y => 0, 207 y => "center",
100 z => 0, 208 z => 0,
101 w => -1, 209 w => undef,
102 h => -1, 210 h => undef,
211 can_events => 1,
103 @_ 212 @_
104 }, $class; 213 }, $class;
105 214
215 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
216
106 for (keys %$self) { 217 for (keys %$self) {
107 if (/^connect_(.*)$/) { 218 if (/^on_(.*)$/) {
108 $self->connect ($1 => delete $self->{$_}); 219 $self->connect ($1 => delete $self->{$_});
109 } 220 }
110 } 221 }
111 222
223 if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {
224 $self->{x} = $layout->{x} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{x};
225 $self->{y} = $layout->{y} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{y};
226 $self->{force_w} = $layout->{w} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{w};
227 $self->{force_h} = $layout->{h} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{h};
228
229 $self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
230 $self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
231
232 $self->show if $layout->{show};
233 }
234
112 $self 235 $self
113} 236}
114 237
238sub destroy {
239 my ($self) = @_;
240
241 $self->hide;
242 %$self = ();
243}
244
245sub show {
246 my ($self) = @_;
247
248 return if $self->{parent};
249
250 $CFClient::UI::ROOT->add ($self);
251}
252
253sub set_visible {
254 my ($self) = @_;
255
256 return if $self->{visible};
257
258 $self->{root} = $self->{parent}{root};
259 $self->{visible} = $self->{parent}{visible} + 1;
260
261 $self->emit (visibility_change => 1);
262
263 $self->realloc if !exists $self->{req_w};
264
265 $_->set_visible for $self->children;
266}
267
268sub set_invisible {
269 my ($self) = @_;
270
271 return unless $self->{visible};
272
273 $_->set_invisible for $self->children;
274
275 delete $self->{root};
276 delete $self->{visible};
277
278 undef $GRAB if $GRAB == $self;
279 undef $HOVER if $HOVER == $self;
280
281 CFClient::UI::check_tooltip
282 if $TOOLTIP->{owner} == $self;
283
284 $self->focus_out;
285
286 $self->emit (visibility_change => 0);
287}
288
289sub set_visibility {
290 my ($self, $visible) = @_;
291
292 return if $self->{visible} == $visible;
293
294 $visible ? $self->hide
295 : $self->show;
296}
297
298sub toggle_visibility {
299 my ($self) = @_;
300
301 $self->{visible}
302 ? $self->hide
303 : $self->show;
304}
305
306sub hide {
307 my ($self) = @_;
308
309 $self->set_invisible;
310
311 $self->{parent}->remove ($self)
312 if $self->{parent};
313}
314
115sub move { 315sub move_abs {
116 my ($self, $x, $y, $z) = @_; 316 my ($self, $x, $y, $z) = @_;
117 317
118 $self->{x} = int $x; 318 $self->{x} = List::Util::max 0, int $x;
119 $self->{y} = int $y; 319 $self->{y} = List::Util::max 0, int $y;
120 $self->{z} = $z if defined $z; 320 $self->{z} = $z if defined $z;
121 321
122 $self->update; 322 $self->update;
123} 323}
124 324
125sub needs_redraw { 325sub set_size {
126 0 326 my ($self, $w, $h) = @_;
327
328 $self->{force_w} = $w;
329 $self->{force_h} = $h;
330
331 $self->realloc;
127} 332}
128 333
129sub size_request { 334sub size_request {
130 require Carp; 335 require Carp;
131 Carp::confess "size_request is abtract"; 336 Carp::confess "size_request is abstract";
132} 337}
133 338
134sub configure { 339sub configure {
135 my ($self, $x, $y, $w, $h) = @_; 340 my ($self, $x, $y, $w, $h) = @_;
136 341
342 if ($self->{aspect}) {
343 my ($ow, $oh) = ($w, $h);
344
345 $w = List::Util::min $w, int $h * $self->{aspect};
346 $h = List::Util::min $h, int $w / $self->{aspect};
347
348 # use alignment to adjust x, y
349
350 $x += int 0.5 * ($ow - $w);
351 $y += int 0.5 * ($oh - $h);
352 }
353
354 if ($self->{x} ne $x || $self->{y} ne $y) {
137 $self->{x} = $x; 355 $self->{x} = $x;
138 $self->{y} = $y; 356 $self->{y} = $y;
357 $self->update;
358 }
139 359
140 return unless $self->{w} != $w || $self->{h} != $h; 360 if ($self->{alloc_w} != $w || $self->{alloc_h} != $h) {
361 return unless $self->{visible};
141 362
142 $self->{w} = $w; 363 $self->{alloc_w} = $w;
143 $self->{h} = $h; 364 $self->{alloc_h} = $h;
144 365
145 $self->size_allocate ($w, $h); 366 $self->{root}{size_alloc}{$self+0} = $self;
367 }
146} 368}
147 369
148sub size_allocate { 370sub size_allocate {
149 # nothing to be done 371 # nothing to be done
150} 372}
151 373
152# return top left coordinates 374sub children {
153sub _topleft { 375}
376
377sub set_max_size {
154 my ($self, $x, $y) = @_; 378 my ($self, $w, $h) = @_;
155 379
156 $self->{parent}->_topleft ($x + $self->{x}, $y + $self->{y}); 380 delete $self->{max_w}; $self->{max_w} = $w if $w;
381 delete $self->{max_h}; $self->{max_h} = $h if $h;
382}
383
384sub set_tooltip {
385 my ($self, $tooltip) = @_;
386
387 $tooltip =~ s/^\s+//;
388 $tooltip =~ s/\s+$//;
389
390 return if $self->{tooltip} eq $tooltip;
391
392 $self->{tooltip} = $tooltip;
393
394 if ($CFClient::UI::TOOLTIP->{owner} == $self) {
395 delete $CFClient::UI::TOOLTIP->{owner};
396 CFClient::UI::check_tooltip;
397 }
157} 398}
158 399
159# translate global coordinates to local coordinate system 400# translate global coordinates to local coordinate system
160sub coord2local { 401sub coord2local {
161 my ($self, $x, $y) = @_; 402 my ($self, $x, $y) = @_;
162 403
163 my ($X, $Y) = $self->_topleft; 404 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
164 ($x - $X, $y - $Y)
165} 405}
166 406
167# translate local coordinates to global coordinate system 407# translate local coordinates to global coordinate system
168sub coord2global { 408sub coord2global {
169 my ($self, $x, $y) = @_; 409 my ($self, $x, $y) = @_;
170 410
171 my ($X, $Y) = $self->_topleft; 411 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
172 ($x + $X, $y + $Y)
173} 412}
174 413
175sub focus_in { 414sub focus_in {
176 my ($self) = @_; 415 my ($self) = @_;
177 416
178 return if $FOCUS == $self; 417 return if $FOCUS == $self;
179 return unless $self->{can_focus}; 418 return unless $self->{can_focus};
180 419
181 my $focus = $FOCUS; $FOCUS = $self; 420 my $focus = $FOCUS; $FOCUS = $self;
182 421
183 $self->emit (focus_in => $focus); 422 $self->_emit (focus_in => $focus);
184 423
185 $focus->update if $focus; 424 $focus->update if $focus;
186 $FOCUS->update; 425 $FOCUS->update;
187} 426}
188 427
… …
191 430
192 return unless $FOCUS == $self; 431 return unless $FOCUS == $self;
193 432
194 my $focus = $FOCUS; undef $FOCUS; 433 my $focus = $FOCUS; undef $FOCUS;
195 434
196 $self->emit (focus_out => $focus); 435 $self->_emit (focus_out => $focus);
197 436
198 $focus->update if $focus; #? 437 $focus->update if $focus; #?
438
439 $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus
440 unless $FOCUS;
199} 441}
200 442
201sub mouse_motion { } 443sub mouse_motion { }
202sub button_up { } 444sub button_up { }
203sub key_down { } 445sub key_down { }
204sub key_up { } 446sub key_up { }
205 447
206sub button_down { 448sub button_down {
207 my ($self, $ev, $x, $y) = @_; 449 my ($self, $ev, $x, $y) = @_;
208 450
209 $self->focus_in; 451 $self->focus_in;
… …
212sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} } 454sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} }
213sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } 455sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} }
214sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} } 456sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} }
215sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} } 457sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} }
216sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} } 458sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} }
459
460sub find_widget {
461 my ($self, $x, $y) = @_;
462
463 return () unless $self->{can_events};
464
465 return $self
466 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
467 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
468
469 ()
470}
471
472sub set_parent {
473 my ($self, $parent) = @_;
474
475 Scalar::Util::weaken ($self->{parent} = $parent);
476 $self->set_visible if $parent->{visible};
477}
478
479sub connect {
480 my ($self, $signal, $cb) = @_;
481
482 push @{ $self->{signal_cb}{$signal} }, $cb;
483}
484
485sub _emit {
486 my ($self, $signal, @args) = @_;
487
488 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
489}
490
491sub emit {
492 my ($self, $signal, @args) = @_;
493
494 $self->_emit ($signal, @args)
495 || $self->$signal (@args);
496}
497
498sub visibility_change {
499 #my ($self, $visible) = @_;
500}
501
502sub realloc {
503 my ($self) = @_;
504
505 if ($self->{visible}) {
506 return if $self->{root}{realloc}{$self+0};
507
508 $self->{root}{realloc}{$self+0} = $self;
509 $self->{root}->update;
510 } else {
511 delete $self->{req_w};
512 delete $self->{req_h};
513 }
514}
515
516sub update {
517 my ($self) = @_;
518
519 $self->{parent}->update
520 if $self->{parent};
521}
522
523sub reconfigure {
524 my ($self) = @_;
525
526 $self->realloc;
527 $self->update;
528}
217 529
218sub draw { 530sub draw {
219 my ($self) = @_; 531 my ($self) = @_;
220 532
221 return unless $self->{h} && $self->{w}; 533 return unless $self->{h} && $self->{w};
… …
237 glVertex $x + $self->{w}, $y + $self->{h}; 549 glVertex $x + $self->{w}, $y + $self->{h};
238 glVertex $x , $y + $self->{h}; 550 glVertex $x , $y + $self->{h};
239 glEnd; 551 glEnd;
240 glDisable GL_BLEND; 552 glDisable GL_BLEND;
241 } 553 }
554
555 if ($ENV{CFPLUS_DEBUG} & 1) {
556 glPushMatrix;
557 glColor 1, 1, 0, 1;
558 glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
559 glBegin GL_LINE_LOOP;
560 glVertex 0 , 0;
561 glVertex $self->{w} - 1, 0;
562 glVertex $self->{w} - 1, $self->{h} - 1;
563 glVertex 0 , $self->{h} - 1;
564 glEnd;
565 glPopMatrix;
566 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
567 }
242} 568}
243 569
244sub _draw { 570sub _draw {
245 my ($self) = @_; 571 my ($self) = @_;
246 572
247 warn "no draw defined for $self\n"; 573 warn "no draw defined for $self\n";
248} 574}
249 575
250sub find_widget {
251 my ($self, $x, $y) = @_;
252
253 return $self
254 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
255 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
256
257 ()
258}
259
260sub set_parent {
261 my ($self, $parent) = @_;
262
263 Scalar::Util::weaken ($self->{parent} = $parent);
264}
265
266sub check_size {
267 my ($self) = @_;
268
269 my ($w, $h) = $self->size_request;
270
271 if ($w != $self->{req_w} || $h != $self->{req_h}) {
272 $self->{req_w} = $w;
273 $self->{req_h} = $h;
274
275 $self->{parent}->check_size
276 if $self->{parent};
277
278 $self->size_allocate ($w, $h);
279 $self->update;
280 }
281}
282
283sub update {
284 my ($self) = @_;
285
286 $self->{parent}->update
287 if $self->{parent};
288}
289
290sub connect {
291 my ($self, $signal, $cb) = @_;
292
293 push @{ $self->{signal_cb}{$signal} }, $cb;
294}
295
296sub emit {
297 my ($self, $signal, @args) = @_;
298
299 for my $cb (@{$self->{signal_cb}{$signal} || []}) {
300 $cb->($self, @args);
301 }
302}
303
304sub DESTROY { 576sub DESTROY {
305 my ($self) = @_; 577 my ($self) = @_;
306 578
579 delete $WIDGET{$self+0};
307 #$self->deactivate; 580 #$self->deactivate;
308} 581}
309 582
310############################################################################# 583#############################################################################
311 584
312package CFClient::UI::DrawBG; 585package CFClient::UI::DrawBG;
313 586
314our @ISA = CFClient::UI::Base::; 587our @ISA = CFClient::UI::Base::;
315 588
316use strict; 589use strict;
317use SDL::OpenGL; 590use CFClient::OpenGL;
318 591
319sub new { 592sub new {
320 my $class = shift; 593 my $class = shift;
321 594
322 # range [value, low, high, page] 595 # range [value, low, high, page]
323 596
324 $class->SUPER::new ( 597 $class->SUPER::new (
325 bg => [0, 0, 0, 0.2], 598 #bg => [0, 0, 0, 0.2],
326 active_bg => [1, 1, 1, 0.5], 599 #active_bg => [1, 1, 1, 0.5],
327 @_ 600 @_
328 ) 601 )
329} 602}
330 603
331sub _draw { 604sub _draw {
332 my ($self) = @_; 605 my ($self) = @_;
333 606
607 my $color = $FOCUS == $self && $self->{active_bg}
608 ? $self->{active_bg}
609 : $self->{bg};
610
611 if ($color && (@$color < 4 || $color->[3])) {
334 my ($w, $h) = @$self{qw(w h)}; 612 my ($w, $h) = @$self{qw(w h)};
335 613
336 glEnable GL_BLEND; 614 glEnable GL_BLEND;
337 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 615 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
338 glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} }; 616 glColor @$color;
339 617
340 glBegin GL_QUADS; 618 glBegin GL_QUADS;
341 glVertex 0 , 0; 619 glVertex 0 , 0;
342 glVertex 0 , $h; 620 glVertex 0 , $h;
343 glVertex $w, $h; 621 glVertex $w, $h;
344 glVertex $w, 0; 622 glVertex $w, 0;
345 glEnd; 623 glEnd;
346 624
347 glDisable GL_BLEND; 625 glDisable GL_BLEND;
626 }
348} 627}
349 628
350############################################################################# 629#############################################################################
351 630
352package CFClient::UI::Empty; 631package CFClient::UI::Empty;
353
354our @ISA = CFClient::UI::Base::;
355
356sub size_request {
357 (0, 0)
358}
359
360sub draw { }
361
362#############################################################################
363
364package CFClient::UI::Container;
365 632
366our @ISA = CFClient::UI::Base::; 633our @ISA = CFClient::UI::Base::;
367 634
368sub new { 635sub new {
369 my ($class, %arg) = @_; 636 my ($class, %arg) = @_;
637 $class->SUPER::new (can_events => 0, %arg);
638}
639
640sub size_request {
641 my ($self) = @_;
642
643 ($self->{w} + 0, $self->{h} + 0)
644}
645
646sub draw { }
647
648#############################################################################
649
650package CFClient::UI::Container;
651
652our @ISA = CFClient::UI::Base::;
653
654sub new {
655 my ($class, %arg) = @_;
370 656
371 my $children = delete $arg{children} || []; 657 my $children = delete $arg{children} || [];
372 658
373 my $self = $class->SUPER::new (children => [], %arg); 659 my $self = $class->SUPER::new (
660 children => [],
661 can_events => 0,
662 %arg,
663 );
374 $self->add ($_) for @$children; 664 $self->add ($_) for @$children;
375 665
376 $self 666 $self
377} 667}
378 668
379sub add { 669sub add {
380 my ($self, $child) = @_; 670 my ($self, @widgets) = @_;
381 671
382 $child->set_parent ($self); 672 $_->set_parent ($self)
673 for @widgets;
383 674
384 use sort 'stable'; 675 use sort 'stable';
385 676
386 $self->{children} = [ 677 $self->{children} = [
387 sort { $a->{z} <=> $b->{z} } 678 sort { $a->{z} <=> $b->{z} }
388 @{$self->{children}}, $child 679 @{$self->{children}}, @widgets
389 ]; 680 ];
390 681
391 $self->{w} = $self->{h} = -1; 682 $self->realloc;
683}
392 684
393 $child->check_size; 685sub children {
686 @{ $_[0]{children} }
394} 687}
395 688
396sub remove { 689sub remove {
397 my ($self, $widget) = @_; 690 my ($self, $child) = @_;
398 691
692 delete $child->{parent};
693 $child->hide;
694
399 $self->{children} = [ grep $_ != $widget, @{ $self->{children} } ]; 695 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
400 696
401 $self->check_size; 697 $self->realloc;
698}
699
700sub clear {
701 my ($self) = @_;
702
703 my $children = delete $self->{children};
704 $self->{children} = [];
705
706 for (@$children) {
707 delete $_->{parent};
708 $_->hide;
709 }
710
711 $self->realloc;
402} 712}
403 713
404sub find_widget { 714sub find_widget {
405 my ($self, $x, $y) = @_; 715 my ($self, $x, $y) = @_;
406 716
… …
436 746
437 $class->SUPER::new (children => [$child], %arg) 747 $class->SUPER::new (children => [$child], %arg)
438} 748}
439 749
440sub add { 750sub add {
441 my ($self, $widget) = @_; 751 my ($self, $child) = @_;
442 752
443 $self->{children} = []; 753 $self->{children} = [];
444 754
445 $self->SUPER::add ($widget); 755 $self->SUPER::add ($child);
446} 756}
447 757
448sub remove { 758sub remove {
449 my ($self, $widget) = @_; 759 my ($self, $widget) = @_;
450 760
… …
470 780
471package CFClient::UI::Window; 781package CFClient::UI::Window;
472 782
473our @ISA = CFClient::UI::Bin::; 783our @ISA = CFClient::UI::Bin::;
474 784
475use SDL::OpenGL; 785use CFClient::OpenGL;
476 786
477sub new { 787sub new {
478 my ($class, %arg) = @_; 788 my ($class, %arg) = @_;
479 789
480 my $self = $class->SUPER::new (%arg); 790 my $self = $class->SUPER::new (%arg);
481} 791}
482 792
483sub update { 793sub update {
484 my ($self) = @_; 794 my ($self) = @_;
485 795
486 # we want to do this delayed... 796 $ROOT->on_post_alloc ($self => sub { $self->render_child });
487 $self->render_chld;
488 $self->SUPER::update; 797 $self->SUPER::update;
489}
490
491sub render_chld {
492 my ($self) = @_;
493
494 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
495 glClearColor 0, 0, 0, 1;
496 glClear GL_COLOR_BUFFER_BIT;
497 $self->child->draw;
498 };
499} 798}
500 799
501sub size_allocate { 800sub size_allocate {
502 my ($self, $w, $h) = @_; 801 my ($self, $w, $h) = @_;
503 802
504 $self->child->configure (0, 0, $w, $h); 803 $self->SUPER::size_allocate ($w, $h);
804 $self->update;
805}
505 806
807sub _render {
808 $_[0]{children}[0]->draw;
809}
810
811sub render_child {
812 my ($self) = @_;
813
814 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
815 glClearColor 0, 0, 0, 0;
816 glClear GL_COLOR_BUFFER_BIT;
817
506 $self->render_chld; 818 $self->_render;
819 };
507} 820}
508 821
509sub _draw { 822sub _draw {
510 my ($self) = @_; 823 my ($self) = @_;
511 824
512 my ($w, $h) = ($self->w, $self->h); 825 my ($w, $h) = ($self->w, $self->h);
513 826
514 my $tex = $self->{texture} 827 my $tex = $self->{texture}
515 or return; 828 or return;
516 829
517 glEnable GL_BLEND;
518 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
519 glEnable GL_TEXTURE_2D; 830 glEnable GL_TEXTURE_2D;
520 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 831 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
832 glColor 1, 1, 1, 1;
521 833
522 $tex->draw_quad (0, 0, $w, $h); 834 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
523 835
524 glDisable GL_BLEND;
525 glDisable GL_TEXTURE_2D; 836 glDisable GL_TEXTURE_2D;
526} 837}
527 838
528############################################################################# 839#############################################################################
529 840
530package CFClient::UI::ViewPort; 841package CFClient::UI::ViewPort;
531 842
532our @ISA = CFClient::UI::Window::; 843our @ISA = CFClient::UI::Window::;
533
534sub new { die }
535
536sub size_request {
537 my ($self) = @_;
538
539 @$self{qw(child_w child_h)} = $self->child->size_request;
540 $self->child->size_allocate (0, 0, @$self{qw(child_w child_h)});
541
542 @$self{qw(child_w child_h)}
543}
544
545sub _draw {
546 my ($self) = @_;
547
548 $self->{children}[1]->draw;
549}
550
551
552#############################################################################
553
554package CFClient::UI::Frame;
555
556our @ISA = CFClient::UI::Bin::;
557
558use SDL::OpenGL;
559
560sub size_request {
561 my ($self) = @_;
562 my $chld = $self->child
563 or return (0, 0);
564
565 $chld->move (2, 2);
566
567 map { $_ + 4 } $chld->size_request;
568}
569
570sub size_allocate {
571 my ($self, $x, $y, $w, $h) = @_;
572
573 $self->child->configure (2, 2, $w - 4, $h - 4);
574}
575
576sub _draw {
577 my ($self) = @_;
578
579 my $chld = $self->child;
580
581 my ($w, $h) = $chld->size_request;
582
583 glBegin GL_QUADS;
584 glColor 0, 0, 0;
585 glVertex 0 , 0;
586 glVertex 0 , $h + 4;
587 glVertex $w + 4 , $h + 4;
588 glVertex $w + 4 , 0;
589 glEnd;
590
591 $chld->draw;
592}
593
594#############################################################################
595
596package CFClient::UI::FancyFrame;
597
598our @ISA = CFClient::UI::Bin::;
599
600use SDL::OpenGL;
601
602my @tex =
603 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
604 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
605 844
606sub new { 845sub new {
607 my $class = shift; 846 my $class = shift;
608 847
609 # TODO: user_x, user_y, overwrite moveto?
610
611 $class->SUPER::new ( 848 $class->SUPER::new (
612 bg => [1, 1, 1, 1], 849 scroll_x => 0,
613 border_bg => [1, 1, 1, 1], 850 scroll_y => 1,
614 border => int $::FONTSIZE * 0.8,
615 @_ 851 @_,
616 ) 852 )
617} 853}
618 854
619sub size_request { 855sub size_request {
620 my ($self) = @_; 856 my ($self) = @_;
621 857
622 return ($self->{user_w}, $self->{user_h}) if $self->{user_w} && $self->{user_h}; 858 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
623 859
624 my ($w, $h) = $self->SUPER::size_request; 860 $w = 10 if $self->{scroll_x};
861 $h = 10 if $self->{scroll_y};
625 862
626 ( 863 ($w, $h)
627 $w + $self->{border} * 2,
628 $h + $self->{border} * 2,
629 )
630} 864}
631 865
632sub size_allocate { 866sub size_allocate {
633 my ($self, $w, $h) = @_; 867 my ($self, $w, $h) = @_;
634 868
869 my $child = $self->child;
870
871 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
872 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
873
874 $self->child->configure (0, 0, $w, $h);
875 $self->update;
876}
877
878sub set_offset {
879 my ($self, $x, $y) = @_;
880
881 $self->{view_x} = int $x;
882 $self->{view_y} = int $y;
883
884 $self->update;
885}
886
887# hmm, this does not work for topleft of $self... but we should not ask for that
888sub coord2local {
889 my ($self, $x, $y) = @_;
890
891 $self->SUPER::coord2local ($x + $self->{view_x}, $y + $self->{view_y})
892}
893
894sub coord2global {
895 my ($self, $x, $y) = @_;
896
897 $x = List::Util::min $self->{w}, $x - $self->{view_x};
898 $y = List::Util::min $self->{h}, $y - $self->{view_y};
899
900 $self->SUPER::coord2global ($x, $y)
901}
902
903sub find_widget {
904 my ($self, $x, $y) = @_;
905
906 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
907 && $y >= $self->{y} && $y < $self->{y} + $self->{h}
908 ) {
909 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
910 } else {
911 $self->CFClient::UI::Base::find_widget ($x, $y)
912 }
913}
914
915sub _render {
916 my ($self) = @_;
917
918 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
919
920 $self->SUPER::_render;
921}
922
923#############################################################################
924
925package CFClient::UI::ScrolledWindow;
926
927our @ISA = CFClient::UI::HBox::;
928
929sub new {
930 my $class = shift;
931
932 my $self;
933
934 my $slider = new CFClient::UI::Slider
935 vertical => 1,
936 range => [0, 0, 1, 0.01], # HACK fix
937 on_changed => sub {
938 $self->{vp}->set_offset (0, $_[1]);
939 },
940 ;
941
942 $self = $class->SUPER::new (
943 vp => (new CFClient::UI::ViewPort expand => 1),
944 slider => $slider,
945 @_,
946 );
947
948 $self->{vp}->add ($self->{scrolled});
949 $self->add ($self->{vp});
950 $self->add ($self->{slider});
951
952 $self
953}
954
955sub update {
956 my ($self) = @_;
957
958 $self->SUPER::update;
959
960 # todo: overwrite size_allocate of child
961 my $child = $self->{vp}->child;
962 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
963}
964
965sub size_allocate {
966 my ($self, $w, $h) = @_;
967
968 $self->SUPER::size_allocate ($w, $h);
969
970 my $child = $self->{vp}->child;
971 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
972}
973
974#TODO# update range on size_allocate depending on child
975# update viewport offset on scroll
976
977#############################################################################
978
979package CFClient::UI::Frame;
980
981our @ISA = CFClient::UI::Bin::;
982
983use CFClient::OpenGL;
984
985sub new {
986 my $class = shift;
987
988 $class->SUPER::new (
989 bg => undef,
990 @_,
991 )
992}
993
994sub _draw {
995 my ($self) = @_;
996
997 if ($self->{bg}) {
998 my ($w, $h) = @$self{qw(w h)};
999
1000 glEnable GL_BLEND;
1001 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1002 glColor @{ $self->{bg} };
1003
1004 glBegin GL_QUADS;
1005 glVertex 0 , 0;
1006 glVertex 0 , $h;
1007 glVertex $w, $h;
1008 glVertex $w, 0;
1009 glEnd;
1010
1011 glDisable GL_BLEND;
1012 }
1013
1014 $self->SUPER::_draw;
1015}
1016
1017#############################################################################
1018
1019package CFClient::UI::FancyFrame;
1020
1021our @ISA = CFClient::UI::Bin::;
1022
1023use CFClient::OpenGL;
1024
1025my $bg =
1026 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
1027 mipmap => 1, wrap => 1;
1028
1029my @border =
1030 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1031 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1032
1033sub new {
1034 my $class = shift;
1035
1036 my $self = $class->SUPER::new (
1037 bg => [1, 1, 1, 1],
1038 border_bg => [1, 1, 1, 1],
1039 border => 0.6,
1040 can_events => 1,
1041 min_w => 16,
1042 min_h => 16,
1043 @_
1044 );
1045
1046 $self->{title} &&= new CFClient::UI::Label
1047 align => 0,
1048 valign => 1,
1049 text => $self->{title},
1050 fontsize => $self->{border};
1051
1052 $self
1053}
1054
1055sub border {
1056 int $_[0]{border} * $::FONTSIZE
1057}
1058
1059sub size_request {
1060 my ($self) = @_;
1061
1062 my ($w, $h) = $self->SUPER::size_request;
1063
1064 (
1065 $w + $self->border * 2,
1066 $h + $self->border * 2,
1067 )
1068}
1069
1070sub size_allocate {
1071 my ($self, $w, $h) = @_;
1072
635 $h -= List::Util::max 0, $self->{border} * 2; 1073 $h -= List::Util::max 0, $self->border * 2;
636 $w -= List::Util::max 0, $self->{border} * 2; 1074 $w -= List::Util::max 0, $self->border * 2;
637 1075
1076 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
1077 if $self->{title};
1078
638 $self->child->configure ($self->{border}, $self->{border}, $w, $h); 1079 $self->child->configure ($self->border, $self->border, $w, $h);
639} 1080}
640 1081
641sub button_down { 1082sub button_down {
642 my ($self, $ev, $x, $y) = @_; 1083 my ($self, $ev, $x, $y) = @_;
643 1084
644 if ($x < $self->{w} && $x >= $self->{w} - $self->{border} 1085 my ($w, $h) = @$self{qw(w h)};
645 && $y < $self->{h} && $y >= $self->{h} - $self->{border}) { 1086 my $border = $self->border;
646 1087
1088 my $lr = ($x >= 0 && $x < $border) || ($x > $w - $border && $x < $w);
1089 my $td = ($y >= 0 && $y < $border) || ($y > $h - $border && $y < $h);
1090
1091 if ($lr & $td) {
1092 my ($wx, $wy) = ($self->{x}, $self->{y});
647 my ($ox, $oy) = ($ev->button_x, $ev->button_y); 1093 my ($ox, $oy) = ($ev->{x}, $ev->{y});
648 my ($bw, $bh) = ($self->{w}, $self->{h}); 1094 my ($bw, $bh) = ($self->{w}, $self->{h});
1095
1096 my $mx = $x < $border;
1097 my $my = $y < $border;
649 1098
650 $self->{motion} = sub { 1099 $self->{motion} = sub {
651 my ($ev, $x, $y) = @_; 1100 my ($ev, $x, $y) = @_;
652 1101
653 ($x, $y) = ($ev->motion_x, $ev->motion_y); 1102 my $dx = $ev->{x} - $ox;
1103 my $dy = $ev->{y} - $oy;
654 1104
655 $self->{user_w} = $bw + $x - $ox; 1105 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
656 $self->{user_h} = $bh + $y - $oy; 1106 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
657 $self->check_size; 1107
1108 $self->realloc;
1109 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
658 }; 1110 };
659 1111
660 } elsif ($x >= 0 && $x < $self->{w} 1112 } elsif ($lr ^ $td) {
661 && $y >= 0 && $y < $self->{border}) {
662
663 my ($ox, $oy) = ($ev->button_x, $ev->button_y); 1113 my ($ox, $oy) = ($ev->{x}, $ev->{y});
664 my ($bx, $by) = ($self->{x}, $self->{y}); 1114 my ($bx, $by) = ($self->{x}, $self->{y});
665 1115
666 $self->{motion} = sub { 1116 $self->{motion} = sub {
667 my ($ev, $x, $y) = @_; 1117 my ($ev, $x, $y) = @_;
668 1118
669 ($x, $y) = ($ev->motion_x, $ev->motion_y); 1119 ($x, $y) = ($ev->{x}, $ev->{y});
670 1120
671 $self->move ($bx + $x - $ox, $by + $y - $oy); 1121 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
672 $self->update;
673 }; 1122 };
674 } 1123 }
675} 1124}
676 1125
677sub button_up { 1126sub button_up {
… …
690 my ($self) = @_; 1139 my ($self) = @_;
691 1140
692 my ($w, $h ) = ($self->{w}, $self->{h}); 1141 my ($w, $h ) = ($self->{w}, $self->{h});
693 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1142 my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
694 1143
695 glEnable GL_BLEND;
696 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
697 glEnable GL_TEXTURE_2D; 1144 glEnable GL_TEXTURE_2D;
698 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1145 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
699 1146
1147 my $border = $self->border;
1148
700 glColor @{ $self->{border_bg} }; 1149 glColor @{ $self->{border_bg} };
701 $tex[1]->draw_quad (0, 0, $w, $self->{border}); 1150 $border[0]->draw_quad_alpha (0, 0, $w, $border);
702 $tex[3]->draw_quad (0, $self->{border}, $self->{border}, $ch); 1151 $border[1]->draw_quad_alpha (0, $border, $border, $ch);
703 $tex[2]->draw_quad ($w - $self->{border}, $self->{border}, $self->{border}, $ch); 1152 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
704 $tex[4]->draw_quad (0, $h - $self->{border}, $w, $self->{border}); 1153 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
705 1154
706 my $bg = $tex[0]; 1155 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1156 glColor @{ $self->{bg} };
707 1157
708 # TODO: repeat texture not scale 1158 # TODO: repeat texture not scale
709 my $rep_x = $cw / $bg->{w}; 1159 # solve this better(?)
710 my $rep_y = $ch / $bg->{h}; 1160 $bg->{s} = $cw / $bg->{w};
711 1161 $bg->{t} = $ch / $bg->{h};
712 glColor @{ $self->{bg} };
713
714 $bg->{s} = $rep_x;
715 $bg->{t} = $rep_y;
716 $bg->{wrap_mode} = 1;
717 $bg->draw_quad ($self->{border}, $self->{border}, $cw, $ch); 1162 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1163 }
718 1164
719 glDisable GL_TEXTURE_2D; 1165 glDisable GL_TEXTURE_2D;
720 glDisable GL_BLEND; 1166
1167 $self->{title}->draw if $self->{title};
721 1168
722 $self->child->draw; 1169 $self->child->draw;
723} 1170}
724 1171
725############################################################################# 1172#############################################################################
… …
728 1175
729our @ISA = CFClient::UI::Base::; 1176our @ISA = CFClient::UI::Base::;
730 1177
731use List::Util qw(max sum); 1178use List::Util qw(max sum);
732 1179
733use SDL::OpenGL; 1180use CFClient::OpenGL;
734 1181
735sub new { 1182sub new {
736 my $class = shift; 1183 my $class = shift;
737 1184
738 $class->SUPER::new ( 1185 $class->SUPER::new (
739 col_expand => [], 1186 col_expand => [],
740 @_ 1187 @_,
741 ) 1188 )
1189}
1190
1191sub children {
1192 grep $_, map @$_, grep $_, @{ $_[0]{children} }
742} 1193}
743 1194
744sub add { 1195sub add {
745 my ($self, $x, $y, $child) = @_; 1196 my ($self, $x, $y, $child) = @_;
746 1197
747 $child->set_parent ($self); 1198 $child->set_parent ($self);
748 $self->{children}[$y][$x] = $child; 1199 $self->{children}[$y][$x] = $child;
749 1200
750 $self->{w} = $self->{h} = -1; 1201 $self->realloc;
751
752 $child->check_size;
753} 1202}
754 1203
755# TODO: move to container class maybe? send childs a signal on removal? 1204# TODO: move to container class maybe? send children a signal on removal?
756sub clear { 1205sub clear {
757 my ($self) = @_; 1206 my ($self) = @_;
758 1207
1208 my @children = $self->children;
759 delete $self->{children}; 1209 delete $self->{children};
760 $self->update; 1210
1211 for (@children) {
1212 delete $_->{parent};
1213 $_->hide;
1214 }
1215
1216 $self->realloc;
761} 1217}
762 1218
763sub get_wh { 1219sub get_wh {
764 my ($self) = @_; 1220 my ($self) = @_;
765 1221
… …
770 or next; 1226 or next;
771 1227
772 for my $x (0 .. $#$row) { 1228 for my $x (0 .. $#$row) {
773 my $widget = $row->[$x] 1229 my $widget = $row->[$x]
774 or next; 1230 or next;
775 my ($w, $h) = $widget->size_request; 1231 my ($w, $h) = @$widget{qw(req_w req_h)};
776 1232
777 $w[$x] = max $w[$x], $w; 1233 $w[$x] = max $w[$x], $w;
778 $h[$y] = max $h[$y], $h; 1234 $h[$y] = max $h[$y], $h;
779 } 1235 }
780 } 1236 }
… …
796sub size_allocate { 1252sub size_allocate {
797 my ($self, $w, $h) = @_; 1253 my ($self, $w, $h) = @_;
798 1254
799 my ($ws, $hs) = $self->get_wh; 1255 my ($ws, $hs) = $self->get_wh;
800 1256
801 my $req_w = sum @$ws; 1257 my $req_w = (sum @$ws) || 1;
802 my $req_h = sum @$hs; 1258 my $req_h = (sum @$hs) || 1;
803 1259
804 # TODO: nicer code && do row_expand 1260 # TODO: nicer code && do row_expand
805 my @col_expand = @{$self->{col_expand}}; 1261 my @col_expand = @{$self->{col_expand}};
806 @col_expand = (1) x @$ws unless @col_expand; 1262 @col_expand = (1) x @$ws unless @col_expand;
807 my $col_expand = (sum @col_expand) || 1; 1263 my $col_expand = (sum @col_expand) || 1;
… …
861 } 1317 }
862} 1318}
863 1319
864############################################################################# 1320#############################################################################
865 1321
866package CFClient::UI::HBox; 1322package CFClient::UI::Box;
867
868# TODO: wrap into common Box base class
869 1323
870our @ISA = CFClient::UI::Container::; 1324our @ISA = CFClient::UI::Container::;
871 1325
872sub size_request { 1326sub size_request {
873 my ($self) = @_; 1327 my ($self) = @_;
874 1328
875 my @alloc = map [$_->size_request], @{$self->{children}}; 1329 $self->{vertical}
876 1330 ? (
877 ( 1331 (List::Util::max map $_->{req_w}, @{$self->{children}}),
878 (List::Util::sum map $_->[0], @alloc), 1332 (List::Util::sum map $_->{req_h}, @{$self->{children}}),
879 (List::Util::max map $_->[1], @alloc), 1333 )
880 ) 1334 : (
1335 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1336 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1337 )
881} 1338}
882 1339
883sub size_allocate { 1340sub size_allocate {
884 my ($self, $w, $h) = @_; 1341 my ($self, $w, $h) = @_;
885 1342
886 ($h, $w) = ($w, $h); 1343 my $space = $self->{vertical} ? $h : $w;
887
888 my $children = $self->{children}; 1344 my $children = $self->{children};
889 1345
890 my @h = map +($_->size_request)[0], @$children; 1346 my @req;
891 1347
892 my $req_h = List::Util::sum @h; 1348 if ($self->{homogeneous}) {
893 1349 @req = ($space / (@$children || 1)) x @$children;
894 if ($req_h > $h) {
895 # ah well, not enough space
896 $_ *= $h / $req_h for @h;
897 } else { 1350 } else {
1351 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children;
1352 my $req = List::Util::sum @req;
1353
1354 if ($req > $space) {
1355 # ah well, not enough space
1356 $_ *= $space / $req for @req;
1357 } else {
898 my $exp = List::Util::sum map $_->{expand}, @$children; 1358 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;
899 $exp ||= 1;
900 1359
1360 $space = ($space - $req) / $expand; # remaining space to give away
1361
1362 $req[$_] += $space * $children->[$_]{expand}
901 for (0 .. $#$children) { 1363 for 0 .. $#$children;
902 my $child = $children->[$_];
903
904 my $alloc_h = $h[$_];
905 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
906 $h[$_] = $alloc_h;
907 } 1364 }
908 } 1365 }
909 1366
910 CFClient::UI::harmonize \@h; 1367 CFClient::UI::harmonize \@req;
911 1368
912 my $y = 0; 1369 my $pos = 0;
913 for (0 .. $#$children) { 1370 for (0 .. $#$children) {
914 my $child = $children->[$_];
915 my $h = $h[$_]; 1371 my $alloc = $req[$_];
916 $child->configure ($y, 0, $h, $w); 1372 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
917 1373
918 $y += $h; 1374 $pos += $alloc;
919 } 1375 }
920 1376
921 1 1377 1
922} 1378}
923 1379
924############################################################################# 1380#############################################################################
925 1381
1382package CFClient::UI::HBox;
1383
1384our @ISA = CFClient::UI::Box::;
1385
1386sub new {
1387 my $class = shift;
1388
1389 $class->SUPER::new (
1390 vertical => 0,
1391 @_,
1392 )
1393}
1394
1395#############################################################################
1396
926package CFClient::UI::VBox; 1397package CFClient::UI::VBox;
927 1398
928# TODO: wrap into common Box base class
929
930our @ISA = CFClient::UI::Container::; 1399our @ISA = CFClient::UI::Box::;
931 1400
932sub size_request { 1401sub new {
933 my ($self) = @_; 1402 my $class = shift;
934 1403
935 my @alloc = map [$_->size_request], @{$self->{children}}; 1404 $class->SUPER::new (
936 1405 vertical => 1,
937 ( 1406 @_,
938 (List::Util::max map $_->[0], @alloc),
939 (List::Util::sum map $_->[1], @alloc),
940 ) 1407 )
941} 1408}
942 1409
943sub size_allocate {
944 my ($self, $w, $h) = @_;
945
946 my $children = $self->{children};
947
948 my @h = map +($_->size_request)[1], @$children;
949
950 my $req_h = List::Util::sum @h;
951
952 if ($req_h > $h) {
953 # ah well, not enough space
954 $_ *= $h / $req_h for @h;
955 } else {
956 my $exp = List::Util::sum map $_->{expand}, @$children;
957 $exp ||= 1;
958
959 for (0 .. $#$children) {
960 my $child = $children->[$_];
961
962 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
963 }
964 }
965
966 CFClient::UI::harmonize \@h;
967
968 my $y = 0;
969 for (0 .. $#$children) {
970 my $child = $children->[$_];
971 my $h = $h[$_];
972 $child->configure (0, $y, $w, $h);
973
974 $y += $h;
975 }
976
977 1
978}
979
980############################################################################# 1410#############################################################################
981 1411
982package CFClient::UI::Label; 1412package CFClient::UI::Label;
983 1413
984our @ISA = CFClient::UI::Base::; 1414our @ISA = CFClient::UI::DrawBG::;
985 1415
986use SDL::OpenGL; 1416use CFClient::OpenGL;
987 1417
988sub new { 1418sub new {
989 my ($class, %arg) = @_; 1419 my ($class, %arg) = @_;
990 1420
991 my $self = $class->SUPER::new ( 1421 my $self = $class->SUPER::new (
992 fg => [1, 1, 1], 1422 fg => [1, 1, 1],
993 fontsize => $::FONTSIZE, 1423 #bg => none
994 text => "", 1424 #active_bg => none
1425 #font => default_font
1426 #text => initial text
1427 #markup => initial narkup
1428 #max_w => maximum pixel width
1429 ellipsise => 3, # end
1430 layout => (new CFClient::Layout),
1431 fontsize => 1,
995 align => -1, 1432 align => -1,
996 valign => -1, 1433 valign => -1,
997 padding => 2, 1434 padding_x => 2,
998 layout => new CFClient::Layout, 1435 padding_y => 2,
1436 can_events => 0,
999 %arg 1437 %arg
1000 ); 1438 );
1001 1439
1002 $self->{xxx}++ if $self->{text} eq "Client Setup" && $self->{align};#d# 1440 if (exists $self->{template}) {
1441 my $layout = new CFClient::Layout;
1442 $layout->set_text (delete $self->{template});
1443 $self->{template} = $layout;
1444 }
1003 1445
1004 $self->set_text (delete $self->{text}) if exists $self->{text}; 1446 if (exists $self->{markup}) {
1005 $self->set_markup (delete $self->{markup}) if exists $self->{markup}; 1447 $self->set_markup (delete $self->{markup});
1448 } else {
1449 $self->set_text (delete $self->{text});
1450 }
1006 1451
1007 $self 1452 $self
1008} 1453}
1009 1454
1010sub escape_text { 1455sub escape($) {
1011 local $_ = $_[1]; 1456 local $_ = $_[0];
1012 1457
1013 s/&/&amp;/g; 1458 s/&/&amp;/g;
1014 s/>/&gt;/g; 1459 s/>/&gt;/g;
1015 s/</&lt;/g; 1460 s/</&lt;/g;
1016 1461
1017 $_[1] 1462 $_
1463}
1464
1465sub update {
1466 my ($self) = @_;
1467
1468 delete $self->{texture};
1469 $self->SUPER::update;
1018} 1470}
1019 1471
1020sub set_text { 1472sub set_text {
1021 my ($self, $text) = @_; 1473 my ($self, $text) = @_;
1022 1474
1475 return if $self->{text} eq "T$text";
1476 $self->{text} = "T$text";
1477
1478 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1023 $self->{layout}->set_text ($text); 1479 $self->{layout}->set_text ($text);
1024 1480
1025 delete $self->{texture}; 1481 $self->realloc;
1026 $self->update; 1482 $self->update;
1027} 1483}
1028 1484
1029sub set_markup { 1485sub set_markup {
1030 my ($self, $markup) = @_; 1486 my ($self, $markup) = @_;
1031 1487
1488 return if $self->{text} eq "M$markup";
1489 $self->{text} = "M$markup";
1490
1491 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1492
1493 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1032 $self->{layout}->set_markup ($markup); 1494 $self->{layout}->set_markup ($markup);
1033 1495
1034 delete $self->{texture}; 1496 $self->realloc;
1035 $self->update; 1497 $self->update;
1036} 1498}
1037 1499
1038sub size_request { 1500sub size_request {
1039 my ($self) = @_; 1501 my ($self) = @_;
1040 1502
1041 $self->{layout}->set_width; 1503 $self->{layout}->set_font ($self->{font}) if $self->{font};
1504 $self->{layout}->set_width ($self->{max_w} || -1);
1505 $self->{layout}->set_ellipsise ($self->{ellipsise});
1506 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1042 $self->{layout}->set_height ($self->{fontsize}); 1507 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1043 1508
1044 my ($w, $h) = $self->{layout}->size; 1509 my ($w, $h) = $self->{layout}->size;
1045 1510
1511 if (exists $self->{template}) {
1512 $self->{template}->set_font ($self->{font}) if $self->{font};
1513 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1514
1515 my ($w2, $h2) = $self->{template}->size;
1516
1517 $w = List::Util::max $w, $w2;
1518 $h = List::Util::max $h, $h2;
1046 ( 1519 }
1047 $w + $self->{padding} * 2, 1520
1048 $h + $self->{padding} * 2, 1521 ($w, $h)
1049 )
1050} 1522}
1051 1523
1052sub size_allocate { 1524sub size_allocate {
1053 my ($self, $w, $h) = @_; 1525 my ($self, $w, $h) = @_;
1054 1526
1055 delete $self->{texture}; 1527 delete $self->{texture};
1056} 1528}
1057 1529
1058sub update { 1530sub set_fontsize {
1059 my ($self) = @_; 1531 my ($self, $fontsize) = @_;
1060 1532
1533 $self->{fontsize} = $fontsize;
1061 delete $self->{texture}; 1534 delete $self->{texture};
1062 $self->SUPER::update; 1535
1536 $self->realloc;
1063} 1537}
1064 1538
1065sub _draw { 1539sub _draw {
1066 my ($self) = @_; 1540 my ($self) = @_;
1067 1541
1542 $self->SUPER::_draw; # draw background, if applicable
1543
1068 my $tex = $self->{texture} ||= do { 1544 my $tex = $self->{texture} ||= do {
1545 $self->{layout}->set_foreground (@{$self->{fg}});
1546 $self->{layout}->set_font ($self->{font}) if $self->{font};
1069 $self->{layout}->set_width ($self->{w}); 1547 $self->{layout}->set_width ($self->{w});
1070 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize}); 1548 $self->{layout}->set_ellipsise ($self->{ellipsise});
1549 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1550 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1551
1071 new_from_layout CFClient::Texture $self->{layout} 1552 my $tex = new_from_layout CFClient::Texture $self->{layout};
1553
1554 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1555 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1556 : ($self->{w} - $tex->{w}) * 0.5);
1557
1558 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1559 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1560 : ($self->{h} - $tex->{h}) * 0.5);
1561
1562 $tex
1072 }; 1563 };
1073 1564
1074 glEnable GL_BLEND;
1075 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1076 glEnable GL_TEXTURE_2D; 1565 glEnable GL_TEXTURE_2D;
1077 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1566 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1078 1567
1568 if ($tex->{format} == GL_ALPHA) {
1079 glColor @{$self->{fg}}; 1569 glColor @{$self->{fg}};
1080
1081 $self->{ox} = int (
1082 $self->{align} < 0 ? $self->{padding}
1083 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1084 : ($self->{w} - $tex->{w}) * 0.5
1085 );
1086
1087 $self->{oy} = int (
1088 $self->{valign} < 0 ? $self->{padding}
1089 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1090 : ($self->{h} - $tex->{h}) * 0.5
1091 );
1092
1093 $tex->draw_quad ($self->{ox}, $self->{oy}); 1570 $tex->draw_quad_alpha ($self->{ox}, $self->{oy});
1571 } else {
1572 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1573 }
1094 1574
1095 glDisable GL_TEXTURE_2D; 1575 glDisable GL_TEXTURE_2D;
1096 glDisable GL_BLEND;
1097} 1576}
1098 1577
1099############################################################################# 1578#############################################################################
1100 1579
1101package CFClient::UI::EntryBase; 1580package CFClient::UI::EntryBase;
1102 1581
1103our @ISA = CFClient::UI::Label::; 1582our @ISA = CFClient::UI::Label::;
1104 1583
1105use SDL; 1584use CFClient::OpenGL;
1106use SDL::OpenGL;
1107 1585
1108sub new { 1586sub new {
1109 my $class = shift; 1587 my $class = shift;
1110 1588
1111 $class->SUPER::new ( 1589 $class->SUPER::new (
1112 fg => [1, 1, 1], 1590 fg => [1, 1, 1],
1113 bg => [0, 0, 0, 0.2], 1591 bg => [0, 0, 0, 0.2],
1114 active_bg => [1, 1, 1, 0.5], 1592 active_bg => [1, 1, 1, 0.5],
1115 active_fg => [0, 0, 0], 1593 active_fg => [0, 0, 0],
1116 can_hover => 1, 1594 can_hover => 1,
1117 can_focus => 1, 1595 can_focus => 1,
1118 valign => 0, 1596 valign => 0,
1597 can_events => 1,
1598 #text => ...
1119 @_ 1599 @_
1120 ) 1600 )
1121} 1601}
1122 1602
1123sub _set_text { 1603sub _set_text {
… …
1125 1605
1126 delete $self->{cur_h}; 1606 delete $self->{cur_h};
1127 1607
1128 return if $self->{text} eq $text; 1608 return if $self->{text} eq $text;
1129 1609
1610 delete $self->{texture};
1611
1130 $self->{last_activity} = $::NOW; 1612 $self->{last_activity} = $::NOW;
1131 $self->{text} = $text; 1613 $self->{text} = $text;
1132 1614
1133 $text =~ s/./*/g if $self->{hidden}; 1615 $text =~ s/./*/g if $self->{hidden};
1134 $self->{layout}->set_text ("$text "); 1616 $self->{layout}->set_text ("$text ");
1135 1617
1136 $self->emit (changed => $self->{text}); 1618 $self->_emit (changed => $self->{text});
1619}
1620
1621sub set_text {
1622 my ($self, $text) = @_;
1623
1624 $self->{cursor} = length $text;
1625 $self->_set_text ($text);
1626
1627 $self->realloc;
1137} 1628}
1138 1629
1139sub get_text { 1630sub get_text {
1140 $_[0]{text} 1631 $_[0]{text}
1141} 1632}
… …
1146 my ($w, $h) = $self->SUPER::size_request; 1637 my ($w, $h) = $self->SUPER::size_request;
1147 1638
1148 ($w + 1, $h) # add 1 for cursor 1639 ($w + 1, $h) # add 1 for cursor
1149} 1640}
1150 1641
1151sub size_allocate {
1152 my ($self, $w, $h) = @_;
1153
1154 $self->_set_text ($self->{text});
1155}
1156
1157sub set_text {
1158 my ($self, $text) = @_;
1159
1160 $self->{cursor} = length $text;
1161 $self->_set_text ($text);
1162 $self->update;
1163}
1164
1165sub key_down { 1642sub key_down {
1166 my ($self, $ev) = @_; 1643 my ($self, $ev) = @_;
1167 1644
1168 my $mod = $ev->key_mod; 1645 my $mod = $ev->{mod};
1169 my $sym = $ev->key_sym; 1646 my $sym = $ev->{sym};
1170
1171 my $uni = $ev->key_unicode; 1647 my $uni = $ev->{unicode};
1172 1648
1173 my $text = $self->get_text; 1649 my $text = $self->get_text;
1174 1650
1175 if ($sym == SDLK_BACKSPACE) { 1651 if ($uni == 8) {
1176 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 1652 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1177 } elsif ($sym == SDLK_DELETE) { 1653 } elsif ($uni == 127) {
1178 substr $text, $self->{cursor}, 1, ""; 1654 substr $text, $self->{cursor}, 1, "";
1179 } elsif ($sym == SDLK_LEFT) { 1655 } elsif ($sym == CFClient::SDLK_LEFT) {
1180 --$self->{cursor} if $self->{cursor}; 1656 --$self->{cursor} if $self->{cursor};
1181 } elsif ($sym == SDLK_RIGHT) { 1657 } elsif ($sym == CFClient::SDLK_RIGHT) {
1182 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1658 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1183 } elsif ($sym == SDLK_HOME) { 1659 } elsif ($sym == CFClient::SDLK_HOME) {
1184 $self->{cursor} = 0; 1660 $self->{cursor} = 0;
1185 } elsif ($sym == SDLK_END) { 1661 } elsif ($sym == CFClient::SDLK_END) {
1186 $self->{cursor} = length $text; 1662 $self->{cursor} = length $text;
1187 } elsif ($sym == SDLK_ESCAPE) { 1663 } elsif ($uni == 27) {
1188 $self->emit ('escape'); 1664 $self->_emit ('escape');
1189 } elsif ($uni) { 1665 } elsif ($uni) {
1190 substr $text, $self->{cursor}++, 0, chr $uni; 1666 substr $text, $self->{cursor}++, 0, chr $uni;
1191 } 1667 }
1192 1668
1193 $self->_set_text ($text); 1669 $self->_set_text ($text);
1194 $self->update; 1670
1671 $self->realloc;
1195} 1672}
1196 1673
1197sub focus_in { 1674sub focus_in {
1198 my ($self) = @_; 1675 my ($self) = @_;
1199 1676
… …
1267 1744
1268package CFClient::UI::Entry; 1745package CFClient::UI::Entry;
1269 1746
1270our @ISA = CFClient::UI::EntryBase::; 1747our @ISA = CFClient::UI::EntryBase::;
1271 1748
1272use SDL; 1749use CFClient::OpenGL;
1273use SDL::OpenGL;
1274 1750
1275sub key_down { 1751sub key_down {
1276 my ($self, $ev) = @_; 1752 my ($self, $ev) = @_;
1277 1753
1278 my $sym = $ev->key_sym; 1754 my $sym = $ev->{sym};
1279 1755
1280 if ($sym == SDLK_RETURN) { 1756 if ($sym == 13) {
1757 unshift @{$self->{history}},
1758 my $txt = $self->get_text;
1759 $self->{history_pointer} = -1;
1760 $self->{history_saveback} = '';
1281 $self->emit (activate => $self->get_text); 1761 $self->_emit (activate => $txt);
1282 $self->update; 1762 $self->update;
1763
1764 } elsif ($sym == CFClient::SDLK_UP) {
1765 if ($self->{history_pointer} < 0) {
1766 $self->{history_saveback} = $self->get_text;
1767 }
1768 if (@{$self->{history} || []} > 0) {
1769 $self->{history_pointer}++;
1770 if ($self->{history_pointer} >= @{$self->{history} || []}) {
1771 $self->{history_pointer} = @{$self->{history} || []} - 1;
1772 }
1773 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1774 }
1775
1776 } elsif ($sym == CFClient::SDLK_DOWN) {
1777 $self->{history_pointer}--;
1778 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1779
1780 if ($self->{history_pointer} >= 0) {
1781 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1782 } else {
1783 $self->set_text ($self->{history_saveback});
1784 }
1283 1785
1284 } else { 1786 } else {
1285 $self->SUPER::key_down ($ev); 1787 $self->SUPER::key_down ($ev);
1286 } 1788 }
1287 1789
… …
1291 1793
1292package CFClient::UI::Button; 1794package CFClient::UI::Button;
1293 1795
1294our @ISA = CFClient::UI::Label::; 1796our @ISA = CFClient::UI::Label::;
1295 1797
1296use SDL; 1798use CFClient::OpenGL;
1297use SDL::OpenGL;
1298 1799
1299my @tex = 1800my @tex =
1300 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 1801 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1301 qw(b1_button_active.png); 1802 qw(b1_button_active.png);
1302 1803
1303sub new { 1804sub new {
1304 my $class = shift; 1805 my $class = shift;
1305 1806
1306 $class->SUPER::new ( 1807 $class->SUPER::new (
1307 padding => 4, 1808 padding_x => 4,
1809 padding_y => 4,
1308 fg => [1, 1, 1], 1810 fg => [1, 1, 1],
1309 bg => [1, 1, 1, 0.2],
1310 active_fg => [0, 0, 1], 1811 active_fg => [0, 0, 1],
1311 can_hover => 1, 1812 can_hover => 1,
1312 align => 0, 1813 align => 0,
1313 valign => 0, 1814 valign => 0,
1815 can_events => 1,
1314 @_ 1816 @_
1315 ) 1817 )
1316} 1818}
1317 1819
1820sub activate { }
1821
1318sub button_up { 1822sub button_up {
1319 my ($self, $ev, $x, $y) = @_; 1823 my ($self, $ev, $x, $y) = @_;
1320 1824
1825 $self->emit ("activate")
1321 if ($x >= 0 && $x < $self->{w} 1826 if $x >= 0 && $x < $self->{w}
1322 && $y >= 0 && $y < $self->{h}) { 1827 && $y >= 0 && $y < $self->{h};
1323 $self->emit ("activate");
1324 }
1325} 1828}
1326 1829
1327sub _draw { 1830sub _draw {
1328 my ($self) = @_; 1831 my ($self) = @_;
1329 1832
1330 local $self->{fg} = $self->{fg}; 1833 local $self->{fg} = $self->{fg};
1331 1834
1332 if ($GRAB == $self) { 1835 if ($GRAB == $self) {
1333 $self->{fg} = $self->{active_fg}; 1836 $self->{fg} = $self->{active_fg};
1334 } 1837 }
1838
1839 glEnable GL_TEXTURE_2D;
1840 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1841 glColor 0, 0, 0, 1;
1842
1843 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1844
1845 glDisable GL_TEXTURE_2D;
1846
1847 $self->SUPER::_draw;
1848}
1849
1850#############################################################################
1851
1852package CFClient::UI::CheckBox;
1853
1854our @ISA = CFClient::UI::DrawBG::;
1855
1856my @tex =
1857 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1858 qw(c1_checkbox_bg.png c1_checkbox_active.png);
1859
1860use CFClient::OpenGL;
1861
1862sub new {
1863 my $class = shift;
1864
1865 $class->SUPER::new (
1866 padding_x => 2,
1867 padding_y => 2,
1868 fg => [1, 1, 1],
1869 active_fg => [1, 1, 0],
1870 bg => [0, 0, 0, 0.2],
1871 active_bg => [1, 1, 1, 0.5],
1872 state => 0,
1873 can_hover => 1,
1874 @_
1875 )
1876}
1877
1878sub size_request {
1879 my ($self) = @_;
1880
1881 (6) x 2
1882}
1883
1884sub button_down {
1885 my ($self, $ev, $x, $y) = @_;
1886
1887 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1888 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1889 $self->{state} = !$self->{state};
1890 $self->_emit (changed => $self->{state});
1891 }
1892}
1893
1894sub _draw {
1895 my ($self) = @_;
1896
1897 $self->SUPER::_draw;
1898
1899 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1900
1901 my ($w, $h) = @$self{qw(w h)};
1902
1903 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
1904
1905 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1906
1907 my $tex = $self->{state} ? $tex[1] : $tex[0];
1908
1909 glEnable GL_TEXTURE_2D;
1910 $tex->draw_quad_alpha (0, 0, $s, $s);
1911 glDisable GL_TEXTURE_2D;
1912}
1913
1914#############################################################################
1915
1916package CFClient::UI::Image;
1917
1918our @ISA = CFClient::UI::Base::;
1919
1920use CFClient::OpenGL;
1921use Carp qw/confess/;
1922
1923our %loaded_images;
1924
1925sub new {
1926 my $class = shift;
1927
1928 my $self = $class->SUPER::new (can_events => 0, @_);
1929
1930 $self->{image} or confess "Image has 'image' not set. This is a fatal error!";
1931
1932 $loaded_images{$self->{image}} ||=
1933 new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1;
1934
1935 my $tex = $self->{tex} = $loaded_images{$self->{image}};
1936
1937 Scalar::Util::weaken $loaded_images{$self->{image}};
1938
1939 $self->{aspect} = $tex->{w} / $tex->{h};
1940
1941 $self
1942}
1943
1944sub size_request {
1945 my ($self) = @_;
1946
1947 ($self->{tex}->{w}, $self->{tex}->{h})
1948}
1949
1950sub _draw {
1951 my ($self) = @_;
1952
1953 my $tex = $self->{tex};
1954
1955 my ($w, $h) = ($self->{w}, $self->{h});
1956
1957 if ($self->{rot90}) {
1958 glRotate 90, 0, 0, 1;
1959 glTranslate 0, -$self->{w}, 0;
1960
1961 ($w, $h) = ($h, $w);
1962 }
1963
1964 glEnable GL_TEXTURE_2D;
1965 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1966
1967 $tex->draw_quad_alpha (0, 0, $w, $h);
1968
1969 glDisable GL_TEXTURE_2D;
1970}
1971
1972#############################################################################
1973
1974package CFClient::UI::VGauge;
1975
1976our @ISA = CFClient::UI::Base::;
1977
1978use List::Util qw(min max);
1979
1980use CFClient::OpenGL;
1981
1982my %tex = (
1983 food => [
1984 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1985 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
1986 ],
1987 grace => [
1988 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1989 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
1990 ],
1991 hp => [
1992 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1993 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
1994 ],
1995 mana => [
1996 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1997 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
1998 ],
1999);
2000
2001# eg. VGauge->new (gauge => 'food'), default gauge: food
2002sub new {
2003 my $class = shift;
2004
2005 my $self = $class->SUPER::new (
2006 type => 'food',
2007 @_
2008 );
2009
2010 $self->{aspect} = $tex{$self->{type}}[0]{w} / $tex{$self->{type}}[0]{h};
2011
2012 $self
2013}
2014
2015sub size_request {
2016 my ($self) = @_;
2017
2018 #my $tex = $tex{$self->{type}}[0];
2019 #@$tex{qw(w h)}
2020 (0, 0)
2021}
2022
2023sub set_max {
2024 my ($self, $max) = @_;
2025
2026 return if $self->{max_val} == $max;
2027
2028 $self->{max_val} = $max;
2029 $self->update;
2030}
2031
2032sub set_value {
2033 my ($self, $val, $max) = @_;
2034
2035 $self->set_max ($max)
2036 if defined $max;
2037
2038 return if $self->{val} == $val;
2039
2040 $self->{val} = $val;
2041 $self->update;
2042}
2043
2044sub _draw {
2045 my ($self) = @_;
2046
2047 my $tex = $tex{$self->{type}};
2048 my ($t1, $t2, $t3) = @$tex;
2049
2050 my ($w, $h) = ($self->{w}, $self->{h});
2051
2052 if ($self->{vertical}) {
2053 glRotate 90, 0, 0, 1;
2054 glTranslate 0, -$self->{w}, 0;
2055
2056 ($w, $h) = ($h, $w);
2057 }
2058
2059 my $ycut = $self->{val} / ($self->{max_val} || 1);
2060
2061 my $ycut1 = max 0, min 1, $ycut;
2062 my $ycut2 = max 0, min 1, $ycut - 1;
2063
2064 my $h1 = $self->{h} * (1 - $ycut1);
2065 my $h2 = $self->{h} * (1 - $ycut2);
1335 2066
1336 glEnable GL_BLEND; 2067 glEnable GL_BLEND;
1337 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2068 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1338 glEnable GL_TEXTURE_2D; 2069 glEnable GL_TEXTURE_2D;
1339 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2070 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1340 glColor 0, 0, 0, 1;
1341 2071
1342 $tex[0]->draw_quad (0, 0, $self->{w}, $self->{h}); 2072 glBindTexture GL_TEXTURE_2D, $t1->{name};
2073 glBegin GL_QUADS;
2074 glTexCoord 0 , 0; glVertex 0 , 0;
2075 glTexCoord 0 , $t1->{t} * (1 - $ycut1); glVertex 0 , $h1;
2076 glTexCoord $t1->{s}, $t1->{t} * (1 - $ycut1); glVertex $w, $h1;
2077 glTexCoord $t1->{s}, 0; glVertex $w, 0;
2078 glEnd;
1343 2079
2080 my $ycut1 = List::Util::min 1, $ycut;
2081 glBindTexture GL_TEXTURE_2D, $t2->{name};
2082 glBegin GL_QUADS;
2083 glTexCoord 0 , $t2->{t} * (1 - $ycut1); glVertex 0 , $h1;
2084 glTexCoord 0 , $t2->{t} * (1 - $ycut2); glVertex 0 , $h2;
2085 glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut2); glVertex $w, $h2;
2086 glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut1); glVertex $w, $h1;
2087 glEnd;
2088
2089 if ($t3) {
2090 glBindTexture GL_TEXTURE_2D, $t3->{name};
2091 glBegin GL_QUADS;
2092 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2093 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h};
2094 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h};
2095 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2096 glEnd;
2097 }
2098
2099 glDisable GL_BLEND;
1344 glDisable GL_TEXTURE_2D; 2100 glDisable GL_TEXTURE_2D;
1345 glDisable GL_BLEND;
1346
1347 $self->SUPER::_draw;
1348} 2101}
1349 2102
1350############################################################################# 2103#############################################################################
1351 2104
1352package CFClient::UI::CheckBox; 2105package CFClient::UI::Gauge;
1353 2106
1354our @ISA = CFClient::UI::DrawBG::; 2107our @ISA = CFClient::UI::VBox::;
1355
1356my @tex =
1357 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
1358 qw(c1_checkbox_bg.png c1_checkbox_active.png);
1359
1360use SDL;
1361use SDL::OpenGL;
1362 2108
1363sub new { 2109sub new {
1364 my $class = shift; 2110 my ($class, %arg) = @_;
1365 2111
1366 $class->SUPER::new ( 2112 my $self = $class->SUPER::new (
1367 padding => 2, 2113 tooltip => $arg{type},
1368 fg => [1, 1, 1],
1369 active_fg => [1, 1, 0],
1370 state => 0,
1371 can_hover => 1, 2114 can_hover => 1,
1372 @_ 2115 can_events => 1,
2116 %arg,
1373 ) 2117 );
1374}
1375 2118
1376sub size_request { 2119 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999");
1377 my ($self) = @_; 2120 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
1378 2121 $self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999");
1379 ($self->{padding} * 2 + 6) x 2
1380}
1381
1382sub button_down {
1383 my ($self, $ev, $x, $y) = @_;
1384
1385 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}
1386 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {
1387 $self->{state} = !$self->{state};
1388 $self->emit (changed => $self->{state});
1389 }
1390}
1391
1392sub _draw {
1393 my ($self) = @_;
1394
1395 $self->SUPER::_draw;
1396
1397 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0;
1398
1399 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;
1400
1401 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1402
1403 glEnable GL_BLEND;
1404 glEnable GL_TEXTURE_2D;
1405 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1406
1407 my $tex = $self->{state} ? $tex[1] : $tex[0];
1408
1409 $tex->draw_quad (0, 0, $s, $s);
1410
1411 glDisable GL_TEXTURE_2D;
1412 glDisable GL_BLEND;
1413}
1414
1415#############################################################################
1416
1417package CFClient::UI::VGauge;
1418
1419our @ISA = CFClient::UI::Base::;
1420
1421use SDL::OpenGL;
1422
1423my %tex = (
1424 food => [
1425 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
1426 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
1427 ],
1428 grace => [
1429 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
1430 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png/
1431 ],
1432 hp => [
1433 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
1434 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
1435 ],
1436 mana => [
1437 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
1438 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png/
1439 ],
1440);
1441
1442# eg. VGauge->new (gauge => 'food'), default gauge: food
1443sub new {
1444 my $class = shift;
1445
1446 my $self = $class->SUPER::new (gauge => 'food', @_);
1447 2122
1448 $self 2123 $self
1449} 2124}
1450 2125
1451sub size_request { 2126sub set_fontsize {
1452 my ($self) = @_; 2127 my ($self, $fsize) = @_;
1453 2128
1454 my $tex = $tex{$self->{gauge}}[0]; 2129 $self->{value}->set_fontsize ($fsize);
1455 2130 $self->{max} ->set_fontsize ($fsize);
1456 @$tex{qw(w h)}
1457} 2131}
1458 2132
1459sub set_max { 2133sub set_max {
1460 my ($self, $max) = @_; 2134 my ($self, $max) = @_;
1461 2135
1462 $self->{max_val} = $max; 2136 $self->{gauge}->set_max ($max);
2137 $self->{max}->set_text ($max);
1463} 2138}
1464 2139
1465sub set_value { 2140sub set_value {
1466 my ($self, $val, $max) = @_; 2141 my ($self, $val, $max) = @_;
1467 2142
1468 $self->set_max ($max) 2143 $self->set_max ($max)
1469 if defined $max; 2144 if defined $max;
1470 2145
1471 $max = $self->{max_val}; 2146 $self->{gauge}->set_value ($val, $max);
1472 $self->{val} = $val; 2147 $self->{value}->set_text ($val);
1473
1474 $self->update;
1475}
1476
1477sub _draw {
1478 my ($self) = @_;
1479
1480 my $tex = $tex{$self->{gauge}};
1481
1482 my ($w, $h) = ($self->{w}, $self->{h});
1483
1484 my $ycut = $self->{val} / ($self->{max_val} || 1);
1485 $ycut = 1 if $self->{val} > $self->{max_val};
1486
1487 my $t1 = $tex->[0];
1488 my $t2 = $tex->[1];
1489
1490 glEnable GL_BLEND;
1491 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1492 glEnable GL_TEXTURE_2D;
1493 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1494
1495 my $h1 = $self->{h} - $ycut * $self->{h};
1496 my $h2 = $ycut * $self->{h};
1497
1498 my $yp = 0;
1499
1500 glBindTexture GL_TEXTURE_2D, $t1->{name};
1501 glBegin GL_QUADS;
1502 glTexCoord 0 , 0; glVertex 0 , $yp;
1503 glTexCoord 0 , $t1->{t} * (1 - $ycut); glVertex 0 , $yp + $h1;
1504 glTexCoord $t1->{s}, $t1->{t} * (1 - $ycut); glVertex 0 + $w, $yp + $h1;
1505 glTexCoord $t1->{s}, 0; glVertex 0 + $w, $yp;
1506 glEnd;
1507
1508 $yp += $h1;
1509
1510 glBindTexture GL_TEXTURE_2D, $t2->{name};
1511 glBegin GL_QUADS;
1512 glTexCoord 0 , $t2->{t} * (1 - $ycut); glVertex 0 , $yp;
1513 glTexCoord 0 , $t2->{t}; glVertex 0 , $yp + $h2;
1514 glTexCoord $t2->{s}, $t2->{t}; glVertex 0 + $w, $yp + $h2;
1515 glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut); glVertex 0 + $w, $yp;
1516 glEnd;
1517
1518 glDisable GL_BLEND;
1519 glDisable GL_TEXTURE_2D;
1520} 2148}
1521 2149
1522############################################################################# 2150#############################################################################
1523 2151
1524package CFClient::UI::Slider; 2152package CFClient::UI::Slider;
1525 2153
1526use strict; 2154use strict;
1527 2155
1528use SDL::OpenGL; 2156use CFClient::OpenGL;
1529 2157
1530our @ISA = CFClient::UI::DrawBG::; 2158our @ISA = CFClient::UI::DrawBG::;
1531 2159
1532my @tex = 2160my @tex =
1533 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 2161 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
1534 qw(s1_slider.png s1_slider_bg.png); 2162 qw(s1_slider.png s1_slider_bg.png);
1535 2163
1536sub new { 2164sub new {
1537 my $class = shift; 2165 my $class = shift;
1538 2166
1539 # range [value, low, high, page] 2167 # range [value, low, high, page, unit]
1540 2168
1541 # TODO: 0-width page 2169 # TODO: 0-width page
1542 # TODO: req_w/h are wrong with vertical 2170 # TODO: req_w/h are wrong with vertical
1543 # TODO: calculations are off 2171 # TODO: calculations are off
1544 my $self = $class->SUPER::new ( 2172 my $self = $class->SUPER::new (
1545 fg => [1, 1, 1], 2173 fg => [1, 1, 1],
1546 active_fg => [0, 0, 0], 2174 active_fg => [0, 0, 0],
2175 bg => [0, 0, 0, 0.2],
2176 active_bg => [1, 1, 1, 0.5],
1547 range => [0, 0, 100, 10], 2177 range => [0, 0, 100, 10, 0],
1548 req_w => 40, 2178 min_w => $::WIDTH / 80,
1549 req_h => 13, 2179 min_h => $::WIDTH / 80,
1550 vertical => 0, 2180 vertical => 0,
1551 can_hover => 1, 2181 can_hover => 1,
1552 inner_pad => 5, 2182 inner_pad => 0.02,
1553 @_ 2183 @_
1554 ); 2184 );
1555 2185
2186 $self->set_value ($self->{range}[0]);
2187 $self->update;
2188
1556 $self 2189 $self
1557} 2190}
1558 2191
2192sub changed { }
2193
2194sub set_range {
2195 my ($self, $range) = @_;
2196
2197 ($range, $self->{range}) = ($self->{range}, $range);
2198
2199 $self->update
2200 if "@$range" ne "@{$self->{range}}";
2201}
2202
2203sub set_value {
2204 my ($self, $value) = @_;
2205
2206 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
2207
2208 $hi = $lo + 1 if $hi <= $lo;
2209
2210 $page = $hi - $lo if $page > $hi - $lo;
2211
2212 $value = $lo if $value < $lo;
2213 $value = $hi - $page if $value > $hi - $page;
2214
2215 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
2216 if $unit;
2217
2218 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2219
2220 if ($value != $old_value) {
2221 $self->_emit (changed => $value);
2222 $self->update;
2223 }
2224}
2225
1559sub size_request { 2226sub size_request {
1560 my ($self) = @_; 2227 my ($self) = @_;
1561 2228
1562 my $w = $self->{req_w}; 2229 ($self->{req_w}, $self->{req_h})
1563 my $h = $self->{req_h};
1564
1565 $self->{vertical} ? ($h, $w) : ($w, $h)
1566} 2230}
1567 2231
1568sub button_down { 2232sub button_down {
1569 my ($self, $ev, $x, $y) = @_; 2233 my ($self, $ev, $x, $y) = @_;
1570 2234
1571 $self->SUPER::button_down ($ev, $x, $y); 2235 $self->SUPER::button_down ($ev, $x, $y);
2236
2237 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2238
1572 $self->mouse_motion ($ev, $x, $y); 2239 $self->mouse_motion ($ev, $x, $y);
1573} 2240}
1574 2241
1575sub mouse_motion { 2242sub mouse_motion {
1576 my ($self, $ev, $x, $y) = @_; 2243 my ($self, $ev, $x, $y) = @_;
1577 2244
1578 if ($GRAB == $self) { 2245 if ($GRAB == $self) {
2246 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2247
2248 my (undef, $lo, $hi, $page) = @{$self->{range}};
2249
2250 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2251
2252 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2253 }
2254}
2255
2256sub update {
2257 my ($self) = @_;
2258
2259 $CFClient::UI::ROOT->on_post_alloc ($self => sub {
2260 $self->set_value ($self->{range}[0]);
2261
1579 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2262 my ($value, $lo, $hi, $page) = @{$self->{range}};
2263 my $range = ($hi - $page - $lo) || 1e-100;
1580 2264
1581 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2265 my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
1582 2266
1583 my $inner_pad_px = $self->_calc_inner_pad_px ($w); 2267 $self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
1584 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right 2268 $self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
1585 2269
1586 $x -= $inner_pad_px; # substract the padding 2270 $value = ($value - $lo) / $range;
1587 $x = $x * ($hi - $lo) / $inner_w + $lo; 2271 $value = $value * $self->{scale} + $self->{offset};
1588 $x = $lo if $x < $lo;
1589 $x = $hi - $page if $x > $hi - $page;
1590 $self->{range}[0] = $x;
1591 2272
1592 $self->emit (changed => $x); 2273 $self->{knob_x} = $value - $knob_w * 0.5;
1593 $self->update; 2274 $self->{knob_w} = $knob_w;
1594 } 2275 });
1595}
1596 2276
1597# the inner_* stuff is for generating a padding for the slider handle, 2277 $self->SUPER::update;
1598# so that the handle doesn't leave the texture. This calculation isn't 100%
1599# correct propably, but it does the job for now
1600sub _calc_inner_pad_px {
1601 my ($self, $w) = @_;
1602 ($w / 100) * $self->{inner_pad} # % to pixels
1603} 2278}
1604 2279
1605sub _draw { 2280sub _draw {
1606 my ($self) = @_; 2281 my ($self) = @_;
1607 2282
1608 $self->SUPER::_draw (); 2283 $self->SUPER::_draw ();
1609 2284
1610 my ($w, $h) = @$self{qw(w h)}; 2285 glScale $self->{w}, $self->{h};
1611 2286
1612 if ($self->{vertical}) { 2287 if ($self->{vertical}) {
1613 # draw a vertical slider like a rotated horizontal slider 2288 # draw a vertical slider like a rotated horizontal slider
1614 2289
2290 glTranslate 1, 0, 0;
1615 glRotate 90, 0, 0, 1; 2291 glRotate 90, 0, 0, 1;
1616 glTranslate 0, -$self->{w}, 0;
1617
1618 ($w, $h) = ($h, $w);
1619 } 2292 }
1620 2293
1621 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg}; 2294 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
1622 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg}; 2295 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
1623 2296
1624 my ($value, $lo, $hi, $page) = @{$self->{range}};
1625
1626 $hi = $value + 1 if $lo == $hi;
1627
1628 my $inner_pad_px = $self->_calc_inner_pad_px ($w);
1629 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
1630
1631 $page = int $page * $inner_w / ($hi - $lo);
1632 $value = int +($value - $lo) * $inner_w / ($hi - $lo);
1633
1634 $w -= $page;
1635 $page &= ~1;
1636 glTranslate $page * 0.5, 0, 0;
1637 $page ||= 2;
1638
1639 my $knob_a = $inner_pad_px + ($value - $page * 0.5);
1640 my $knob_b = $inner_pad_px + ($value + $page * 0.5);
1641
1642 glEnable GL_BLEND;
1643 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1644 glEnable GL_TEXTURE_2D; 2297 glEnable GL_TEXTURE_2D;
1645 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2298 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1646 2299
1647 # draw background 2300 # draw background
1648 $tex[1]->draw_quad (0, 0, $w, $h); 2301 $tex[1]->draw_quad_alpha (0, 0, 1, 1);
1649 2302
1650 # draw handle 2303 # draw handle
1651 $tex[0]->draw_quad ($knob_a, 0, $knob_b - $knob_a, $h); 2304 $tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1);
1652 2305
1653 glDisable GL_BLEND;
1654 glDisable GL_TEXTURE_2D; 2306 glDisable GL_TEXTURE_2D;
1655} 2307}
1656 2308
1657############################################################################# 2309#############################################################################
1658 2310
2311package CFClient::UI::ValSlider;
2312
2313our @ISA = CFClient::UI::HBox::;
2314
2315sub new {
2316 my ($class, %arg) = @_;
2317
2318 my $range = delete $arg{range};
2319
2320 my $self = $class->SUPER::new (
2321 slider => (new CFClient::UI::Slider expand => 1, range => $range),
2322 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),
2323 to_value => sub { shift },
2324 from_value => sub { shift },
2325 %arg,
2326 );
2327
2328 $self->{slider}->connect (changed => sub {
2329 my ($self, $value) = @_;
2330 $self->{parent}{entry}->set_text ($self->{parent}{to_value}->($value));
2331 $self->{parent}->emit (changed => $value);
2332 });
2333
2334# $self->{entry}->connect (changed => sub {
2335# my ($self, $value) = @_;
2336# $self->{parent}{slider}->set_value ($self->{parent}{from_value}->($value));
2337# $self->{parent}->emit (changed => $value);
2338# });
2339
2340 $self->add ($self->{slider}, $self->{entry});
2341
2342 $self->{slider}->emit (changed => $self->{slider}{range}[0]);
2343
2344 $self
2345}
2346
2347sub set_range { shift->{slider}->set_range (@_) }
2348sub set_value { shift->{slider}->set_value (@_) }
2349
2350#############################################################################
2351
1659package CFClient::UI::TextView; 2352package CFClient::UI::TextView;
1660 2353
1661our @ISA = CFClient::UI::HBox::; 2354our @ISA = CFClient::UI::HBox::;
1662 2355
1663use SDL::OpenGL; 2356use CFClient::OpenGL;
1664 2357
1665sub new { 2358sub new {
1666 my $class = shift; 2359 my $class = shift;
1667 2360
1668 my $self = $class->SUPER::new ( 2361 my $self = $class->SUPER::new (
1669 req_w => $::WIDTH / 6, 2362 fontsize => 1,
1670 req_h => $::HEIGHT / 6, 2363 can_events => 0,
1671 fontsize => $::FONTSIZE, 2364 #font => default_font
1672 @_, 2365 @_,
1673 2366
1674 layout => (new CFClient::Layout), 2367 layout => (new CFClient::Layout 1),
1675 par => [], 2368 par => [],
1676 height => 0, 2369 height => 0,
1677 children => [ 2370 children => [
1678 (new CFClient::UI::Empty expand => 1), 2371 (new CFClient::UI::Empty expand => 1),
1679 (new CFClient::UI::Slider vertical => 1), 2372 (new CFClient::UI::Slider vertical => 1),
1680 ], 2373 ],
1681 ); 2374 );
1682 2375
1683 $self->{children}[1]->connect (changed => sub { 2376 $self->{children}[1]->connect (changed => sub { $self->update });
1684 $self->update;
1685 });
1686 2377
1687 $self 2378 $self
1688} 2379}
1689 2380
1690sub set_fontsize { 2381sub set_fontsize {
… …
1692 2383
1693 $self->{fontsize} = $fontsize; 2384 $self->{fontsize} = $fontsize;
1694 $self->reflow; 2385 $self->reflow;
1695} 2386}
1696 2387
2388sub size_allocate {
2389 my ($self, $w, $h) = @_;
2390
2391 $self->SUPER::size_allocate ($w, $h);
2392
2393 $self->{layout}->set_font ($self->{font}) if $self->{font};
2394 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2395 $self->{layout}->set_width ($self->{children}[0]{w});
2396
2397 $self->reflow;
2398}
2399
1697sub text_height { 2400sub text_size {
1698 my ($self, $text) = @_; 2401 my ($self, $text, $indent) = @_;
1699 2402
1700 my $layout = $self->{layout}; 2403 my $layout = $self->{layout};
1701 2404
1702 $layout->set_height ($self->{fontsize}); 2405 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
1703 $layout->set_width ($self->{w}); 2406 $layout->set_width ($self->{children}[0]{w} - $indent);
1704 $layout->set_text ($text); 2407 $layout->set_markup ($text);
1705 2408
1706 ($layout->size)[1] 2409 $layout->size
1707} 2410}
1708 2411
1709sub reflow { 2412sub reflow {
1710 my ($self) = @_; 2413 my ($self) = @_;
1711 2414
1712 $self->{need_reflow}++; 2415 $self->{need_reflow}++;
1713 $self->update; 2416 $self->update;
1714} 2417}
1715 2418
1716sub size_request { 2419sub set_offset {
1717 my ($self) = @_; 2420 my ($self, $offset) = @_;
1718 2421
1719 ($self->{req_w}, $self->{req_h}) 2422 # todo: base offset on lines or so, not on pixels
2423 $self->{children}[1]->set_value ($offset);
1720} 2424}
1721 2425
1722sub size_allocate { 2426sub clear {
1723 my ($self, $w, $h) = @_; 2427 my ($self) = @_;
1724 2428
1725 $self->{layout}->set_height ($self->{fontsize}); 2429 $self->{par} = [];
1726 $self->{layout}->set_width ($self->{w}); 2430 $self->{height} = 0;
1727 2431 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
1728 $self->reflow;
1729 $self->update;
1730} 2432}
1731 2433
1732sub add_paragraph { 2434sub add_paragraph {
1733 my ($self, $color, $text) = @_; 2435 my ($self, $color, $text, $indent) = @_;
1734 2436
1735 #TODO: intelligently "reformat" paragraph 2437 for my $line (split /\n/, $text) {
1736 2438 my ($w, $h) = $self->text_size ($line);
1737 my $height = $self->text_height ($text);
1738
1739 $self->{height} += $height; 2439 $self->{height} += $h;
2440 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];
2441 }
1740 2442
1741 push @{$self->{par}}, [$height, $color, $text];
1742
1743 $self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}]; 2443 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]);
1744 $self->{children}[1]->update;
1745} 2444}
1746 2445
1747sub update { 2446sub update {
1748 my ($self) = @_; 2447 my ($self) = @_;
1749 2448
… …
1751 2450
1752 return unless $self->{h} > 0; 2451 return unless $self->{h} > 0;
1753 2452
1754 delete $self->{texture}; 2453 delete $self->{texture};
1755 2454
1756 $ROOT->on_refresh ($self, sub { 2455 $ROOT->on_post_alloc ($self, sub {
2456 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2457
1757 if (delete $self->{need_reflow}) { 2458 if (delete $self->{need_reflow}) {
1758 my $height = 0; 2459 my $height = 0;
1759 2460
1760 $height += $_->[0] = $self->text_height ($_->[2]) 2461 my $layout = $self->{layout};
2462
2463 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2464
1761 for @{$self->{par}}; 2465 for (@{$self->{par}}) {
2466 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2467 $layout->set_width ($W - $_->[3]);
2468 $layout->set_markup ($_->[4]);
2469 my ($w, $h) = $layout->size;
2470 $_->[0] = $w + $_->[3];
2471 $_->[1] = $h;
2472 }
2473
2474 $height += $_->[1];
2475 }
1762 2476
1763 $self->{height} = $height; 2477 $self->{height} = $height;
1764 2478
1765 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2479 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
1766 2480
1767 delete $self->{texture}; 2481 delete $self->{texture};
1768 } 2482 }
1769 2483
1770 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 2484 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
1771 glClearColor 0, 0, 0, 1; 2485 glClearColor 0.5, 0.5, 0.5, 0;
1772 glClear GL_COLOR_BUFFER_BIT; 2486 glClear GL_COLOR_BUFFER_BIT;
1773 2487
2488 my $top = int $self->{children}[1]{range}[0];
2489
2490 my $y0 = $top;
2491 my $y1 = $top + $H;
2492
2493 my $y = 0;
2494
2495 my $layout = $self->{layout};
2496
2497 $layout->set_font ($self->{font}) if $self->{font};
2498
1774 glEnable GL_BLEND; 2499 glEnable GL_BLEND;
2500 #TODO# not correct in windows where rgba is forced off
1775 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2501 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1776 glEnable GL_TEXTURE_2D;
1777 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1778
1779 my $top = int $self->{children}[1]{range}[0];
1780
1781 my $y0 = $top;
1782 my $y1 = $top + $self->{h};
1783
1784 my $y = 0;
1785
1786 my $layout = $self->{layout};
1787 2502
1788 for my $par (@{$self->{par}}) { 2503 for my $par (@{$self->{par}}) {
1789 my $h = $par->[0]; 2504 my $h = $par->[1];
1790 2505
1791 if ($y0 < $y + $h && $y < $y1) { 2506 if ($y0 < $y + $h && $y < $y1) {
2507 $layout->set_foreground (@{ $par->[2] });
2508 $layout->set_width ($W - $par->[3]);
1792 $layout->set_text ($par->[2]); 2509 $layout->set_markup ($par->[4]);
1793 2510
1794 glColor @{ $par->[1] }; 2511 my ($w, $h, $data, $format, $internalformat) = $layout->render;
1795 my ($W, $H) = $layout->size; 2512
1796 CFClient::Texture->new_from_layout ($layout)->draw_quad (0, $y - $y0); 2513 glRasterPos $par->[3], $y - $y0;
2514 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
1797 } 2515 }
1798 2516
1799 $y += $h; 2517 $y += $h;
1800 } 2518 }
1801 2519
1802 glDisable GL_TEXTURE_2D;
1803 glDisable GL_BLEND; 2520 glDisable GL_BLEND;
1804 }; 2521 };
1805 }); 2522 });
1806} 2523}
1807 2524
1808sub _draw { 2525sub _draw {
1809 my ($self) = @_; 2526 my ($self) = @_;
1810 2527
1811 if ($self->{texture}) {
1812 glEnable GL_TEXTURE_2D; 2528 glEnable GL_TEXTURE_2D;
1813 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2529 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2530 glColor 1, 1, 1, 1;
1814 $self->{texture}->draw_quad (0, 0, $self->{w}, $self->{h}); 2531 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
1815 glDisable GL_TEXTURE_2D; 2532 glDisable GL_TEXTURE_2D;
1816 }
1817 2533
1818 $self->{children}[1]->draw; 2534 $self->{children}[1]->draw;
1819 2535
1820} 2536}
1821 2537
1822############################################################################# 2538#############################################################################
1823 2539
1824package CFClient::UI::MapWidget;
1825
1826use strict;
1827
1828use List::Util qw(min max);
1829
1830use SDL;
1831use SDL::OpenGL;
1832
1833our @ISA = CFClient::UI::Base::;
1834
1835sub new {
1836 my $class = shift;
1837
1838 $class->SUPER::new (
1839 z => -1,
1840 can_focus => 1,
1841 list => (glGenLists 1),
1842 @_
1843 )
1844}
1845
1846sub key_down {
1847 print "MAPKEYDOWN\n";
1848}
1849
1850sub key_up {
1851}
1852
1853sub button_down {
1854 my ($self, $ev, $x, $y) = @_;
1855
1856 $self->focus_in;
1857
1858 if ($ev->button == 2) {
1859 my ($ox, $oy) = ($ev->button_x, $ev->button_y);
1860 my ($bw, $bh) = ($::CFG->{map_shift_x}, $::CFG->{map_shift_y});
1861
1862 $self->{motion} = sub {
1863 my ($ev, $x, $y) = @_;
1864
1865 ($x, $y) = ($ev->motion_x, $ev->motion_y);
1866
1867 $::CFG->{map_shift_x} = $bw + $x - $ox;
1868 $::CFG->{map_shift_y} = $bh + $y - $oy;
1869
1870 $self->update;
1871 };
1872 }
1873}
1874
1875sub button_up {
1876 my ($self, $ev, $x, $y) = @_;
1877
1878 delete $self->{motion};
1879}
1880
1881sub mouse_motion {
1882 my ($self, $ev, $x, $y) = @_;
1883
1884 $self->{motion}->($ev, $x, $y) if $self->{motion};
1885}
1886
1887sub size_request {
1888 (
1889 1 + 32 * int $::WIDTH / 32,
1890 1 + 32 * int $::HEIGHT / 32,
1891 )
1892}
1893
1894sub update {
1895 my ($self) = @_;
1896
1897 $self->{need_update} = 1;
1898 $self->SUPER::update;
1899}
1900
1901sub draw {
1902 my ($self) = @_;
1903
1904 if (delete $self->{need_update}) {
1905 glNewList $self->{list}, GL_COMPILE;
1906
1907 if ($::MAP) {
1908 my $sw = int $::WIDTH / 32;
1909 my $sh = int $::HEIGHT / 32;
1910
1911 my $sx = $::CFG->{map_shift_x}; my $sx0 = $sx & 31; $sx = ($sx - $sx0) / 32;
1912 my $sy = $::CFG->{map_shift_y}; my $sy0 = $sy & 31; $sy = ($sy - $sy0) / 32;
1913
1914 glTranslate $sx0 - 32, $sy0 - 32, 0;
1915
1916 my ($w, $h, $data) = $::MAP->draw ($sx, $sy, 0, 0, $sw + 1, $sh + 1);
1917
1918 if ($::CFG->{fow_enable}) {
1919 if ($::CFG->{fow_smooth} && $CFClient::GL_VERSION >= 1.2) { # smooth fog of war
1920 glConvolutionParameter (GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER);
1921 glConvolutionFilter2D (
1922 GL_CONVOLUTION_2D,
1923 GL_ALPHA,
1924 3, 3,
1925 GL_ALPHA, GL_FLOAT,
1926 pack "f*",
1927 0.1, 0.1, 0.1,
1928 0.1, 0.2, 0.1,
1929 0.1, 0.1, 0.1,
1930 );
1931 glEnable GL_CONVOLUTION_2D;
1932 }
1933
1934 $self->{fow_texture} = new CFClient::Texture
1935 w => $w,
1936 h => $h,
1937 data => $data,
1938 internalformat => GL_ALPHA,
1939 format => GL_ALPHA;
1940
1941 glDisable GL_CONVOLUTION_2D if $::CFG->{fow_smooth};
1942
1943 glEnable GL_BLEND;
1944 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1945 glEnable GL_TEXTURE_2D;
1946 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1947
1948 glColor +($::CFG->{fow_intensity}) x 3, 1;
1949 $self->{fow_texture}->draw_quad (0, 0, $w * 32, $h * 32);
1950
1951 glDisable GL_TEXTURE_2D;
1952 glDisable GL_BLEND;
1953 }
1954
1955 # HACK BEGIN
1956 {
1957 glTranslate -($sx0 - 32), -($sy0 - 32), 0;#remove
1958 my ($w, $h) = (250, 250);
1959
1960 glEnable GL_BLEND;
1961 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1962 glEnable GL_TEXTURE_2D;
1963 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1964
1965 $self->{mapmap_texture} =
1966 new CFClient::Texture
1967 w => $w,
1968 h => $h,
1969 data => $::MAP->mapmap ($w, $h),
1970 type => $CFClient::GL_VERSION >= 1.2 ? GL_UNSIGNED_INT_8_8_8_8_REV : GL_UNSIGNED_BYTE;
1971
1972 $self->{mapmap_texture}->draw_quad (100, 100);
1973
1974 glDisable GL_TEXTURE_2D;
1975 glDisable GL_BLEND;
1976 }
1977 # HACK END
1978 }
1979
1980 glEndList;
1981 }
1982
1983 glPushMatrix;
1984 glCallList $self->{list};
1985 glPopMatrix;
1986
1987 if ($FOCUS != $self) {
1988 glColor 64/255, 64/255, 64/255;
1989 glLogicOp GL_AND;
1990 glEnable GL_COLOR_LOGIC_OP;
1991 glBegin GL_QUADS;
1992 glVertex 0, 0;
1993 glVertex 0, $::HEIGHT;
1994 glVertex $::WIDTH, $::HEIGHT;
1995 glVertex $::WIDTH, 0;
1996 glEnd;
1997 glDisable GL_COLOR_LOGIC_OP;
1998 }
1999}
2000
2001my %DIR = (
2002 SDLK_KP8, [1, "north"],
2003 SDLK_KP9, [2, "northeast"],
2004 SDLK_KP6, [3, "east"],
2005 SDLK_KP3, [4, "southeast"],
2006 SDLK_KP2, [5, "south"],
2007 SDLK_KP1, [6, "southwest"],
2008 SDLK_KP4, [7, "west"],
2009 SDLK_KP7, [8, "northwest"],
2010
2011 SDLK_UP, [1, "north"],
2012 SDLK_RIGHT, [3, "east"],
2013 SDLK_DOWN, [5, "south"],
2014 SDLK_LEFT, [7, "west"],
2015);
2016
2017sub key_down {
2018 my ($self, $ev) = @_;
2019
2020 my $mod = $ev->key_mod;
2021 my $sym = $ev->key_sym;
2022
2023 if ($sym == SDLK_KP5) {
2024 $::CONN->user_send ("stay fire");
2025 } elsif ($sym == SDLK_a) {
2026 $::CONN->user_send ("apply");
2027 } elsif ($sym == SDLK_QUOTE) {
2028 $self->emit ('activate_console');
2029 } elsif ($sym == SDLK_SLASH) {
2030 $self->emit ('activate_console' => '/');
2031 } elsif (exists $DIR{$sym}) {
2032 if ($mod & KMOD_SHIFT) {
2033 $self->{shft}++;
2034 $::CONN->user_send ("fire $DIR{$sym}[0]");
2035 } elsif ($mod & KMOD_CTRL) {
2036 $self->{ctrl}++;
2037 $::CONN->user_send ("run $DIR{$sym}[0]");
2038 } else {
2039 $::CONN->user_send ("$DIR{$sym}[1]");
2040 }
2041 }
2042}
2043
2044sub key_up {
2045 my ($self, $ev) = @_;
2046
2047 my $mod = $ev->key_mod;
2048 my $sym = $ev->key_sym;
2049
2050 if (!($mod & KMOD_SHIFT) && delete $self->{shft}) {
2051 $::CONN->user_send ("fire_stop");
2052 }
2053 if (!($mod & KMOD_CTRL ) && delete $self->{ctrl}) {
2054 $::CONN->user_send ("run_stop");
2055 }
2056}
2057
2058#############################################################################
2059
2060package CFClient::UI::Animator; 2540package CFClient::UI::Animator;
2061 2541
2062use SDL::OpenGL; 2542use CFClient::OpenGL;
2063 2543
2064our @ISA = CFClient::UI::Bin::; 2544our @ISA = CFClient::UI::Bin::;
2065 2545
2066sub moveto { 2546sub moveto {
2067 my ($self, $x, $y) = @_; 2547 my ($self, $x, $y) = @_;
… …
2105 2585
2106sub new { 2586sub new {
2107 my $class = shift; 2587 my $class = shift;
2108 2588
2109 my $self = $class->SUPER::new ( 2589 my $self = $class->SUPER::new (
2110 state => 0, 2590 state => 0,
2111 connect_activate => \&toggle_flopper, 2591 on_activate => \&toggle_flopper,
2112 @_ 2592 @_
2113 ); 2593 );
2114 2594
2115 if ($self->{state}) {
2116 $self->{state} = 0;
2117 $self->toggle_flopper;
2118 }
2119
2120 $self 2595 $self
2121} 2596}
2122 2597
2123sub toggle_flopper { 2598sub toggle_flopper {
2124 my ($self) = @_; 2599 my ($self) = @_;
2125 2600
2126 # TODO: use animation 2601 $self->{other}->toggle_visibility;
2127 if ($self->{state} = !$self->{state}) { 2602}
2128 $CFClient::UI::ROOT->add ($self->{other}); 2603
2129 $self->{other}->move ($self->coord2global (0, $self->{h})); 2604#############################################################################
2605
2606package CFClient::UI::Tooltip;
2607
2608our @ISA = CFClient::UI::Bin::;
2609
2610use CFClient::OpenGL;
2611
2612sub new {
2613 my $class = shift;
2614
2615 $class->SUPER::new (
2616 @_,
2617 can_events => 0,
2618 )
2619}
2620
2621sub set_tooltip_from {
2622 my ($self, $widget) = @_;
2623
2624 my $tooltip = $widget->{tooltip};
2625
2626 if ($ENV{CFPLUS_DEBUG} & 2) {
2627 $tooltip .= "\n\n" . (ref $widget) . "\n"
2628 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2629 . "req $widget->{req_w} $widget->{req_h}\n"
2630 . "visible $widget->{visible}";
2631 }
2632
2633 $self->add (new CFClient::UI::Label
2634 markup => $tooltip,
2635 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2636 fontsize => 0.8,
2637 fg => [0, 0, 0, 1],
2638 ellipsise => 0,
2639 font => ($widget->{tooltip_font} || $::FONT_PROP),
2640 );
2641}
2642
2643sub size_request {
2644 my ($self) = @_;
2645
2646 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2647
2648 ($w + 4, $h + 4)
2649}
2650
2651sub size_allocate {
2652 my ($self, $w, $h) = @_;
2653
2654 $self->SUPER::size_allocate ($w - 4, $h - 4);
2655}
2656
2657sub visibility_change {
2658 my ($self, $visible) = @_;
2659
2660 return unless $visible;
2661
2662 $self->{root}->on_post_alloc ("move_$self" => sub {
2663 my $widget = $self->{owner}
2664 or return;
2665
2666 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2667
2668 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2669 if $x + $self->{w} > $::WIDTH;
2670
2671 $self->move_abs ($x, $y);
2672 });
2673}
2674
2675sub _draw {
2676 my ($self) = @_;
2677
2678 glTranslate 0.375, 0.375;
2679
2680 my ($w, $h) = @$self{qw(w h)};
2681
2682 glColor 1, 0.8, 0.4;
2683 glBegin GL_QUADS;
2684 glVertex 0 , 0;
2685 glVertex 0 , $h;
2686 glVertex $w, $h;
2687 glVertex $w, 0;
2688 glEnd;
2689
2690 glColor 0, 0, 0;
2691 glBegin GL_LINE_LOOP;
2692 glVertex 0 , 0;
2693 glVertex 0 , $h;
2694 glVertex $w, $h;
2695 glVertex $w, 0;
2696 glEnd;
2697
2698 glTranslate 2 - 0.375, 2 - 0.375;
2699
2700 $self->SUPER::_draw;
2701}
2702
2703#############################################################################
2704
2705package CFClient::UI::Face;
2706
2707our @ISA = CFClient::UI::Base::;
2708
2709use CFClient::OpenGL;
2710
2711sub new {
2712 my $class = shift;
2713
2714 my $self = $class->SUPER::new (
2715 aspect => 1,
2716 can_events => 0,
2717 @_,
2718 );
2719
2720 if ($self->{anim} && $self->{animspeed}) {
2721 Scalar::Util::weaken (my $widget = $self);
2722
2723 $self->{timer} = Event->timer (
2724 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2725 hard => 1,
2726 interval => $self->{animspeed},
2727 cb => sub {
2728 ++$widget->{frame};
2729 $widget->update;
2730 },
2731 );
2732 }
2733
2734 $self
2735}
2736
2737sub size_request {
2738 (32, 8)
2739}
2740
2741sub update {
2742 my ($self) = @_;
2743
2744 return unless $self->{visible};
2745
2746 $self->SUPER::update;
2747}
2748
2749sub _draw {
2750 my ($self) = @_;
2751
2752 return unless $::CONN;
2753
2754 my $face;
2755
2756 if ($self->{frame}) {
2757 my $anim = $::CONN->{anim}[$self->{anim}];
2758
2759 $face = $anim->[ $self->{frame} % @$anim ]
2760 if $anim && @$anim;
2761 }
2762
2763 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2764
2765 if ($tex) {
2766 glEnable GL_TEXTURE_2D;
2767 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2768 glColor 1, 1, 1, 1;
2769 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2770 glDisable GL_TEXTURE_2D;
2771 }
2772}
2773
2774sub DESTROY {
2775 my ($self) = @_;
2776
2777 $self->{timer}->cancel
2778 if $self->{timer};
2779
2780 $self->SUPER::DESTROY;
2781}
2782
2783#############################################################################
2784
2785package CFClient::UI::Inventory;
2786
2787our @ISA = CFClient::UI::ScrolledWindow::;
2788
2789sub new {
2790 my $class = shift;
2791
2792 my $self = $class->SUPER::new (
2793 scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2794 @_,
2795 );
2796
2797 $self
2798}
2799
2800sub set_items {
2801 my ($self, $items) = @_;
2802
2803 $self->{scrolled}->clear;
2804 return unless $items;
2805
2806 my @items = sort {
2807 ($a->{type} <=> $b->{type})
2808 or ($a->{name} cmp $b->{name})
2809 } @$items;
2810
2811 $self->{real_items} = \@items;
2812
2813 my $row = 0;
2814 for my $item (@items) {
2815 CFClient::Item::update_widgets $item;
2816
2817 $self->{scrolled}->add (0, $row, $item->{face_widget});
2818 $self->{scrolled}->add (1, $row, $item->{desc_widget});
2819 $self->{scrolled}->add (2, $row, $item->{weight_widget});
2820
2821 $row++;
2822 }
2823}
2824
2825#############################################################################
2826
2827package CFClient::UI::Menu;
2828
2829our @ISA = CFClient::UI::FancyFrame::;
2830
2831use CFClient::OpenGL;
2832
2833sub new {
2834 my $class = shift;
2835
2836 my $self = $class->SUPER::new (
2837 items => [],
2838 z => 100,
2839 @_,
2840 );
2841
2842 $self->add ($self->{vbox} = new CFClient::UI::VBox);
2843
2844 for my $item (@{ $self->{items} }) {
2845 my ($widget, $cb) = @$item;
2846
2847 # handle various types of items, only text for now
2848 if (!ref $widget) {
2849 $widget = new CFClient::UI::Label
2850 can_hover => 1,
2851 can_events => 1,
2852 text => $widget;
2853 }
2854
2855 $self->{item}{$widget} = $item;
2856
2857 $self->{vbox}->add ($widget);
2858 }
2859
2860 $self
2861}
2862
2863# popup given the event (must be a mouse button down event currently)
2864sub popup {
2865 my ($self, $ev) = @_;
2866
2867 $self->_emit ("popdown");
2868
2869 # maybe save $GRAB? must be careful about events...
2870 $GRAB = $self;
2871 $self->{button} = $ev->{button};
2872
2873 $self->show;
2874 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2875}
2876
2877sub mouse_motion {
2878 my ($self, $ev, $x, $y) = @_;
2879
2880 # TODO: should use vbox->find_widget or so
2881 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2882 $self->{hover} = $self->{item}{$HOVER};
2883}
2884
2885sub button_up {
2886 my ($self, $ev, $x, $y) = @_;
2887
2888 if ($ev->{button} == $self->{button}) {
2889 undef $GRAB;
2890 $self->hide;
2891
2130 $self->emit ("open"); 2892 $self->_emit ("popdown");
2893 $self->{hover}[1]->() if $self->{hover};
2894 }
2895}
2896
2897#############################################################################
2898
2899package CFClient::UI::Statusbox;
2900
2901our @ISA = CFClient::UI::VBox::;
2902
2903sub new {
2904 my $class = shift;
2905
2906 $class->SUPER::new (
2907 fontsize => 0.8,
2908 @_,
2909 )
2910}
2911
2912sub reorder {
2913 my ($self) = @_;
2914 my $NOW = time;
2915
2916 while (my ($k, $v) = each %{ $self->{item} }) {
2917 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2918 }
2919
2920 my @widgets;
2921
2922 my @items = sort {
2923 $a->{pri} <=> $b->{pri}
2924 or $b->{id} <=> $a->{id}
2925 } values %{ $self->{item} };
2926
2927 my $count = 10 + 1;
2928 for my $item (@items) {
2929 last unless --$count;
2930
2931 push @widgets, $item->{label} ||= do {
2932 # TODO: doesn't handle markup well (read as: at all)
2933 my $short = $item->{count} > 1
2934 ? "<b>$item->{count} ×</b> $item->{text}"
2935 : $item->{text};
2936
2937 for ($short) {
2938 s/^\s+//;
2939 s/\s+/ /g;
2940 }
2941
2942 new CFClient::UI::Label
2943 markup => $short,
2944 tooltip => $item->{tooltip},
2945 tooltip_font => $::FONT_PROP,
2946 tooltip_width => 0.67,
2947 fontsize => $item->{fontsize} || $self->{fontsize},
2948 max_w => $::WIDTH * 0.44,
2949 fg => $item->{fg},
2950 can_events => 1,
2951 can_hover => 1
2952 };
2953 }
2954
2955 $self->clear;
2956 $self->SUPER::add (reverse @widgets);
2957}
2958
2959sub add {
2960 my ($self, $text, %arg) = @_;
2961
2962 $text =~ s/^\s+//;
2963 $text =~ s/\s+$//;
2964
2965 return unless $text;
2966
2967 my $timeout = time + ((delete $arg{timeout}) || 60);
2968
2969 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2970
2971 if (my $item = $self->{item}{$group}) {
2972 if ($item->{text} eq $text) {
2973 $item->{count}++;
2974 } else {
2975 $item->{count} = 1;
2976 $item->{text} = $item->{tooltip} = $text;
2977 }
2978 $item->{id} = ++$self->{id};
2979 $item->{timeout} = $timeout;
2980 delete $item->{label};
2131 } else { 2981 } else {
2132 $CFClient::UI::ROOT->remove ($self->{other}); 2982 $self->{item}{$group} = {
2133 $self->emit ("close"); 2983 id => ++$self->{id},
2984 text => $text,
2985 timeout => $timeout,
2986 tooltip => $text,
2987 fg => [0.8, 0.8, 0.8, 0.8],
2988 pri => 0,
2989 count => 1,
2990 %arg,
2991 };
2134 } 2992 }
2135 2993
2136 $self->emit (changed => $self->{state}); 2994 $self->reorder;
2995}
2996
2997sub reconfigure {
2998 my ($self) = @_;
2999
3000 delete $_->{label}
3001 for values %{ $self->{item} || {} };
3002
3003 $self->reorder;
3004 $self->SUPER::reconfigure;
2137} 3005}
2138 3006
2139############################################################################# 3007#############################################################################
2140 3008
2141package CFClient::UI::Root; 3009package CFClient::UI::Root;
2142 3010
2143our @ISA = CFClient::UI::Container::; 3011our @ISA = CFClient::UI::Container::;
2144 3012
2145use SDL::OpenGL; 3013use CFClient::OpenGL;
2146 3014
2147sub check_size { 3015sub new {
2148 my ($self) = @_; 3016 my $class = shift;
2149 3017
2150 $self->configure (0, 0, $::WITH, $::HEIGHT); 3018 my $self = $class->SUPER::new (
3019 visible => 1,
3020 @_,
3021 );
3022
3023 Scalar::Util::weaken ($self->{root} = $self);
3024
3025 $self
2151} 3026}
2152 3027
2153sub size_request { 3028sub size_request {
2154 ($::WIDTH, $::HEIGHT) 3029 my ($self) = @_;
2155}
2156 3030
2157sub configure { 3031 ($self->{w}, $self->{h})
3032}
3033
3034sub _to_pixel {
3035 my ($coord, $size, $max) = @_;
3036
3037 $coord =
3038 $coord eq "center" ? ($max - $size) * 0.5
3039 : $coord eq "max" ? $max
3040 : $coord;
3041
3042 $coord = 0 if $coord < 0;
3043 $coord = $max - $size if $coord > $max - $size;
3044
3045 int $coord + 0.5
3046}
3047
3048sub size_allocate {
2158 my ($self, $x, $y, $w, $h) = @_; 3049 my ($self, $w, $h) = @_;
2159 3050
2160 $self->SUPER::configure ($x, $y, $w, $h); 3051 for my $child ($self->children) {
3052 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2161 3053
2162 $_->configure ($_->{x}, $_->{y}, $_->size_request) 3054 $X = $child->{force_x} if exists $child->{force_x};
2163 for @{$self->{children}}; 3055 $Y = $child->{force_y} if exists $child->{force_y};
2164}
2165 3056
2166sub _topleft { 3057 $X = _to_pixel $X, $W, $self->{w};
3058 $Y = _to_pixel $Y, $H, $self->{h};
3059
3060 $child->configure ($X, $Y, $W, $H);
3061 }
3062}
3063
3064sub coord2local {
2167 my ($self, $x, $y) = @_; 3065 my ($self, $x, $y) = @_;
2168 3066
2169 ($x, $y) 3067 ($x, $y)
2170} 3068}
2171 3069
3070sub coord2global {
3071 my ($self, $x, $y) = @_;
3072
3073 ($x, $y)
3074}
3075
2172sub update { 3076sub update {
2173 my ($self) = @_; 3077 my ($self) = @_;
2174 3078
2175 $self->check_size; 3079 $::WANT_REFRESH++;
2176 ::refresh ();
2177} 3080}
2178 3081
2179sub add { 3082sub add {
2180 my ($self, $child) = @_; 3083 my ($self, @children) = @_;
2181 3084
3085 $_->{is_toplevel} = 1
3086 for @children;
3087
2182 $self->SUPER::add ($child); 3088 $self->SUPER::add (@children);
3089}
3090
3091sub remove {
3092 my ($self, @children) = @_;
3093
3094 $self->SUPER::remove (@children);
3095
3096 delete $self->{is_toplevel}
3097 for @children;
3098
3099 while (@children) {
3100 my $w = pop @children;
3101 push @children, $w->children;
3102 $w->set_invisible;
3103 }
2183} 3104}
2184 3105
2185sub on_refresh { 3106sub on_refresh {
2186 my ($self, $id, $cb) = @_; 3107 my ($self, $id, $cb) = @_;
2187 3108
2188 $self->{refresh_hook}{$id} = $cb; 3109 $self->{refresh_hook}{$id} = $cb;
2189} 3110}
2190 3111
3112sub on_post_alloc {
3113 my ($self, $id, $cb) = @_;
3114
3115 $self->{post_alloc_hook}{$id} = $cb;
3116}
3117
2191sub draw { 3118sub draw {
2192 my ($self) = @_; 3119 my ($self) = @_;
2193 3120
2194 while (my $rcb = delete $self->{refresh_hook}) { 3121 while ($self->{refresh_hook}) {
2195 $_->() for values %$rcb; 3122 $_->()
3123 for values %{delete $self->{refresh_hook}};
2196 } 3124 }
3125
3126 if ($self->{realloc}) {
3127 my @queue;
3128
3129 while () {
3130 if ($self->{realloc}) {
3131 #TODO use array-of-depth approach
3132
3133 use sort 'stable';
3134
3135 @queue = sort { $a->{visible} <=> $b->{visible} }
3136 @queue, values %{delete $self->{realloc}};
3137 }
3138
3139 my $widget = pop @queue || last;
3140
3141 $widget->{visible} or last; # do not resize invisible widgets
3142
3143 my ($w, $h) = $widget->size_request;
3144
3145 $w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3146 $h = List::Util::max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3147
3148 $w = $widget->{force_w} if exists $widget->{force_w};
3149 $h = $widget->{force_h} if exists $widget->{force_h};
3150
3151 if ($widget->{req_w} != $w || $widget->{req_h} != $h
3152 || delete $widget->{force_realloc}) {
3153 $widget->{req_w} = $w;
3154 $widget->{req_h} = $h;
3155
3156 $self->{size_alloc}{$widget+0} = $widget;
3157
3158 if (my $parent = $widget->{parent}) {
3159 $self->{realloc}{$parent+0} = $parent;
3160 #unshift @queue, $parent;
3161 $parent->{force_size_alloc} = 1;
3162 $self->{size_alloc}{$parent+0} = $parent;
3163 }
3164 }
3165
3166 delete $self->{realloc}{$widget+0};
3167 }
3168 }
3169
3170 while (my $size_alloc = delete $self->{size_alloc}) {
3171 my @queue = sort { $b->{visible} <=> $a->{visible} }
3172 values %$size_alloc;
3173
3174 while () {
3175 my $widget = pop @queue || last;
3176
3177 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3178
3179 $w = 0 if $w < 0;
3180 $h = 0 if $h < 0;
3181
3182 $w = int $w + 0.5;
3183 $h = int $h + 0.5;
3184
3185 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3186 $widget->{w} = $w;
3187 $widget->{h} = $h;
3188
3189 $widget->emit (size_allocate => $w, $h);
3190 }
3191 }
3192 }
3193
3194 while ($self->{post_alloc_hook}) {
3195 $_->()
3196 for values %{delete $self->{post_alloc_hook}};
3197 }
3198
2197 3199
2198 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3200 glViewport 0, 0, $::WIDTH, $::HEIGHT;
2199 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3201 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2200 glClear GL_COLOR_BUFFER_BIT; 3202 glClear GL_COLOR_BUFFER_BIT;
2201 3203
2202 glMatrixMode GL_PROJECTION; 3204 glMatrixMode GL_PROJECTION;
2203 glLoadIdentity; 3205 glLoadIdentity;
2204 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000; 3206 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
2205 glMatrixMode GL_MODELVIEW; 3207 glMatrixMode GL_MODELVIEW;
2206 glLoadIdentity; 3208 glLoadIdentity;
2207 3209
2208 $self->_draw; 3210 $self->_draw;
2209} 3211}
2210 3212
2211############################################################################# 3213#############################################################################
2212 3214
3215package CFClient::UI::BindEditor;
3216
3217our @ISA = CFClient::UI::FancyFrame::;
3218
3219sub new {
3220 my $class = shift;
3221
3222 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3223
3224 $self->add (my $vb = new CFClient::UI::VBox);
3225
3226
3227 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3228 text => "start recording",
3229 tooltip => "Start/Stops recording of actions."
3230 ."All subsequent actions after the recording started will be captured."
3231 ."The actions are displayed after the record was stopped."
3232 ."To bind the action you have to click on the 'Bind' button",
3233 on_activate => sub {
3234 unless ($self->{recording}) {
3235 $self->start;
3236 } else {
3237 $self->stop;
3238 }
3239 });
3240
3241 $vb->add (new CFClient::UI::Label text => "Actions:");
3242 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3243
3244 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3245 $vb->add (my $hb = new CFClient::UI::HBox);
3246 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3247 $hb->add (new CFClient::UI::Button
3248 text => "bind",
3249 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3250 on_activate => sub {
3251 $self->ask_for_bind;
3252 });
3253
3254 $vb->add (my $hb = new CFClient::UI::HBox);
3255 $hb->add (new CFClient::UI::Button
3256 text => "ok",
3257 expand => 1,
3258 tooltip => "This closes the binding editor and saves the binding",
3259 on_activate => sub {
3260 $self->hide;
3261 $self->commit;
3262 });
3263
3264 $hb->add (new CFClient::UI::Button
3265 text => "cancel",
3266 expand => 1,
3267 tooltip => "This closes the binding editor without saving",
3268 on_activate => sub {
3269 $self->hide;
3270 $self->{binding_cancel}->()
3271 if $self->{binding_cancel};
3272 });
3273
3274 $self->update_binding_widgets;
3275
3276 $self
3277}
3278
3279sub commit {
3280 my ($self) = @_;
3281 my ($mod, $sym, $cmds) = $self->get_binding;
3282 if ($sym != 0 && @$cmds > 0) {
3283 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3284 ."'. Don't forget 'Save Config'!");
3285 $self->{binding_change}->($mod, $sym, $cmds)
3286 if $self->{binding_change};
3287 } else {
3288 $::STATUSBOX->add ("No action bound, no key or action specified!");
3289 $self->{binding_cancel}->()
3290 if $self->{binding_cancel};
3291 }
3292}
3293
3294sub start {
3295 my ($self) = @_;
3296
3297 $self->{rec_btn}->set_text ("stop recording");
3298 $self->{recording} = 1;
3299 $self->clear_command_list;
3300 $::CONN->start_record if $::CONN;
3301}
3302
3303sub stop {
3304 my ($self) = @_;
3305
3306 $self->{rec_btn}->set_text ("start recording");
3307 $self->{recording} = 0;
3308
3309 my $rec;
3310 $rec = $::CONN->stop_record if $::CONN;
3311 return unless ref $rec eq 'ARRAY';
3312 $self->set_command_list ($rec);
3313}
3314
3315sub ask_for_bind {
3316 my ($self, $commit) = @_;
3317
3318 CFClient::Binder::open_binding_dialog (sub {
3319 my ($mod, $sym) = @_;
3320 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3321 $self->update_binding_widgets;
3322 $self->commit if $commit;
3323 });
3324}
3325
3326sub set_binding {
3327 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3328
3329 $self->clear_command_list;
3330 $self->{recording} = 0;
3331 $self->{rec_btn}->set_text ("start recording");
3332
3333 $self->{binding} = [$mod, $sym];
3334 $self->{commands} = $cmds;
3335
3336 $self->{binding_change} = $cb;
3337 $self->{binding_cancel} = $ccb;
3338
3339 $self->update_binding_widgets;
3340}
3341
3342sub update_binding_widgets {
3343 my ($self) = @_;
3344 my ($mod, $sym, $cmds) = $self->get_binding;
3345 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3346 $self->set_command_list ($cmds);
3347}
3348
3349sub get_binding {
3350 my ($self) = @_;
3351 return (
3352 $self->{binding}->[0],
3353 $self->{binding}->[1],
3354 [ grep { defined $_ } @{$self->{commands}} ]
3355 );
3356}
3357
3358sub clear_command_list {
3359 my ($self) = @_;
3360 $self->{cmdbox}->clear ();
3361}
3362
3363sub set_command_list {
3364 my ($self, $cmds) = @_;
3365
3366 $self->{cmdbox}->clear ();
3367 $self->{commands} = $cmds;
3368
3369 my $idx = 0;
3370
3371 for (@$cmds) {
3372 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3373
3374 my $i = $idx;
3375 $hb->add (new CFClient::UI::Button
3376 text => "delete",
3377 tooltip => "Deletes the action from the record",
3378 on_activate => sub {
3379 $self->{cmdbox}->remove ($hb);
3380 $cmds->[$i] = undef;
3381 });
3382
3383 $hb->add (new CFClient::UI::Label text => $_);
3384
3385 $idx++
3386 }
3387}
3388
3389
3390#############################################################################
3391
2213package CFClient::UI; 3392package CFClient::UI;
2214 3393
2215$ROOT = new CFClient::UI::Root; 3394$ROOT = new CFClient::UI::Root;
3395$TOOLTIP = new CFClient::UI::Tooltip z => 900;
2216 3396
22171 33971
2218 3398

Diff Legend

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