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

Diff Legend

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