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.272 by root, Sat Jun 3 01:47:14 2006 UTC vs.
Revision 1.360 by root, Fri Dec 8 22:25:32 2006 UTC

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

Diff Legend

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