ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/DC/UI.pm
(Generate patch)

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

Diff Legend

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