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.277 by root, Sun Jun 4 00:21:52 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
… …
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);
1179 # HACK: the next line is required to enforce placement 1277 # HACK: the next line is required to enforce placement
1180 $self->{parent}->size_allocate ($self->{parent}{w}, $self->{parent}{h}); 1278 $self->{parent}->invoke_size_allocate ($self->{parent}{w}, $self->{parent}{h});
1181 }; 1279 };
1182 } else { 1280 } else {
1183 return 0; 1281 return 0;
1184 } 1282 }
1185 1283
1186 1 1284 1
1187} 1285}
1188 1286
1189sub button_up { 1287sub invoke_button_up {
1190 my ($self, $ev, $x, $y) = @_; 1288 my ($self, $ev, $x, $y) = @_;
1191 1289
1192 !!delete $self->{motion} 1290 ! ! delete $self->{motion}
1193} 1291}
1194 1292
1195sub mouse_motion { 1293sub invoke_mouse_motion {
1196 my ($self, $ev, $x, $y) = @_; 1294 my ($self, $ev, $x, $y) = @_;
1197 1295
1198 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1296 $self->{motion}->($ev, $x, $y) if $self->{motion};
1199 1297
1200 !!$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
1201} 1307}
1202 1308
1203sub _draw { 1309sub _draw {
1204 my ($self) = @_; 1310 my ($self) = @_;
1205 1311
… …
1231 1337
1232 glDisable GL_TEXTURE_2D; 1338 glDisable GL_TEXTURE_2D;
1233 1339
1234 $child->draw; 1340 $child->draw;
1235 1341
1236 if ($self->{title}) { 1342 if ($self->{title_widget}) {
1237 glTranslate 0, $border - $self->{h}; 1343 glTranslate 0, $border - $self->{h};
1238 $self->{title}->_draw; 1344 $self->{title_widget}->_draw;
1345
1346 glTranslate 0, - ($border - $self->{h});
1239 } 1347 }
1348
1349 $self->{close_button}->draw
1350 if $self->{close_button};
1240} 1351}
1241 1352
1242############################################################################# 1353#############################################################################
1243 1354
1244package CFClient::UI::Table; 1355package CFPlus::UI::Table;
1245 1356
1246our @ISA = CFClient::UI::Base::; 1357our @ISA = CFPlus::UI::Base::;
1247 1358
1248use List::Util qw(max sum); 1359use List::Util qw(max sum);
1249 1360
1250use CFClient::OpenGL; 1361use CFPlus::OpenGL;
1251 1362
1252sub new { 1363sub new {
1253 my $class = shift; 1364 my $class = shift;
1254 1365
1255 $class->SUPER::new ( 1366 $class->SUPER::new (
… …
1261sub children { 1372sub children {
1262 grep $_, map @$_, grep $_, @{ $_[0]{children} } 1373 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1263} 1374}
1264 1375
1265sub add { 1376sub add {
1266 my ($self, $x, $y, $child) = @_; 1377 my ($self) = shift;
1267 1378
1379 while (@_) {
1380 my ($x, $y, $child) = splice @_, 0, 3, ();
1268 $child->set_parent ($self); 1381 $child->set_parent ($self);
1269 $self->{children}[$y][$x] = $child; 1382 $self->{children}[$y][$x] = $child;
1383 }
1270 1384
1385 $self->{force_realloc} = 1;
1386 $self->{force_size_alloc} = 1;
1271 $self->realloc; 1387 $self->realloc;
1388}
1389
1390sub remove {
1391 my ($self, $child) = @_;
1392
1393 # TODO: not yet implemented
1272} 1394}
1273 1395
1274# 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?
1275sub clear { 1397sub clear {
1276 my ($self) = @_; 1398 my ($self) = @_;
… …
1317 (sum @$ws), 1439 (sum @$ws),
1318 (sum @$hs), 1440 (sum @$hs),
1319 ) 1441 )
1320} 1442}
1321 1443
1322sub size_allocate { 1444sub invoke_size_allocate {
1323 my ($self, $w, $h) = @_; 1445 my ($self, $w, $h) = @_;
1324 1446
1325 my ($ws, $hs) = $self->get_wh; 1447 my ($ws, $hs) = $self->get_wh;
1326 1448
1327 my $req_w = (sum @$ws) || 1; 1449 my $req_w = (sum @$ws) || 1;
… …
1334 1456
1335 # linearly scale sizes 1457 # linearly scale sizes
1336 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 1458 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1337 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs; 1459 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1338 1460
1339 CFClient::UI::harmonize $ws; 1461 CFPlus::UI::harmonize $ws;
1340 CFClient::UI::harmonize $hs; 1462 CFPlus::UI::harmonize $hs;
1341 1463
1342 my $y; 1464 my $y;
1343 1465
1344 for my $r (0 .. $#{$self->{children}}) { 1466 for my $r (0 .. $#{$self->{children}}) {
1345 my $row = $self->{children}[$r] 1467 my $row = $self->{children}[$r]
… …
1359 } 1481 }
1360 1482
1361 $y += $row_h; 1483 $y += $row_h;
1362 } 1484 }
1363 1485
1486 1
1364} 1487}
1365 1488
1366sub find_widget { 1489sub find_widget {
1367 my ($self, $x, $y) = @_; 1490 my ($self, $x, $y) = @_;
1368 1491
… …
1387 } 1510 }
1388} 1511}
1389 1512
1390############################################################################# 1513#############################################################################
1391 1514
1392package CFClient::UI::Box; 1515package CFPlus::UI::Box;
1393 1516
1394our @ISA = CFClient::UI::Container::; 1517our @ISA = CFPlus::UI::Container::;
1395 1518
1396sub size_request { 1519sub size_request {
1397 my ($self) = @_; 1520 my ($self) = @_;
1398 1521
1399 $self->{vertical} 1522 $self->{vertical}
… …
1405 (List::Util::sum map $_->{req_w}, @{$self->{children}}), 1528 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1406 (List::Util::max map $_->{req_h}, @{$self->{children}}), 1529 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1407 ) 1530 )
1408} 1531}
1409 1532
1410sub size_allocate { 1533sub invoke_size_allocate {
1411 my ($self, $w, $h) = @_; 1534 my ($self, $w, $h) = @_;
1412 1535
1413 my $space = $self->{vertical} ? $h : $w; 1536 my $space = $self->{vertical} ? $h : $w;
1414 my $children = $self->{children}; 1537 my @children = $self->visible_children;
1415 1538
1416 my @req; 1539 my @req;
1417 1540
1418 if ($self->{homogeneous}) { 1541 if ($self->{homogeneous}) {
1419 @req = ($space / (@$children || 1)) x @$children; 1542 @req = ($space / (@children || 1)) x @children;
1420 } else { 1543 } else {
1421 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children; 1544 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @children;
1422 my $req = List::Util::sum @req; 1545 my $req = List::Util::sum @req;
1423 1546
1424 if ($req > $space) { 1547 if ($req > $space) {
1425 # ah well, not enough space 1548 # ah well, not enough space
1426 $_ *= $space / $req for @req; 1549 $_ *= $space / $req for @req;
1427 } else { 1550 } else {
1428 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1; 1551 my $expand = (List::Util::sum map $_->{expand}, @children) || 1;
1429 1552
1430 $space = ($space - $req) / $expand; # remaining space to give away 1553 $space = ($space - $req) / $expand; # remaining space to give away
1431 1554
1432 $req[$_] += $space * $children->[$_]{expand} 1555 $req[$_] += $space * $children[$_]{expand}
1433 for 0 .. $#$children; 1556 for 0 .. $#children;
1434 } 1557 }
1435 } 1558 }
1436 1559
1437 CFClient::UI::harmonize \@req; 1560 CFPlus::UI::harmonize \@req;
1438 1561
1439 my $pos = 0; 1562 my $pos = 0;
1440 for (0 .. $#$children) { 1563 for (0 .. $#children) {
1441 my $alloc = $req[$_]; 1564 my $alloc = $req[$_];
1442 $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));
1443 1566
1444 $pos += $alloc; 1567 $pos += $alloc;
1445 } 1568 }
1446 1569
1447 1 1570 1
1448} 1571}
1449 1572
1450############################################################################# 1573#############################################################################
1451 1574
1452package CFClient::UI::HBox; 1575package CFPlus::UI::HBox;
1453 1576
1454our @ISA = CFClient::UI::Box::; 1577our @ISA = CFPlus::UI::Box::;
1455 1578
1456sub new { 1579sub new {
1457 my $class = shift; 1580 my $class = shift;
1458 1581
1459 $class->SUPER::new ( 1582 $class->SUPER::new (
… …
1462 ) 1585 )
1463} 1586}
1464 1587
1465############################################################################# 1588#############################################################################
1466 1589
1467package CFClient::UI::VBox; 1590package CFPlus::UI::VBox;
1468 1591
1469our @ISA = CFClient::UI::Box::; 1592our @ISA = CFPlus::UI::Box::;
1470 1593
1471sub new { 1594sub new {
1472 my $class = shift; 1595 my $class = shift;
1473 1596
1474 $class->SUPER::new ( 1597 $class->SUPER::new (
… …
1477 ) 1600 )
1478} 1601}
1479 1602
1480############################################################################# 1603#############################################################################
1481 1604
1482package CFClient::UI::Label; 1605package CFPlus::UI::Label;
1483 1606
1484our @ISA = CFClient::UI::DrawBG::; 1607our @ISA = CFPlus::UI::DrawBG::;
1485 1608
1486use CFClient::OpenGL; 1609use CFPlus::OpenGL;
1487 1610
1488sub new { 1611sub new {
1489 my ($class, %arg) = @_; 1612 my ($class, %arg) = @_;
1490 1613
1491 my $self = $class->SUPER::new ( 1614 my $self = $class->SUPER::new (
… …
1495 #font => default_font 1618 #font => default_font
1496 #text => initial text 1619 #text => initial text
1497 #markup => initial narkup 1620 #markup => initial narkup
1498 #max_w => maximum pixel width 1621 #max_w => maximum pixel width
1499 ellipsise => 3, # end 1622 ellipsise => 3, # end
1500 layout => (new CFClient::Layout), 1623 layout => (new CFPlus::Layout),
1501 fontsize => 1, 1624 fontsize => 1,
1502 align => -1, 1625 align => -1,
1503 valign => -1, 1626 valign => -1,
1504 padding_x => 2, 1627 padding_x => 2,
1505 padding_y => 2, 1628 padding_y => 2,
1506 can_events => 0, 1629 can_events => 0,
1507 %arg 1630 %arg
1508 ); 1631 );
1509 1632
1510 if (exists $self->{template}) { 1633 if (exists $self->{template}) {
1511 my $layout = new CFClient::Layout; 1634 my $layout = new CFPlus::Layout;
1512 $layout->set_text (delete $self->{template}); 1635 $layout->set_text (delete $self->{template});
1513 $self->{template} = $layout; 1636 $self->{template} = $layout;
1514 } 1637 }
1515 1638
1516 if (exists $self->{markup}) { 1639 if (exists $self->{markup}) {
… …
1520 } 1643 }
1521 1644
1522 $self 1645 $self
1523} 1646}
1524 1647
1525sub escape($) {
1526 local $_ = $_[0];
1527
1528 s/&/&amp;/g;
1529 s/>/&gt;/g;
1530 s/</&lt;/g;
1531
1532 $_
1533}
1534
1535sub update { 1648sub update {
1536 my ($self) = @_; 1649 my ($self) = @_;
1537 1650
1538 delete $self->{texture}; 1651 delete $self->{texture};
1539 $self->SUPER::update; 1652 $self->SUPER::update;
1540} 1653}
1541 1654
1655sub realloc {
1656 my ($self) = @_;
1657
1658 delete $self->{ox};
1659 $self->SUPER::realloc;
1660}
1661
1542sub set_text { 1662sub set_text {
1543 my ($self, $text) = @_; 1663 my ($self, $text) = @_;
1544 1664
1545 return if $self->{text} eq "T$text"; 1665 return if $self->{text} eq "T$text";
1546 $self->{text} = "T$text"; 1666 $self->{text} = "T$text";
1547 1667
1548 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1549 $self->{layout}->set_text ($text); 1668 $self->{layout}->set_text ($text);
1550 1669
1670 delete $self->{size_req};
1551 $self->realloc; 1671 $self->realloc;
1552 $self->update; 1672 $self->update;
1553} 1673}
1554 1674
1555sub set_markup { 1675sub set_markup {
… …
1558 return if $self->{text} eq "M$markup"; 1678 return if $self->{text} eq "M$markup";
1559 $self->{text} = "M$markup"; 1679 $self->{text} = "M$markup";
1560 1680
1561 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1681 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1562 1682
1563 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1564 $self->{layout}->set_markup ($markup); 1683 $self->{layout}->set_markup ($markup);
1565 1684
1685 delete $self->{size_req};
1566 $self->realloc; 1686 $self->realloc;
1567 $self->update; 1687 $self->update;
1568} 1688}
1569 1689
1570sub size_request { 1690sub size_request {
1571 my ($self) = @_; 1691 my ($self) = @_;
1572 1692
1693 $self->{size_req} ||= do {
1573 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1694 $self->{layout}->set_font ($self->{font}) if $self->{font};
1574 $self->{layout}->set_width ($self->{max_w} || -1); 1695 $self->{layout}->set_width ($self->{max_w} || -1);
1575 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1696 $self->{layout}->set_ellipsise ($self->{ellipsise});
1576 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1697 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1577 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1698 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1578 1699
1579 my ($w, $h) = $self->{layout}->size; 1700 my ($w, $h) = $self->{layout}->size;
1580 1701
1581 if (exists $self->{template}) { 1702 if (exists $self->{template}) {
1582 $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);
1583 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1705 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1584 1706
1585 my ($w2, $h2) = $self->{template}->size; 1707 my ($w2, $h2) = $self->{template}->size;
1586 1708
1587 $w = List::Util::max $w, $w2; 1709 $w = List::Util::max $w, $w2;
1588 $h = List::Util::max $h, $h2; 1710 $h = List::Util::max $h, $h2;
1711 }
1712
1713 [$w, $h]
1589 } 1714 };
1590 1715
1591 ($w, $h) 1716 @{ $self->{size_req} }
1592} 1717}
1593 1718
1719sub baseline_shift {
1720 $_[0]{layout}->descent
1721}
1722
1594sub size_allocate { 1723sub invoke_size_allocate {
1595 my ($self, $w, $h) = @_; 1724 my ($self, $w, $h) = @_;
1596 1725
1597 delete $self->{ox}; 1726 delete $self->{ox};
1598 1727
1599 delete $self->{texture} 1728 delete $self->{texture}
1600 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
1601} 1732}
1602 1733
1603sub set_fontsize { 1734sub set_fontsize {
1604 my ($self, $fontsize) = @_; 1735 my ($self, $fontsize) = @_;
1605 1736
1606 $self->{fontsize} = $fontsize; 1737 $self->{fontsize} = $fontsize;
1738 delete $self->{size_req};
1607 delete $self->{texture}; 1739 delete $self->{texture};
1608 1740
1609 $self->realloc; 1741 $self->realloc;
1610} 1742}
1611 1743
1744sub reconfigure {
1745 my ($self) = @_;
1746
1747 delete $self->{size_req};
1748 delete $self->{texture};
1749
1750 $self->SUPER::reconfigure;
1751}
1752
1612sub _draw { 1753sub _draw {
1613 my ($self) = @_; 1754 my ($self) = @_;
1614 1755
1615 $self->SUPER::_draw; # draw background, if applicable 1756 $self->SUPER::_draw; # draw background, if applicable
1616 1757
1617 my $tex = $self->{texture} ||= do { 1758 my $size = $self->{texture} ||= do {
1618 $self->{layout}->set_foreground (@{$self->{fg}}); 1759 $self->{layout}->set_foreground (@{$self->{fg}});
1619 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1760 $self->{layout}->set_font ($self->{font}) if $self->{font};
1620 $self->{layout}->set_width ($self->{w}); 1761 $self->{layout}->set_width ($self->{w});
1621 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1762 $self->{layout}->set_ellipsise ($self->{ellipsise});
1622 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1763 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1623 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1764 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1624 1765
1625 new_from_layout CFClient::Texture $self->{layout} 1766 [$self->{layout}->size]
1626 }; 1767 };
1627 1768
1628 unless (exists $self->{ox}) { 1769 unless (exists $self->{ox}) {
1629 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x} 1770 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1630 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x} 1771 : $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
1631 : ($self->{w} - $tex->{w}) * 0.5); 1772 : ($self->{w} - $size->[0]) * 0.5);
1632 1773
1633 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 1774 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1634 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y} 1775 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1635 : ($self->{h} - $tex->{h}) * 0.5); 1776 : ($self->{h} - $size->[1]) * 0.5);
1636 }; 1777 };
1637 1778
1638 glEnable GL_TEXTURE_2D; 1779 my $w = List::Util::min $self->{w} + 4, $size->[0];
1639 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1780 my $h = List::Util::min $self->{h} + 2, $size->[1];
1640 1781
1641 if ($tex->{format} == GL_ALPHA) { 1782 $self->{layout}->render ($self->{ox}, $self->{oy});
1642 glColor @{$self->{fg}};
1643 $tex->draw_quad_alpha ($self->{ox}, $self->{oy});
1644 } else {
1645 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1646 }
1647
1648 glDisable GL_TEXTURE_2D;
1649} 1783}
1650 1784
1651############################################################################# 1785#############################################################################
1652 1786
1653package CFClient::UI::EntryBase; 1787package CFPlus::UI::EntryBase;
1654 1788
1655our @ISA = CFClient::UI::Label::; 1789our @ISA = CFPlus::UI::Label::;
1656 1790
1657use CFClient::OpenGL; 1791use CFPlus::OpenGL;
1658 1792
1659sub new { 1793sub new {
1660 my $class = shift; 1794 my $class = shift;
1661 1795
1662 $class->SUPER::new ( 1796 $class->SUPER::new (
… …
1667 can_hover => 1, 1801 can_hover => 1,
1668 can_focus => 1, 1802 can_focus => 1,
1669 valign => 0, 1803 valign => 0,
1670 can_events => 1, 1804 can_events => 1,
1671 #text => ... 1805 #text => ...
1806 #hidden => "*",
1672 @_ 1807 @_
1673 ) 1808 )
1674} 1809}
1675 1810
1676sub _set_text { 1811sub _set_text {
… …
1683 $self->{last_activity} = $::NOW; 1818 $self->{last_activity} = $::NOW;
1684 $self->{text} = $text; 1819 $self->{text} = $text;
1685 1820
1686 $text =~ s/./*/g if $self->{hidden}; 1821 $text =~ s/./*/g if $self->{hidden};
1687 $self->{layout}->set_text ("$text "); 1822 $self->{layout}->set_text ("$text ");
1823 delete $self->{size_req};
1688 1824
1689 $self->_emit (changed => $self->{text}); 1825 $self->emit (changed => $self->{text});
1826
1827 $self->realloc;
1690 $self->update; 1828 $self->update;
1691} 1829}
1692 1830
1693sub set_text { 1831sub set_text {
1694 my ($self, $text) = @_; 1832 my ($self, $text) = @_;
1695 1833
1696 $self->{cursor} = length $text; 1834 $self->{cursor} = length $text;
1697 $self->_set_text ($text); 1835 $self->_set_text ($text);
1698
1699 $self->realloc;
1700} 1836}
1701 1837
1702sub get_text { 1838sub get_text {
1703 $_[0]{text} 1839 $_[0]{text}
1704} 1840}
… …
1709 my ($w, $h) = $self->SUPER::size_request; 1845 my ($w, $h) = $self->SUPER::size_request;
1710 1846
1711 ($w + 1, $h) # add 1 for cursor 1847 ($w + 1, $h) # add 1 for cursor
1712} 1848}
1713 1849
1714sub key_down { 1850sub invoke_key_down {
1715 my ($self, $ev) = @_; 1851 my ($self, $ev) = @_;
1716 1852
1717 my $mod = $ev->{mod}; 1853 my $mod = $ev->{mod};
1718 my $sym = $ev->{sym}; 1854 my $sym = $ev->{sym};
1719 my $uni = $ev->{unicode}; 1855 my $uni = $ev->{unicode};
… …
1722 1858
1723 if ($uni == 8) { 1859 if ($uni == 8) {
1724 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 1860 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1725 } elsif ($uni == 127) { 1861 } elsif ($uni == 127) {
1726 substr $text, $self->{cursor}, 1, ""; 1862 substr $text, $self->{cursor}, 1, "";
1727 } elsif ($sym == CFClient::SDLK_LEFT) { 1863 } elsif ($sym == CFPlus::SDLK_LEFT) {
1728 --$self->{cursor} if $self->{cursor}; 1864 --$self->{cursor} if $self->{cursor};
1729 } elsif ($sym == CFClient::SDLK_RIGHT) { 1865 } elsif ($sym == CFPlus::SDLK_RIGHT) {
1730 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1866 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1731 } elsif ($sym == CFClient::SDLK_HOME) { 1867 } elsif ($sym == CFPlus::SDLK_HOME) {
1732 $self->{cursor} = 0; 1868 $self->{cursor} = 0;
1733 } elsif ($sym == CFClient::SDLK_END) { 1869 } elsif ($sym == CFPlus::SDLK_END) {
1734 $self->{cursor} = length $text; 1870 $self->{cursor} = length $text;
1735 } elsif ($uni == 27) { 1871 } elsif ($uni == 27) {
1736 $self->_emit ('escape'); 1872 $self->emit ('escape');
1737 } elsif ($uni) { 1873 } elsif ($uni) {
1738 substr $text, $self->{cursor}++, 0, chr $uni; 1874 substr $text, $self->{cursor}++, 0, chr $uni;
1739 } else { 1875 } else {
1740 return 0; 1876 return 0;
1741 } 1877 }
… …
1745 $self->realloc; 1881 $self->realloc;
1746 1882
1747 1 1883 1
1748} 1884}
1749 1885
1750sub focus_in { 1886sub invoke_focus_in {
1751 my ($self) = @_; 1887 my ($self) = @_;
1752 1888
1753 $self->{last_activity} = $::NOW; 1889 $self->{last_activity} = $::NOW;
1754 1890
1755 $self->SUPER::focus_in; 1891 $self->SUPER::invoke_focus_in
1756} 1892}
1757 1893
1758sub button_down { 1894sub invoke_button_down {
1759 my ($self, $ev, $x, $y) = @_; 1895 my ($self, $ev, $x, $y) = @_;
1760 1896
1761 $self->SUPER::button_down ($ev, $x, $y); 1897 $self->SUPER::invoke_button_down ($ev, $x, $y);
1762 1898
1763 my $idx = $self->{layout}->xy_to_index ($x, $y); 1899 my $idx = $self->{layout}->xy_to_index ($x, $y);
1764 1900
1765 # byte-index to char-index 1901 # byte-index to char-index
1766 my $text = $self->{text}; 1902 my $text = $self->{text};
1767 utf8::encode $text; 1903 utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1768 $self->{cursor} = length substr $text, 0, $idx; 1904 $self->{cursor} = length $text;
1769 1905
1770 $self->_set_text ($self->{text}); 1906 $self->_set_text ($self->{text});
1771 $self->update; 1907 $self->update;
1772 1908
1773 1 1909 1
1774} 1910}
1775 1911
1776sub mouse_motion { 1912sub invoke_mouse_motion {
1777 my ($self, $ev, $x, $y) = @_; 1913 my ($self, $ev, $x, $y) = @_;
1778# 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#
1779 1915
1780 0 1916 1
1781} 1917}
1782 1918
1783sub _draw { 1919sub _draw {
1784 my ($self) = @_; 1920 my ($self) = @_;
1785 1921
1786 local $self->{fg} = $self->{fg}; 1922 local $self->{fg} = $self->{fg};
1787 1923
1788 if ($FOCUS == $self) { 1924 if ($FOCUS == $self) {
1789 glColor @{$self->{active_bg}}; 1925 glColor_premultiply @{$self->{active_bg}};
1790 $self->{fg} = $self->{active_fg}; 1926 $self->{fg} = $self->{active_fg};
1791 } else { 1927 } else {
1792 glColor @{$self->{bg}}; 1928 glColor_premultiply @{$self->{bg}};
1793 } 1929 }
1794 1930
1795 glEnable GL_BLEND; 1931 glEnable GL_BLEND;
1796 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1932 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1797 glBegin GL_QUADS; 1933 glBegin GL_QUADS;
1798 glVertex 0 , 0; 1934 glVertex 0 , 0;
1799 glVertex 0 , $self->{h}; 1935 glVertex 0 , $self->{h};
1800 glVertex $self->{w}, $self->{h}; 1936 glVertex $self->{w}, $self->{h};
1801 glVertex $self->{w}, 0; 1937 glVertex $self->{w}, 0;
… …
1820 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};
1821 glEnd; 1957 glEnd;
1822 } 1958 }
1823} 1959}
1824 1960
1825package CFClient::UI::Entry; 1961package CFPlus::UI::Entry;
1826 1962
1827our @ISA = CFClient::UI::EntryBase::; 1963our @ISA = CFPlus::UI::EntryBase::;
1828 1964
1829use CFClient::OpenGL; 1965use CFPlus::OpenGL;
1830 1966
1831sub key_down { 1967sub invoke_key_down {
1832 my ($self, $ev) = @_; 1968 my ($self, $ev) = @_;
1833 1969
1834 my $sym = $ev->{sym}; 1970 my $sym = $ev->{sym};
1835 1971
1836 if ($sym == 13) { 1972 if ($sym == 13) {
1837 unshift @{$self->{history}}, 1973 unshift @{$self->{history}},
1838 my $txt = $self->get_text; 1974 my $txt = $self->get_text;
1975
1839 $self->{history_pointer} = -1; 1976 $self->{history_pointer} = -1;
1840 $self->{history_saveback} = ''; 1977 $self->{history_saveback} = '';
1841 $self->_emit (activate => $txt); 1978 $self->emit (activate => $txt);
1842 $self->update; 1979 $self->update;
1843 1980
1844 } elsif ($sym == CFClient::SDLK_UP) { 1981 } elsif ($sym == CFPlus::SDLK_UP) {
1845 if ($self->{history_pointer} < 0) { 1982 if ($self->{history_pointer} < 0) {
1846 $self->{history_saveback} = $self->get_text; 1983 $self->{history_saveback} = $self->get_text;
1847 } 1984 }
1848 if (@{$self->{history} || []} > 0) { 1985 if (@{$self->{history} || []} > 0) {
1849 $self->{history_pointer}++; 1986 $self->{history_pointer}++;
… …
1851 $self->{history_pointer} = @{$self->{history} || []} - 1; 1988 $self->{history_pointer} = @{$self->{history} || []} - 1;
1852 } 1989 }
1853 $self->set_text ($self->{history}->[$self->{history_pointer}]); 1990 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1854 } 1991 }
1855 1992
1856 } elsif ($sym == CFClient::SDLK_DOWN) { 1993 } elsif ($sym == CFPlus::SDLK_DOWN) {
1857 $self->{history_pointer}--; 1994 $self->{history_pointer}--;
1858 $self->{history_pointer} = -1 if $self->{history_pointer} < 0; 1995 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1859 1996
1860 if ($self->{history_pointer} >= 0) { 1997 if ($self->{history_pointer} >= 0) {
1861 $self->set_text ($self->{history}->[$self->{history_pointer}]); 1998 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1862 } else { 1999 } else {
1863 $self->set_text ($self->{history_saveback}); 2000 $self->set_text ($self->{history_saveback});
1864 } 2001 }
1865 2002
1866 } else { 2003 } else {
1867 return $self->SUPER::key_down ($ev) 2004 return $self->SUPER::invoke_key_down ($ev)
1868 } 2005 }
1869 2006
1870 1 2007 1
1871} 2008}
1872 2009
1873############################################################################# 2010#############################################################################
1874 2011
1875package CFClient::UI::Button; 2012package CFPlus::UI::Button;
1876 2013
1877our @ISA = CFClient::UI::Label::; 2014our @ISA = CFPlus::UI::Label::;
1878 2015
1879use CFClient::OpenGL; 2016use CFPlus::OpenGL;
1880 2017
1881my @tex = 2018my @tex =
1882 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2019 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1883 qw(b1_button_active.png); 2020 qw(b1_button_active.png);
1884 2021
1885sub new { 2022sub new {
1886 my $class = shift; 2023 my $class = shift;
1887 2024
… …
1896 can_events => 1, 2033 can_events => 1,
1897 @_ 2034 @_
1898 ) 2035 )
1899} 2036}
1900 2037
1901sub activate { }
1902
1903sub button_up { 2038sub invoke_button_up {
1904 my ($self, $ev, $x, $y) = @_; 2039 my ($self, $ev, $x, $y) = @_;
1905 2040
1906 $self->emit ("activate") 2041 $self->emit ("activate")
1907 if $x >= 0 && $x < $self->{w} 2042 if $x >= 0 && $x < $self->{w}
1908 && $y >= 0 && $y < $self->{h}; 2043 && $y >= 0 && $y < $self->{h};
… …
1911} 2046}
1912 2047
1913sub _draw { 2048sub _draw {
1914 my ($self) = @_; 2049 my ($self) = @_;
1915 2050
1916 local $self->{fg} = $self->{fg}; 2051 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1917
1918 if ($GRAB == $self) {
1919 $self->{fg} = $self->{active_fg};
1920 }
1921 2052
1922 glEnable GL_TEXTURE_2D; 2053 glEnable GL_TEXTURE_2D;
1923 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2054 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1924 glColor 0, 0, 0, 1; 2055 glColor 0, 0, 0, 1;
1925 2056
… …
1930 $self->SUPER::_draw; 2061 $self->SUPER::_draw;
1931} 2062}
1932 2063
1933############################################################################# 2064#############################################################################
1934 2065
1935package CFClient::UI::CheckBox; 2066package CFPlus::UI::CheckBox;
1936 2067
1937our @ISA = CFClient::UI::DrawBG::; 2068our @ISA = CFPlus::UI::DrawBG::;
1938 2069
1939my @tex = 2070my @tex =
1940 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2071 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1941 qw(c1_checkbox_bg.png c1_checkbox_active.png); 2072 qw(c1_checkbox_bg.png c1_checkbox_active.png);
1942 2073
1943use CFClient::OpenGL; 2074use CFPlus::OpenGL;
1944 2075
1945sub new { 2076sub new {
1946 my $class = shift; 2077 my $class = shift;
1947 2078
1948 $class->SUPER::new ( 2079 $class->SUPER::new (
… …
1962 my ($self) = @_; 2093 my ($self) = @_;
1963 2094
1964 (6) x 2 2095 (6) x 2
1965} 2096}
1966 2097
2098sub toggle {
2099 my ($self) = @_;
2100
2101 $self->{state} = !$self->{state};
2102 $self->emit (changed => $self->{state});
2103 $self->update;
2104}
2105
1967sub button_down { 2106sub invoke_button_down {
1968 my ($self, $ev, $x, $y) = @_; 2107 my ($self, $ev, $x, $y) = @_;
1969 2108
1970 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x} 2109 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1971 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) { 2110 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1972 $self->{state} = !$self->{state}; 2111 $self->toggle;
1973 $self->_emit (changed => $self->{state});
1974 } else { 2112 } else {
1975 return 0 2113 return 0
1976 } 2114 }
1977 2115
1978 1 2116 1
… …
1998 glDisable GL_TEXTURE_2D; 2136 glDisable GL_TEXTURE_2D;
1999} 2137}
2000 2138
2001############################################################################# 2139#############################################################################
2002 2140
2003package CFClient::UI::Image; 2141package CFPlus::UI::Image;
2004 2142
2005our @ISA = CFClient::UI::Base::; 2143our @ISA = CFPlus::UI::Base::;
2006 2144
2007use CFClient::OpenGL; 2145use CFPlus::OpenGL;
2008use Carp qw/confess/;
2009 2146
2010our %loaded_images; 2147our %texture_cache;
2011 2148
2012sub new { 2149sub new {
2013 my $class = shift; 2150 my $class = shift;
2014 2151
2015 my $self = $class->SUPER::new (can_events => 0, @_); 2152 my $self = $class->SUPER::new (
2153 can_events => 0,
2154 @_,
2155 );
2016 2156
2017 $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";
2018 2159
2019 $loaded_images{$self->{image}} ||= 2160 $self->{tex} ||= $texture_cache{$self->{path}} ||=
2020 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;
2021 2162
2022 my $tex = $self->{tex} = $loaded_images{$self->{image}}; 2163 Scalar::Util::weaken $texture_cache{$self->{path}};
2023 2164
2024 Scalar::Util::weaken $loaded_images{$self->{image}}; 2165 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2025
2026 $self->{aspect} = $tex->{w} / $tex->{h};
2027 2166
2028 $self 2167 $self
2029} 2168}
2030 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
2031sub size_request { 2185sub size_request {
2032 my ($self) = @_; 2186 my ($self) = @_;
2033 2187
2034 ($self->{tex}->{w}, $self->{tex}->{h}) 2188 ($self->{tex}{w}, $self->{tex}{h})
2035} 2189}
2036 2190
2037sub _draw { 2191sub _draw {
2038 my ($self) = @_; 2192 my ($self) = @_;
2039 2193
… …
2049 } 2203 }
2050 2204
2051 glEnable GL_TEXTURE_2D; 2205 glEnable GL_TEXTURE_2D;
2052 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2206 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2053 2207
2054 $tex->draw_quad_alpha (0, 0, $w, $h); 2208 $tex->draw_quad (0, 0, $w, $h);
2055 2209
2056 glDisable GL_TEXTURE_2D; 2210 glDisable GL_TEXTURE_2D;
2057} 2211}
2058 2212
2059############################################################################# 2213#############################################################################
2060 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
2061package CFClient::UI::VGauge; 2251package CFPlus::UI::VGauge;
2062 2252
2063our @ISA = CFClient::UI::Base::; 2253our @ISA = CFPlus::UI::Base::;
2064 2254
2065use List::Util qw(min max); 2255use List::Util qw(min max);
2066 2256
2067use CFClient::OpenGL; 2257use CFPlus::OpenGL;
2068 2258
2069my %tex = ( 2259my %tex = (
2070 food => [ 2260 food => [
2071 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2261 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2072 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ 2262 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2073 ], 2263 ],
2074 grace => [ 2264 grace => [
2075 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2265 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2076 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/
2077 ], 2267 ],
2078 hp => [ 2268 hp => [
2079 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2269 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2080 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/ 2270 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2081 ], 2271 ],
2082 mana => [ 2272 mana => [
2083 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2273 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2084 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/
2085 ], 2275 ],
2086); 2276);
2087 2277
2088# eg. VGauge->new (gauge => 'food'), default gauge: food 2278# eg. VGauge->new (gauge => 'food'), default gauge: food
… …
2148 my $ycut1 = max 0, min 1, $ycut; 2338 my $ycut1 = max 0, min 1, $ycut;
2149 my $ycut2 = max 0, min 1, $ycut - 1; 2339 my $ycut2 = max 0, min 1, $ycut - 1;
2150 2340
2151 my $h1 = $self->{h} * (1 - $ycut1); 2341 my $h1 = $self->{h} * (1 - $ycut1);
2152 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);
2153 2346
2154 glEnable GL_BLEND; 2347 glEnable GL_BLEND;
2155 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;
2156 glEnable GL_TEXTURE_2D; 2350 glEnable GL_TEXTURE_2D;
2157 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2351 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2158 2352
2159 glBindTexture GL_TEXTURE_2D, $t1->{name}; 2353 glBindTexture GL_TEXTURE_2D, $t1->{name};
2160 glBegin GL_QUADS; 2354 glBegin GL_QUADS;
… …
2175 2369
2176 if ($t3) { 2370 if ($t3) {
2177 glBindTexture GL_TEXTURE_2D, $t3->{name}; 2371 glBindTexture GL_TEXTURE_2D, $t3->{name};
2178 glBegin GL_QUADS; 2372 glBegin GL_QUADS;
2179 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2; 2373 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2180 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h}; 2374 glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2181 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h}; 2375 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2182 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2; 2376 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2183 glEnd; 2377 glEnd;
2184 } 2378 }
2185 2379
2186 glDisable GL_BLEND; 2380 glDisable GL_BLEND;
2187 glDisable GL_TEXTURE_2D; 2381 glDisable GL_TEXTURE_2D;
2188} 2382}
2189 2383
2190############################################################################# 2384#############################################################################
2191 2385
2192package CFClient::UI::Gauge; 2386package CFPlus::UI::Gauge;
2193 2387
2194our @ISA = CFClient::UI::VBox::; 2388our @ISA = CFPlus::UI::VBox::;
2195 2389
2196sub new { 2390sub new {
2197 my ($class, %arg) = @_; 2391 my ($class, %arg) = @_;
2198 2392
2199 my $self = $class->SUPER::new ( 2393 my $self = $class->SUPER::new (
… …
2201 can_hover => 1, 2395 can_hover => 1,
2202 can_events => 1, 2396 can_events => 1,
2203 %arg, 2397 %arg,
2204 ); 2398 );
2205 2399
2206 $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");
2207 $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);
2208 $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");
2209 2403
2210 $self 2404 $self
2211} 2405}
2212 2406
2213sub set_fontsize { 2407sub set_fontsize {
… …
2234 $self->{value}->set_text ($val); 2428 $self->{value}->set_text ($val);
2235} 2429}
2236 2430
2237############################################################################# 2431#############################################################################
2238 2432
2239package CFClient::UI::Slider; 2433package CFPlus::UI::Slider;
2240 2434
2241use strict; 2435use strict;
2242 2436
2243use CFClient::OpenGL; 2437use CFPlus::OpenGL;
2244 2438
2245our @ISA = CFClient::UI::DrawBG::; 2439our @ISA = CFPlus::UI::DrawBG::;
2246 2440
2247my @tex = 2441my @tex =
2248 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 2442 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
2249 qw(s1_slider.png s1_slider_bg.png); 2443 qw(s1_slider.png s1_slider_bg.png);
2250 2444
2251sub new { 2445sub new {
2252 my $class = shift; 2446 my $class = shift;
2253 2447
… …
2274 $self->update; 2468 $self->update;
2275 2469
2276 $self 2470 $self
2277} 2471}
2278 2472
2279sub changed { }
2280
2281sub set_range { 2473sub set_range {
2282 my ($self, $range) = @_; 2474 my ($self, $range) = @_;
2283 2475
2284 ($range, $self->{range}) = ($self->{range}, $range); 2476 ($range, $self->{range}) = ($self->{range}, $range);
2285 2477
2286 $self->update
2287 if "@$range" ne "@{$self->{range}}"; 2478 if ("@$range" ne "@{$self->{range}}") {
2479 $self->update;
2480 $self->set_value ($self->{range}[0]);
2481 }
2288} 2482}
2289 2483
2290sub set_value { 2484sub set_value {
2291 my ($self, $value) = @_; 2485 my ($self, $value) = @_;
2292 2486
… …
2303 if $unit; 2497 if $unit;
2304 2498
2305 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2499 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2306 2500
2307 if ($value != $old_value) { 2501 if ($value != $old_value) {
2308 $self->_emit (changed => $value); 2502 $self->emit (changed => $value);
2309 $self->update; 2503 $self->update;
2310 } 2504 }
2311} 2505}
2312 2506
2313sub size_request { 2507sub size_request {
2314 my ($self) = @_; 2508 my ($self) = @_;
2315 2509
2316 ($self->{req_w}, $self->{req_h}) 2510 ($self->{req_w}, $self->{req_h})
2317} 2511}
2318 2512
2319sub button_down { 2513sub invoke_button_down {
2320 my ($self, $ev, $x, $y) = @_; 2514 my ($self, $ev, $x, $y) = @_;
2321 2515
2322 $self->SUPER::button_down ($ev, $x, $y); 2516 $self->SUPER::invoke_button_down ($ev, $x, $y);
2323 2517
2324 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2518 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2325 2519
2326 $self->mouse_motion ($ev, $x, $y) 2520 $self->invoke_mouse_motion ($ev, $x, $y)
2327} 2521}
2328 2522
2329sub mouse_motion { 2523sub invoke_mouse_motion {
2330 my ($self, $ev, $x, $y) = @_; 2524 my ($self, $ev, $x, $y) = @_;
2331 2525
2332 if ($GRAB == $self) { 2526 if ($GRAB == $self) {
2333 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2527 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2334 2528
… …
2340 } else { 2534 } else {
2341 return 0; 2535 return 0;
2342 } 2536 }
2343 2537
2344 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
2345} 2549}
2346 2550
2347sub update { 2551sub update {
2348 my ($self) = @_; 2552 my ($self) = @_;
2349 2553
… …
2398 glDisable GL_TEXTURE_2D; 2602 glDisable GL_TEXTURE_2D;
2399} 2603}
2400 2604
2401############################################################################# 2605#############################################################################
2402 2606
2403package CFClient::UI::ValSlider; 2607package CFPlus::UI::ValSlider;
2404 2608
2405our @ISA = CFClient::UI::HBox::; 2609our @ISA = CFPlus::UI::HBox::;
2406 2610
2407sub new { 2611sub new {
2408 my ($class, %arg) = @_; 2612 my ($class, %arg) = @_;
2409 2613
2410 my $range = delete $arg{range}; 2614 my $range = delete $arg{range};
2411 2615
2412 my $self = $class->SUPER::new ( 2616 my $self = $class->SUPER::new (
2413 slider => (new CFClient::UI::Slider expand => 1, range => $range), 2617 slider => (new CFPlus::UI::Slider expand => 1, range => $range),
2414 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}), 2618 entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
2415 to_value => sub { shift }, 2619 to_value => sub { shift },
2416 from_value => sub { shift }, 2620 from_value => sub { shift },
2417 %arg, 2621 %arg,
2418 ); 2622 );
2419 2623
… …
2439sub set_range { shift->{slider}->set_range (@_) } 2643sub set_range { shift->{slider}->set_range (@_) }
2440sub set_value { shift->{slider}->set_value (@_) } 2644sub set_value { shift->{slider}->set_value (@_) }
2441 2645
2442############################################################################# 2646#############################################################################
2443 2647
2444package CFClient::UI::TextView; 2648package CFPlus::UI::TextScroller;
2445 2649
2446our @ISA = CFClient::UI::HBox::; 2650our @ISA = CFPlus::UI::HBox::;
2447 2651
2448use CFClient::OpenGL; 2652use CFPlus::OpenGL;
2449 2653
2450sub new { 2654sub new {
2451 my $class = shift; 2655 my $class = shift;
2452 2656
2453 my $self = $class->SUPER::new ( 2657 my $self = $class->SUPER::new (
2454 fontsize => 1, 2658 fontsize => 1,
2455 can_events => 0, 2659 can_events => 1,
2660 indent => 0,
2456 #font => default_font 2661 #font => default_font
2457 @_, 2662 @_,
2458 2663
2459 layout => (new CFClient::Layout 1), 2664 layout => (new CFPlus::Layout),
2460 par => [], 2665 par => [],
2461 height => 0, 2666 height => 0,
2462 children => [ 2667 children => [
2463 (new CFClient::UI::Empty expand => 1), 2668 (new CFPlus::UI::Empty expand => 1),
2464 (new CFClient::UI::Slider vertical => 1), 2669 (new CFPlus::UI::Slider vertical => 1),
2465 ], 2670 ],
2466 ); 2671 );
2467 2672
2468 $self->{children}[1]->connect (changed => sub { $self->update }); 2673 $self->{children}[1]->connect (changed => sub { $self->update });
2469 2674
… …
2475 2680
2476 $self->{fontsize} = $fontsize; 2681 $self->{fontsize} = $fontsize;
2477 $self->reflow; 2682 $self->reflow;
2478} 2683}
2479 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
2480sub size_allocate { 2694sub invoke_size_allocate {
2481 my ($self, $w, $h) = @_; 2695 my ($self, $w, $h) = @_;
2482 2696
2483 $self->SUPER::size_allocate ($w, $h); 2697 my ($empty, $slider, @other) = @{ $self->{children} };
2698 $_->configure (@$_{qw(x y req_w req_h)}) for @other;
2484 2699
2485 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2700 $self->{layout}->set_font ($self->{font}) if $self->{font};
2486 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2701 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2487 $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});
2488 2704
2489 $self->reflow; 2705 $self->reflow;
2490}
2491 2706
2492sub text_size { 2707 local $self->{children} = [$empty, $slider];
2708 $self->SUPER::invoke_size_allocate ($w, $h)
2709}
2710
2711sub invoke_mouse_wheel {
2493 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) = @_;
2494 2723
2495 my $layout = $self->{layout}; 2724 my $layout = $self->{layout};
2496 2725
2726 $layout->set_font ($self->{font}) if $self->{font};
2727 $layout->set_foreground (@{$para->{fg}});
2497 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2728 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2498 $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});
2499 $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}}
2500 2737 );
2738
2501 $layout->size 2739 $layout
2502} 2740}
2503 2741
2504sub reflow { 2742sub reflow {
2505 my ($self) = @_; 2743 my ($self) = @_;
2506 2744
… …
2515 $self->{children}[1]->set_value ($offset); 2753 $self->{children}[1]->set_value ($offset);
2516} 2754}
2517 2755
2518sub clear { 2756sub clear {
2519 my ($self) = @_; 2757 my ($self) = @_;
2758
2759 my (undef, undef, @other) = @{ $self->{children} };
2760 $self->remove ($_) for @other;
2520 2761
2521 $self->{par} = []; 2762 $self->{par} = [];
2522 $self->{height} = 0; 2763 $self->{height} = 0;
2523 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]); 2764 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2524} 2765}
2525 2766
2526sub add_paragraph { 2767sub add_paragraph {
2527 my ($self, $color, $text, $indent) = @_; 2768 my $self = shift;
2528 2769
2529 for my $line (split /\n/, $text) { 2770 for my $para (@_) {
2530 my ($w, $h) = $self->text_size ($line); 2771 $para = {
2531 $self->{height} += $h; 2772 fg => [1, 1, 1, 1],
2532 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line]; 2773 indent => 0,
2533 } 2774 markup => "",
2775 widget => [],
2776 ref $para ? %$para : (markup => $para),
2777 w => 1e10,
2778 wrapped => 1,
2779 };
2534 2780
2535 $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;
2536} 2794}
2537 2795
2538sub update { 2796sub update {
2539 my ($self) = @_; 2797 my ($self) = @_;
2540 2798
… …
2542 2800
2543 return unless $self->{h} > 0; 2801 return unless $self->{h} > 0;
2544 2802
2545 delete $self->{texture}; 2803 delete $self->{texture};
2546 2804
2547 $ROOT->on_post_alloc ($self, sub { 2805 $ROOT->on_post_alloc ($self => sub {
2548 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 2806 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2549 2807
2550 if (delete $self->{need_reflow}) { 2808 if (delete $self->{need_reflow}) {
2551 my $height = 0; 2809 my $height = 0;
2552 2810
2553 my $layout = $self->{layout};
2554
2555 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2556
2557 for (@{$self->{par}}) { 2811 for my $para (@{$self->{par}}) {
2558 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support 2812 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2559 $layout->set_width ($W - $_->[3]); 2813 my $layout = $self->get_layout ($para);
2560 $layout->set_markup ($_->[4]);
2561 my ($w, $h) = $layout->size; 2814 my ($w, $h) = $layout->size;
2562 $_->[0] = $w + $_->[3]; 2815
2563 $_->[1] = $h; 2816 $para->{w} = $w + $para->{indent};
2817 $para->{h} = $h;
2818 $para->{wrapped} = $layout->has_wrapped;
2564 } 2819 }
2565 2820
2566 $height += $_->[1]; 2821 $height += $para->{h};
2567 } 2822 }
2568 2823
2569 $self->{height} = $height; 2824 $self->{height} = $height;
2570 2825
2571 $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]);
2572 2827
2573 delete $self->{texture}; 2828 delete $self->{texture};
2574 } 2829 }
2575 2830
2831 if (delete $self->{scroll_to_bottom}) {
2832 $self->{children}[1]->set_value (1e10);
2833 }
2834
2576 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 2835 $self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2577 glClearColor 0.5, 0.5, 0.5, 0; 2836 glClearColor 0, 0, 0, 0;
2578 glClear GL_COLOR_BUFFER_BIT; 2837 glClear GL_COLOR_BUFFER_BIT;
2579 2838
2580 my $top = int $self->{children}[1]{range}[0]; 2839 my $top = int $self->{children}[1]{range}[0];
2581 2840
2582 my $y0 = $top; 2841 my $y0 = $top;
2583 my $y1 = $top + $H; 2842 my $y1 = $top + $H;
2584 2843
2585 my $y = 0; 2844 my $y = 0;
2586 2845
2587 my $layout = $self->{layout};
2588
2589 $layout->set_font ($self->{font}) if $self->{font};
2590
2591 glEnable GL_BLEND;
2592 #TODO# not correct in windows where rgba is forced off
2593 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2594
2595 for my $par (@{$self->{par}}) { 2846 for my $para (@{$self->{par}}) {
2596 my $h = $par->[1]; 2847 my $h = $para->{h};
2597 2848
2598 if ($y0 < $y + $h && $y < $y1) { 2849 if ($y0 < $y + $h && $y < $y1) {
2599 $layout->set_foreground (@{ $par->[2] });
2600 $layout->set_width ($W - $par->[3]);
2601 $layout->set_markup ($par->[4]);
2602 2850
2603 my ($w, $h, $data, $format, $internalformat) = $layout->render; 2851 my $layout = $self->get_layout ($para);
2604 2852
2605 glRasterPos $par->[3], $y - $y0; 2853 $layout->render ($para->{indent}, $y - $y0);
2606 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 }
2607 } 2867 }
2608 2868
2609 $y += $h; 2869 $y += $h;
2610 } 2870 }
2611
2612 glDisable GL_BLEND;
2613 }; 2871 };
2614 }); 2872 });
2615} 2873}
2616 2874
2875sub reconfigure {
2876 my ($self) = @_;
2877
2878 $self->SUPER::reconfigure;
2879
2880 $_->{w} = 1e10 for @{ $self->{par} };
2881 $self->reflow;
2882}
2883
2617sub _draw { 2884sub _draw {
2618 my ($self) = @_; 2885 my ($self) = @_;
2619 2886
2620 glEnable GL_TEXTURE_2D; 2887 glEnable GL_TEXTURE_2D;
2621 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2888 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2622 glColor 1, 1, 1, 1; 2889 glColor 0, 0, 0, 1;
2623 $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});
2624 glDisable GL_TEXTURE_2D; 2891 glDisable GL_TEXTURE_2D;
2625 2892
2626 $self->{children}[1]->draw; 2893 $self->{children}[1]->draw;
2627
2628} 2894}
2629 2895
2630############################################################################# 2896#############################################################################
2631 2897
2632package CFClient::UI::Animator; 2898package CFPlus::UI::Animator;
2633 2899
2634use CFClient::OpenGL; 2900use CFPlus::OpenGL;
2635 2901
2636our @ISA = CFClient::UI::Bin::; 2902our @ISA = CFPlus::UI::Bin::;
2637 2903
2638sub moveto { 2904sub moveto {
2639 my ($self, $x, $y) = @_; 2905 my ($self, $x, $y) = @_;
2640 2906
2641 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y]; 2907 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
… …
2669 glPopMatrix; 2935 glPopMatrix;
2670} 2936}
2671 2937
2672############################################################################# 2938#############################################################################
2673 2939
2674package CFClient::UI::Flopper; 2940package CFPlus::UI::Flopper;
2675 2941
2676our @ISA = CFClient::UI::Button::; 2942our @ISA = CFPlus::UI::Button::;
2677 2943
2678sub new { 2944sub new {
2679 my $class = shift; 2945 my $class = shift;
2680 2946
2681 my $self = $class->SUPER::new ( 2947 my $self = $class->SUPER::new (
… …
2693 $self->{other}->toggle_visibility; 2959 $self->{other}->toggle_visibility;
2694} 2960}
2695 2961
2696############################################################################# 2962#############################################################################
2697 2963
2698package CFClient::UI::Tooltip; 2964package CFPlus::UI::Tooltip;
2699 2965
2700our @ISA = CFClient::UI::Bin::; 2966our @ISA = CFPlus::UI::Bin::;
2701 2967
2702use CFClient::OpenGL; 2968use CFPlus::OpenGL;
2703 2969
2704sub new { 2970sub new {
2705 my $class = shift; 2971 my $class = shift;
2706 2972
2707 $class->SUPER::new ( 2973 $class->SUPER::new (
… …
2720 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n" 2986 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2721 . "req $widget->{req_w} $widget->{req_h}\n" 2987 . "req $widget->{req_w} $widget->{req_h}\n"
2722 . "visible $widget->{visible}"; 2988 . "visible $widget->{visible}";
2723 } 2989 }
2724 2990
2991 $tooltip =~ s/^\n+//;
2992 $tooltip =~ s/\n+$//;
2993
2725 $self->add (new CFClient::UI::Label 2994 $self->add (new CFPlus::UI::Label
2726 markup => $tooltip, 2995 markup => $tooltip,
2727 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2996 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2728 fontsize => 0.8, 2997 fontsize => 0.8,
2729 fg => [0, 0, 0, 1], 2998 fg => [0, 0, 0, 1],
2730 ellipsise => 0, 2999 ellipsise => 0,
… …
2738 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 3007 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2739 3008
2740 ($w + 4, $h + 4) 3009 ($w + 4, $h + 4)
2741} 3010}
2742 3011
2743sub size_allocate { 3012sub invoke_size_allocate {
2744 my ($self, $w, $h) = @_; 3013 my ($self, $w, $h) = @_;
2745 3014
2746 $self->SUPER::size_allocate ($w - 4, $h - 4); 3015 $self->SUPER::invoke_size_allocate ($w - 4, $h - 4)
2747} 3016}
2748 3017
2749sub visibility_change { 3018sub invoke_visibility_change {
2750 my ($self, $visible) = @_; 3019 my ($self, $visible) = @_;
2751 3020
2752 return unless $visible; 3021 return unless $visible;
2753 3022
2754 $self->{root}->on_post_alloc ("move_$self" => sub { 3023 $self->{root}->on_post_alloc ("move_$self" => sub {
2755 my $widget = $self->{owner} 3024 my $widget = $self->{owner}
2756 or return; 3025 or return;
2757 3026
3027 if ($widget->{visible}) {
2758 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 3028 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2759 3029
2760 ($x, $y) = $widget->coord2global (-$self->{w}, 0) 3030 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2761 if $x + $self->{w} > $::WIDTH; 3031 if $x + $self->{w} > $self->{root}{w};
2762 3032
2763 $self->move_abs ($x, $y); 3033 $self->move_abs ($x, $y);
3034 } else {
3035 $self->hide;
3036 }
2764 }); 3037 });
2765} 3038}
2766 3039
2767sub _draw { 3040sub _draw {
2768 my ($self) = @_; 3041 my ($self) = @_;
… …
2792 $self->SUPER::_draw; 3065 $self->SUPER::_draw;
2793} 3066}
2794 3067
2795############################################################################# 3068#############################################################################
2796 3069
2797package CFClient::UI::Face; 3070package CFPlus::UI::Face;
2798 3071
2799our @ISA = CFClient::UI::Base::; 3072our @ISA = CFPlus::UI::DrawBG::;
2800 3073
2801use CFClient::OpenGL; 3074use CFPlus::OpenGL;
2802 3075
2803sub new { 3076sub new {
2804 my $class = shift; 3077 my $class = shift;
2805 3078
2806 my $self = $class->SUPER::new ( 3079 my $self = $class->SUPER::new (
… …
2841sub _draw { 3114sub _draw {
2842 my ($self) = @_; 3115 my ($self) = @_;
2843 3116
2844 return unless $::CONN; 3117 return unless $::CONN;
2845 3118
3119 $self->SUPER::_draw;
3120
2846 my $face; 3121 my $face;
2847 3122
2848 if ($self->{frame}) { 3123 if ($self->{frame}) {
2849 my $anim = $::CONN->{anim}[$self->{anim}]; 3124 my $anim = $::CONN->{anim}[$self->{anim}];
2850 3125
… …
2855 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 3130 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2856 3131
2857 if ($tex) { 3132 if ($tex) {
2858 glEnable GL_TEXTURE_2D; 3133 glEnable GL_TEXTURE_2D;
2859 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3134 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2860 glColor 1, 1, 1, 1; 3135 glColor 0, 0, 0, 1;
2861 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3136 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2862 glDisable GL_TEXTURE_2D; 3137 glDisable GL_TEXTURE_2D;
2863 } 3138 }
2864} 3139}
2865 3140
2866sub DESTROY { 3141sub destroy {
2867 my ($self) = @_; 3142 my ($self) = @_;
2868 3143
2869 $self->{timer}->cancel 3144 $self->{timer}->cancel
2870 if $self->{timer}; 3145 if $self->{timer};
2871 3146
2872 $self->SUPER::DESTROY; 3147 $self->SUPER::destroy;
2873} 3148}
2874 3149
2875############################################################################# 3150#############################################################################
2876 3151
2877package CFClient::UI::Buttonbar; 3152package CFPlus::UI::Buttonbar;
2878 3153
2879our @ISA = CFClient::UI::HBox::; 3154our @ISA = CFPlus::UI::HBox::;
2880 3155
2881# TODO: should actualyl wrap buttons and other goodies. 3156# TODO: should actualyl wrap buttons and other goodies.
2882 3157
2883############################################################################# 3158#############################################################################
2884 3159
2885package CFClient::UI::Menu; 3160package CFPlus::UI::Menu;
2886 3161
2887our @ISA = CFClient::UI::FancyFrame::; 3162our @ISA = CFPlus::UI::FancyFrame::;
2888 3163
2889use CFClient::OpenGL; 3164use CFPlus::OpenGL;
2890 3165
2891sub new { 3166sub new {
2892 my $class = shift; 3167 my $class = shift;
2893 3168
2894 my $self = $class->SUPER::new ( 3169 my $self = $class->SUPER::new (
2895 items => [], 3170 items => [],
2896 z => 100, 3171 z => 100,
2897 @_, 3172 @_,
2898 ); 3173 );
2899 3174
2900 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3175 $self->add ($self->{vbox} = new CFPlus::UI::VBox);
2901 3176
2902 for my $item (@{ $self->{items} }) { 3177 for my $item (@{ $self->{items} }) {
2903 my ($widget, $cb) = @$item; 3178 my ($widget, $cb, $tooltip) = @$item;
2904 3179
2905 # handle various types of items, only text for now 3180 # handle various types of items, only text for now
2906 if (!ref $widget) { 3181 if (!ref $widget) {
3182 if ($widget =~ /\t/) {
3183 my ($left, $right) = split /\t/, $widget, 2;
3184
2907 $widget = new CFClient::UI::Label 3185 $widget = new CFPlus::UI::HBox
2908 can_hover => 1, 3186 can_hover => 1,
2909 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,
2910 text => $widget; 3199 markup => $widget,
3200 tooltip => $tooltip;
3201 }
2911 } 3202 }
2912 3203
2913 $self->{item}{$widget} = $item; 3204 $self->{item}{$widget} = $item;
2914 3205
2915 $self->{vbox}->add ($widget); 3206 $self->{vbox}->add ($widget);
… …
2920 3211
2921# 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)
2922sub popup { 3213sub popup {
2923 my ($self, $ev) = @_; 3214 my ($self, $ev) = @_;
2924 3215
2925 $self->_emit ("popdown"); 3216 $self->emit ("popdown");
2926 3217
2927 # maybe save $GRAB? must be careful about events... 3218 # maybe save $GRAB? must be careful about events...
2928 $GRAB = $self; 3219 $GRAB = $self;
2929 $self->{button} = $ev->{button}; 3220 $self->{button} = $ev->{button};
2930 3221
2931 $self->show; 3222 $self->show;
2932 $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);
2933} 3224}
2934 3225
2935sub mouse_motion { 3226sub invoke_mouse_motion {
2936 my ($self, $ev, $x, $y) = @_; 3227 my ($self, $ev, $x, $y) = @_;
2937 3228
2938 # TODO: should use vbox->find_widget or so 3229 # TODO: should use vbox->find_widget or so
2939 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 3230 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2940 $self->{hover} = $self->{item}{$HOVER}; 3231 $self->{hover} = $self->{item}{$HOVER};
2941 3232
2942 0 3233 0
2943} 3234}
2944 3235
2945sub button_up { 3236sub invoke_button_up {
2946 my ($self, $ev, $x, $y) = @_; 3237 my ($self, $ev, $x, $y) = @_;
2947 3238
2948 if ($ev->{button} == $self->{button}) { 3239 if ($ev->{button} == $self->{button}) {
2949 undef $GRAB; 3240 undef $GRAB;
2950 $self->hide; 3241 $self->hide;
2951 3242
2952 $self->_emit ("popdown"); 3243 $self->emit ("popdown");
2953 $self->{hover}[1]->() if $self->{hover}; 3244 $self->{hover}[1]->() if $self->{hover};
2954 } else { 3245 } else {
2955 return 0 3246 return 0
2956 } 3247 }
2957 3248
2958 1 3249 1
2959} 3250}
2960 3251
2961############################################################################# 3252#############################################################################
2962 3253
2963package CFClient::UI::Multiplexer; 3254package CFPlus::UI::Multiplexer;
2964 3255
2965our @ISA = CFClient::UI::Container::; 3256our @ISA = CFPlus::UI::Container::;
2966 3257
2967sub new { 3258sub new {
2968 my $class = shift; 3259 my $class = shift;
2969 3260
2970 my $self = $class->SUPER::new ( 3261 my $self = $class->SUPER::new (
… …
2984 3275
2985 $self->{current} = $self->{children}[0] 3276 $self->{current} = $self->{children}[0]
2986 if @{ $self->{children} }; 3277 if @{ $self->{children} };
2987} 3278}
2988 3279
3280sub get_current_page {
3281 my ($self) = @_;
3282
3283 $self->{current}
3284}
3285
2989sub set_current_page { 3286sub set_current_page {
2990 my ($self, $page_or_widget) = @_; 3287 my ($self, $page_or_widget) = @_;
2991 3288
2992 my $widget = ref $page_or_widget 3289 my $widget = ref $page_or_widget
2993 ? $page_or_widget 3290 ? $page_or_widget
2994 : $self->{children}[$page_or_widget]; 3291 : $self->{children}[$page_or_widget];
2995 3292
2996 $self->{current} = $widget; 3293 $self->{current} = $widget;
2997 $self->{current}->configure (0, 0, $self->{w}, $self->{h}); 3294 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
2998 3295
2999 $self->_emit (page_changed => $self->{current}); 3296 $self->emit (page_changed => $self->{current});
3000 3297
3001 $self->realloc; 3298 $self->realloc;
3002} 3299}
3003 3300
3004sub visible_children { 3301sub visible_children {
… …
3009 my ($self) = @_; 3306 my ($self) = @_;
3010 3307
3011 $self->{current}->size_request 3308 $self->{current}->size_request
3012} 3309}
3013 3310
3014sub size_allocate { 3311sub invoke_size_allocate {
3015 my ($self, $w, $h) = @_; 3312 my ($self, $w, $h) = @_;
3016 3313
3017 $self->{current}->configure (0, 0, $w, $h); 3314 $self->{current}->configure (0, 0, $w, $h);
3315
3316 1
3018} 3317}
3019 3318
3020sub _draw { 3319sub _draw {
3021 my ($self) = @_; 3320 my ($self) = @_;
3022 3321
3023 $self->{current}->draw; 3322 $self->{current}->draw;
3024} 3323}
3025 3324
3026############################################################################# 3325#############################################################################
3027 3326
3028package CFClient::UI::Notebook; 3327package CFPlus::UI::Notebook;
3029 3328
3030our @ISA = CFClient::UI::VBox::; 3329our @ISA = CFPlus::UI::VBox::;
3031 3330
3032sub new { 3331sub new {
3033 my $class = shift; 3332 my $class = shift;
3034 3333
3035 my $self = $class->SUPER::new ( 3334 my $self = $class->SUPER::new (
3036 buttonbar => (new CFClient::UI::Buttonbar), 3335 buttonbar => (new CFPlus::UI::Buttonbar),
3037 multiplexer => (new CFClient::UI::Multiplexer expand => 1), 3336 multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3038 # filter => # will be put between multiplexer and $self 3337 # filter => # will be put between multiplexer and $self
3039 @_, 3338 @_,
3040 ); 3339 );
3041 3340
3042 $self->{filter}->add ($self->{multiplexer}) if $self->{filter}; 3341 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
… …
3048sub add { 3347sub add {
3049 my ($self, $title, $widget, $tooltip) = @_; 3348 my ($self, $title, $widget, $tooltip) = @_;
3050 3349
3051 Scalar::Util::weaken $self; 3350 Scalar::Util::weaken $self;
3052 3351
3053 $self->{buttonbar}->add (new CFClient::UI::Button 3352 $self->{buttonbar}->add (new CFPlus::UI::Button
3054 markup => $title, 3353 markup => $title,
3055 tooltip => $tooltip, 3354 tooltip => $tooltip,
3056 on_activate => sub { $self->set_current_page ($widget) }, 3355 on_activate => sub { $self->set_current_page ($widget) },
3057 ); 3356 );
3058 3357
3059 $self->{multiplexer}->add ($widget); 3358 $self->{multiplexer}->add ($widget);
3060} 3359}
3061 3360
3361sub get_current_page {
3362 my ($self) = @_;
3363
3364 $self->{multiplexer}->get_current_page
3365}
3366
3062sub set_current_page { 3367sub set_current_page {
3063 my ($self, $page) = @_; 3368 my ($self, $page) = @_;
3064 3369
3065 $self->{multiplexer}->set_current_page ($page); 3370 $self->{multiplexer}->set_current_page ($page);
3066 $self->_emit (page_changed => $self->{multiplexer}{current}); 3371 $self->emit (page_changed => $self->{multiplexer}{current});
3067} 3372}
3068 3373
3069############################################################################# 3374#############################################################################
3070 3375
3071package CFClient::UI::Statusbox; 3376package CFPlus::UI::Selector;
3072 3377
3378use utf8;
3379
3073our @ISA = CFClient::UI::VBox::; 3380our @ISA = CFPlus::UI::Button::;
3074 3381
3075sub new { 3382sub new {
3076 my $class = shift; 3383 my $class = shift;
3077 3384
3078 $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 (
3079 fontsize => 0.8, 3440 fontsize => 0.8,
3080 @_, 3441 @_,
3081 ) 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
3082} 3449}
3083 3450
3084sub reorder { 3451sub reorder {
3085 my ($self) = @_; 3452 my ($self) = @_;
3086 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} };
3087 3459
3088 while (my ($k, $v) = each %{ $self->{item} }) { 3460 while (my ($k, $v) = each %{ $self->{item} }) {
3089 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3461 delete $self->{item}{$k} if $v->{timeout} < $NOW;
3090 } 3462 }
3091 3463
… …
3094 my @items = sort { 3466 my @items = sort {
3095 $a->{pri} <=> $b->{pri} 3467 $a->{pri} <=> $b->{pri}
3096 or $b->{id} <=> $a->{id} 3468 or $b->{id} <=> $a->{id}
3097 } values %{ $self->{item} }; 3469 } values %{ $self->{item} };
3098 3470
3471 $self->{timer}->interval (1);
3472
3099 my $count = 10 + 1; 3473 my $count = 10 + 1;
3100 for my $item (@items) { 3474 for my $item (@items) {
3101 last unless --$count; 3475 last unless --$count;
3102 3476
3103 push @widgets, $item->{label} ||= do { 3477 my $label = $item->{label} ||= do {
3104 # TODO: doesn't handle markup well (read as: at all) 3478 # TODO: doesn't handle markup well (read as: at all)
3105 my $short = $item->{count} > 1 3479 my $short = $item->{count} > 1
3106 ? "<b>$item->{count} ×</b> $item->{text}" 3480 ? "<b>$item->{count} ×</b> $item->{text}"
3107 : $item->{text}; 3481 : $item->{text};
3108 3482
3109 for ($short) { 3483 for ($short) {
3110 s/^\s+//; 3484 s/^\s+//;
3111 s/\s+/ /g; 3485 s/\s+/ /g;
3112 } 3486 }
3113 3487
3114 new CFClient::UI::Label 3488 new CFPlus::UI::Label
3115 markup => $short, 3489 markup => $short,
3116 tooltip => $item->{tooltip}, 3490 tooltip => $item->{tooltip},
3117 tooltip_font => $::FONT_PROP, 3491 tooltip_font => $::FONT_PROP,
3118 tooltip_width => 0.67, 3492 tooltip_width => 0.67,
3119 fontsize => $item->{fontsize} || $self->{fontsize}, 3493 fontsize => $item->{fontsize} || $self->{fontsize},
3120 max_w => $::WIDTH * 0.44, 3494 max_w => $::WIDTH * 0.44,
3121 fg => $item->{fg}, 3495 fg => [@{ $item->{fg} }],
3122 can_events => 1, 3496 can_events => 1,
3123 can_hover => 1 3497 can_hover => 1
3124 }; 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;
3125 } 3511 }
3126 3512
3127 $self->clear; 3513 $self->clear;
3128 $self->SUPER::add (reverse @widgets); 3514 $self->SUPER::add (reverse @widgets);
3129} 3515}
… …
3134 $text =~ s/^\s+//; 3520 $text =~ s/^\s+//;
3135 $text =~ s/\s+$//; 3521 $text =~ s/\s+$//;
3136 3522
3137 return unless $text; 3523 return unless $text;
3138 3524
3139 my $timeout = time + ((delete $arg{timeout}) || 60); 3525 my $timeout = (int time) + ((delete $arg{timeout}) || 60);
3140 3526
3141 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 3527 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
3142 3528
3143 if (my $item = $self->{item}{$group}) { 3529 if (my $item = $self->{item}{$group}) {
3144 if ($item->{text} eq $text) { 3530 if ($item->{text} eq $text) {
3145 $item->{count}++; 3531 $item->{count}++;
3146 } else { 3532 } else {
3147 $item->{count} = 1; 3533 $item->{count} = 1;
3148 $item->{text} = $item->{tooltip} = $text; 3534 $item->{text} = $item->{tooltip} = $text;
3149 } 3535 }
3150 $item->{id} = ++$self->{id}; 3536 $item->{id} += 0.2;#d#
3151 $item->{timeout} = $timeout; 3537 $item->{timeout} = $timeout;
3152 delete $item->{label}; 3538 delete $item->{label};
3153 } else { 3539 } else {
3154 $self->{item}{$group} = { 3540 $self->{item}{$group} = {
3155 id => ++$self->{id}, 3541 id => ++$self->{id},
… …
3161 count => 1, 3547 count => 1,
3162 %arg, 3548 %arg,
3163 }; 3549 };
3164 } 3550 }
3165 3551
3552 $ROOT->on_refresh (reorder => sub {
3166 $self->reorder; 3553 $self->reorder;
3554 });
3167} 3555}
3168 3556
3169sub reconfigure { 3557sub reconfigure {
3170 my ($self) = @_; 3558 my ($self) = @_;
3171 3559
… …
3174 3562
3175 $self->reorder; 3563 $self->reorder;
3176 $self->SUPER::reconfigure; 3564 $self->SUPER::reconfigure;
3177} 3565}
3178 3566
3567sub destroy {
3568 my ($self) = @_;
3569
3570 $self->{timer}->cancel;
3571
3572 $self->SUPER::destroy;
3573}
3574
3179############################################################################# 3575#############################################################################
3180 3576
3181package CFClient::UI::Inventory; 3577package CFPlus::UI::Inventory;
3182 3578
3183our @ISA = CFClient::UI::ScrolledWindow::; 3579our @ISA = CFPlus::UI::Table::;
3184 3580
3185sub new { 3581sub new {
3186 my $class = shift; 3582 my $class = shift;
3187 3583
3188 my $self = $class->SUPER::new ( 3584 my $self = $class->SUPER::new (
3189 child => (new CFClient::UI::Table col_expand => [0, 1, 0]), 3585 col_expand => [0, 1, 0],
3586 items => [],
3190 @_, 3587 @_,
3191 ); 3588 );
3192 3589
3590 $self->set_sort_order (undef);
3591
3193 $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;
3194} 3628}
3195 3629
3196sub set_items { 3630sub set_items {
3197 my ($self, $items) = @_; 3631 my ($self, $items) = @_;
3198 3632
3199 $self->{child}->clear; 3633 $self->{items} = [$items ? values %$items : ()];
3200 return unless $items; 3634 $self->update_items;
3201
3202 my @items = sort {
3203 ($a->{type} <=> $b->{type})
3204 or ($a->{name} cmp $b->{name})
3205 } @$items;
3206
3207 $self->{real_items} = \@items;
3208
3209 my $row = 0;
3210 for my $item (@items) {
3211 CFClient::Item::update_widgets $item;
3212
3213 $self->{child}->add (0, $row, $item->{face_widget});
3214 $self->{child}->add (1, $row, $item->{desc_widget});
3215 $self->{child}->add (2, $row, $item->{weight_widget});
3216
3217 $row++;
3218 }
3219} 3635}
3220 3636
3221############################################################################# 3637#############################################################################
3222 3638
3223package CFClient::UI::BindEditor;
3224
3225our @ISA = CFClient::UI::FancyFrame::;
3226
3227sub new {
3228 my $class = shift;
3229
3230 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3231
3232 $self->add (my $vb = new CFClient::UI::VBox);
3233
3234
3235 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3236 text => "start recording",
3237 tooltip => "Start/Stops recording of actions."
3238 ."All subsequent actions after the recording started will be captured."
3239 ."The actions are displayed after the record was stopped."
3240 ."To bind the action you have to click on the 'Bind' button",
3241 on_activate => sub {
3242 unless ($self->{recording}) {
3243 $self->start;
3244 } else {
3245 $self->stop;
3246 }
3247 });
3248
3249 $vb->add (new CFClient::UI::Label text => "Actions:");
3250 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3251
3252 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3253 $vb->add (my $hb = new CFClient::UI::HBox);
3254 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3255 $hb->add (new CFClient::UI::Button
3256 text => "bind",
3257 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3258 on_activate => sub {
3259 $self->ask_for_bind;
3260 });
3261
3262 $vb->add (my $hb = new CFClient::UI::HBox);
3263 $hb->add (new CFClient::UI::Button
3264 text => "ok",
3265 expand => 1,
3266 tooltip => "This closes the binding editor and saves the binding",
3267 on_activate => sub {
3268 $self->hide;
3269 $self->commit;
3270 });
3271
3272 $hb->add (new CFClient::UI::Button
3273 text => "cancel",
3274 expand => 1,
3275 tooltip => "This closes the binding editor without saving",
3276 on_activate => sub {
3277 $self->hide;
3278 $self->{binding_cancel}->()
3279 if $self->{binding_cancel};
3280 });
3281
3282 $self->update_binding_widgets;
3283
3284 $self
3285}
3286
3287sub commit {
3288 my ($self) = @_;
3289 my ($mod, $sym, $cmds) = $self->get_binding;
3290 if ($sym != 0 && @$cmds > 0) {
3291 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3292 ."'. Don't forget 'Save Config'!");
3293 $self->{binding_change}->($mod, $sym, $cmds)
3294 if $self->{binding_change};
3295 } else {
3296 $::STATUSBOX->add ("No action bound, no key or action specified!");
3297 $self->{binding_cancel}->()
3298 if $self->{binding_cancel};
3299 }
3300}
3301
3302sub start {
3303 my ($self) = @_;
3304
3305 $self->{rec_btn}->set_text ("stop recording");
3306 $self->{recording} = 1;
3307 $self->clear_command_list;
3308 $::CONN->start_record if $::CONN;
3309}
3310
3311sub stop {
3312 my ($self) = @_;
3313
3314 $self->{rec_btn}->set_text ("start recording");
3315 $self->{recording} = 0;
3316
3317 my $rec;
3318 $rec = $::CONN->stop_record if $::CONN;
3319 return unless ref $rec eq 'ARRAY';
3320 $self->set_command_list ($rec);
3321}
3322
3323
3324sub ask_for_bind_and_commit {
3325 my ($self) = @_;
3326 $self->ask_for_bind (1);
3327}
3328
3329sub ask_for_bind {
3330 my ($self, $commit) = @_;
3331
3332 CFClient::Binder::open_binding_dialog (sub {
3333 my ($mod, $sym) = @_;
3334 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3335 $self->update_binding_widgets;
3336 $self->commit if $commit;
3337 });
3338}
3339
3340# $mod and $sym are the modifiers and key symbol
3341# $cmds is a array ref of strings (the commands)
3342# $cb is the callback that is executed on OK
3343# $ccb is the callback that is executed on CANCEL and
3344# when the binding was unsuccessful on OK
3345sub set_binding {
3346 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3347
3348 $self->clear_command_list;
3349 $self->{recording} = 0;
3350 $self->{rec_btn}->set_text ("start recording");
3351
3352 $self->{binding} = [$mod, $sym];
3353 $self->{commands} = $cmds;
3354
3355 $self->{binding_change} = $cb;
3356 $self->{binding_cancel} = $ccb;
3357
3358 $self->update_binding_widgets;
3359}
3360
3361# this is a shortcut method that asks for a binding
3362# and then just binds it.
3363sub do_quick_binding {
3364 my ($self, $cmds) = @_;
3365 $self->set_binding (undef, undef, $cmds, sub {
3366 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3367 });
3368 $self->ask_for_bind (1);
3369}
3370
3371sub update_binding_widgets {
3372 my ($self) = @_;
3373 my ($mod, $sym, $cmds) = $self->get_binding;
3374 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3375 $self->set_command_list ($cmds);
3376}
3377
3378sub get_binding {
3379 my ($self) = @_;
3380 return (
3381 $self->{binding}->[0],
3382 $self->{binding}->[1],
3383 [ grep { defined $_ } @{$self->{commands}} ]
3384 );
3385}
3386
3387sub clear_command_list {
3388 my ($self) = @_;
3389 $self->{cmdbox}->clear ();
3390}
3391
3392sub set_command_list {
3393 my ($self, $cmds) = @_;
3394
3395 $self->{cmdbox}->clear ();
3396 $self->{commands} = $cmds;
3397
3398 my $idx = 0;
3399
3400 for (@$cmds) {
3401 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3402
3403 my $i = $idx;
3404 $hb->add (new CFClient::UI::Label text => $_);
3405 $hb->add (new CFClient::UI::Button
3406 text => "delete",
3407 tooltip => "Deletes the action from the record",
3408 on_activate => sub {
3409 $self->{cmdbox}->remove ($hb);
3410 $cmds->[$i] = undef;
3411 });
3412
3413
3414 $idx++
3415 }
3416}
3417
3418#############################################################################
3419
3420package CFClient::UI::SpellList; 3639package CFPlus::UI::SpellList;
3421 3640
3422our @ISA = CFClient::UI::Table::; 3641our @ISA = CFPlus::UI::Table::;
3423 3642
3424sub new { 3643sub new {
3425 my $class = shift; 3644 my $class = shift;
3426 3645
3427 my $self = $class->SUPER::new ( 3646 my $self = $class->SUPER::new (
… …
3429 commands => [], 3648 commands => [],
3430 @_, 3649 @_,
3431 ) 3650 )
3432} 3651}
3433 3652
3434# 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
3435sub add_spell { 3738sub add_spell {
3436 my ($self, $spell) = @_; 3739 my ($self, $spell) = @_;
3740
3437 $self->{spells}->{$spell->{name}} = $spell; 3741 $self->{spell}->{$spell->{name}} = $spell;
3438 3742 $self->rebuild_spell_list;
3439 $self->add (0, $self->{tbl_idx}, new CFClient::UI::Face
3440 face => $spell->{face},
3441 can_hover => 1,
3442 can_events => 1,
3443 tooltip => $spell->{message});
3444
3445 $self->add (1, $self->{tbl_idx}, new CFClient::UI::Label
3446 text => $spell->{name},
3447 can_hover => 1,
3448 can_events => 1,
3449 tooltip => $spell->{message},
3450 expand => 1);
3451
3452 $self->add (2, $self->{tbl_idx}, new CFClient::UI::Label
3453 text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
3454 $spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
3455 expand => 1);
3456
3457 $self->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
3458 text => "bind to key",
3459 on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
3460}
3461
3462sub rebuild_spell_list {
3463 my ($self) = @_;
3464 $self->{tbl_idx} = 0;
3465 $self->add_spell ($_) for values %{$self->{spells}};
3466} 3743}
3467 3744
3468sub remove_spell { 3745sub remove_spell {
3469 my ($self, $spell) = @_; 3746 my ($self, $spell) = @_;
3747
3470 delete $self->{spells}->{$spell->{name}}; 3748 delete $self->{spell}->{$spell->{name}};
3471 $self->rebuild_spell_list; 3749 $self->rebuild_spell_list;
3472} 3750}
3473 3751
3752sub clear_spells {
3753 my ($self) = @_;
3754
3755 $self->{spell} = {};
3756 $self->rebuild_spell_list;
3757}
3758
3474############################################################################# 3759#############################################################################
3475 3760
3476package CFClient::UI::Root; 3761package CFPlus::UI::Root;
3477 3762
3478our @ISA = CFClient::UI::Container::; 3763our @ISA = CFPlus::UI::Container::;
3479 3764
3765use List::Util qw(min max);
3766
3480use CFClient::OpenGL; 3767use CFPlus::OpenGL;
3481 3768
3482sub new { 3769sub new {
3483 my $class = shift; 3770 my $class = shift;
3484 3771
3485 my $self = $class->SUPER::new ( 3772 my $self = $class->SUPER::new (
… …
3510 $coord = $max - $size if $coord > $max - $size; 3797 $coord = $max - $size if $coord > $max - $size;
3511 3798
3512 int $coord + 0.5 3799 int $coord + 0.5
3513} 3800}
3514 3801
3515sub size_allocate { 3802sub invoke_size_allocate {
3516 my ($self, $w, $h) = @_; 3803 my ($self, $w, $h) = @_;
3517 3804
3518 for my $child ($self->children) { 3805 for my $child ($self->children) {
3519 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)};
3520 3807
… …
3524 $X = _to_pixel $X, $W, $self->{w}; 3811 $X = _to_pixel $X, $W, $self->{w};
3525 $Y = _to_pixel $Y, $H, $self->{h}; 3812 $Y = _to_pixel $Y, $H, $self->{h};
3526 3813
3527 $child->configure ($X, $Y, $W, $H); 3814 $child->configure ($X, $Y, $W, $H);
3528 } 3815 }
3816
3817 1
3529} 3818}
3530 3819
3531sub coord2local { 3820sub coord2local {
3532 my ($self, $x, $y) = @_; 3821 my ($self, $x, $y) = @_;
3533 3822
… …
3618 3907
3619 delete $queue{$widget+0}; 3908 delete $queue{$widget+0};
3620 3909
3621 my ($w, $h) = $widget->size_request; 3910 my ($w, $h) = $widget->size_request;
3622 3911
3623 $w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2; 3912 $w = max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3624 $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};
3625 3917
3626 $w = $widget->{force_w} if exists $widget->{force_w}; 3918 $w = $widget->{force_w} if exists $widget->{force_w};
3627 $h = $widget->{force_h} if exists $widget->{force_h}; 3919 $h = $widget->{force_h} if exists $widget->{force_h};
3628 3920
3629 if ($widget->{req_w} != $w || $widget->{req_h} != $h 3921 if ($widget->{req_w} != $w || $widget->{req_h} != $h
… …
3655 3947
3656 my ($w, $h) = @$widget{qw(alloc_w alloc_h)}; 3948 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3657 3949
3658 $w = 0 if $w < 0; 3950 $w = 0 if $w < 0;
3659 $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};
3660 3961
3661 $w = int $w + 0.5; 3962 $w = int $w + 0.5;
3662 $h = int $h + 0.5; 3963 $h = int $h + 0.5;
3663 3964
3664 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}) {
… …
3688 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 3989 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3689 glMatrixMode GL_MODELVIEW; 3990 glMatrixMode GL_MODELVIEW;
3690 glLoadIdentity; 3991 glLoadIdentity;
3691 3992
3692 { 3993 {
3693 package CFClient::UI::Base; 3994 package CFPlus::UI::Base;
3694 3995
3695 ($draw_x, $draw_y, $draw_w, $draw_h) = 3996 ($draw_x, $draw_y, $draw_w, $draw_h) =
3696 (0, 0, $self->{w}, $self->{h}); 3997 (0, 0, $self->{w}, $self->{h});
3697 } 3998 }
3698 3999
3699 $self->_draw; 4000 $self->_draw;
3700} 4001}
3701 4002
3702############################################################################# 4003#############################################################################
3703 4004
3704package CFClient::UI; 4005package CFPlus::UI;
3705 4006
3706$ROOT = new CFClient::UI::Root; 4007$ROOT = new CFPlus::UI::Root;
3707$TOOLTIP = new CFClient::UI::Tooltip z => 900; 4008$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
3708 4009
37091 40101
3710 4011

Diff Legend

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