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.283 by root, Mon Jun 5 02:28:30 2006 UTC vs.
Revision 1.367 by root, Fri Apr 27 00:59:14 2007 UTC

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

Diff Legend

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