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

Diff Legend

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