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.150 by elmex, Sun Apr 23 00:08:29 2006 UTC vs.
Revision 1.272 by root, Sat Jun 3 01:47:14 2006 UTC

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

Diff Legend

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