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

Diff Legend

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