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.109 by root, Sat Apr 15 01:13:47 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
12our $TOPLEVEL; 14our $LAYOUT;
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 = $TOPLEVEL->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->translate ($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 || $TOPLEVEL->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->translate ($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 || $TOPLEVEL->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
70 $HOVER->mouse_motion ($ev, $HOVER->translate ($x, $y)) if $HOVER; 133 check_tooltip;
134 }
135
136 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
137 if $HOVER;
138}
139
140# convert position array to integers
141sub harmonize {
142 my ($vals) = @_;
143
144 my $rem = 0;
145
146 for (@$vals) {
147 my $i = int $_ + $rem;
148 $rem += $_ - $i;
149 $_ = $i;
150 }
151}
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;
71} 192}
72 193
73############################################################################# 194#############################################################################
74 195
75package CFClient::UI::Base; 196package CFClient::UI::Base;
76 197
77use strict; 198use strict;
78 199
79use SDL::OpenGL; 200use CFClient::OpenGL;
80 201
81sub new { 202sub new {
82 my $class = shift; 203 my $class = shift;
83 204
84 my $self = bless { 205 my $self = bless {
85 x => 0, 206 x => "center",
86 y => 0, 207 y => "center",
87 z => 0, 208 z => 0,
88 w => -1, 209 w => undef,
89 h => -1, 210 h => undef,
211 can_events => 1,
90 @_ 212 @_
91 }, $class; 213 }, $class;
92 214
215 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
216
93 for (keys %$self) { 217 for (keys %$self) {
94 if (/^connect_(.*)$/) { 218 if (/^on_(.*)$/) {
95 $self->connect ($1 => delete $self->{$_}); 219 $self->connect ($1 => delete $self->{$_});
96 } 220 }
97 } 221 }
98 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
99 $self 235 $self
100} 236}
101 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
102sub move { 315sub move_abs {
103 my ($self, $x, $y, $z) = @_; 316 my ($self, $x, $y, $z) = @_;
104 $self->{x} = $x; 317
105 $self->{y} = $y; 318 $self->{x} = List::Util::max 0, int $x;
319 $self->{y} = List::Util::max 0, int $y;
106 $self->{z} = $z if defined $z; 320 $self->{z} = $z if defined $z;
107}
108 321
109sub needs_redraw { 322 $self->update;
110 0 323}
324
325sub set_size {
326 my ($self, $w, $h) = @_;
327
328 $self->{force_w} = $w;
329 $self->{force_h} = $h;
330
331 $self->realloc;
111} 332}
112 333
113sub size_request { 334sub size_request {
114 require Carp; 335 require Carp;
115 Carp::confess "size_request is abtract"; 336 Carp::confess "size_request is abstract";
116} 337}
117 338
118sub _size_allocate { 339sub configure {
119 my ($self, $x, $y, $w, $h) = @_; 340 my ($self, $x, $y, $w, $h) = @_;
120 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) {
121 $self->{x} = $x; 355 $self->{x} = $x;
122 $self->{y} = $y; 356 $self->{y} = $y;
357 $self->update;
358 }
123 359
124 return unless $self->{w} != $w || $self->{h} != $h; 360 if ($self->{alloc_w} != $w || $self->{alloc_h} != $h) {
361 return unless $self->{visible};
125 362
126 $self->{w} = $w; 363 $self->{alloc_w} = $w;
127 $self->{h} = $h; 364 $self->{alloc_h} = $h;
128 365
366 $self->{root}{size_alloc}{$self+0} = $self;
129 1 367 }
130} 368}
131 369
132sub size_allocate { 370sub size_allocate {
371 # nothing to be done
372}
373
374sub children {
375}
376
377sub set_max_size {
133 my ($self, $x, $y, $w, $h) = @_; 378 my ($self, $w, $h) = @_;
134 379
135 $self->_size_allocate ($x, $y, $w, $h); 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 }
136} 398}
137 399
138# translate global coordinates to local coordinate system 400# translate global coordinates to local coordinate system
139sub translate { 401sub coord2local {
140 my ($self, $x, $y) = @_; 402 my ($self, $x, $y) = @_;
141 403
142 $self->{parent}->translate ($x - $self->{x}, $y - $self->{y}); 404 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
405}
406
407# translate local coordinates to global coordinate system
408sub coord2global {
409 my ($self, $x, $y) = @_;
410
411 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
143} 412}
144 413
145sub focus_in { 414sub focus_in {
146 my ($self) = @_; 415 my ($self) = @_;
147 416
148 return if $FOCUS == $self; 417 return if $FOCUS == $self;
149 return unless $self->{can_focus}; 418 return unless $self->{can_focus};
150 419
151 my $focus = $FOCUS; $FOCUS = $self; 420 my $focus = $FOCUS; $FOCUS = $self;
421
422 $self->_emit (focus_in => $focus);
423
152 $focus->update if $focus; 424 $focus->update if $focus;
153 $FOCUS->update; 425 $FOCUS->update;
154} 426}
155 427
156sub focus_out { 428sub focus_out {
157 my ($self) = @_; 429 my ($self) = @_;
158 430
159 return unless $FOCUS == $self; 431 return unless $FOCUS == $self;
160 432
161 my $focus = $FOCUS; undef $FOCUS; 433 my $focus = $FOCUS; undef $FOCUS;
434
435 $self->_emit (focus_out => $focus);
436
162 $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;
163} 441}
164 442
165sub mouse_motion { } 443sub mouse_motion { }
166sub button_up { } 444sub button_up { }
167sub key_down { } 445sub key_down { }
168sub key_up { } 446sub key_up { }
169 447
170sub button_down { 448sub button_down {
171 my ($self, $ev, $x, $y) = @_; 449 my ($self, $ev, $x, $y) = @_;
172 450
173 $self->focus_in; 451 $self->focus_in;
… …
177sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } 455sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} }
178sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} } 456sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} }
179sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} } 457sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} }
180sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} } 458sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} }
181 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}
529
182sub draw { 530sub draw {
183 my ($self) = @_; 531 my ($self) = @_;
184 532
185 return unless $self->{h} && $self->{w}; 533 return unless $self->{h} && $self->{w};
186 534
… …
190 glPopMatrix; 538 glPopMatrix;
191 539
192 if ($self == $HOVER && $self->{can_hover}) { 540 if ($self == $HOVER && $self->{can_hover}) {
193 my ($x, $y) = @$self{qw(x y)}; 541 my ($x, $y) = @$self{qw(x y)};
194 542
195 glColor 0, 0, 1, 0.2; 543 glColor 1, 0.8, 0.5, 0.2;
196 glEnable GL_BLEND; 544 glEnable GL_BLEND;
197 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 545 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
198 glBegin GL_QUADS; 546 glBegin GL_QUADS;
199 glVertex $x , $y; 547 glVertex $x , $y;
200 glVertex $x + $self->{w}, $y; 548 glVertex $x + $self->{w}, $y;
201 glVertex $x + $self->{w}, $y + $self->{h}; 549 glVertex $x + $self->{w}, $y + $self->{h};
202 glVertex $x , $y + $self->{h}; 550 glVertex $x , $y + $self->{h};
203 glEnd; 551 glEnd;
204 glDisable GL_BLEND; 552 glDisable GL_BLEND;
205 } 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 }
206} 568}
207 569
208sub _draw { 570sub _draw {
209 my ($self) = @_; 571 my ($self) = @_;
210 572
211 warn "no draw defined for $self\n"; 573 warn "no draw defined for $self\n";
212} 574}
213 575
214sub find_widget {
215 my ($self, $x, $y) = @_;
216
217 return $self
218 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
219 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
220
221 ()
222}
223
224sub set_parent {
225 my ($self, $par) = @_;
226
227 $self->{parent} = $par;
228 Scalar::Util::weaken $self->{parent};
229}
230
231sub get_parent {
232 $_[0]->{parent}
233}
234
235sub update {
236 my ($self) = @_;
237
238 $self->{parent}->update
239 if $self->{parent};
240}
241
242sub connect {
243 my ($self, $signal, $cb) = @_;
244
245 push @{ $self->{cb}{$signal} }, $cb;
246}
247
248sub emit {
249 my ($self, $signal, @args) = @_;
250
251 $_->($self, @args)
252 for @{$self->{cb}{$signal} || []};
253}
254
255sub DESTROY { 576sub DESTROY {
256 my ($self) = @_; 577 my ($self) = @_;
257 578
579 delete $WIDGET{$self+0};
258 #$self->deactivate; 580 #$self->deactivate;
259} 581}
260 582
261############################################################################# 583#############################################################################
262 584
263package CFClient::UI::DrawBG; 585package CFClient::UI::DrawBG;
264 586
265our @ISA = CFClient::UI::Base::; 587our @ISA = CFClient::UI::Base::;
266 588
267use strict; 589use strict;
268use SDL::OpenGL; 590use CFClient::OpenGL;
269 591
270sub new { 592sub new {
271 my $class = shift; 593 my $class = shift;
272 594
273 # range [value, low, high, page] 595 # range [value, low, high, page]
274 596
275 $class->SUPER::new ( 597 $class->SUPER::new (
276 bg => [0, 0, 0, 0.2], 598 #bg => [0, 0, 0, 0.2],
277 active_bg => [1, 1, 1, 0.5], 599 #active_bg => [1, 1, 1, 0.5],
278 @_ 600 @_
279 ) 601 )
280} 602}
281 603
282sub _draw { 604sub _draw {
283 my ($self) = @_; 605 my ($self) = @_;
284 606
607 my $color = $FOCUS == $self && $self->{active_bg}
608 ? $self->{active_bg}
609 : $self->{bg};
610
611 if ($color && (@$color < 4 || $color->[3])) {
285 my ($w, $h) = @$self{qw(w h)}; 612 my ($w, $h) = @$self{qw(w h)};
286 613
287 glEnable GL_BLEND; 614 glEnable GL_BLEND;
288 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 615 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
289 glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} }; 616 glColor @$color;
290 617
291 glBegin GL_QUADS; 618 glBegin GL_QUADS;
292 glVertex 0 , 0; 619 glVertex 0 , 0;
293 glVertex 0 , $h; 620 glVertex 0 , $h;
294 glVertex $w, $h; 621 glVertex $w, $h;
295 glVertex $w, 0; 622 glVertex $w, 0;
296 glEnd; 623 glEnd;
297 624
298 glDisable GL_BLEND; 625 glDisable GL_BLEND;
626 }
299} 627}
300 628
301############################################################################# 629#############################################################################
302 630
303package CFClient::UI::Empty; 631package CFClient::UI::Empty;
304
305our @ISA = CFClient::UI::Base::;
306
307sub size_request {
308 (0, 0)
309}
310
311sub draw { }
312
313#############################################################################
314
315package CFClient::UI::Container;
316 632
317our @ISA = CFClient::UI::Base::; 633our @ISA = CFClient::UI::Base::;
318 634
319sub new { 635sub new {
320 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) = @_;
321 656
322 my $children = delete $arg{children} || []; 657 my $children = delete $arg{children} || [];
323 658
324 my $self = $class->SUPER::new (children => [], %arg); 659 my $self = $class->SUPER::new (
660 children => [],
661 can_events => 0,
662 %arg,
663 );
325 $self->add ($_) for @$children; 664 $self->add ($_) for @$children;
326 665
327 $self 666 $self
328} 667}
329 668
330sub add { 669sub add {
331 my ($self, $chld) = @_; 670 my ($self, @widgets) = @_;
332 671
333 $chld->set_parent ($self); 672 $_->set_parent ($self)
673 for @widgets;
674
675 use sort 'stable';
334 676
335 $self->{children} = [ 677 $self->{children} = [
336 sort { $a->{z} <=> $b->{z} } 678 sort { $a->{z} <=> $b->{z} }
337 @{$self->{children}}, $chld 679 @{$self->{children}}, @widgets
338 ]; 680 ];
339 681
340 $self->{w} = $self->{h} = -1; 682 $self->realloc;
341 $self->update; 683}
684
685sub children {
686 @{ $_[0]{children} }
342} 687}
343 688
344sub remove { 689sub remove {
345 my ($self, $widget) = @_; 690 my ($self, $child) = @_;
346 691
692 delete $child->{parent};
693 $child->hide;
694
347 $self->{children} = [ grep $_ != $widget, @{ $self->{children} } ]; 695 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
348 696
349 $self->size_allocate (0, 0, $self->{w}, $self->{h}); 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;
350} 712}
351 713
352sub find_widget { 714sub find_widget {
353 my ($self, $x, $y) = @_; 715 my ($self, $x, $y) = @_;
354 716
… …
384 746
385 $class->SUPER::new (children => [$child], %arg) 747 $class->SUPER::new (children => [$child], %arg)
386} 748}
387 749
388sub add { 750sub add {
389 my ($self, $widget) = @_; 751 my ($self, $child) = @_;
390 752
391 $self->{children} = []; 753 $self->{children} = [];
392 754
393 $self->SUPER::add ($widget); 755 $self->SUPER::add ($child);
394} 756}
395 757
396sub remove { 758sub remove {
397 my ($self, $widget) = @_; 759 my ($self, $widget) = @_;
398 760
… …
407sub size_request { 769sub size_request {
408 $_[0]{children}[0]->size_request 770 $_[0]{children}[0]->size_request
409} 771}
410 772
411sub size_allocate { 773sub size_allocate {
412 my ($self, $x, $y, $w, $h) = @_; 774 my ($self, $w, $h) = @_;
413 775
414 $self->_size_allocate ($x, $y, $w, $h) or return;
415
416 $self->{children}[0]->size_allocate (0, 0, $w, $h); 776 $self->{children}[0]->configure (0, 0, $w, $h);
417} 777}
418 778
419############################################################################# 779#############################################################################
420 780
421package CFClient::UI::Window; 781package CFClient::UI::Window;
422 782
423our @ISA = CFClient::UI::Bin::; 783our @ISA = CFClient::UI::Bin::;
424 784
425use SDL::OpenGL; 785use CFClient::OpenGL;
426 786
427sub new { 787sub new {
428 my ($class, %arg) = @_; 788 my ($class, %arg) = @_;
429 789
430 my $self = $class->SUPER::new (%arg); 790 my $self = $class->SUPER::new (%arg);
431} 791}
432 792
433sub update { 793sub update {
434 my ($self) = @_; 794 my ($self) = @_;
435 795
436 # we want to do this delayed... 796 $ROOT->on_post_alloc ($self => sub { $self->render_child });
437 $self->render_chld;
438 $self->SUPER::update; 797 $self->SUPER::update;
439} 798}
440 799
800sub size_allocate {
801 my ($self, $w, $h) = @_;
802
803 $self->SUPER::size_allocate ($w, $h);
804 $self->update;
805}
806
807sub _render {
808 $_[0]{children}[0]->draw;
809}
810
441sub render_chld { 811sub render_child {
442 my ($self) = @_; 812 my ($self) = @_;
443 813
444 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 814 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
445 glClearColor 0, 0, 0, 1; 815 glClearColor 0, 0, 0, 0;
446 glClear GL_COLOR_BUFFER_BIT; 816 glClear GL_COLOR_BUFFER_BIT;
447 $self->child->draw; 817
818 $self->_render;
448 }; 819 };
449}
450
451sub size_allocate {
452 my ($self, $x, $y, $w, $h) = @_;
453
454 $self->_size_allocate ($x, $y, $w, $h) or return;
455
456 $self->child->size_allocate (0, 0, $w, $h);
457
458 $self->render_chld;
459} 820}
460 821
461sub _draw { 822sub _draw {
462 my ($self) = @_; 823 my ($self) = @_;
463 824
464 my ($w, $h) = ($self->w, $self->h); 825 my ($w, $h) = ($self->w, $self->h);
465 826
466 my $tex = $self->{texture} 827 my $tex = $self->{texture}
467 or return; 828 or return;
468 829
469 glEnable GL_BLEND;
470 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
471 glEnable GL_TEXTURE_2D; 830 glEnable GL_TEXTURE_2D;
472 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;
473 833
474 $tex->draw_quad (0, 0, $w, $h); 834 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
475 835
476 glDisable GL_BLEND;
477 glDisable GL_TEXTURE_2D; 836 glDisable GL_TEXTURE_2D;
478} 837}
479 838
480############################################################################# 839#############################################################################
481 840
482package CFClient::UI::Frame; 841package CFClient::UI::ViewPort;
483 842
484our @ISA = CFClient::UI::Bin::; 843our @ISA = CFClient::UI::Window::;
485
486use SDL::OpenGL;
487
488sub size_request {
489 my ($self) = @_;
490 my $chld = $self->child
491 or return (0, 0);
492
493 $chld->move (2, 2);
494
495 map { $_ + 4 } $chld->size_request;
496}
497
498sub size_allocate {
499 my ($self, $x, $y, $w, $h) = @_;
500
501 $self->_size_allocate ($x, $y, $w, $h) or return;
502
503 $self->child->size_allocate (2, 2, $w - 4, $h - 4);
504}
505
506sub _draw {
507 my ($self) = @_;
508
509 my $chld = $self->child;
510
511 my ($w, $h) = $chld->size_request;
512
513 glBegin GL_QUADS;
514 glColor 0, 0, 0;
515 glVertex 0 , 0;
516 glVertex 0 , $h + 4;
517 glVertex $w + 4 , $h + 4;
518 glVertex $w + 4 , 0;
519 glEnd;
520
521 $chld->draw;
522}
523
524#############################################################################
525
526package CFClient::UI::FancyFrame;
527
528our @ISA = CFClient::UI::Bin::;
529
530use SDL::OpenGL;
531
532my @tex =
533 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
534 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
535 844
536sub new { 845sub new {
537 my $class = shift; 846 my $class = shift;
538 847
539 # TODO: user_x, user_y, overwrite moveto?
540
541 $class->SUPER::new ( 848 $class->SUPER::new (
849 scroll_x => 0,
850 scroll_y => 1,
851 @_,
852 )
853}
854
855sub size_request {
856 my ($self) = @_;
857
858 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
859
860 $w = 10 if $self->{scroll_x};
861 $h = 10 if $self->{scroll_y};
862
863 ($w, $h)
864}
865
866sub size_allocate {
867 my ($self, $w, $h) = @_;
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 (
542 bg => [1, 1, 1, 1], 1037 bg => [1, 1, 1, 1],
543 border_bg => [1, 1, 1, 1], 1038 border_bg => [1, 1, 1, 1],
544 border => $::FONTSIZE * 0.8, 1039 border => 0.6,
1040 can_events => 1,
1041 min_w => 16,
1042 min_h => 16,
545 @_ 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,
546 ) 1067 )
547} 1068}
548 1069
549sub size_request {
550 my ($self) = @_;
551
552 return ($self->{user_w}, $self->{user_h}) if $self->{user_w} && $self->{user_h};
553
554 my ($w, $h) = $self->SUPER::size_request;
555
556 (
557 $w + $self->{border} * 2,
558 $h + $self->{border} * 2,
559 )
560}
561
562sub size_allocate { 1070sub size_allocate {
563 my ($self, $x, $y, $w, $h) = @_; 1071 my ($self, $w, $h) = @_;
564 1072
565 $self->_size_allocate ($x, $y, $w, $h) or return;
566
567 $h -= List::Util::max 0, $self->{border} * 2; 1073 $h -= List::Util::max 0, $self->border * 2;
568 $w -= List::Util::max 0, $self->{border} * 2; 1074 $w -= List::Util::max 0, $self->border * 2;
569 1075
1076 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
1077 if $self->{title};
1078
570 $self->child->size_allocate ($self->{border}, $self->{border}, $w, $h); 1079 $self->child->configure ($self->border, $self->border, $w, $h);
571} 1080}
572 1081
573sub button_down { 1082sub button_down {
574 my ($self, $ev, $x, $y) = @_; 1083 my ($self, $ev, $x, $y) = @_;
575 1084
576 if ($x < $self->{w} && $x >= $self->{w} - $self->{border} 1085 my ($w, $h) = @$self{qw(w h)};
577 && $y < $self->{h} && $y >= $self->{h} - $self->{border}) { 1086 my $border = $self->border;
578 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});
579 my ($ox, $oy) = ($ev->button_x, $ev->button_y); 1093 my ($ox, $oy) = ($ev->{x}, $ev->{y});
580 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;
581 1098
582 $self->{motion} = sub { 1099 $self->{motion} = sub {
583 my ($ev, $x, $y) = @_; 1100 my ($ev, $x, $y) = @_;
584 1101
585 ($x, $y) = ($ev->motion_x, $ev->motion_y); 1102 my $dx = $ev->{x} - $ox;
1103 my $dy = $ev->{y} - $oy;
586 1104
587 $self->{user_w} = $bw + $x - $ox; 1105 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
588 $self->{user_h} = $bh + $y - $oy; 1106 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1107
589 $self->update; 1108 $self->realloc;
1109 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
590 }; 1110 };
591 1111
592 } elsif ($x >= 0 && $x < $self->{w} 1112 } elsif ($lr ^ $td) {
593 && $y >= 0 && $y < $self->{border}) {
594
595 my ($ox, $oy) = ($ev->button_x, $ev->button_y); 1113 my ($ox, $oy) = ($ev->{x}, $ev->{y});
596 my ($bx, $by) = ($self->{x}, $self->{y}); 1114 my ($bx, $by) = ($self->{x}, $self->{y});
597 1115
598 $self->{motion} = sub { 1116 $self->{motion} = sub {
599 my ($ev, $x, $y) = @_; 1117 my ($ev, $x, $y) = @_;
600 1118
601 ($x, $y) = ($ev->motion_x, $ev->motion_y); 1119 ($x, $y) = ($ev->{x}, $ev->{y});
602 1120
603 $self->move ($bx + $x - $ox, $by + $y - $oy); 1121 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
604 $self->update;
605 }; 1122 };
606 } 1123 }
607} 1124}
608 1125
609sub button_up { 1126sub button_up {
… …
622 my ($self) = @_; 1139 my ($self) = @_;
623 1140
624 my ($w, $h ) = ($self->{w}, $self->{h}); 1141 my ($w, $h ) = ($self->{w}, $self->{h});
625 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1142 my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
626 1143
627 glEnable GL_BLEND;
628 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
629 glEnable GL_TEXTURE_2D; 1144 glEnable GL_TEXTURE_2D;
630 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1145 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
631 1146
1147 my $border = $self->border;
1148
632 glColor @{ $self->{border_bg} }; 1149 glColor @{ $self->{border_bg} };
633 $tex[1]->draw_quad (0, 0, $w, $self->{border}); 1150 $border[0]->draw_quad_alpha (0, 0, $w, $border);
634 $tex[3]->draw_quad (0, $self->{border}, $self->{border}, $ch); 1151 $border[1]->draw_quad_alpha (0, $border, $border, $ch);
635 $tex[2]->draw_quad ($w - $self->{border}, $self->{border}, $self->{border}, $ch); 1152 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
636 $tex[4]->draw_quad (0, $h - $self->{border}, $w, $self->{border}); 1153 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
637 1154
638 my $bg = $tex[0]; 1155 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1156 glColor @{ $self->{bg} };
639 1157
640 # TODO: repeat texture not scale 1158 # TODO: repeat texture not scale
641 my $rep_x = $cw / $bg->{w}; 1159 # solve this better(?)
642 my $rep_y = $ch / $bg->{h}; 1160 $bg->{s} = $cw / $bg->{w};
643 1161 $bg->{t} = $ch / $bg->{h};
644 glColor @{ $self->{bg} };
645
646 $bg->{s} = $rep_x;
647 $bg->{t} = $rep_y;
648 $bg->{wrap_mode} = 1;
649 $bg->draw_quad ($self->{border}, $self->{border}, $cw, $ch); 1162 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1163 }
650 1164
651 glDisable GL_TEXTURE_2D; 1165 glDisable GL_TEXTURE_2D;
652 glDisable GL_BLEND; 1166
1167 $self->{title}->draw if $self->{title};
653 1168
654 $self->child->draw; 1169 $self->child->draw;
655} 1170}
656 1171
657############################################################################# 1172#############################################################################
… …
660 1175
661our @ISA = CFClient::UI::Base::; 1176our @ISA = CFClient::UI::Base::;
662 1177
663use List::Util qw(max sum); 1178use List::Util qw(max sum);
664 1179
665use SDL::OpenGL; 1180use CFClient::OpenGL;
666 1181
667sub new { 1182sub new {
668 my $class = shift; 1183 my $class = shift;
669 1184
670 $class->SUPER::new ( 1185 $class->SUPER::new (
671 col_expand => [], 1186 col_expand => [],
672 @_ 1187 @_,
673 ) 1188 )
674} 1189}
675 1190
1191sub children {
1192 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1193}
1194
676sub add { 1195sub add {
677 my ($self, $x, $y, $chld) = @_; 1196 my ($self, $x, $y, $child) = @_;
678 1197
1198 $child->set_parent ($self);
679 $self->{children}[$y][$x] = $chld; 1199 $self->{children}[$y][$x] = $child;
680 $chld->set_parent ($self);
681 1200
682 $self->{w} = $self->{h} = -1; 1201 $self->realloc;
683 $self->update; 1202}
1203
1204# TODO: move to container class maybe? send children a signal on removal?
1205sub clear {
1206 my ($self) = @_;
1207
1208 my @children = $self->children;
1209 delete $self->{children};
1210
1211 for (@children) {
1212 delete $_->{parent};
1213 $_->hide;
1214 }
1215
1216 $self->realloc;
684} 1217}
685 1218
686sub get_wh { 1219sub get_wh {
687 my ($self) = @_; 1220 my ($self) = @_;
688 1221
… …
693 or next; 1226 or next;
694 1227
695 for my $x (0 .. $#$row) { 1228 for my $x (0 .. $#$row) {
696 my $widget = $row->[$x] 1229 my $widget = $row->[$x]
697 or next; 1230 or next;
698 my ($w, $h) = $widget->size_request; 1231 my ($w, $h) = @$widget{qw(req_w req_h)};
699 1232
700 $w[$x] = max $w[$x], $w; 1233 $w[$x] = max $w[$x], $w;
701 $h[$y] = max $h[$y], $h; 1234 $h[$y] = max $h[$y], $h;
702 } 1235 }
703 } 1236 }
… …
715 (sum @$hs), 1248 (sum @$hs),
716 ) 1249 )
717} 1250}
718 1251
719sub size_allocate { 1252sub size_allocate {
720 my ($self, $x, $y, $w, $h) = @_; 1253 my ($self, $w, $h) = @_;
721
722 $self->_size_allocate ($x, $y, $w, $h) or return;
723 1254
724 my ($ws, $hs) = $self->get_wh; 1255 my ($ws, $hs) = $self->get_wh;
725 1256
726 my $req_w = sum @$ws; 1257 my $req_w = (sum @$ws) || 1;
727 my $req_h = sum @$hs; 1258 my $req_h = (sum @$hs) || 1;
728 1259
729 # TODO: nicer code && do row_expand 1260 # TODO: nicer code && do row_expand
730 my @col_expand = @{$self->{col_expand}}; 1261 my @col_expand = @{$self->{col_expand}};
731 @col_expand = (1) x @$ws unless @col_expand; 1262 @col_expand = (1) x @$ws unless @col_expand;
732 my $col_expand = (sum @col_expand) || 1; 1263 my $col_expand = (sum @col_expand) || 1;
733 1264
734 # linearly scale sizes 1265 # linearly scale sizes
735 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 1266 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
736 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs; 1267 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
737 1268
738 $_ = int $_ for @$ws; #TODO: avoid rounding problems 1269 CFClient::UI::harmonize $ws;
739 $_ = int $_ for @$hs; #TODO: avoid rounding problems 1270 CFClient::UI::harmonize $hs;
740 1271
741 my $y; 1272 my $y;
742 1273
743 for my $r (0 .. $#{$self->{children}}) { 1274 for my $r (0 .. $#{$self->{children}}) {
744 my $row = $self->{children}[$r] 1275 my $row = $self->{children}[$r]
… …
749 1280
750 for my $c (0 .. $#$row) { 1281 for my $c (0 .. $#$row) {
751 my $col_w = $ws->[$c]; 1282 my $col_w = $ws->[$c];
752 1283
753 if (my $widget = $row->[$c]) { 1284 if (my $widget = $row->[$c]) {
754 $widget->size_allocate ($x, $y, $col_w, $row_h); 1285 $widget->configure ($x, $y, $col_w, $row_h);
755 } 1286 }
756 1287
757 $x += $col_w; 1288 $x += $col_w;
758 } 1289 }
759 1290
… …
786 } 1317 }
787} 1318}
788 1319
789############################################################################# 1320#############################################################################
790 1321
1322package CFClient::UI::Box;
1323
1324our @ISA = CFClient::UI::Container::;
1325
1326sub size_request {
1327 my ($self) = @_;
1328
1329 $self->{vertical}
1330 ? (
1331 (List::Util::max map $_->{req_w}, @{$self->{children}}),
1332 (List::Util::sum map $_->{req_h}, @{$self->{children}}),
1333 )
1334 : (
1335 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1336 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1337 )
1338}
1339
1340sub size_allocate {
1341 my ($self, $w, $h) = @_;
1342
1343 my $space = $self->{vertical} ? $h : $w;
1344 my $children = $self->{children};
1345
1346 my @req;
1347
1348 if ($self->{homogeneous}) {
1349 @req = ($space / (@$children || 1)) x @$children;
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 {
1358 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;
1359
1360 $space = ($space - $req) / $expand; # remaining space to give away
1361
1362 $req[$_] += $space * $children->[$_]{expand}
1363 for 0 .. $#$children;
1364 }
1365 }
1366
1367 CFClient::UI::harmonize \@req;
1368
1369 my $pos = 0;
1370 for (0 .. $#$children) {
1371 my $alloc = $req[$_];
1372 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1373
1374 $pos += $alloc;
1375 }
1376
1377 1
1378}
1379
1380#############################################################################
1381
791package CFClient::UI::HBox; 1382package CFClient::UI::HBox;
792 1383
793# TODO: wrap into common Box base class
794
795our @ISA = CFClient::UI::Container::; 1384our @ISA = CFClient::UI::Box::;
796 1385
797sub size_request { 1386sub new {
798 my ($self) = @_; 1387 my $class = shift;
799 1388
800 my @alloc = map [$_->size_request], @{$self->{children}}; 1389 $class->SUPER::new (
801 1390 vertical => 0,
802 ( 1391 @_,
803 (List::Util::sum map $_->[0], @alloc),
804 (List::Util::max map $_->[1], @alloc),
805 ) 1392 )
806} 1393}
807 1394
808sub size_allocate {
809 my ($self, $x, $y, $w, $h) = @_;
810
811 $self->_size_allocate ($x, $y, $w, $h);
812
813 ($h, $w) = ($w, $h);
814
815 my $children = $self->{children};
816
817 my @h = map +($_->size_request)[0], @$children;
818
819 my $req_h = List::Util::sum @h;
820
821 if ($req_h > $h) {
822 # ah well, not enough space
823 $_ *= $h / $req_h for @h;
824 } else {
825 my $exp = List::Util::sum map $_->{expand}, @$children;
826 $exp ||= 1;
827
828 for (0 .. $#$children) {
829 my $child = $children->[$_];
830
831 my $alloc_h = $h[$_];
832 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
833 $h[$_] = $alloc_h;
834 }
835 }
836
837 my $y = 0;
838 for (0 .. $#$children) {
839 my $child = $children->[$_];
840 my $h = int $h[$_];
841 $child->size_allocate ($y, 0, $h, $w);
842
843 $y += $h;
844 }
845}
846
847############################################################################# 1395#############################################################################
848 1396
849package CFClient::UI::VBox; 1397package CFClient::UI::VBox;
850 1398
851# TODO: wrap into common Box base class
852
853our @ISA = CFClient::UI::Container::; 1399our @ISA = CFClient::UI::Box::;
854 1400
855sub size_request { 1401sub new {
856 my ($self) = @_; 1402 my $class = shift;
857 1403
858 my @alloc = map [$_->size_request], @{$self->{children}}; 1404 $class->SUPER::new (
859 1405 vertical => 1,
860 ( 1406 @_,
861 (List::Util::max map $_->[0], @alloc),
862 (List::Util::sum map $_->[1], @alloc),
863 ) 1407 )
864} 1408}
865 1409
866sub size_allocate {
867 my ($self, $x, $y, $w, $h) = @_;
868
869 $self->_size_allocate ($x, $y, $w, $h);
870
871 my $children = $self->{children};
872
873 my @h = map +($_->size_request)[1], @$children;
874
875 my $req_h = List::Util::sum @h;
876
877 if ($req_h > $h) {
878 # ah well, not enough space
879 $_ *= $h / $req_h for @h;
880 } else {
881 my $exp = List::Util::sum map $_->{expand}, @$children;
882 $exp ||= 1;
883
884 for (0 .. $#$children) {
885 my $child = $children->[$_];
886
887 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
888 }
889 }
890
891 my $y = 0;
892 for (0 .. $#$children) {
893 my $child = $children->[$_];
894 my $h = int $h[$_];
895 $child->size_allocate (0, $y, $w, $h);
896
897 $y += $h;
898 }
899}
900
901############################################################################# 1410#############################################################################
902 1411
903package CFClient::UI::Label; 1412package CFClient::UI::Label;
904 1413
905our @ISA = CFClient::UI::Base::; 1414our @ISA = CFClient::UI::DrawBG::;
906 1415
907use SDL::OpenGL; 1416use CFClient::OpenGL;
908 1417
909sub new { 1418sub new {
910 my ($class, %arg) = @_; 1419 my ($class, %arg) = @_;
911 1420
912 my $self = $class->SUPER::new ( 1421 my $self = $class->SUPER::new (
913 fg => [1, 1, 1], 1422 fg => [1, 1, 1],
914 fontsize => $::FONTSIZE, 1423 #bg => none
915 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,
916 align => -1, 1432 align => -1,
1433 valign => -1,
917 padding => 2, 1434 padding_x => 2,
918 layout => new CFClient::Layout, 1435 padding_y => 2,
1436 can_events => 0,
919 %arg 1437 %arg
920 ); 1438 );
921 1439
1440 if (exists $self->{template}) {
1441 my $layout = new CFClient::Layout;
1442 $layout->set_text (delete $self->{template});
1443 $self->{template} = $layout;
1444 }
1445
1446 if (exists $self->{markup}) {
1447 $self->set_markup (delete $self->{markup});
1448 } else {
922 $self->set_text ($self->{text}); 1449 $self->set_text (delete $self->{text});
1450 }
923 1451
924 $self 1452 $self
925} 1453}
926 1454
927sub escape_text { 1455sub escape($) {
928 local $_ = $_[1]; 1456 local $_ = $_[0];
929 1457
930 s/&/&amp;/g; 1458 s/&/&amp;/g;
931 s/>/&gt;/g; 1459 s/>/&gt;/g;
932 s/</&lt;/g; 1460 s/</&lt;/g;
933 1461
934 $_[1] 1462 $_
1463}
1464
1465sub update {
1466 my ($self) = @_;
1467
1468 delete $self->{texture};
1469 $self->SUPER::update;
935} 1470}
936 1471
937sub set_text { 1472sub set_text {
938 my ($self, $text) = @_; 1473 my ($self, $text) = @_;
939 1474
1475 return if $self->{text} eq "T$text";
940 $self->{text} = $text; 1476 $self->{text} = "T$text";
1477
1478 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1479 $self->{layout}->set_text ($text);
1480
1481 $self->realloc;
1482 $self->update;
1483}
1484
1485sub set_markup {
1486 my ($self, $markup) = @_;
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;
941 $self->{layout}->set_markup ($text); 1494 $self->{layout}->set_markup ($markup);
1495
1496 $self->realloc;
1497 $self->update;
1498}
1499
1500sub size_request {
1501 my ($self) = @_;
1502
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});
1507 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1508
1509 my ($w, $h) = $self->{layout}->size;
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;
1519 }
1520
1521 ($w, $h)
1522}
1523
1524sub size_allocate {
1525 my ($self, $w, $h) = @_;
942 1526
943 delete $self->{texture}; 1527 delete $self->{texture};
944# $self->{w} = $self->{h} = -1;
945 $self->update;
946} 1528}
947 1529
948sub get_text { 1530sub set_fontsize {
949 my ($self, $text) = @_; 1531 my ($self, $fontsize) = @_;
950 1532
951 $self->{text} 1533 $self->{fontsize} = $fontsize;
952}
953
954sub size_request {
955 my ($self) = @_;
956
957 $self->{layout}->set_width;
958 $self->{layout}->set_height ($self->{fontsize});
959 my ($w, $h) = $self->{layout}->size;
960
961 (
962 $w + $self->{padding} * 2,
963 $h + $self->{padding} * 2,
964 )
965}
966
967sub size_allocate {
968 my ($self, $x, $y, $w, $h) = @_;
969
970 $self->_size_allocate ($x, $y, $w, $h) or return;
971
972 delete $self->{texture}; 1534 delete $self->{texture};
973}
974 1535
975sub update { 1536 $self->realloc;
976 my ($self) = @_;
977
978 delete $self->{texture};
979 $self->SUPER::update;
980} 1537}
981 1538
982sub _draw { 1539sub _draw {
983 my ($self) = @_; 1540 my ($self) = @_;
984 1541
1542 $self->SUPER::_draw; # draw background, if applicable
1543
985 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};
986 $self->{layout}->set_width ($self->{w}); 1547 $self->{layout}->set_width ($self->{w});
987 $self->{layout}->set_height (List::Util::min $self->{h} - $self->{padding} * 2, $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
988 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
989 }; 1563 };
990 1564
991 glEnable GL_BLEND;
992 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
993 glEnable GL_TEXTURE_2D; 1565 glEnable GL_TEXTURE_2D;
994 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1566 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
995 1567
1568 if ($tex->{format} == GL_ALPHA) {
996 glColor @{$self->{fg}}; 1569 glColor @{$self->{fg}};
997 1570 $tex->draw_quad_alpha ($self->{ox}, $self->{oy});
998 my $x = 1571 } else {
999 $self->{align} < 0 ? $self->{padding} 1572 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1000 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} 1573 }
1001 : ($self->{w} - $tex->{w}) * 0.5;
1002
1003 $tex->draw_quad (int $x, int +($self->{h} - $tex->{h}) * 0.5);
1004 1574
1005 glDisable GL_TEXTURE_2D; 1575 glDisable GL_TEXTURE_2D;
1006 glDisable GL_BLEND;
1007} 1576}
1008 1577
1009############################################################################# 1578#############################################################################
1010 1579
1011package CFClient::UI::Entry; 1580package CFClient::UI::EntryBase;
1012 1581
1013our @ISA = CFClient::UI::Label::; 1582our @ISA = CFClient::UI::Label::;
1014 1583
1015use SDL; 1584use CFClient::OpenGL;
1016use SDL::OpenGL;
1017 1585
1018sub new { 1586sub new {
1019 my $class = shift; 1587 my $class = shift;
1020 1588
1021 $class->SUPER::new ( 1589 $class->SUPER::new (
1022 fg => [1, 1, 1], 1590 fg => [1, 1, 1],
1023 bg => [0, 0, 0, 0.2], 1591 bg => [0, 0, 0, 0.2],
1024 active_bg => [1, 1, 1, 0.5], 1592 active_bg => [1, 1, 1, 0.5],
1025 active_fg => [0, 0, 0], 1593 active_fg => [0, 0, 0],
1026 can_hover => 1, 1594 can_hover => 1,
1027 can_focus => 1, 1595 can_focus => 1,
1596 valign => 0,
1597 can_events => 1,
1598 #text => ...
1028 @_ 1599 @_
1029 ) 1600 )
1030} 1601}
1031 1602
1032sub _set_text { 1603sub _set_text {
1033 my ($self, $text) = @_; 1604 my ($self, $text) = @_;
1034 1605
1035 my $old_text = $self->{text}; 1606 delete $self->{cur_h};
1607
1608 return if $self->{text} eq $text;
1609
1610 delete $self->{texture};
1036 1611
1037 $self->{last_activity} = $::NOW; 1612 $self->{last_activity} = $::NOW;
1038
1039 $self->{text} = $text; 1613 $self->{text} = $text;
1040 $self->{layout}->set_width ($self->{w});
1041 $self->{layout}->set_height (List::Util::min $self->{h} - $self->{padding} * 2, $self->{fontsize});
1042 1614
1043 $text =~ s/./*/g if $self->{hidden}; 1615 $text =~ s/./*/g if $self->{hidden};
1616 $self->{layout}->set_text ("$text ");
1044 1617
1045 $self->{layout}->set_markup ($self->escape_text ($text) . " "); 1618 $self->_emit (changed => $self->{text});
1046
1047 $text = substr $text, 0, $self->{cursor};
1048 utf8::encode $text;
1049
1050 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text);
1051
1052 $self->emit (changed => $self->{text}) # XXX: is this the right place to do this?
1053 if $old_text ne $self->{text};
1054}
1055
1056sub size_request {
1057 my ($self) = @_;
1058
1059 my ($w, $h) = $self->SUPER::size_request;
1060
1061 ($w + 1, $h) # add 1 for cursor
1062}
1063
1064sub size_allocate {
1065 my ($self, $x, $y, $w, $h) = @_;
1066
1067 $self->SUPER::size_allocate ($x, $y, $w, $h);
1068
1069 $self->_set_text ($self->{text});
1070} 1619}
1071 1620
1072sub set_text { 1621sub set_text {
1073 my ($self, $text) = @_; 1622 my ($self, $text) = @_;
1074 1623
1075 $self->{cursor} = length $text; 1624 $self->{cursor} = length $text;
1076 $self->_set_text ($text); 1625 $self->_set_text ($text);
1077 $self->update; 1626
1627 $self->realloc;
1628}
1629
1630sub get_text {
1631 $_[0]{text}
1632}
1633
1634sub size_request {
1635 my ($self) = @_;
1636
1637 my ($w, $h) = $self->SUPER::size_request;
1638
1639 ($w + 1, $h) # add 1 for cursor
1078} 1640}
1079 1641
1080sub key_down { 1642sub key_down {
1081 my ($self, $ev) = @_; 1643 my ($self, $ev) = @_;
1082 1644
1083 my $mod = $ev->key_mod; 1645 my $mod = $ev->{mod};
1084 my $sym = $ev->key_sym; 1646 my $sym = $ev->{sym};
1085
1086 my $uni = $ev->key_unicode; 1647 my $uni = $ev->{unicode};
1087 1648
1088 my $text = $self->get_text; 1649 my $text = $self->get_text;
1089 1650
1090 if ($sym == SDLK_BACKSPACE) { 1651 if ($uni == 8) {
1091 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 1652 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1092 } elsif ($sym == SDLK_DELETE) { 1653 } elsif ($uni == 127) {
1093 substr $text, $self->{cursor}, 1, ""; 1654 substr $text, $self->{cursor}, 1, "";
1094 } elsif ($sym == SDLK_LEFT) { 1655 } elsif ($sym == CFClient::SDLK_LEFT) {
1095 --$self->{cursor} if $self->{cursor}; 1656 --$self->{cursor} if $self->{cursor};
1096 } elsif ($sym == SDLK_RIGHT) { 1657 } elsif ($sym == CFClient::SDLK_RIGHT) {
1097 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1658 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1098 } elsif ($sym == SDLK_HOME) { 1659 } elsif ($sym == CFClient::SDLK_HOME) {
1099 $self->{cursor} = 0; 1660 $self->{cursor} = 0;
1100 } elsif ($sym == SDLK_END) { 1661 } elsif ($sym == CFClient::SDLK_END) {
1101 $self->{cursor} = length $text; 1662 $self->{cursor} = length $text;
1102 } elsif ($sym == SDLK_ESCAPE) { 1663 } elsif ($uni == 27) {
1103 $self->emit ('escape'); 1664 $self->_emit ('escape');
1104 } elsif ($uni) { 1665 } elsif ($uni) {
1105 substr $text, $self->{cursor}++, 0, chr $uni; 1666 substr $text, $self->{cursor}++, 0, chr $uni;
1106 } 1667 }
1107 1668
1108 $self->_set_text ($text); 1669 $self->_set_text ($text);
1109 $self->update; 1670
1671 $self->realloc;
1110} 1672}
1111 1673
1112sub focus_in { 1674sub focus_in {
1113 my ($self) = @_; 1675 my ($self) = @_;
1114 1676
… …
1162 1724
1163 $self->SUPER::_draw; 1725 $self->SUPER::_draw;
1164 1726
1165 #TODO: force update every cursor change :( 1727 #TODO: force update every cursor change :(
1166 if ($FOCUS == $self && (($::NOW - $self->{last_activity}) & 1023) < 600) { 1728 if ($FOCUS == $self && (($::NOW - $self->{last_activity}) & 1023) < 600) {
1729
1730 unless (exists $self->{cur_h}) {
1731 my $text = substr $self->{text}, 0, $self->{cursor};
1732 utf8::encode $text;
1733
1734 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)
1735 }
1736
1167 glColor @{$self->{fg}}; 1737 glColor @{$self->{fg}};
1168 glBegin GL_LINES; 1738 glBegin GL_LINES;
1169 glVertex $self->{cur_x}, $self->{cur_y};
1170 glVertex $self->{cur_x}, $self->{cur_y} + $self->{cur_h}; 1739 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};
1740 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1171 glEnd; 1741 glEnd;
1172 } 1742 }
1173} 1743}
1174 1744
1175package CFClient::UI::LineEntry; 1745package CFClient::UI::Entry;
1176 1746
1177our @ISA = CFClient::UI::Entry::; 1747our @ISA = CFClient::UI::EntryBase::;
1178 1748
1179use SDL; 1749use CFClient::OpenGL;
1180use SDL::OpenGL;
1181 1750
1182sub key_down { 1751sub key_down {
1183 my ($self, $ev) = @_; 1752 my ($self, $ev) = @_;
1184 1753
1185 my $sym = $ev->key_sym; 1754 my $sym = $ev->{sym};
1186 1755
1187 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} = '';
1188 $self->emit (activate => $self->get_text); 1761 $self->_emit (activate => $txt);
1189 $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 }
1190 1785
1191 } else { 1786 } else {
1192 $self->SUPER::key_down ($ev); 1787 $self->SUPER::key_down ($ev);
1193 } 1788 }
1194 1789
… …
1198 1793
1199package CFClient::UI::Button; 1794package CFClient::UI::Button;
1200 1795
1201our @ISA = CFClient::UI::Label::; 1796our @ISA = CFClient::UI::Label::;
1202 1797
1203use SDL; 1798use CFClient::OpenGL;
1204use SDL::OpenGL;
1205 1799
1206my @tex = 1800my @tex =
1207 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 1801 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1208 qw(b1_button_active.png); 1802 qw(b1_button_active.png);
1209 1803
1210sub new { 1804sub new {
1211 my $class = shift; 1805 my $class = shift;
1212 1806
1213 $class->SUPER::new ( 1807 $class->SUPER::new (
1214 padding => 4, 1808 padding_x => 4,
1809 padding_y => 4,
1215 fg => [1, 1, 1], 1810 fg => [1, 1, 1],
1216 bg => [1, 1, 1, 0.2],
1217 active_fg => [1, 1, 0], 1811 active_fg => [0, 0, 1],
1218 can_hover => 1, 1812 can_hover => 1,
1813 align => 0,
1814 valign => 0,
1815 can_events => 1,
1219 @_ 1816 @_
1220 ) 1817 )
1221} 1818}
1222 1819
1820sub activate { }
1821
1223sub button_up { 1822sub button_up {
1224 my ($self, $ev, $x, $y) = @_; 1823 my ($self, $ev, $x, $y) = @_;
1225 1824
1825 $self->emit ("activate")
1226 if ($x >= 0 && $x < $self->{w} 1826 if $x >= 0 && $x < $self->{w}
1227 && $y >= 0 && $y < $self->{h}) { 1827 && $y >= 0 && $y < $self->{h};
1228 $self->emit ("activate");
1229 }
1230} 1828}
1231 1829
1232sub _draw { 1830sub _draw {
1233 my ($self) = @_; 1831 my ($self) = @_;
1234 1832
1235 local $self->{fg} = $self->{fg}; 1833 local $self->{fg} = $self->{fg};
1236 my $tex = $tex[0];
1237
1238 glEnable GL_BLEND;
1239 glEnable GL_TEXTURE_2D;
1240 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1241 1834
1242 if ($GRAB == $self) { 1835 if ($GRAB == $self) {
1243 $self->{fg} = $self->{active_fg}; 1836 $self->{fg} = $self->{active_fg};
1244 } 1837 }
1245 1838
1246 glBindTexture GL_TEXTURE_2D, $tex->{name}; 1839 glEnable GL_TEXTURE_2D;
1247 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1840 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1841 glColor 0, 0, 0, 1;
1248 1842
1249 $tex->draw_quad (0, 0, $self->{w}, $self->{h}); 1843 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1250 1844
1251 glDisable GL_TEXTURE_2D; 1845 glDisable GL_TEXTURE_2D;
1252 glDisable GL_BLEND;
1253 1846
1254 $self->SUPER::_draw; 1847 $self->SUPER::_draw;
1255} 1848}
1256 1849
1257############################################################################# 1850#############################################################################
… …
1259package CFClient::UI::CheckBox; 1852package CFClient::UI::CheckBox;
1260 1853
1261our @ISA = CFClient::UI::DrawBG::; 1854our @ISA = CFClient::UI::DrawBG::;
1262 1855
1263my @tex = 1856my @tex =
1264 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 1857 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1265 qw(c1_checkbox_bg.png c1_checkbox_active.png); 1858 qw(c1_checkbox_bg.png c1_checkbox_active.png);
1266 1859
1267use SDL; 1860use CFClient::OpenGL;
1268use SDL::OpenGL;
1269 1861
1270sub new { 1862sub new {
1271 my $class = shift; 1863 my $class = shift;
1272 1864
1273 $class->SUPER::new ( 1865 $class->SUPER::new (
1274 padding => 2, 1866 padding_x => 2,
1867 padding_y => 2,
1275 fg => [1, 1, 1], 1868 fg => [1, 1, 1],
1276 active_fg => [1, 1, 0], 1869 active_fg => [1, 1, 0],
1870 bg => [0, 0, 0, 0.2],
1871 active_bg => [1, 1, 1, 0.5],
1277 state => 0, 1872 state => 0,
1278 can_hover => 1, 1873 can_hover => 1,
1279 @_ 1874 @_
1280 ) 1875 )
1281} 1876}
1282 1877
1283sub size_request { 1878sub size_request {
1284 my ($self) = @_; 1879 my ($self) = @_;
1285 1880
1286 ($self->{padding} * 2 + 6) x 2 1881 (6) x 2
1287}
1288
1289sub size_allocate {
1290 my ($self, $x, $y, $w, $h) = @_;
1291
1292 $self->_size_allocate ($x, $y, $w, $h);
1293} 1882}
1294 1883
1295sub button_down { 1884sub button_down {
1296 my ($self, $ev, $x, $y) = @_; 1885 my ($self, $ev, $x, $y) = @_;
1297 1886
1298 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1887 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1299 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1888 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1300 $self->{state} = !$self->{state}; 1889 $self->{state} = !$self->{state};
1301 $self->emit (changed => $self->{state}); 1890 $self->_emit (changed => $self->{state});
1302 } 1891 }
1303} 1892}
1304 1893
1305sub _draw { 1894sub _draw {
1306 my ($self) = @_; 1895 my ($self) = @_;
1307 1896
1308 $self->SUPER::_draw; 1897 $self->SUPER::_draw;
1309 1898
1310 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 1899 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1311 1900
1312 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; 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;
1313 1904
1314 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 1905 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1315 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);
2066
1316 glEnable GL_BLEND; 2067 glEnable GL_BLEND;
2068 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1317 glEnable GL_TEXTURE_2D; 2069 glEnable GL_TEXTURE_2D;
1318 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2070 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1319 2071
1320 my $tex = $self->{state} ? $tex[1] : $tex[0]; 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;
1321 2079
1322 $tex->draw_quad (0, 0, $s, $s); 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;
1323 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;
1324 glDisable GL_TEXTURE_2D; 2100 glDisable GL_TEXTURE_2D;
1325 glDisable GL_BLEND;
1326} 2101}
1327 2102
1328############################################################################# 2103#############################################################################
1329 2104
2105package CFClient::UI::Gauge;
2106
2107our @ISA = CFClient::UI::VBox::;
2108
2109sub new {
2110 my ($class, %arg) = @_;
2111
2112 my $self = $class->SUPER::new (
2113 tooltip => $arg{type},
2114 can_hover => 1,
2115 can_events => 1,
2116 %arg,
2117 );
2118
2119 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999");
2120 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
2121 $self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999");
2122
2123 $self
2124}
2125
2126sub set_fontsize {
2127 my ($self, $fsize) = @_;
2128
2129 $self->{value}->set_fontsize ($fsize);
2130 $self->{max} ->set_fontsize ($fsize);
2131}
2132
2133sub set_max {
2134 my ($self, $max) = @_;
2135
2136 $self->{gauge}->set_max ($max);
2137 $self->{max}->set_text ($max);
2138}
2139
2140sub set_value {
2141 my ($self, $val, $max) = @_;
2142
2143 $self->set_max ($max)
2144 if defined $max;
2145
2146 $self->{gauge}->set_value ($val, $max);
2147 $self->{value}->set_text ($val);
2148}
2149
2150#############################################################################
2151
1330package CFClient::UI::Slider; 2152package CFClient::UI::Slider;
1331 2153
1332use strict; 2154use strict;
1333 2155
1334use SDL::OpenGL; 2156use CFClient::OpenGL;
1335 2157
1336our @ISA = CFClient::UI::DrawBG::; 2158our @ISA = CFClient::UI::DrawBG::;
1337 2159
1338my @tex = 2160my @tex =
1339 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 2161 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
1340 qw(s1_slider.png s1_slider_bg.png); 2162 qw(s1_slider.png s1_slider_bg.png);
1341 2163
1342sub new { 2164sub new {
1343 my $class = shift; 2165 my $class = shift;
1344 2166
1345 # range [value, low, high, page] 2167 # range [value, low, high, page, unit]
1346 2168
1347 # TODO: 0-width page 2169 # TODO: 0-width page
1348 # TODO: req_w/h are wrong with vertical 2170 # TODO: req_w/h are wrong with vertical
1349 # TODO: calculations are off 2171 # TODO: calculations are off
1350 my $self = $class->SUPER::new ( 2172 my $self = $class->SUPER::new (
1351 fg => [1, 1, 1], 2173 fg => [1, 1, 1],
1352 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],
1353 range => [0, 0, 100, 10], 2177 range => [0, 0, 100, 10, 0],
1354 req_w => 40, 2178 min_w => $::WIDTH / 80,
1355 req_h => 13, 2179 min_h => $::WIDTH / 80,
1356 vertical => 0, 2180 vertical => 0,
1357 can_hover => 1, 2181 can_hover => 1,
1358 inner_pad => 5, 2182 inner_pad => 0.02,
1359 @_ 2183 @_
1360 ); 2184 );
1361 2185
2186 $self->set_value ($self->{range}[0]);
2187 $self->update;
2188
1362 $self 2189 $self
1363} 2190}
1364 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
1365sub size_request { 2226sub size_request {
1366 my ($self) = @_; 2227 my ($self) = @_;
1367 2228
1368 my $w = $self->{req_w}; 2229 ($self->{req_w}, $self->{req_h})
1369 my $h = $self->{req_h};
1370
1371 $self->{vertical} ? ($h, $w) : ($w, $h)
1372} 2230}
1373 2231
1374sub button_down { 2232sub button_down {
1375 my ($self, $ev, $x, $y) = @_; 2233 my ($self, $ev, $x, $y) = @_;
1376 2234
1377 $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
1378 $self->mouse_motion ($ev, $x, $y); 2239 $self->mouse_motion ($ev, $x, $y);
1379} 2240}
1380 2241
1381sub mouse_motion { 2242sub mouse_motion {
1382 my ($self, $ev, $x, $y) = @_; 2243 my ($self, $ev, $x, $y) = @_;
1383 2244
1384 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
1385 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2262 my ($value, $lo, $hi, $page) = @{$self->{range}};
2263 my $range = ($hi - $page - $lo) || 1e-100;
1386 2264
1387 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2265 my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
1388 2266
1389 my $inner_pad_px = $self->_calc_inner_pad_px ($w); 2267 $self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
1390 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right 2268 $self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
1391 2269
1392 $x -= $inner_pad_px; # substract the padding 2270 $value = ($value - $lo) / $range;
1393 $x = $x * ($hi - $lo) / $inner_w + $lo; 2271 $value = $value * $self->{scale} + $self->{offset};
1394 $x = $lo if $x < $lo;
1395 $x = $hi - $page if $x > $hi - $page;
1396 $self->{range}[0] = $x;
1397 2272
1398 $self->emit (changed => $x); 2273 $self->{knob_x} = $value - $knob_w * 0.5;
1399 $self->update; 2274 $self->{knob_w} = $knob_w;
1400 } 2275 });
1401}
1402 2276
1403# the inner_* stuff is for generating a padding for the slider handle, 2277 $self->SUPER::update;
1404# so that the handle doesn't leave the texture. This calculation isn't 100%
1405# correct propably, but it does the job for now
1406sub _calc_inner_pad_px {
1407 my ($self, $w) = @_;
1408 ($w / 100) * $self->{inner_pad} # % to pixels
1409} 2278}
1410 2279
1411sub _draw { 2280sub _draw {
1412 my ($self) = @_; 2281 my ($self) = @_;
1413 2282
1414 $self->SUPER::_draw (); 2283 $self->SUPER::_draw ();
1415 2284
1416 my ($w, $h) = @$self{qw(w h)}; 2285 glScale $self->{w}, $self->{h};
1417 2286
1418 if ($self->{vertical}) { 2287 if ($self->{vertical}) {
1419 # draw a vertical slider like a rotated horizontal slider 2288 # draw a vertical slider like a rotated horizontal slider
1420 2289
2290 glTranslate 1, 0, 0;
1421 glRotate 90, 0, 0, 1; 2291 glRotate 90, 0, 0, 1;
1422 glTranslate 0, -$self->{w}, 0;
1423
1424 ($w, $h) = ($h, $w);
1425 } 2292 }
1426 2293
1427 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg}; 2294 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
1428 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg}; 2295 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
1429 2296
1430 my ($value, $lo, $hi, $page) = @{$self->{range}};
1431
1432 $hi = $value + 1 if $lo == $hi;
1433
1434 my $inner_pad_px = $self->_calc_inner_pad_px ($w);
1435 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
1436
1437 $page = int $page * $inner_w / ($hi - $lo);
1438 $value = int +($value - $lo) * $inner_w / ($hi - $lo);
1439
1440 $w -= $page;
1441 $page &= ~1;
1442 glTranslate $page * 0.5, 0, 0;
1443 $page ||= 2;
1444
1445 my $knob_a = $inner_pad_px + ($value - $page * 0.5);
1446 my $knob_b = $inner_pad_px + ($value + $page * 0.5);
1447
1448 glEnable GL_BLEND;
1449 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1450 glEnable GL_TEXTURE_2D; 2297 glEnable GL_TEXTURE_2D;
1451 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2298 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1452 2299
1453 # draw background 2300 # draw background
1454 $tex[1]->draw_quad (0, 0, $w, $h); 2301 $tex[1]->draw_quad_alpha (0, 0, 1, 1);
1455 2302
1456 # draw handle 2303 # draw handle
1457 $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);
1458 2305
1459 glDisable GL_BLEND;
1460 glDisable GL_TEXTURE_2D; 2306 glDisable GL_TEXTURE_2D;
1461} 2307}
1462 2308
1463############################################################################# 2309#############################################################################
1464 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
1465package CFClient::UI::TextView; 2352package CFClient::UI::TextView;
1466 2353
1467our @ISA = CFClient::UI::HBox::; 2354our @ISA = CFClient::UI::HBox::;
1468 2355
1469use SDL::OpenGL; 2356use CFClient::OpenGL;
1470 2357
1471sub new { 2358sub new {
1472 my $class = shift; 2359 my $class = shift;
1473 2360
1474 my $self = $class->SUPER::new ( 2361 my $self = $class->SUPER::new (
1475 req_w => $::WIDTH / 6, 2362 fontsize => 1,
1476 req_h => $::HEIGHT / 6, 2363 can_events => 0,
1477 fontsize => $::FONTSIZE, 2364 #font => default_font
1478 @_, 2365 @_,
1479 2366
1480 layout => (new CFClient::Layout), 2367 layout => (new CFClient::Layout 1),
1481 par => [], 2368 par => [],
1482 height => 0, 2369 height => 0,
1483 children => [ 2370 children => [
1484 (new CFClient::UI::Empty expand => 1), 2371 (new CFClient::UI::Empty expand => 1),
1485 (new CFClient::UI::Slider vertical => 1), 2372 (new CFClient::UI::Slider vertical => 1),
1486 ], 2373 ],
1487 ); 2374 );
1488 2375
1489 $self->{children}[1]->connect (changed => sub { 2376 $self->{children}[1]->connect (changed => sub { $self->update });
1490 $self->update;
1491 });
1492 2377
1493 $self 2378 $self
1494} 2379}
1495 2380
1496sub set_fontsize { 2381sub set_fontsize {
… …
1498 2383
1499 $self->{fontsize} = $fontsize; 2384 $self->{fontsize} = $fontsize;
1500 $self->reflow; 2385 $self->reflow;
1501} 2386}
1502 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
1503sub text_height { 2400sub text_size {
1504 my ($self, $text) = @_; 2401 my ($self, $text, $indent) = @_;
1505 2402
1506 my $layout = $self->{layout}; 2403 my $layout = $self->{layout};
1507 2404
1508 $layout->set_height ($self->{fontsize}); 2405 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
1509 $layout->set_width ($self->{w}); 2406 $layout->set_width ($self->{children}[0]{w} - $indent);
1510 $layout->set_text ($text); 2407 $layout->set_markup ($text);
1511 2408
1512 ($layout->size)[1] 2409 $layout->size
1513} 2410}
1514 2411
1515sub reflow { 2412sub reflow {
1516 my ($self) = @_; 2413 my ($self) = @_;
1517 2414
1518 $self->{need_reflow}++; 2415 $self->{need_reflow}++;
1519 $self->update; 2416 $self->update;
1520} 2417}
1521 2418
1522sub size_request { 2419sub set_offset {
1523 my ($self) = @_; 2420 my ($self, $offset) = @_;
1524 2421
1525 ($self->{req_w}, $self->{req_h}) 2422 # todo: base offset on lines or so, not on pixels
2423 $self->{children}[1]->set_value ($offset);
1526} 2424}
1527 2425
1528sub size_allocate { 2426sub clear {
1529 my ($self, $x, $y, $w, $h) = @_; 2427 my ($self) = @_;
1530 2428
1531 $self->SUPER::size_allocate ($x, $y, $w, $h); 2429 $self->{par} = [];
1532 2430 $self->{height} = 0;
1533 $self->{layout}->set_height ($self->{fontsize}); 2431 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
1534 $self->{layout}->set_width ($self->{w});
1535
1536 $self->reflow;
1537} 2432}
1538 2433
1539sub add_paragraph { 2434sub add_paragraph {
1540 my ($self, $color, $text) = @_; 2435 my ($self, $color, $text, $indent) = @_;
1541 2436
1542 #TODO: intelligently "reformat" paragraph 2437 for my $line (split /\n/, $text) {
1543 2438 my ($w, $h) = $self->text_size ($line);
1544 my $height = $self->text_height ($text);
1545
1546 $self->{height} += $height; 2439 $self->{height} += $h;
2440 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];
2441 }
1547 2442
1548 push @{$self->{par}}, [$height, $color, $text];
1549
1550 $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]);
1551 $self->{children}[1]->update;
1552} 2444}
1553 2445
1554sub update { 2446sub update {
1555 my ($self) = @_; 2447 my ($self) = @_;
1556 2448
… …
1558 2450
1559 return unless $self->{h} > 0; 2451 return unless $self->{h} > 0;
1560 2452
1561 delete $self->{texture}; 2453 delete $self->{texture};
1562 2454
1563 $TOPLEVEL->on_refresh ($self, sub { 2455 $ROOT->on_post_alloc ($self, sub {
2456 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2457
1564 if (delete $self->{need_reflow}) { 2458 if (delete $self->{need_reflow}) {
1565 my $height = 0; 2459 my $height = 0;
1566 2460
1567 $height += $_->[0] = $self->text_height ($_->[2]) 2461 my $layout = $self->{layout};
2462
2463 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2464
1568 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 }
1569 2476
1570 $self->{height} = $height; 2477 $self->{height} = $height;
1571 2478
1572 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2479 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
1573 2480
1574 delete $self->{texture}; 2481 delete $self->{texture};
1575 } 2482 }
1576 2483
1577 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 2484 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
1578 glClearColor 0, 0, 0, 1; 2485 glClearColor 0.5, 0.5, 0.5, 0;
1579 glClear GL_COLOR_BUFFER_BIT; 2486 glClear GL_COLOR_BUFFER_BIT;
1580 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
1581 glEnable GL_BLEND; 2499 glEnable GL_BLEND;
2500 #TODO# not correct in windows where rgba is forced off
1582 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2501 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1583 glEnable GL_TEXTURE_2D;
1584 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1585
1586 my $top = int $self->{children}[1]{range}[0];
1587
1588 my $y0 = $top;
1589 my $y1 = $top + $self->{h};
1590
1591 my $y = 0;
1592
1593 my $layout = $self->{layout};
1594 2502
1595 for my $par (@{$self->{par}}) { 2503 for my $par (@{$self->{par}}) {
1596 my $h = $par->[0]; 2504 my $h = $par->[1];
1597 2505
1598 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]);
1599 $layout->set_text ($par->[2]); 2509 $layout->set_markup ($par->[4]);
1600 2510
1601 glColor @{ $par->[1] }; 2511 my ($w, $h, $data, $format, $internalformat) = $layout->render;
1602 my ($W, $H) = $layout->size; 2512
1603 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;
1604 } 2515 }
1605 2516
1606 $y += $h; 2517 $y += $h;
1607 } 2518 }
1608 2519
1609 glDisable GL_TEXTURE_2D;
1610 glDisable GL_BLEND; 2520 glDisable GL_BLEND;
1611 }; 2521 };
1612 }); 2522 });
1613} 2523}
1614 2524
1615sub _draw { 2525sub _draw {
1616 my ($self) = @_; 2526 my ($self) = @_;
1617 2527
1618 if ($self->{texture}) {
1619 glEnable GL_TEXTURE_2D; 2528 glEnable GL_TEXTURE_2D;
1620 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;
1621 $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});
1622 glDisable GL_TEXTURE_2D; 2532 glDisable GL_TEXTURE_2D;
1623 }
1624 2533
1625 $self->{children}[1]->draw; 2534 $self->{children}[1]->draw;
1626 2535
1627} 2536}
1628 2537
1629############################################################################# 2538#############################################################################
1630 2539
1631package CFClient::UI::MapWidget;
1632
1633use strict;
1634
1635use List::Util qw(min max);
1636
1637use SDL;
1638use SDL::OpenGL;
1639
1640our @ISA = CFClient::UI::Base::;
1641
1642sub new {
1643 my $class = shift;
1644
1645 $class->SUPER::new (
1646 z => -1,
1647 can_focus => 1,
1648 list => (glGenLists 1),
1649 @_
1650 )
1651}
1652
1653sub key_down {
1654 print "MAPKEYDOWN\n";
1655}
1656
1657sub key_up {
1658}
1659
1660sub button_down {
1661 my ($self, $ev, $x, $y) = @_;
1662
1663 $self->focus_in;
1664
1665 if ($ev->button == 2) {
1666 my ($ox, $oy) = ($ev->button_x, $ev->button_y);
1667 my ($bw, $bh) = ($::CFG->{map_shift_x}, $::CFG->{map_shift_y});
1668
1669 $self->{motion} = sub {
1670 my ($ev, $x, $y) = @_;
1671
1672 ($x, $y) = ($ev->motion_x, $ev->motion_y);
1673
1674 $::CFG->{map_shift_x} = $bw + $x - $ox;
1675 $::CFG->{map_shift_y} = $bh + $y - $oy;
1676
1677 $self->update;
1678 };
1679 }
1680}
1681
1682sub button_up {
1683 my ($self, $ev, $x, $y) = @_;
1684
1685 delete $self->{motion};
1686}
1687
1688sub mouse_motion {
1689 my ($self, $ev, $x, $y) = @_;
1690
1691 $self->{motion}->($ev, $x, $y) if $self->{motion};
1692}
1693
1694sub size_request {
1695 (
1696 1 + 32 * int $::WIDTH / 32,
1697 1 + 32 * int $::HEIGHT / 32,
1698 )
1699}
1700
1701sub update {
1702 my ($self) = @_;
1703
1704 $self->{need_update} = 1;
1705 $self->SUPER::update;
1706}
1707
1708sub draw {
1709 my ($self) = @_;
1710
1711 if (delete $self->{need_update}) {
1712 glNewList $self->{list}, GL_COMPILE;
1713
1714 if ($::MAP) {
1715 my $sw = int $::WIDTH / 32;
1716 my $sh = int $::HEIGHT / 32;
1717
1718 my $sx = $::CFG->{map_shift_x};
1719 my $sy = $::CFG->{map_shift_y};
1720
1721 glTranslate +($sx & 31) - 32, ($sy & 31) - 32, 0;
1722
1723 my ($w, $h, $data) = $::MAP->draw ($sx >> 5, $sy >> 5, 0, 0, $sw + 1, $sh + 1);
1724
1725 if ($::CFG->{fow_enable}) {
1726 if ($::CFG->{fow_smooth}) { # smooth fog of war
1727 glConvolutionParameter GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER;
1728 glConvolutionFilter2D
1729 GL_CONVOLUTION_2D,
1730 GL_ALPHA,
1731 3, 3,
1732 GL_ALPHA, GL_FLOAT,
1733 pack "f*",
1734 0.1, 0.1, 0.1,
1735 0.1, 0.2, 0.1,
1736 0.1, 0.1, 0.1,
1737 ;
1738 glEnable GL_CONVOLUTION_2D;
1739 }
1740
1741 my $tex = new CFClient::Texture
1742 w => $w,
1743 h => $h,
1744 data => $data,
1745 internalformat => GL_ALPHA,
1746 format => GL_ALPHA;
1747
1748 glDisable GL_CONVOLUTION_2D if $::CFG->{fow_smooth};
1749
1750 glEnable GL_BLEND;
1751 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1752 glEnable GL_TEXTURE_2D;
1753 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1754
1755 glColor +($::CFG->{fow_intensity}) x 3, 1;
1756 $tex->draw_quad (0, 0, $w * 32, $h * 32);
1757
1758 glDisable GL_TEXTURE_2D;
1759 glDisable GL_BLEND;
1760 }
1761
1762 # HACK BEGIN
1763 {
1764 my ($w, $h) = (250, 250);
1765
1766 glEnable GL_BLEND;
1767 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1768 glEnable GL_TEXTURE_2D;
1769 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1770
1771 CFClient::Texture->new (
1772 w => $w,
1773 h => $h,
1774 data => $::MAP->mapmap ($w, $h),
1775 type => GL_UNSIGNED_INT_8_8_8_8_REV
1776 )->draw_quad (100, 100);
1777
1778 glDisable GL_TEXTURE_2D;
1779 glDisable GL_BLEND;
1780 }
1781 # HACK END
1782 }
1783
1784 glEndList;
1785 }
1786
1787 glPushMatrix;
1788 glCallList $self->{list};
1789 glPopMatrix;
1790
1791 if ($FOCUS != $self) {
1792 glColor 64/255, 64/255, 64/255;
1793 glLogicOp GL_AND;
1794 glEnable GL_COLOR_LOGIC_OP;
1795 glBegin GL_QUADS;
1796 glVertex 0, 0;
1797 glVertex 0, $::HEIGHT;
1798 glVertex $::WIDTH, $::HEIGHT;
1799 glVertex $::WIDTH, 0;
1800 glEnd;
1801 glDisable GL_COLOR_LOGIC_OP;
1802 }
1803}
1804
1805my %DIR = (
1806 SDLK_KP8, [1, "north"],
1807 SDLK_KP9, [2, "northeast"],
1808 SDLK_KP6, [3, "east"],
1809 SDLK_KP3, [4, "southeast"],
1810 SDLK_KP2, [5, "south"],
1811 SDLK_KP1, [6, "southwest"],
1812 SDLK_KP4, [7, "west"],
1813 SDLK_KP7, [8, "northwest"],
1814
1815 SDLK_UP, [1, "north"],
1816 SDLK_RIGHT, [3, "east"],
1817 SDLK_DOWN, [5, "south"],
1818 SDLK_LEFT, [7, "west"],
1819);
1820
1821sub key_down {
1822 my ($self, $ev) = @_;
1823
1824 my $mod = $ev->key_mod;
1825 my $sym = $ev->key_sym;
1826
1827 if ($sym == SDLK_KP5) {
1828 $::CONN->user_send ("command stay fire");
1829 } elsif ($sym == SDLK_a) {
1830 $::CONN->user_send ("command apply");
1831 } elsif ($sym == SDLK_QUOTE) {
1832 $self->emit ('activate_console');
1833 } elsif ($sym == SDLK_SLASH) {
1834 $self->emit ('activate_console' => '/');
1835 } elsif (exists $DIR{$sym}) {
1836 if ($mod & KMOD_SHIFT) {
1837 $self->{shft}++;
1838 $::CONN->user_send ("command fire $DIR{$sym}[0]");
1839 } elsif ($mod & KMOD_CTRL) {
1840 $self->{ctrl}++;
1841 $::CONN->user_send ("command run $DIR{$sym}[0]");
1842 } else {
1843 $::CONN->user_send ("command $DIR{$sym}[1]");
1844 }
1845 }
1846}
1847
1848sub key_up {
1849 my ($self, $ev) = @_;
1850
1851 my $mod = $ev->key_mod;
1852 my $sym = $ev->key_sym;
1853
1854 if (!($mod & KMOD_SHIFT) && delete $self->{shft}) {
1855 $::CONN->user_send ("command fire_stop");
1856 }
1857 if (!($mod & KMOD_CTRL ) && delete $self->{ctrl}) {
1858 $::CONN->user_send ("command run_stop");
1859 }
1860}
1861
1862#############################################################################
1863
1864package CFClient::UI::Animator; 2540package CFClient::UI::Animator;
1865 2541
1866use SDL::OpenGL; 2542use CFClient::OpenGL;
1867 2543
1868our @ISA = CFClient::UI::Bin::; 2544our @ISA = CFClient::UI::Bin::;
1869 2545
1870sub moveto { 2546sub moveto {
1871 my ($self, $x, $y) = @_; 2547 my ($self, $x, $y) = @_;
… …
1909 2585
1910sub new { 2586sub new {
1911 my $class = shift; 2587 my $class = shift;
1912 2588
1913 my $self = $class->SUPER::new ( 2589 my $self = $class->SUPER::new (
1914 state => 0, 2590 state => 0,
1915 connect_activate => \&toggle_flopper, 2591 on_activate => \&toggle_flopper,
1916 @_ 2592 @_
1917 ); 2593 );
1918 2594
1919 if ($self->{state}) {
1920 $self->{state} = 0;
1921 $self->toggle_flopper;
1922 }
1923
1924 $self 2595 $self
1925} 2596}
1926 2597
1927sub toggle_flopper { 2598sub toggle_flopper {
1928 my ($self) = @_; 2599 my ($self) = @_;
1929 2600
1930 # TODO: use animation 2601 $self->{other}->toggle_visibility;
1931 if ($self->{state} = !$self->{state}) { 2602}
1932 $CFClient::UI::TOPLEVEL->add ($self->{other}); 2603
1933 $self->{other}->move ( 2604#############################################################################
1934 ($::WIDTH - $self->{other}{w}) * 0.5, 2605
1935 ($::HEIGHT - $self->{other}{h}) * 0.5, 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 },
1936 ); 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
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};
1937 } else { 2981 } else {
1938 $CFClient::UI::TOPLEVEL->remove ($self->{other}); 2982 $self->{item}{$group} = {
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 };
1939 } 2992 }
2993
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;
1940} 3005}
1941 3006
1942############################################################################# 3007#############################################################################
1943 3008
1944package CFClient::UI::Toplevel; 3009package CFClient::UI::Root;
1945 3010
1946our @ISA = CFClient::UI::Container::; 3011our @ISA = CFClient::UI::Container::;
1947 3012
1948use SDL::OpenGL; 3013use CFClient::OpenGL;
3014
3015sub new {
3016 my $class = shift;
3017
3018 my $self = $class->SUPER::new (
3019 visible => 1,
3020 @_,
3021 );
3022
3023 Scalar::Util::weaken ($self->{root} = $self);
3024
3025 $self
3026}
1949 3027
1950sub size_request { 3028sub size_request {
1951 ($::WIDTH, $::HEIGHT) 3029 my ($self) = @_;
3030
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
1952} 3046}
1953 3047
1954sub size_allocate { 3048sub size_allocate {
1955 my ($self, $x, $y, $w, $h) = @_; 3049 my ($self, $w, $h) = @_;
1956 3050
1957 $self->_size_allocate ($x, $y, $w, $h); 3051 for my $child ($self->children) {
3052 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
1958 3053
1959 $_->size_allocate ($_->{x}, $_->{y}, $_->size_request) 3054 $X = $child->{force_x} if exists $child->{force_x};
1960 for @{$self->{children}}; 3055 $Y = $child->{force_y} if exists $child->{force_y};
1961}
1962 3056
1963sub translate { 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 {
1964 my ($self, $x, $y) = @_; 3065 my ($self, $x, $y) = @_;
1965 3066
1966 ($x, $y) 3067 ($x, $y)
1967} 3068}
1968 3069
3070sub coord2global {
3071 my ($self, $x, $y) = @_;
3072
3073 ($x, $y)
3074}
3075
1969sub update { 3076sub update {
1970 my ($self) = @_; 3077 my ($self) = @_;
1971 3078
1972 $self->size_allocate (0, 0, $::WIDTH, $::HEIGHT); 3079 $::WANT_REFRESH++;
1973 ::refresh ();
1974} 3080}
1975 3081
1976sub add { 3082sub add {
1977 my ($self, $widget) = @_; 3083 my ($self, @children) = @_;
1978 3084
3085 $_->{is_toplevel} = 1
3086 for @children;
3087
1979 $self->SUPER::add ($widget); 3088 $self->SUPER::add (@children);
3089}
1980 3090
1981 $widget->size_allocate ($widget->{x}, $widget->{y}, $widget->size_request); 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 }
1982} 3104}
1983 3105
1984sub on_refresh { 3106sub on_refresh {
1985 my ($self, $id, $cb) = @_; 3107 my ($self, $id, $cb) = @_;
1986 3108
1987 $self->{refresh_hook}{$id} = $cb; 3109 $self->{refresh_hook}{$id} = $cb;
1988} 3110}
1989 3111
3112sub on_post_alloc {
3113 my ($self, $id, $cb) = @_;
3114
3115 $self->{post_alloc_hook}{$id} = $cb;
3116}
3117
1990sub draw { 3118sub draw {
1991 my ($self) = @_; 3119 my ($self) = @_;
1992 3120
1993 while (my $rcb = delete $self->{refresh_hook}) { 3121 while ($self->{refresh_hook}) {
1994 $_->() for values %$rcb; 3122 $_->()
3123 for values %{delete $self->{refresh_hook}};
1995 } 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
1996 3199
1997 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3200 glViewport 0, 0, $::WIDTH, $::HEIGHT;
1998 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3201 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
1999 glClear GL_COLOR_BUFFER_BIT; 3202 glClear GL_COLOR_BUFFER_BIT;
2000 3203
2001 glMatrixMode GL_PROJECTION; 3204 glMatrixMode GL_PROJECTION;
2002 glLoadIdentity; 3205 glLoadIdentity;
2003 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000; 3206 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
2004 glMatrixMode GL_MODELVIEW; 3207 glMatrixMode GL_MODELVIEW;
2005 glLoadIdentity; 3208 glLoadIdentity;
2006 3209
2007 $self->_draw; 3210 $self->_draw;
2008} 3211}
2009 3212
2010############################################################################# 3213#############################################################################
2011 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
2012package CFClient::UI; 3392package CFClient::UI;
2013 3393
2014$TOPLEVEL = new CFClient::UI::Toplevel; 3394$ROOT = new CFClient::UI::Root;
3395$TOOLTIP = new CFClient::UI::Tooltip z => 900;
2015 3396
20161 33971
2017 3398

Diff Legend

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