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.281 by root, Mon Jun 5 01:59:59 2006 UTC vs.
Revision 1.374 by root, Mon Jul 16 12:36:48 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
873our @ISA = CFClient::UI::Window::; 949our @ISA = CFPlus::UI::Window::;
874 950
875sub new { 951sub new {
876 my $class = shift; 952 my $class = shift;
877 953
878 $class->SUPER::new ( 954 $class->SUPER::new (
… …
891 $h = 10 if $self->{scroll_y}; 967 $h = 10 if $self->{scroll_y};
892 968
893 ($w, $h) 969 ($w, $h)
894} 970}
895 971
896sub size_allocate { 972sub invoke_size_allocate {
897 my ($self, $w, $h) = @_; 973 my ($self, $w, $h) = @_;
898 974
899 my $child = $self->child; 975 my $child = $self->child;
900 976
901 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w}; 977 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
902 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h}; 978 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
903 979
904 $self->child->configure (0, 0, $w, $h); 980 $self->child->configure (0, 0, $w, $h);
905 $self->update; 981 $self->update;
982
983 1
906} 984}
907 985
908sub set_offset { 986sub set_offset {
909 my ($self, $x, $y) = @_; 987 my ($self, $x, $y) = @_;
910 988
… …
936 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w} 1014 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
937 && $y >= $self->{y} && $y < $self->{y} + $self->{h} 1015 && $y >= $self->{y} && $y < $self->{y} + $self->{h}
938 ) { 1016 ) {
939 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y}) 1017 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
940 } else { 1018 } else {
941 $self->CFClient::UI::Base::find_widget ($x, $y) 1019 $self->CFPlus::UI::Base::find_widget ($x, $y)
942 } 1020 }
943} 1021}
944 1022
945sub _render { 1023sub _render {
946 my ($self) = @_; 1024 my ($self) = @_;
947 1025
948 local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x}; 1026 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}; 1027 local $CFPlus::UI::Base::draw_y = $CFPlus::UI::Base::draw_y - $self->{view_y};
950 1028
951 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 1029 CFPlus::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
952 1030
953 $self->SUPER::_render; 1031 $self->SUPER::_render;
954} 1032}
955 1033
956############################################################################# 1034#############################################################################
957 1035
958package CFClient::UI::ScrolledWindow; 1036package CFPlus::UI::ScrolledWindow;
959 1037
960our @ISA = CFClient::UI::HBox::; 1038our @ISA = CFPlus::UI::Table::;
961 1039
962sub new { 1040sub new {
963 my ($class, %arg) = @_; 1041 my ($class, %arg) = @_;
964 1042
965 my $child = delete $arg{child}; 1043 my $child = delete $arg{child};
966 1044
967 my $self; 1045 my $self;
968 1046
969 my $slider = new CFClient::UI::Slider 1047 my $hslider = new CFPlus::UI::Slider
1048 vertical => 0,
1049 range => [0, 0, 1, 0.01], # HACK fix
1050 on_changed => sub {
1051 $self->{hpos} = $_[1];
1052 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1053 },
1054 ;
1055
1056 my $vslider = new CFPlus::UI::Slider
970 vertical => 1, 1057 vertical => 1,
971 range => [0, 0, 1, 0.01], # HACK fix 1058 range => [0, 0, 1, 0.01], # HACK fix
972 on_changed => sub { 1059 on_changed => sub {
973 $self->{vp}->set_offset (0, $_[1]); 1060 $self->{vpos} = $_[1];
1061 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
974 }, 1062 },
975 ; 1063 ;
976 1064
977 $self = $class->SUPER::new ( 1065 $self = $class->SUPER::new (
978 vp => (new CFClient::UI::ViewPort expand => 1), 1066 scroll_x => 0,
1067 scroll_y => 1,
1068 can_events => 1,
979 slider => $slider, 1069 hslider => $hslider,
1070 vslider => $vslider,
1071 col_expand => [1, 0],
1072 row_expand => [1, 0],
980 %arg, 1073 %arg,
981 ); 1074 );
982 1075
1076 $self->{vp} = new CFPlus::UI::ViewPort
1077 expand => 1,
1078 scroll_x => $self->{scroll_x},
1079 scroll_y => $self->{scroll_y},
1080 ;
1081
983 $self->SUPER::add ($self->{vp}, $self->{slider}); 1082 $self->SUPER::add (0, 0, $self->{vp});
1083
984 $self->add ($child) if $child; 1084 $self->add ($child) if $child;
985 1085
986 $self 1086 $self
987} 1087}
1088
1089#TODO# update range on size_allocate depending on child
988 1090
989sub add { 1091sub add {
990 my ($self, $widget) = @_; 1092 my ($self, $widget) = @_;
991 1093
992 $self->{vp}->add ($self->{child} = $widget); 1094 $self->{vp}->add ($self->{child} = $widget);
993} 1095}
994 1096
1097sub invoke_mouse_wheel {
1098 my ($self, $ev) = @_;
1099
1100 return 0 unless $ev->{dy}; # only vertical movements for now
1101
1102 $self->{vslider}->emit (mouse_wheel => $ev);
1103
1104 1
1105}
1106
1107sub update_slider {
1108 my ($self) = @_;
1109
1110 my $child = ($self->{vp} or return)->child;
1111
1112 my ($w1, $w2) = ($child->{w}, $self->{vp}{w});
1113 $self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]);
1114
1115 my $visible = $w1 > $w2;
1116 if ($visible != $self->{hslider}{visible}) {
1117 $visible ? $self->SUPER::add (0, 1, $self->{hslider})
1118 : $self->{hslider}->hide;
1119 }
1120
1121 my ($h1, $h2) = ($child->{h}, $self->{vp}{h});
1122 $self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]);
1123
1124 my $visible = $h1 > $h2;
1125 if ($visible != $self->{vslider}{visible}) {
1126 $visible ? $self->SUPER::add (1, 0, $self->{vslider})
1127 : $self->{vslider}->hide;
1128 }
1129}
1130
995sub update { 1131sub update {
996 my ($self) = @_; 1132 my ($self) = @_;
997 1133
998 $self->SUPER::update; 1134 $self->SUPER::update;
999 1135 $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} 1136}
1004 1137
1005sub size_allocate { 1138sub invoke_size_allocate {
1006 my ($self, $w, $h) = @_; 1139 my ($self, $w, $h) = @_;
1007 1140
1141 $self->update_slider;
1008 $self->SUPER::size_allocate ($w, $h); 1142 $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} 1143}
1013
1014#TODO# update range on size_allocate depending on child
1015# update viewport offset on scroll
1016 1144
1017############################################################################# 1145#############################################################################
1018 1146
1019package CFClient::UI::Frame; 1147package CFPlus::UI::Frame;
1020 1148
1021our @ISA = CFClient::UI::Bin::; 1149our @ISA = CFPlus::UI::Bin::;
1022 1150
1023use CFClient::OpenGL; 1151use CFPlus::OpenGL;
1024 1152
1025sub new { 1153sub new {
1026 my $class = shift; 1154 my $class = shift;
1027 1155
1028 $class->SUPER::new ( 1156 $class->SUPER::new (
… …
1054 $self->SUPER::_draw; 1182 $self->SUPER::_draw;
1055} 1183}
1056 1184
1057############################################################################# 1185#############################################################################
1058 1186
1059package CFClient::UI::FancyFrame; 1187package CFPlus::UI::FancyFrame;
1060 1188
1061our @ISA = CFClient::UI::Bin::; 1189our @ISA = CFPlus::UI::Bin::;
1062 1190
1063use CFClient::OpenGL; 1191use 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 1192
1073sub new { 1193sub new {
1074 my ($class, %arg) = @_; 1194 my ($class, %arg) = @_;
1075 1195
1076 my $title = delete $arg{title}; 1196 if ((exists $arg{label}) && !ref $arg{label}) {
1197 $arg{label} = new CFPlus::UI::Label
1198 align => 1,
1199 valign => 0,
1200 text => $arg{label},
1201 fontsize => ($arg{border} || 0.8) * 0.75;
1202 }
1203
1204 my $self = $class->SUPER::new (
1205 # label => "",
1206 fg => [0.6, 0.3, 0.1],
1207 border => 0.8,
1208 style => 'single',
1209 %arg,
1210 );
1211
1212 $self
1213}
1214
1215sub add {
1216 my ($self, @widgets) = @_;
1217
1218 $self->SUPER::add (@widgets);
1219 $self->CFPlus::UI::Container::add ($self->{label}) if $self->{label};
1220}
1221
1222sub border {
1223 int $_[0]{border} * $::FONTSIZE
1224}
1225
1226sub size_request {
1227 my ($self) = @_;
1228
1229 ($self->{label_w}, undef) = $self->{label}->size_request
1230 if $self->{label};
1231
1232 my ($w, $h) = $self->SUPER::size_request;
1233
1234 (
1235 $w + $self->border * 2,
1236 $h + $self->border * 2,
1237 )
1238}
1239
1240sub invoke_size_allocate {
1241 my ($self, $w, $h) = @_;
1242
1243 my $border = $self->border;
1244
1245 $w -= List::Util::max 0, $border * 2;
1246 $h -= List::Util::max 0, $border * 2;
1247
1248 if (my $label = $self->{label}) {
1249 $label->{w} = List::Util::max 0, List::Util::min $self->{label_w}, $w - $border * 2;
1250 $label->{h} = List::Util::min $h, $border;
1251 $label->invoke_size_allocate ($label->{w}, $label->{h});
1252 }
1253
1254 $self->child->configure ($border, $border, $w, $h);
1255
1256 1
1257}
1258
1259sub _draw {
1260 my ($self) = @_;
1261
1262 my $child = $self->{children}[0];
1263
1264 my $border = $self->border;
1265 my ($w, $h) = ($self->{w}, $self->{h});
1266
1267 $child->draw;
1268
1269 glColor @{$self->{fg}};
1270 glBegin GL_LINE_STRIP;
1271 glVertex $border * 1.5 , $border * 0.5 + 0.5;
1272 glVertex $border * 0.5 + 0.5, $border * 0.5 + 0.5;
1273 glVertex $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
1274 glVertex $w - $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
1275 glVertex $w - $border * 0.5 + 0.5, $border * 0.5 + 0.5;
1276 glVertex $self->{label} ? $border * 2 + $self->{label}{w} : $border * 1.5, $border * 0.5 + 0.5;
1277 glEnd;
1278
1279 if ($self->{label}) {
1280 glTranslate $border * 2, 0;
1281 $self->{label}->_draw;
1282 }
1283}
1284
1285#############################################################################
1286
1287package CFPlus::UI::Toplevel;
1288
1289our @ISA = CFPlus::UI::Bin::;
1290
1291use CFPlus::OpenGL;
1292
1293my $bg =
1294 new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png",
1295 mipmap => 1, wrap => 1;
1296
1297my @border =
1298 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1299 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1300
1301sub new {
1302 my ($class, %arg) = @_;
1077 1303
1078 my $self = $class->SUPER::new ( 1304 my $self = $class->SUPER::new (
1079 bg => [1, 1, 1, 1], 1305 bg => [1, 1, 1, 1],
1080 border_bg => [1, 1, 1, 1], 1306 border_bg => [1, 1, 1, 1],
1081 border => 0.6, 1307 border => 0.6,
1082 can_events => 1, 1308 can_events => 1,
1083 min_w => 16, 1309 min_w => 64,
1084 min_h => 16, 1310 min_h => 32,
1085 %arg, 1311 %arg,
1086 ); 1312 );
1087 1313
1088 $self->{title} = new CFClient::UI::Label 1314 $self->{title_widget} = new CFPlus::UI::Label
1089 align => 0, 1315 align => 0,
1090 valign => 1, 1316 valign => 1,
1091 text => $title, 1317 text => $self->{title},
1092 fontsize => $self->{border} 1318 fontsize => $self->{border},
1093 if defined $title; 1319 if exists $self->{title};
1320
1321 if ($self->{has_close_button}) {
1322 $self->{close_button} =
1323 new CFPlus::UI::ImageButton
1324 path => 'x1_close.png',
1325 on_activate => sub { $self->emit ("delete") };
1326
1327 $self->CFPlus::UI::Container::add ($self->{close_button});
1328 }
1094 1329
1095 $self 1330 $self
1096} 1331}
1097 1332
1098sub add { 1333sub add {
1099 my ($self, @widgets) = @_; 1334 my ($self, @widgets) = @_;
1100 1335
1101 $self->SUPER::add (@widgets); 1336 $self->SUPER::add (@widgets);
1337 $self->CFPlus::UI::Container::add ($self->{close_button}) if $self->{close_button};
1102 $self->CFClient::UI::Container::add ($self->{title}) if $self->{title}; 1338 $self->CFPlus::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1103} 1339}
1104 1340
1105sub border { 1341sub border {
1106 int $_[0]{border} * $::FONTSIZE 1342 int $_[0]{border} * $::FONTSIZE
1107} 1343}
1108 1344
1109sub size_request { 1345sub size_request {
1110 my ($self) = @_; 1346 my ($self) = @_;
1111 1347
1112 $self->{title}->size_request 1348 $self->{title_widget}->size_request
1113 if $self->{title}; 1349 if $self->{title_widget};
1350
1351 $self->{close_button}->size_request
1352 if $self->{close_button};
1114 1353
1115 my ($w, $h) = $self->SUPER::size_request; 1354 my ($w, $h) = $self->SUPER::size_request;
1116 1355
1117 ( 1356 (
1118 $w + $self->border * 2, 1357 $w + $self->border * 2,
1119 $h + $self->border * 2, 1358 $h + $self->border * 2,
1120 ) 1359 )
1121} 1360}
1122 1361
1123sub size_allocate { 1362sub invoke_size_allocate {
1124 my ($self, $w, $h) = @_; 1363 my ($self, $w, $h) = @_;
1125 1364
1126 if ($self->{title}) { 1365 if ($self->{title_widget}) {
1127 $self->{title}{w} = $w; 1366 $self->{title_widget}{w} = $w;
1128 $self->{title}{h} = $h; 1367 $self->{title_widget}{h} = $h;
1129 $self->{title}->size_allocate ($w, $h); 1368 $self->{title_widget}->invoke_size_allocate ($w, $h);
1130 } 1369 }
1131 1370
1132 my $border = $self->border; 1371 my $border = $self->border;
1133 1372
1134 $h -= List::Util::max 0, $border * 2; 1373 $h -= List::Util::max 0, $border * 2;
1135 $w -= List::Util::max 0, $border * 2; 1374 $w -= List::Util::max 0, $border * 2;
1375
1376 $self->child->configure ($border, $border, $w, $h);
1377
1378 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
1379 if $self->{close_button};
1380
1381 1
1382}
1383
1384sub invoke_delete {
1385 my ($self) = @_;
1386
1387 $self->hide;
1136 1388
1137 $self->child->configure ($border, $border, $w, $h); 1389 1
1138} 1390}
1139 1391
1140sub button_down { 1392sub invoke_button_down {
1141 my ($self, $ev, $x, $y) = @_; 1393 my ($self, $ev, $x, $y) = @_;
1142 1394
1143 my ($w, $h) = @$self{qw(w h)}; 1395 my ($w, $h) = @$self{qw(w h)};
1144 my $border = $self->border; 1396 my $border = $self->border;
1145 1397
… …
1176 1428
1177 ($x, $y) = ($ev->{x}, $ev->{y}); 1429 ($x, $y) = ($ev->{x}, $ev->{y});
1178 1430
1179 $self->move_abs ($bx + $x - $ox, $by + $y - $oy); 1431 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1180 # HACK: the next line is required to enforce placement 1432 # HACK: the next line is required to enforce placement
1181 $self->{parent}->size_allocate ($self->{parent}{w}, $self->{parent}{h}); 1433 $self->{parent}->invoke_size_allocate ($self->{parent}{w}, $self->{parent}{h});
1182 }; 1434 };
1183 } else { 1435 } else {
1184 return 0; 1436 return 0;
1185 } 1437 }
1186 1438
1187 1 1439 1
1188} 1440}
1189 1441
1190sub button_up { 1442sub invoke_button_up {
1191 my ($self, $ev, $x, $y) = @_; 1443 my ($self, $ev, $x, $y) = @_;
1192 1444
1193 !!delete $self->{motion} 1445 ! ! delete $self->{motion}
1194} 1446}
1195 1447
1196sub mouse_motion { 1448sub invoke_mouse_motion {
1197 my ($self, $ev, $x, $y) = @_; 1449 my ($self, $ev, $x, $y) = @_;
1198 1450
1199 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1451 $self->{motion}->($ev, $x, $y) if $self->{motion};
1200 1452
1201 !!$self->{motion} 1453 ! ! $self->{motion}
1454}
1455
1456sub invoke_visibility_change {
1457 my ($self, $visible) = @_;
1458
1459 delete $self->{motion} unless $visible;
1460
1461 0
1202} 1462}
1203 1463
1204sub _draw { 1464sub _draw {
1205 my ($self) = @_; 1465 my ($self) = @_;
1206 1466
… …
1232 1492
1233 glDisable GL_TEXTURE_2D; 1493 glDisable GL_TEXTURE_2D;
1234 1494
1235 $child->draw; 1495 $child->draw;
1236 1496
1237 if ($self->{title}) { 1497 if ($self->{title_widget}) {
1238 glTranslate 0, $border - $self->{h}; 1498 glTranslate 0, $border - $self->{h};
1239 $self->{title}->_draw; 1499 $self->{title_widget}->_draw;
1500
1501 glTranslate 0, - ($border - $self->{h});
1240 } 1502 }
1503
1504 $self->{close_button}->draw
1505 if $self->{close_button};
1241} 1506}
1242 1507
1243############################################################################# 1508#############################################################################
1244 1509
1245package CFClient::UI::Table; 1510package CFPlus::UI::Table;
1246 1511
1247our @ISA = CFClient::UI::Base::; 1512our @ISA = CFPlus::UI::Base::;
1248 1513
1249use List::Util qw(max sum); 1514use List::Util qw(max sum);
1250 1515
1251use CFClient::OpenGL; 1516use CFPlus::OpenGL;
1252 1517
1253sub new { 1518sub new {
1254 my $class = shift; 1519 my $class = shift;
1255 1520
1256 $class->SUPER::new ( 1521 $class->SUPER::new (
1522 children => [],
1257 col_expand => [], 1523 col_expand => [],
1524 row_expand => [],
1258 @_, 1525 @_,
1259 ) 1526 )
1260} 1527}
1261 1528
1262sub children { 1529sub children {
1263 grep $_, map @$_, grep $_, @{ $_[0]{children} } 1530 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1264} 1531}
1265 1532
1533# TODO: store row/col info in child widget and use standard add/del
1266sub add { 1534sub add {
1267 my ($self, $x, $y, $child) = @_; 1535 my ($self) = shift;
1268 1536
1537 while (@_) {
1538 my ($x, $y, $child) = splice @_, 0, 3, ();
1269 $child->set_parent ($self); 1539 $child->set_parent ($self);
1270 $self->{children}[$y][$x] = $child; 1540 $self->{children}[$y][$x] = $child;
1541 }
1271 1542
1543 $self->{force_realloc} = 1;
1544 $self->{force_size_alloc} = 1;
1272 $self->realloc; 1545 $self->realloc;
1546}
1547
1548sub remove {
1549 my ($self, $child) = @_;
1550
1551 for (@{ $self->{children} }) {
1552 for (@{ $_ || [] }) {
1553 $_ = undef if $_ == $child;
1554 }
1555 }
1273} 1556}
1274 1557
1275# TODO: move to container class maybe? send children a signal on removal? 1558# TODO: move to container class maybe? send children a signal on removal?
1276sub clear { 1559sub clear {
1277 my ($self) = @_; 1560 my ($self) = @_;
… …
1318 (sum @$ws), 1601 (sum @$ws),
1319 (sum @$hs), 1602 (sum @$hs),
1320 ) 1603 )
1321} 1604}
1322 1605
1323sub size_allocate { 1606sub invoke_size_allocate {
1324 my ($self, $w, $h) = @_; 1607 my ($self, $w, $h) = @_;
1325 1608
1326 my ($ws, $hs) = $self->get_wh; 1609 my ($ws, $hs) = $self->get_wh;
1327 1610
1328 my $req_w = (sum @$ws) || 1; 1611 my $req_w = (sum @$ws) || 1;
1329 my $req_h = (sum @$hs) || 1; 1612 my $req_h = (sum @$hs) || 1;
1330 1613
1331 # TODO: nicer code && do row_expand 1614 # TODO: nicer code
1332 my @col_expand = @{$self->{col_expand}}; 1615 my @col_expand = @{$self->{col_expand}};
1333 @col_expand = (1) x @$ws unless @col_expand; 1616 @col_expand = (1) x @$ws unless @col_expand;
1334 my $col_expand = (sum @col_expand) || 1; 1617 my $col_expand = (sum @col_expand) || 1;
1335 1618
1336 # linearly scale sizes
1337 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 1619 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1338 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1339 1620
1340 CFClient::UI::harmonize $ws; 1621 CFPlus::UI::harmonize $ws;
1622
1623 my @row_expand = @{$self->{row_expand}};
1624 @row_expand = (1) x @$ws unless @row_expand;
1625 my $row_expand = (sum @row_expand) || 1;
1626
1627 $hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
1628
1341 CFClient::UI::harmonize $hs; 1629 CFPlus::UI::harmonize $hs;
1342 1630
1343 my $y; 1631 my $y;
1344 1632
1345 for my $r (0 .. $#{$self->{children}}) { 1633 for my $r (0 .. $#{$self->{children}}) {
1346 my $row = $self->{children}[$r] 1634 my $row = $self->{children}[$r]
… …
1360 } 1648 }
1361 1649
1362 $y += $row_h; 1650 $y += $row_h;
1363 } 1651 }
1364 1652
1653 1
1365} 1654}
1366 1655
1367sub find_widget { 1656sub find_widget {
1368 my ($self, $x, $y) = @_; 1657 my ($self, $x, $y) = @_;
1369 1658
… …
1388 } 1677 }
1389} 1678}
1390 1679
1391############################################################################# 1680#############################################################################
1392 1681
1393package CFClient::UI::Box; 1682package CFPlus::UI::Fixed;
1394 1683
1684use List::Util qw(min max);
1685
1395our @ISA = CFClient::UI::Container::; 1686our @ISA = CFPlus::UI::Container::;
1687
1688sub add {
1689 my ($self, $child, $posmode, $x, $y, $sizemode, $w, $h) = @_;
1690
1691 $child->{_fixed} = [$posmode, $x, $y, $sizemode, $w, $h];
1692 $self->SUPER::add ($child);
1693}
1694
1695sub _scale($$$) {
1696 my ($mode, $val, $max) = @_;
1697
1698 $mode eq "abs" ? $val
1699 : $mode eq "rel" ? $val * $max
1700 : 0
1701}
1702
1703sub size_request {
1704 my ($self) = @_;
1705
1706 my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0);
1707
1708 # determine overall size by querying abs widgets
1709 for my $child ($self->visible_children) {
1710 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
1711
1712 if ($pos eq "abs") {
1713 $w = _scale $size, $w, $child->{req_w};
1714 $h = _scale $size, $h, $child->{req_h};
1715
1716 $x1 = min $x1, $x; $x2 = max $x2, $x + $w;
1717 $y1 = min $y1, $y; $y2 = max $y2, $y + $h;
1718 }
1719 }
1720
1721 my $W = $x2 - $x1;
1722 my $H = $y2 - $y1;
1723
1724 # now layout remaining widgets
1725 for my $child ($self->visible_children) {
1726 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
1727
1728 if ($pos ne "abs") {
1729 $x = _scale $pos, $x, $W;
1730 $y = _scale $pos, $x, $H;
1731 $w = _scale $size, $w, $child->{req_w};
1732 $h = _scale $size, $h, $child->{req_h};
1733
1734 $x1 = min $x1, $x; $x2 = max $x2, $x + $w;
1735 $y1 = min $y1, $y; $y2 = max $y2, $y + $h;
1736 }
1737 }
1738
1739 my $W = $x2 - $x1;
1740 my $H = $y2 - $y1;
1741
1742 ($W, $H)
1743}
1744
1745sub invoke_size_allocate {
1746 my ($self, $W, $H) = @_;
1747
1748 for my $child ($self->visible_children) {
1749 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
1750
1751 $x = _scale $pos, $x, $W;
1752 $y = _scale $pos, $x, $H;
1753 $w = _scale $size, $w, $child->{req_w};
1754 $h = _scale $size, $h, $child->{req_h};
1755
1756 $child->configure ($x, $y, $w, $h);
1757 }
1758
1759 1
1760}
1761
1762#############################################################################
1763
1764package CFPlus::UI::Box;
1765
1766our @ISA = CFPlus::UI::Container::;
1396 1767
1397sub size_request { 1768sub size_request {
1398 my ($self) = @_; 1769 my ($self) = @_;
1399 1770
1400 $self->{vertical} 1771 $self->{vertical}
… …
1406 (List::Util::sum map $_->{req_w}, @{$self->{children}}), 1777 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1407 (List::Util::max map $_->{req_h}, @{$self->{children}}), 1778 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1408 ) 1779 )
1409} 1780}
1410 1781
1411sub size_allocate { 1782sub invoke_size_allocate {
1412 my ($self, $w, $h) = @_; 1783 my ($self, $w, $h) = @_;
1413 1784
1414 my $space = $self->{vertical} ? $h : $w; 1785 my $space = $self->{vertical} ? $h : $w;
1415 my $children = $self->{children}; 1786 my @children = $self->visible_children;
1416 1787
1417 my @req; 1788 my @req;
1418 1789
1419 if ($self->{homogeneous}) { 1790 if ($self->{homogeneous}) {
1420 @req = ($space / (@$children || 1)) x @$children; 1791 @req = ($space / (@children || 1)) x @children;
1421 } else { 1792 } else {
1422 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children; 1793 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @children;
1423 my $req = List::Util::sum @req; 1794 my $req = List::Util::sum @req;
1424 1795
1425 if ($req > $space) { 1796 if ($req > $space) {
1426 # ah well, not enough space 1797 # ah well, not enough space
1427 $_ *= $space / $req for @req; 1798 $_ *= $space / $req for @req;
1428 } else { 1799 } else {
1429 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1; 1800 my $expand = (List::Util::sum map $_->{expand}, @children) || 1;
1430 1801
1431 $space = ($space - $req) / $expand; # remaining space to give away 1802 $space = ($space - $req) / $expand; # remaining space to give away
1432 1803
1433 $req[$_] += $space * $children->[$_]{expand} 1804 $req[$_] += $space * $children[$_]{expand}
1434 for 0 .. $#$children; 1805 for 0 .. $#children;
1435 } 1806 }
1436 } 1807 }
1437 1808
1438 CFClient::UI::harmonize \@req; 1809 CFPlus::UI::harmonize \@req;
1439 1810
1440 my $pos = 0; 1811 my $pos = 0;
1441 for (0 .. $#$children) { 1812 for (0 .. $#children) {
1442 my $alloc = $req[$_]; 1813 my $alloc = $req[$_];
1443 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h)); 1814 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1444 1815
1445 $pos += $alloc; 1816 $pos += $alloc;
1446 } 1817 }
1447 1818
1448 1 1819 1
1449} 1820}
1450 1821
1451############################################################################# 1822#############################################################################
1452 1823
1453package CFClient::UI::HBox; 1824package CFPlus::UI::HBox;
1454 1825
1455our @ISA = CFClient::UI::Box::; 1826our @ISA = CFPlus::UI::Box::;
1456 1827
1457sub new { 1828sub new {
1458 my $class = shift; 1829 my $class = shift;
1459 1830
1460 $class->SUPER::new ( 1831 $class->SUPER::new (
… …
1463 ) 1834 )
1464} 1835}
1465 1836
1466############################################################################# 1837#############################################################################
1467 1838
1468package CFClient::UI::VBox; 1839package CFPlus::UI::VBox;
1469 1840
1470our @ISA = CFClient::UI::Box::; 1841our @ISA = CFPlus::UI::Box::;
1471 1842
1472sub new { 1843sub new {
1473 my $class = shift; 1844 my $class = shift;
1474 1845
1475 $class->SUPER::new ( 1846 $class->SUPER::new (
… …
1478 ) 1849 )
1479} 1850}
1480 1851
1481############################################################################# 1852#############################################################################
1482 1853
1483package CFClient::UI::Label; 1854package CFPlus::UI::Label;
1484 1855
1485our @ISA = CFClient::UI::DrawBG::; 1856our @ISA = CFPlus::UI::DrawBG::;
1486 1857
1487use CFClient::OpenGL; 1858use CFPlus::OpenGL;
1488 1859
1489sub new { 1860sub new {
1490 my ($class, %arg) = @_; 1861 my ($class, %arg) = @_;
1491 1862
1492 my $self = $class->SUPER::new ( 1863 my $self = $class->SUPER::new (
… …
1495 #active_bg => none 1866 #active_bg => none
1496 #font => default_font 1867 #font => default_font
1497 #text => initial text 1868 #text => initial text
1498 #markup => initial narkup 1869 #markup => initial narkup
1499 #max_w => maximum pixel width 1870 #max_w => maximum pixel width
1871 #style => 0, # render flags
1500 ellipsise => 3, # end 1872 ellipsise => 3, # end
1501 layout => (new CFClient::Layout), 1873 layout => (new CFPlus::Layout),
1502 fontsize => 1, 1874 fontsize => 1,
1503 align => -1, 1875 align => -1,
1504 valign => -1, 1876 valign => -1,
1505 padding_x => 2, 1877 padding_x => 2,
1506 padding_y => 2, 1878 padding_y => 2,
1507 can_events => 0, 1879 can_events => 0,
1508 %arg 1880 %arg
1509 ); 1881 );
1510 1882
1511 if (exists $self->{template}) { 1883 if (exists $self->{template}) {
1512 my $layout = new CFClient::Layout; 1884 my $layout = new CFPlus::Layout;
1513 $layout->set_text (delete $self->{template}); 1885 $layout->set_text (delete $self->{template});
1514 $self->{template} = $layout; 1886 $self->{template} = $layout;
1515 } 1887 }
1516 1888
1517 if (exists $self->{markup}) { 1889 if (exists $self->{markup}) {
… …
1521 } 1893 }
1522 1894
1523 $self 1895 $self
1524} 1896}
1525 1897
1526sub escape($) {
1527 local $_ = $_[0];
1528
1529 s/&/&amp;/g;
1530 s/>/&gt;/g;
1531 s/</&lt;/g;
1532
1533 $_
1534}
1535
1536sub update { 1898sub update {
1537 my ($self) = @_; 1899 my ($self) = @_;
1538 1900
1539 delete $self->{texture}; 1901 delete $self->{texture};
1540 $self->SUPER::update; 1902 $self->SUPER::update;
1541} 1903}
1542 1904
1905sub realloc {
1906 my ($self) = @_;
1907
1908 delete $self->{ox};
1909 $self->SUPER::realloc;
1910}
1911
1543sub set_text { 1912sub set_text {
1544 my ($self, $text) = @_; 1913 my ($self, $text) = @_;
1545 1914
1546 return if $self->{text} eq "T$text"; 1915 return if $self->{text} eq "T$text";
1547 $self->{text} = "T$text"; 1916 $self->{text} = "T$text";
1548 1917
1549 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1550 $self->{layout}->set_text ($text); 1918 $self->{layout}->set_text ($text);
1551 1919
1920 delete $self->{size_req};
1552 $self->realloc; 1921 $self->realloc;
1553 $self->update; 1922 $self->update;
1554} 1923}
1555 1924
1556sub set_markup { 1925sub set_markup {
… …
1559 return if $self->{text} eq "M$markup"; 1928 return if $self->{text} eq "M$markup";
1560 $self->{text} = "M$markup"; 1929 $self->{text} = "M$markup";
1561 1930
1562 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1931 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1563 1932
1564 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1565 $self->{layout}->set_markup ($markup); 1933 $self->{layout}->set_markup ($markup);
1566 1934
1935 delete $self->{size_req};
1567 $self->realloc; 1936 $self->realloc;
1568 $self->update; 1937 $self->update;
1569} 1938}
1570 1939
1571sub size_request { 1940sub size_request {
1572 my ($self) = @_; 1941 my ($self) = @_;
1573 1942
1943 $self->{size_req} ||= do {
1574 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1944 $self->{layout}->set_font ($self->{font}) if $self->{font};
1575 $self->{layout}->set_width ($self->{max_w} || -1); 1945 $self->{layout}->set_width ($self->{max_w} || -1);
1576 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1946 $self->{layout}->set_ellipsise ($self->{ellipsise});
1577 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1947 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1578 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1948 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1579 1949
1580 my ($w, $h) = $self->{layout}->size; 1950 my ($w, $h) = $self->{layout}->size;
1581 1951
1582 if (exists $self->{template}) { 1952 if (exists $self->{template}) {
1583 $self->{template}->set_font ($self->{font}) if $self->{font}; 1953 $self->{template}->set_font ($self->{font}) if $self->{font};
1954 $self->{template}->set_width ($self->{max_w} || -1);
1584 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1955 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1585 1956
1586 my ($w2, $h2) = $self->{template}->size; 1957 my ($w2, $h2) = $self->{template}->size;
1587 1958
1588 $w = List::Util::max $w, $w2; 1959 $w = List::Util::max $w, $w2;
1589 $h = List::Util::max $h, $h2; 1960 $h = List::Util::max $h, $h2;
1961 }
1962
1963 [$w, $h]
1590 } 1964 };
1591 1965
1592 ($w, $h) 1966 @{ $self->{size_req} }
1593} 1967}
1594 1968
1969sub baseline_shift {
1970 $_[0]{layout}->descent
1971}
1972
1595sub size_allocate { 1973sub invoke_size_allocate {
1596 my ($self, $w, $h) = @_; 1974 my ($self, $w, $h) = @_;
1597 1975
1598 delete $self->{ox}; 1976 delete $self->{ox};
1599 1977
1600 delete $self->{texture} 1978 delete $self->{texture}
1601 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w}; 1979 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1980
1981 1
1602} 1982}
1603 1983
1604sub set_fontsize { 1984sub set_fontsize {
1605 my ($self, $fontsize) = @_; 1985 my ($self, $fontsize) = @_;
1606 1986
1607 $self->{fontsize} = $fontsize; 1987 $self->{fontsize} = $fontsize;
1988 delete $self->{size_req};
1608 delete $self->{texture}; 1989 delete $self->{texture};
1609 1990
1610 $self->realloc; 1991 $self->realloc;
1611} 1992}
1612 1993
1994sub reconfigure {
1995 my ($self) = @_;
1996
1997 delete $self->{size_req};
1998 delete $self->{texture};
1999
2000 $self->SUPER::reconfigure;
2001}
2002
1613sub _draw { 2003sub _draw {
1614 my ($self) = @_; 2004 my ($self) = @_;
1615 2005
1616 $self->SUPER::_draw; # draw background, if applicable 2006 $self->SUPER::_draw; # draw background, if applicable
1617 2007
1618 my $tex = $self->{texture} ||= do { 2008 my $size = $self->{texture} ||= do {
1619 $self->{layout}->set_foreground (@{$self->{fg}}); 2009 $self->{layout}->set_foreground (@{$self->{fg}});
1620 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2010 $self->{layout}->set_font ($self->{font}) if $self->{font};
1621 $self->{layout}->set_width ($self->{w}); 2011 $self->{layout}->set_width ($self->{w});
1622 $self->{layout}->set_ellipsise ($self->{ellipsise}); 2012 $self->{layout}->set_ellipsise ($self->{ellipsise});
1623 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 2013 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1624 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2014 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1625 2015
1626 new_from_layout CFClient::Texture $self->{layout} 2016 [$self->{layout}->size]
1627 }; 2017 };
1628 2018
1629 unless (exists $self->{ox}) { 2019 unless (exists $self->{ox}) {
1630 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x} 2020 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1631 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x} 2021 : $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
1632 : ($self->{w} - $tex->{w}) * 0.5); 2022 : ($self->{w} - $size->[0]) * 0.5);
1633 2023
1634 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 2024 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1635 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y} 2025 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1636 : ($self->{h} - $tex->{h}) * 0.5); 2026 : ($self->{h} - $size->[1]) * 0.5);
1637 }; 2027 };
1638 2028
1639 glEnable GL_TEXTURE_2D; 2029 my $w = List::Util::min $self->{w} + 4, $size->[0];
1640 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2030 my $h = List::Util::min $self->{h} + 2, $size->[1];
1641 2031
1642 glColor_premultiply @{$self->{fg}} 2032 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1643 if $tex->{format} == GL_ALPHA;
1644
1645 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1646
1647 glDisable GL_TEXTURE_2D;
1648} 2033}
1649 2034
1650############################################################################# 2035#############################################################################
1651 2036
1652package CFClient::UI::EntryBase; 2037package CFPlus::UI::EntryBase;
1653 2038
1654our @ISA = CFClient::UI::Label::; 2039our @ISA = CFPlus::UI::Label::;
1655 2040
1656use CFClient::OpenGL; 2041use CFPlus::OpenGL;
1657 2042
1658sub new { 2043sub new {
1659 my $class = shift; 2044 my $class = shift;
1660 2045
1661 $class->SUPER::new ( 2046 $class->SUPER::new (
… …
1665 active_fg => [0, 0, 0], 2050 active_fg => [0, 0, 0],
1666 can_hover => 1, 2051 can_hover => 1,
1667 can_focus => 1, 2052 can_focus => 1,
1668 valign => 0, 2053 valign => 0,
1669 can_events => 1, 2054 can_events => 1,
2055 ellipsise => 0,
1670 #text => ... 2056 #text => ...
2057 #hidden => "*",
1671 @_ 2058 @_
1672 ) 2059 )
1673} 2060}
1674 2061
1675sub _set_text { 2062sub _set_text {
… …
1682 $self->{last_activity} = $::NOW; 2069 $self->{last_activity} = $::NOW;
1683 $self->{text} = $text; 2070 $self->{text} = $text;
1684 2071
1685 $text =~ s/./*/g if $self->{hidden}; 2072 $text =~ s/./*/g if $self->{hidden};
1686 $self->{layout}->set_text ("$text "); 2073 $self->{layout}->set_text ("$text ");
2074 delete $self->{size_req};
1687 2075
1688 $self->_emit (changed => $self->{text}); 2076 $self->emit (changed => $self->{text});
2077
2078 $self->realloc;
1689 $self->update; 2079 $self->update;
1690} 2080}
1691 2081
1692sub set_text { 2082sub set_text {
1693 my ($self, $text) = @_; 2083 my ($self, $text) = @_;
1694 2084
1695 $self->{cursor} = length $text; 2085 $self->{cursor} = length $text;
1696 $self->_set_text ($text); 2086 $self->_set_text ($text);
1697
1698 $self->realloc;
1699} 2087}
1700 2088
1701sub get_text { 2089sub get_text {
1702 $_[0]{text} 2090 $_[0]{text}
1703} 2091}
… …
1708 my ($w, $h) = $self->SUPER::size_request; 2096 my ($w, $h) = $self->SUPER::size_request;
1709 2097
1710 ($w + 1, $h) # add 1 for cursor 2098 ($w + 1, $h) # add 1 for cursor
1711} 2099}
1712 2100
1713sub key_down { 2101sub invoke_key_down {
1714 my ($self, $ev) = @_; 2102 my ($self, $ev) = @_;
1715 2103
1716 my $mod = $ev->{mod}; 2104 my $mod = $ev->{mod};
1717 my $sym = $ev->{sym}; 2105 my $sym = $ev->{sym};
1718 my $uni = $ev->{unicode}; 2106 my $uni = $ev->{unicode};
1719 2107
1720 my $text = $self->get_text; 2108 my $text = $self->get_text;
2109
2110 $self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;
1721 2111
1722 if ($uni == 8) { 2112 if ($uni == 8) {
1723 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 2113 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1724 } elsif ($uni == 127) { 2114 } elsif ($uni == 127) {
1725 substr $text, $self->{cursor}, 1, ""; 2115 substr $text, $self->{cursor}, 1, "";
1726 } elsif ($sym == CFClient::SDLK_LEFT) { 2116 } elsif ($sym == CFPlus::SDLK_LEFT) {
1727 --$self->{cursor} if $self->{cursor}; 2117 --$self->{cursor} if $self->{cursor};
1728 } elsif ($sym == CFClient::SDLK_RIGHT) { 2118 } elsif ($sym == CFPlus::SDLK_RIGHT) {
1729 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 2119 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1730 } elsif ($sym == CFClient::SDLK_HOME) { 2120 } elsif ($sym == CFPlus::SDLK_HOME) {
2121 # what a hack
2122 $self->{cursor} =
2123 (substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/
2124 ? length $1
2125 : 0;
2126 } elsif ($sym == CFPlus::SDLK_END) {
2127 # uh, again
2128 $self->{cursor} =
2129 (substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/
2130 ? $self->{cursor} + length $1
2131 : length $self->{text};
2132 } elsif ($uni == 21) { # ctrl-u
2133 $text = "";
1731 $self->{cursor} = 0; 2134 $self->{cursor} = 0;
1732 } elsif ($sym == CFClient::SDLK_END) {
1733 $self->{cursor} = length $text;
1734 } elsif ($uni == 27) { 2135 } elsif ($uni == 27) {
1735 $self->_emit ('escape'); 2136 $self->emit ('escape');
1736 } elsif ($uni) { 2137 } elsif ($uni == 0x0d) {
2138 substr $text, $self->{cursor}++, 0, "\012";
2139 } elsif ($uni >= 0x20) {
1737 substr $text, $self->{cursor}++, 0, chr $uni; 2140 substr $text, $self->{cursor}++, 0, chr $uni;
1738 } else { 2141 } else {
1739 return 0; 2142 return 0;
1740 } 2143 }
1741 2144
1742 $self->_set_text ($text); 2145 $self->_set_text ($text);
1743 2146
1744 $self->realloc; 2147 $self->realloc;
2148 $self->update;
1745 2149
1746 1 2150 1
1747} 2151}
1748 2152
1749sub focus_in { 2153sub invoke_focus_in {
1750 my ($self) = @_; 2154 my ($self) = @_;
1751 2155
1752 $self->{last_activity} = $::NOW; 2156 $self->{last_activity} = $::NOW;
1753 2157
1754 $self->SUPER::focus_in; 2158 $self->SUPER::invoke_focus_in
1755} 2159}
1756 2160
1757sub button_down { 2161sub invoke_button_down {
1758 my ($self, $ev, $x, $y) = @_; 2162 my ($self, $ev, $x, $y) = @_;
1759 2163
1760 $self->SUPER::button_down ($ev, $x, $y); 2164 $self->SUPER::invoke_button_down ($ev, $x, $y);
1761 2165
1762 my $idx = $self->{layout}->xy_to_index ($x, $y); 2166 my $idx = $self->{layout}->xy_to_index ($x, $y);
1763 2167
1764 # byte-index to char-index 2168 # byte-index to char-index
1765 my $text = $self->{text}; 2169 my $text = $self->{text};
1766 utf8::encode $text; 2170 utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1767 $self->{cursor} = length substr $text, 0, $idx; 2171 $self->{cursor} = length $text;
1768 2172
1769 $self->_set_text ($self->{text}); 2173 $self->_set_text ($self->{text});
1770 $self->update; 2174 $self->update;
1771 2175
1772 1 2176 1
1773} 2177}
1774 2178
1775sub mouse_motion { 2179sub invoke_mouse_motion {
1776 my ($self, $ev, $x, $y) = @_; 2180 my ($self, $ev, $x, $y) = @_;
1777# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 2181# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1778 2182
1779 0 2183 1
1780} 2184}
1781 2185
1782sub _draw { 2186sub _draw {
1783 my ($self) = @_; 2187 my ($self) = @_;
1784 2188
… …
1811 utf8::encode $text; 2215 utf8::encode $text;
1812 2216
1813 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text) 2217 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)
1814 } 2218 }
1815 2219
1816 glColor @{$self->{fg}};
1817 glBegin GL_LINES; 2220 glBegin GL_LINES;
1818 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy}; 2221 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};
1819 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h}; 2222 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1820 glEnd; 2223 glEnd;
1821 } 2224 }
1822} 2225}
1823 2226
2227#############################################################################
2228
1824package CFClient::UI::Entry; 2229package CFPlus::UI::Entry;
1825 2230
1826our @ISA = CFClient::UI::EntryBase::; 2231our @ISA = CFPlus::UI::EntryBase::;
1827 2232
1828use CFClient::OpenGL; 2233use CFPlus::OpenGL;
1829 2234
1830sub key_down { 2235sub invoke_key_down {
1831 my ($self, $ev) = @_; 2236 my ($self, $ev) = @_;
1832 2237
1833 my $sym = $ev->{sym}; 2238 my $sym = $ev->{sym};
1834 2239
1835 if ($sym == 13) { 2240 if ($ev->{uni} == 0x0d || $sym == 13) {
1836 unshift @{$self->{history}}, 2241 unshift @{$self->{history}},
1837 my $txt = $self->get_text; 2242 my $txt = $self->get_text;
2243
1838 $self->{history_pointer} = -1; 2244 $self->{history_pointer} = -1;
1839 $self->{history_saveback} = ''; 2245 $self->{history_saveback} = '';
1840 $self->_emit (activate => $txt); 2246 $self->emit (activate => $txt);
1841 $self->update; 2247 $self->update;
1842 2248
1843 } elsif ($sym == CFClient::SDLK_UP) { 2249 } elsif ($sym == CFPlus::SDLK_UP) {
1844 if ($self->{history_pointer} < 0) { 2250 if ($self->{history_pointer} < 0) {
1845 $self->{history_saveback} = $self->get_text; 2251 $self->{history_saveback} = $self->get_text;
1846 } 2252 }
1847 if (@{$self->{history} || []} > 0) { 2253 if (@{$self->{history} || []} > 0) {
1848 $self->{history_pointer}++; 2254 $self->{history_pointer}++;
… …
1850 $self->{history_pointer} = @{$self->{history} || []} - 1; 2256 $self->{history_pointer} = @{$self->{history} || []} - 1;
1851 } 2257 }
1852 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2258 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1853 } 2259 }
1854 2260
1855 } elsif ($sym == CFClient::SDLK_DOWN) { 2261 } elsif ($sym == CFPlus::SDLK_DOWN) {
1856 $self->{history_pointer}--; 2262 $self->{history_pointer}--;
1857 $self->{history_pointer} = -1 if $self->{history_pointer} < 0; 2263 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1858 2264
1859 if ($self->{history_pointer} >= 0) { 2265 if ($self->{history_pointer} >= 0) {
1860 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2266 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1861 } else { 2267 } else {
1862 $self->set_text ($self->{history_saveback}); 2268 $self->set_text ($self->{history_saveback});
1863 } 2269 }
1864 2270
1865 } else { 2271 } else {
1866 return $self->SUPER::key_down ($ev) 2272 return $self->SUPER::invoke_key_down ($ev)
1867 } 2273 }
1868 2274
1869 1 2275 1
1870} 2276}
1871 2277
1872############################################################################# 2278#############################################################################
1873 2279
2280package CFPlus::UI::TextEdit;
2281
2282our @ISA = CFPlus::UI::EntryBase::;
2283
2284use CFPlus::OpenGL;
2285
2286sub move_cursor_ver {
2287 my ($self, $dy) = @_;
2288
2289 my ($y, $x) = $self->{layout}->index_to_line_x ($self->{cursor});
2290
2291 $y += $dy;
2292
2293 if (defined (my $index = $self->{layout}->line_x_to_index ($y, $x))) {
2294 $self->{cursor} = $index;
2295 delete $self->{cur_h};
2296 $self->update;
2297 return;
2298 }
2299}
2300
2301sub invoke_key_down {
2302 my ($self, $ev) = @_;
2303
2304 my $sym = $ev->{sym};
2305
2306 if ($sym == CFPlus::SDLK_UP) {
2307 $self->move_cursor_ver (-1);
2308 } elsif ($sym == CFPlus::SDLK_DOWN) {
2309 $self->move_cursor_ver (+1);
2310 } else {
2311 return $self->SUPER::invoke_key_down ($ev)
2312 }
2313
2314 1
2315}
2316
2317#############################################################################
2318
1874package CFClient::UI::Button; 2319package CFPlus::UI::Button;
1875 2320
1876our @ISA = CFClient::UI::Label::; 2321our @ISA = CFPlus::UI::Label::;
1877 2322
1878use CFClient::OpenGL; 2323use CFPlus::OpenGL;
1879 2324
1880my @tex = 2325my @tex =
1881 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2326 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1882 qw(b1_button_active.png); 2327 qw(b1_button_active.png);
1883 2328
1884sub new { 2329sub new {
1885 my $class = shift; 2330 my $class = shift;
1886 2331
… …
1895 can_events => 1, 2340 can_events => 1,
1896 @_ 2341 @_
1897 ) 2342 )
1898} 2343}
1899 2344
1900sub activate { }
1901
1902sub button_up { 2345sub invoke_button_up {
1903 my ($self, $ev, $x, $y) = @_; 2346 my ($self, $ev, $x, $y) = @_;
1904 2347
1905 $self->emit ("activate") 2348 $self->emit ("activate")
1906 if $x >= 0 && $x < $self->{w} 2349 if $x >= 0 && $x < $self->{w}
1907 && $y >= 0 && $y < $self->{h}; 2350 && $y >= 0 && $y < $self->{h};
… …
1925 $self->SUPER::_draw; 2368 $self->SUPER::_draw;
1926} 2369}
1927 2370
1928############################################################################# 2371#############################################################################
1929 2372
1930package CFClient::UI::CheckBox; 2373package CFPlus::UI::CheckBox;
1931 2374
1932our @ISA = CFClient::UI::DrawBG::; 2375our @ISA = CFPlus::UI::DrawBG::;
1933 2376
1934my @tex = 2377my @tex =
1935 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2378 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1936 qw(c1_checkbox_bg.png c1_checkbox_active.png); 2379 qw(c1_checkbox_bg.png c1_checkbox_active.png);
1937 2380
1938use CFClient::OpenGL; 2381use CFPlus::OpenGL;
1939 2382
1940sub new { 2383sub new {
1941 my $class = shift; 2384 my $class = shift;
1942 2385
1943 $class->SUPER::new ( 2386 $class->SUPER::new (
… …
1957 my ($self) = @_; 2400 my ($self) = @_;
1958 2401
1959 (6) x 2 2402 (6) x 2
1960} 2403}
1961 2404
2405sub toggle {
2406 my ($self) = @_;
2407
2408 $self->{state} = !$self->{state};
2409 $self->emit (changed => $self->{state});
2410 $self->update;
2411}
2412
1962sub button_down { 2413sub invoke_button_down {
1963 my ($self, $ev, $x, $y) = @_; 2414 my ($self, $ev, $x, $y) = @_;
1964 2415
1965 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x} 2416 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1966 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) { 2417 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1967 $self->{state} = !$self->{state}; 2418 $self->toggle;
1968 $self->_emit (changed => $self->{state});
1969 } else { 2419 } else {
1970 return 0 2420 return 0
1971 } 2421 }
1972 2422
1973 1 2423 1
… …
1993 glDisable GL_TEXTURE_2D; 2443 glDisable GL_TEXTURE_2D;
1994} 2444}
1995 2445
1996############################################################################# 2446#############################################################################
1997 2447
1998package CFClient::UI::Image; 2448package CFPlus::UI::Image;
1999 2449
2000our @ISA = CFClient::UI::Base::; 2450our @ISA = CFPlus::UI::Base::;
2001 2451
2002use CFClient::OpenGL; 2452use CFPlus::OpenGL;
2003use Carp qw/confess/;
2004 2453
2005our %loaded_images; 2454our %texture_cache;
2006 2455
2007sub new { 2456sub new {
2008 my $class = shift; 2457 my $class = shift;
2009 2458
2010 my $self = $class->SUPER::new (can_events => 0, @_); 2459 my $self = $class->SUPER::new (
2460 can_events => 0,
2461 @_,
2462 );
2011 2463
2012 $self->{image} or confess "Image has 'image' not set. This is a fatal error!"; 2464 $self->{path} || $self->{tex}
2465 or Carp::croak "'path' or 'tex' attributes required";
2013 2466
2014 $loaded_images{$self->{image}} ||= 2467 $self->{tex} ||= $texture_cache{$self->{path}} ||=
2015 new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1; 2468 new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;
2016 2469
2017 my $tex = $self->{tex} = $loaded_images{$self->{image}}; 2470 CFPlus::weaken $texture_cache{$self->{path}};
2018 2471
2019 Scalar::Util::weaken $loaded_images{$self->{image}}; 2472 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2020
2021 $self->{aspect} = $tex->{w} / $tex->{h};
2022 2473
2023 $self 2474 $self
2024} 2475}
2025 2476
2477sub STORABLE_freeze {
2478 my ($self, $cloning) = @_;
2479
2480 $self->{path}
2481 or die "cannot serialise CFPlus::UI::Image on non-loadable images\n";
2482
2483 $self->{path}
2484}
2485
2486sub STORABLE_attach {
2487 my ($self, $cloning, $path) = @_;
2488
2489 $self->new (path => $path)
2490}
2491
2026sub size_request { 2492sub size_request {
2027 my ($self) = @_; 2493 my ($self) = @_;
2028 2494
2029 ($self->{tex}->{w}, $self->{tex}->{h}) 2495 ($self->{tex}{w}, $self->{tex}{h})
2030} 2496}
2031 2497
2032sub _draw { 2498sub _draw {
2033 my ($self) = @_; 2499 my ($self) = @_;
2034 2500
… …
2044 } 2510 }
2045 2511
2046 glEnable GL_TEXTURE_2D; 2512 glEnable GL_TEXTURE_2D;
2047 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2513 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2048 2514
2049 $tex->draw_quad_alpha (0, 0, $w, $h); 2515 $tex->draw_quad (0, 0, $w, $h);
2050 2516
2051 glDisable GL_TEXTURE_2D; 2517 glDisable GL_TEXTURE_2D;
2052} 2518}
2053 2519
2054############################################################################# 2520#############################################################################
2055 2521
2522package CFPlus::UI::ImageButton;
2523
2524our @ISA = CFPlus::UI::Image::;
2525
2526use CFPlus::OpenGL;
2527
2528my %textures;
2529
2530sub new {
2531 my $class = shift;
2532
2533 my $self = $class->SUPER::new (
2534 padding_x => 4,
2535 padding_y => 4,
2536 fg => [1, 1, 1],
2537 active_fg => [0, 0, 1],
2538 can_hover => 1,
2539 align => 0,
2540 valign => 0,
2541 can_events => 1,
2542 @_
2543 );
2544}
2545
2546sub invoke_button_up {
2547 my ($self, $ev, $x, $y) = @_;
2548
2549 $self->emit ("activate")
2550 if $x >= 0 && $x < $self->{w}
2551 && $y >= 0 && $y < $self->{h};
2552
2553 1
2554}
2555
2556#############################################################################
2557
2056package CFClient::UI::VGauge; 2558package CFPlus::UI::VGauge;
2057 2559
2058our @ISA = CFClient::UI::Base::; 2560our @ISA = CFPlus::UI::Base::;
2059 2561
2060use List::Util qw(min max); 2562use List::Util qw(min max);
2061 2563
2062use CFClient::OpenGL; 2564use CFPlus::OpenGL;
2063 2565
2064my %tex = ( 2566my %tex = (
2065 food => [ 2567 food => [
2066 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2568 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2067 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ 2569 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2068 ], 2570 ],
2069 grace => [ 2571 grace => [
2070 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2572 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2071 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/ 2573 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
2072 ], 2574 ],
2073 hp => [ 2575 hp => [
2074 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2576 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2075 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/ 2577 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2076 ], 2578 ],
2077 mana => [ 2579 mana => [
2078 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2580 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2079 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/ 2581 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
2080 ], 2582 ],
2081); 2583);
2082 2584
2083# eg. VGauge->new (gauge => 'food'), default gauge: food 2585# eg. VGauge->new (gauge => 'food'), default gauge: food
… …
2143 my $ycut1 = max 0, min 1, $ycut; 2645 my $ycut1 = max 0, min 1, $ycut;
2144 my $ycut2 = max 0, min 1, $ycut - 1; 2646 my $ycut2 = max 0, min 1, $ycut - 1;
2145 2647
2146 my $h1 = $self->{h} * (1 - $ycut1); 2648 my $h1 = $self->{h} * (1 - $ycut1);
2147 my $h2 = $self->{h} * (1 - $ycut2); 2649 my $h2 = $self->{h} * (1 - $ycut2);
2650 my $h3 = $self->{h};
2651
2652 $_ = $_ * (284-4)/288 + 4/288 for ($h1, $h2, $h3);
2148 2653
2149 glEnable GL_BLEND; 2654 glEnable GL_BLEND;
2150 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, 2655 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2151 GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2656 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2152 glEnable GL_TEXTURE_2D; 2657 glEnable GL_TEXTURE_2D;
… …
2171 2676
2172 if ($t3) { 2677 if ($t3) {
2173 glBindTexture GL_TEXTURE_2D, $t3->{name}; 2678 glBindTexture GL_TEXTURE_2D, $t3->{name};
2174 glBegin GL_QUADS; 2679 glBegin GL_QUADS;
2175 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2; 2680 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2176 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h}; 2681 glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2177 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h}; 2682 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2178 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2; 2683 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2179 glEnd; 2684 glEnd;
2180 } 2685 }
2181 2686
2182 glDisable GL_BLEND; 2687 glDisable GL_BLEND;
2183 glDisable GL_TEXTURE_2D; 2688 glDisable GL_TEXTURE_2D;
2184} 2689}
2185 2690
2186############################################################################# 2691#############################################################################
2187 2692
2188package CFClient::UI::Gauge; 2693package CFPlus::UI::Gauge;
2189 2694
2190our @ISA = CFClient::UI::VBox::; 2695our @ISA = CFPlus::UI::VBox::;
2191 2696
2192sub new { 2697sub new {
2193 my ($class, %arg) = @_; 2698 my ($class, %arg) = @_;
2194 2699
2195 my $self = $class->SUPER::new ( 2700 my $self = $class->SUPER::new (
… …
2197 can_hover => 1, 2702 can_hover => 1,
2198 can_events => 1, 2703 can_events => 1,
2199 %arg, 2704 %arg,
2200 ); 2705 );
2201 2706
2202 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999"); 2707 $self->add ($self->{value} = new CFPlus::UI::Label valign => +1, align => 0, template => "999");
2203 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1); 2708 $self->add ($self->{gauge} = new CFPlus::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
2204 $self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999"); 2709 $self->add ($self->{max} = new CFPlus::UI::Label valign => -1, align => 0, template => "999");
2205 2710
2206 $self 2711 $self
2207} 2712}
2208 2713
2209sub set_fontsize { 2714sub set_fontsize {
… …
2230 $self->{value}->set_text ($val); 2735 $self->{value}->set_text ($val);
2231} 2736}
2232 2737
2233############################################################################# 2738#############################################################################
2234 2739
2235package CFClient::UI::Slider; 2740package CFPlus::UI::Slider;
2236 2741
2237use strict; 2742use strict;
2238 2743
2239use CFClient::OpenGL; 2744use CFPlus::OpenGL;
2240 2745
2241our @ISA = CFClient::UI::DrawBG::; 2746our @ISA = CFPlus::UI::DrawBG::;
2242 2747
2243my @tex = 2748my @tex =
2244 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 2749 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
2245 qw(s1_slider.png s1_slider_bg.png); 2750 qw(s1_slider.png s1_slider_bg.png);
2246 2751
2247sub new { 2752sub new {
2248 my $class = shift; 2753 my $class = shift;
2249 2754
… …
2270 $self->update; 2775 $self->update;
2271 2776
2272 $self 2777 $self
2273} 2778}
2274 2779
2275sub changed { }
2276
2277sub set_range { 2780sub set_range {
2278 my ($self, $range) = @_; 2781 my ($self, $range) = @_;
2279 2782
2280 ($range, $self->{range}) = ($self->{range}, $range); 2783 ($range, $self->{range}) = ($self->{range}, $range);
2281 2784
2282 $self->update
2283 if "@$range" ne "@{$self->{range}}"; 2785 if ("@$range" ne "@{$self->{range}}") {
2786 $self->update;
2787 $self->set_value ($self->{range}[0]);
2788 }
2284} 2789}
2285 2790
2286sub set_value { 2791sub set_value {
2287 my ($self, $value) = @_; 2792 my ($self, $value) = @_;
2288 2793
… …
2299 if $unit; 2804 if $unit;
2300 2805
2301 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2806 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2302 2807
2303 if ($value != $old_value) { 2808 if ($value != $old_value) {
2304 $self->_emit (changed => $value); 2809 $self->emit (changed => $value);
2305 $self->update; 2810 $self->update;
2306 } 2811 }
2307} 2812}
2308 2813
2309sub size_request { 2814sub size_request {
2310 my ($self) = @_; 2815 my ($self) = @_;
2311 2816
2312 ($self->{req_w}, $self->{req_h}) 2817 ($self->{req_w}, $self->{req_h})
2313} 2818}
2314 2819
2315sub button_down { 2820sub invoke_button_down {
2316 my ($self, $ev, $x, $y) = @_; 2821 my ($self, $ev, $x, $y) = @_;
2317 2822
2318 $self->SUPER::button_down ($ev, $x, $y); 2823 $self->SUPER::invoke_button_down ($ev, $x, $y);
2319 2824
2320 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2825 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2321 2826
2322 $self->mouse_motion ($ev, $x, $y) 2827 $self->invoke_mouse_motion ($ev, $x, $y)
2323} 2828}
2324 2829
2325sub mouse_motion { 2830sub invoke_mouse_motion {
2326 my ($self, $ev, $x, $y) = @_; 2831 my ($self, $ev, $x, $y) = @_;
2327 2832
2328 if ($GRAB == $self) { 2833 if ($GRAB == $self) {
2329 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2834 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2330 2835
… …
2336 } else { 2841 } else {
2337 return 0; 2842 return 0;
2338 } 2843 }
2339 2844
2340 1 2845 1
2846}
2847
2848sub invoke_mouse_wheel {
2849 my ($self, $ev) = @_;
2850
2851 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
2852
2853 my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
2854
2855 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
2856
2857 ! ! $delta
2341} 2858}
2342 2859
2343sub update { 2860sub update {
2344 my ($self) = @_; 2861 my ($self) = @_;
2345 2862
… …
2394 glDisable GL_TEXTURE_2D; 2911 glDisable GL_TEXTURE_2D;
2395} 2912}
2396 2913
2397############################################################################# 2914#############################################################################
2398 2915
2399package CFClient::UI::ValSlider; 2916package CFPlus::UI::ValSlider;
2400 2917
2401our @ISA = CFClient::UI::HBox::; 2918our @ISA = CFPlus::UI::HBox::;
2402 2919
2403sub new { 2920sub new {
2404 my ($class, %arg) = @_; 2921 my ($class, %arg) = @_;
2405 2922
2406 my $range = delete $arg{range}; 2923 my $range = delete $arg{range};
2407 2924
2408 my $self = $class->SUPER::new ( 2925 my $self = $class->SUPER::new (
2409 slider => (new CFClient::UI::Slider expand => 1, range => $range), 2926 slider => (new CFPlus::UI::Slider expand => 1, range => $range),
2410 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}), 2927 entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
2411 to_value => sub { shift }, 2928 to_value => sub { shift },
2412 from_value => sub { shift }, 2929 from_value => sub { shift },
2413 %arg, 2930 %arg,
2414 ); 2931 );
2415 2932
… …
2435sub set_range { shift->{slider}->set_range (@_) } 2952sub set_range { shift->{slider}->set_range (@_) }
2436sub set_value { shift->{slider}->set_value (@_) } 2953sub set_value { shift->{slider}->set_value (@_) }
2437 2954
2438############################################################################# 2955#############################################################################
2439 2956
2440package CFClient::UI::TextView; 2957package CFPlus::UI::TextScroller;
2441 2958
2442our @ISA = CFClient::UI::HBox::; 2959our @ISA = CFPlus::UI::HBox::;
2443 2960
2444use CFClient::OpenGL; 2961use CFPlus::OpenGL;
2445 2962
2446sub new { 2963sub new {
2447 my $class = shift; 2964 my $class = shift;
2448 2965
2449 my $self = $class->SUPER::new ( 2966 my $self = $class->SUPER::new (
2450 fontsize => 1, 2967 fontsize => 1,
2451 can_events => 0, 2968 can_events => 1,
2969 indent => 0,
2452 #font => default_font 2970 #font => default_font
2453 @_, 2971 @_,
2454 2972
2455 layout => (new CFClient::Layout 1), 2973 layout => (new CFPlus::Layout),
2456 par => [], 2974 par => [],
2975 max_par => 0,
2457 height => 0, 2976 height => 0,
2458 children => [ 2977 children => [
2459 (new CFClient::UI::Empty expand => 1), 2978 (new CFPlus::UI::Empty expand => 1),
2460 (new CFClient::UI::Slider vertical => 1), 2979 (new CFPlus::UI::Slider vertical => 1),
2461 ], 2980 ],
2462 ); 2981 );
2463 2982
2464 $self->{children}[1]->connect (changed => sub { $self->update }); 2983 $self->{children}[1]->connect (changed => sub { $self->update });
2465 2984
… …
2471 2990
2472 $self->{fontsize} = $fontsize; 2991 $self->{fontsize} = $fontsize;
2473 $self->reflow; 2992 $self->reflow;
2474} 2993}
2475 2994
2995sub size_request {
2996 my ($self) = @_;
2997
2998 my ($empty, $slider) = @{ $self->{children} };
2999
3000 local $self->{children} = [$empty, $slider];
3001 $self->SUPER::size_request
3002}
3003
2476sub size_allocate { 3004sub invoke_size_allocate {
2477 my ($self, $w, $h) = @_; 3005 my ($self, $w, $h) = @_;
2478 3006
2479 $self->SUPER::size_allocate ($w, $h); 3007 my ($empty, $slider, @other) = @{ $self->{children} };
3008 $_->configure (@$_{qw(x y req_w req_h)}) for @other;
2480 3009
2481 $self->{layout}->set_font ($self->{font}) if $self->{font}; 3010 $self->{layout}->set_font ($self->{font}) if $self->{font};
2482 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 3011 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2483 $self->{layout}->set_width ($self->{children}[0]{w}); 3012 $self->{layout}->set_width ($empty->{w});
3013 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2484 3014
2485 $self->reflow; 3015 $self->reflow;
2486}
2487 3016
2488sub text_size { 3017 local $self->{children} = [$empty, $slider];
3018 $self->SUPER::invoke_size_allocate ($w, $h)
3019}
3020
3021sub invoke_mouse_wheel {
2489 my ($self, $text, $indent) = @_; 3022 my ($self, $ev) = @_;
3023
3024 return 0 unless $ev->{dy}; # only vertical movements
3025
3026 $self->{children}[1]->emit (mouse_wheel => $ev);
3027
3028 1
3029}
3030
3031sub get_layout {
3032 my ($self, $para) = @_;
2490 3033
2491 my $layout = $self->{layout}; 3034 my $layout = $self->{layout};
2492 3035
3036 $layout->set_font ($self->{font}) if $self->{font};
3037 $layout->set_foreground (@{$para->{fg}});
2493 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 3038 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2494 $layout->set_width ($self->{children}[0]{w} - $indent); 3039 $layout->set_width ($self->{children}[0]{w} - $para->{indent});
3040 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2495 $layout->set_markup ($text); 3041 $layout->set_markup ($para->{markup});
3042
3043 $layout->set_shapes (
3044 map
3045 +(0, $_->baseline_shift +$_->{padding_y} - $_->{h}, $_->{w}, $_->{h}),
3046 @{$para->{widget}}
2496 3047 );
3048
2497 $layout->size 3049 $layout
2498} 3050}
2499 3051
2500sub reflow { 3052sub reflow {
2501 my ($self) = @_; 3053 my ($self) = @_;
2502 3054
… …
2509 3061
2510 # todo: base offset on lines or so, not on pixels 3062 # todo: base offset on lines or so, not on pixels
2511 $self->{children}[1]->set_value ($offset); 3063 $self->{children}[1]->set_value ($offset);
2512} 3064}
2513 3065
3066sub current_paragraph {
3067 my ($self) = @_;
3068
3069 $self->{top_paragraph} - 1
3070}
3071
3072sub scroll_to {
3073 my ($self, $para) = @_;
3074
3075 $para = List::Util::max 0, List::Util::min $#{$self->{par}}, $para;
3076
3077 $self->{scroll_to} = $para;
3078 $self->update;
3079}
3080
2514sub clear { 3081sub clear {
2515 my ($self) = @_; 3082 my ($self) = @_;
3083
3084 my (undef, undef, @other) = @{ $self->{children} };
3085 $self->remove ($_) for @other;
2516 3086
2517 $self->{par} = []; 3087 $self->{par} = [];
2518 $self->{height} = 0; 3088 $self->{height} = 0;
2519 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]); 3089 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2520} 3090}
2521 3091
2522sub add_paragraph { 3092sub add_paragraph {
2523 my ($self, $color, $text, $indent) = @_; 3093 my $self = shift;
2524 3094
2525 for my $line (split /\n/, $text) { 3095 for my $para (@_) {
2526 my ($w, $h) = $self->text_size ($line); 3096 $para = {
3097 fg => [1, 1, 1, 1],
3098 indent => 0,
3099 markup => "",
3100 widget => [],
3101 ref $para ? %$para : (markup => $para),
3102 w => 1e10,
3103 wrapped => 1,
3104 };
3105
3106 $self->add (@{ $para->{widget} }) if @{ $para->{widget} };
3107 push @{$self->{par}}, $para;
3108 }
3109
3110 if (my $max = $self->{max_par}) {
3111 shift @{$self->{par}} while @{$self->{par}} > $max;
3112 }
3113
3114 $self->{need_reflow}++;
3115 $self->update;
3116}
3117
3118sub scroll_to_bottom {
3119 my ($self) = @_;
3120
3121 $self->{scroll_to} = $#{$self->{par}};
3122 $self->update;
3123}
3124
3125sub force_uptodate {
3126 my ($self) = @_;
3127
3128 if (delete $self->{need_reflow}) {
3129 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
3130
3131 my $height = 0;
3132
3133 for my $para (@{$self->{par}}) {
3134 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
3135 my $layout = $self->get_layout ($para);
3136 my ($w, $h) = $layout->size;
3137
3138 $para->{w} = $w + $para->{indent};
3139 $para->{h} = $h;
3140 $para->{wrapped} = $layout->has_wrapped;
3141 }
3142
3143 $para->{y} = $height;
3144 $height += $para->{h};
3145 }
3146
2527 $self->{height} += $h; 3147 $self->{height} = $height;
2528 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line]; 3148 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2529 }
2530 3149
2531 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]); 3150 delete $self->{texture};
3151 }
3152
3153 if (my $paridx = delete $self->{scroll_to}) {
3154 $self->{children}[1]->set_value ($self->{par}[$paridx]{y});
3155 }
2532} 3156}
2533 3157
2534sub update { 3158sub update {
2535 my ($self) = @_; 3159 my ($self) = @_;
2536 3160
… …
2538 3162
2539 return unless $self->{h} > 0; 3163 return unless $self->{h} > 0;
2540 3164
2541 delete $self->{texture}; 3165 delete $self->{texture};
2542 3166
2543 $ROOT->on_post_alloc ($self, sub { 3167 $ROOT->on_post_alloc ($self => sub {
3168 $self->force_uptodate;
3169
2544 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 3170 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2545 3171
2546 if (delete $self->{need_reflow}) {
2547 my $height = 0;
2548
2549 my $layout = $self->{layout};
2550
2551 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2552
2553 for (@{$self->{par}}) {
2554 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2555 $layout->set_width ($W - $_->[3]);
2556 $layout->set_markup ($_->[4]);
2557 my ($w, $h) = $layout->size;
2558 $_->[0] = $w + $_->[3];
2559 $_->[1] = $h;
2560 }
2561
2562 $height += $_->[1];
2563 }
2564
2565 $self->{height} = $height;
2566
2567 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2568
2569 delete $self->{texture};
2570 }
2571
2572 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 3172 $self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2573 glClearColor 0, 0, 0, 0; 3173 glClearColor 0, 0, 0, 0;
2574 glClear GL_COLOR_BUFFER_BIT; 3174 glClear GL_COLOR_BUFFER_BIT;
2575 3175
3176 package CFPlus::UI::Base;
3177 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3178 (0, 0, $self->{w}, $self->{h});
3179
3180 my $top = int $self->{children}[1]{range}[0];
3181
3182 my $paridx = 0;
3183 my $top_paragraph;
2576 my $top = int $self->{children}[1]{range}[0]; 3184 my $top = int $self->{children}[1]{range}[0];
2577 3185
2578 my $y0 = $top; 3186 my $y0 = $top;
2579 my $y1 = $top + $H; 3187 my $y1 = $top + $H;
2580 3188
2581 my $y = 0;
2582
2583 my $layout = $self->{layout};
2584
2585 $layout->set_font ($self->{font}) if $self->{font};
2586
2587 glEnable GL_BLEND;
2588 #TODO# not correct in windows where rgba is forced off
2589 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2590
2591 for my $par (@{$self->{par}}) { 3189 for my $para (@{$self->{par}}) {
2592 my $h = $par->[1]; 3190 my $h = $para->{h};
3191 my $y = $para->{y};
2593 3192
2594 if ($y0 < $y + $h && $y < $y1) { 3193 if ($y0 < $y + $h && $y < $y1) {
2595 $layout->set_foreground (@{ $par->[2] }); 3194 my $layout = $self->get_layout ($para);
2596 $layout->set_width ($W - $par->[3]);
2597 $layout->set_markup ($par->[4]);
2598 3195
2599 my ($w, $h, $data, $format, $internalformat) = $layout->render; 3196 $layout->render ($para->{indent}, $y - $y0);
2600 3197
2601 glRasterPos $par->[3], $y - $y0; 3198 if (my @w = @{ $para->{widget} }) {
2602 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data; 3199 my @s = $layout->get_shapes;
3200
3201 for (@w) {
3202 my ($dx, $dy) = splice @s, 0, 2, ();
3203
3204 $_->{x} = $dx + $para->{indent};
3205 $_->{y} = $dy + $y - $y0;
3206
3207 $_->draw;
3208 }
3209 }
2603 } 3210 }
2604 3211
2605 $y += $h; 3212 $paridx++;
3213 $top_paragraph ||= $paridx if $y >= $top;
2606 } 3214 }
2607 3215
2608 glDisable GL_BLEND; 3216 $self->{top_paragraph} = $top_paragraph;
2609 }; 3217 };
2610 }); 3218 });
3219}
3220
3221sub reconfigure {
3222 my ($self) = @_;
3223
3224 $self->SUPER::reconfigure;
3225
3226 $_->{w} = 1e10 for @{ $self->{par} };
3227 $self->reflow;
2611} 3228}
2612 3229
2613sub _draw { 3230sub _draw {
2614 my ($self) = @_; 3231 my ($self) = @_;
2615 3232
… …
2618 glColor 0, 0, 0, 1; 3235 glColor 0, 0, 0, 1;
2619 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 3236 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2620 glDisable GL_TEXTURE_2D; 3237 glDisable GL_TEXTURE_2D;
2621 3238
2622 $self->{children}[1]->draw; 3239 $self->{children}[1]->draw;
2623
2624} 3240}
2625 3241
2626############################################################################# 3242#############################################################################
2627 3243
2628package CFClient::UI::Animator; 3244package CFPlus::UI::Animator;
2629 3245
2630use CFClient::OpenGL; 3246use CFPlus::OpenGL;
2631 3247
2632our @ISA = CFClient::UI::Bin::; 3248our @ISA = CFPlus::UI::Bin::;
2633 3249
2634sub moveto { 3250sub moveto {
2635 my ($self, $x, $y) = @_; 3251 my ($self, $x, $y) = @_;
2636 3252
2637 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y]; 3253 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
… …
2665 glPopMatrix; 3281 glPopMatrix;
2666} 3282}
2667 3283
2668############################################################################# 3284#############################################################################
2669 3285
2670package CFClient::UI::Flopper; 3286package CFPlus::UI::Flopper;
2671 3287
2672our @ISA = CFClient::UI::Button::; 3288our @ISA = CFPlus::UI::Button::;
2673 3289
2674sub new { 3290sub new {
2675 my $class = shift; 3291 my $class = shift;
2676 3292
2677 my $self = $class->SUPER::new ( 3293 my $self = $class->SUPER::new (
… …
2689 $self->{other}->toggle_visibility; 3305 $self->{other}->toggle_visibility;
2690} 3306}
2691 3307
2692############################################################################# 3308#############################################################################
2693 3309
2694package CFClient::UI::Tooltip; 3310package CFPlus::UI::Tooltip;
2695 3311
2696our @ISA = CFClient::UI::Bin::; 3312our @ISA = CFPlus::UI::Bin::;
2697 3313
2698use CFClient::OpenGL; 3314use CFPlus::OpenGL;
2699 3315
2700sub new { 3316sub new {
2701 my $class = shift; 3317 my $class = shift;
2702 3318
2703 $class->SUPER::new ( 3319 $class->SUPER::new (
… …
2706 ) 3322 )
2707} 3323}
2708 3324
2709sub set_tooltip_from { 3325sub set_tooltip_from {
2710 my ($self, $widget) = @_; 3326 my ($self, $widget) = @_;
3327
3328 $widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
3329 if $widget->{tooltip} =~ /^#(.*)$/;
2711 3330
2712 my $tooltip = $widget->{tooltip}; 3331 my $tooltip = $widget->{tooltip};
2713 3332
2714 if ($ENV{CFPLUS_DEBUG} & 2) { 3333 if ($ENV{CFPLUS_DEBUG} & 2) {
2715 $tooltip .= "\n\n" . (ref $widget) . "\n" 3334 $tooltip .= "\n\n" . (ref $widget) . "\n"
2716 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n" 3335 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2717 . "req $widget->{req_w} $widget->{req_h}\n" 3336 . "req $widget->{req_w} $widget->{req_h}\n"
2718 . "visible $widget->{visible}"; 3337 . "visible $widget->{visible}";
2719 } 3338 }
2720 3339
3340 $tooltip =~ s/^\n+//;
3341 $tooltip =~ s/\n+$//;
3342
2721 $self->add (new CFClient::UI::Label 3343 $self->add (new CFPlus::UI::Label
2722 markup => $tooltip, 3344 markup => $tooltip,
2723 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 3345 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2724 fontsize => 0.8, 3346 fontsize => 0.8,
2725 fg => [0, 0, 0, 1], 3347 style => 1, # FLAG_INVERSE
2726 ellipsise => 0, 3348 ellipsise => 0,
2727 font => ($widget->{tooltip_font} || $::FONT_PROP), 3349 font => ($widget->{tooltip_font} || $::FONT_PROP),
2728 ); 3350 );
2729} 3351}
2730 3352
… …
2734 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 3356 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2735 3357
2736 ($w + 4, $h + 4) 3358 ($w + 4, $h + 4)
2737} 3359}
2738 3360
2739sub size_allocate { 3361sub invoke_size_allocate {
2740 my ($self, $w, $h) = @_; 3362 my ($self, $w, $h) = @_;
2741 3363
2742 $self->SUPER::size_allocate ($w - 4, $h - 4); 3364 $self->SUPER::invoke_size_allocate ($w - 4, $h - 4)
2743} 3365}
2744 3366
2745sub visibility_change { 3367sub invoke_visibility_change {
2746 my ($self, $visible) = @_; 3368 my ($self, $visible) = @_;
2747 3369
2748 return unless $visible; 3370 return unless $visible;
2749 3371
2750 $self->{root}->on_post_alloc ("move_$self" => sub { 3372 $self->{root}->on_post_alloc ("move_$self" => sub {
2751 my $widget = $self->{owner} 3373 my $widget = $self->{owner}
2752 or return; 3374 or return;
2753 3375
3376 if ($widget->{visible}) {
2754 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 3377 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2755 3378
2756 ($x, $y) = $widget->coord2global (-$self->{w}, 0) 3379 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2757 if $x + $self->{w} > $::WIDTH; 3380 if $x + $self->{w} > $self->{root}{w};
2758 3381
2759 $self->move_abs ($x, $y); 3382 $self->move_abs ($x, $y);
3383 } else {
3384 $self->hide;
3385 }
2760 }); 3386 });
2761} 3387}
2762 3388
2763sub _draw { 3389sub _draw {
2764 my ($self) = @_; 3390 my ($self) = @_;
… …
2788 $self->SUPER::_draw; 3414 $self->SUPER::_draw;
2789} 3415}
2790 3416
2791############################################################################# 3417#############################################################################
2792 3418
2793package CFClient::UI::Face; 3419package CFPlus::UI::Face;
2794 3420
2795our @ISA = CFClient::UI::Base::; 3421our @ISA = CFPlus::UI::DrawBG::;
2796 3422
2797use CFClient::OpenGL; 3423use CFPlus::OpenGL;
2798 3424
2799sub new { 3425sub new {
2800 my $class = shift; 3426 my $class = shift;
2801 3427
2802 my $self = $class->SUPER::new ( 3428 my $self = $class->SUPER::new (
3429 size_w => 32,
3430 size_h => 8,
2803 aspect => 1, 3431 aspect => 1,
2804 can_events => 0, 3432 can_events => 0,
2805 @_, 3433 @_,
2806 ); 3434 );
2807 3435
2808 if ($self->{anim} && $self->{animspeed}) { 3436 if ($self->{anim} && $self->{animspeed}) {
2809 Scalar::Util::weaken (my $widget = $self); 3437 CFPlus::weaken (my $widget = $self);
2810 3438
2811 $self->{timer} = Event->timer ( 3439 $self->{timer} = Event->timer (
2812 at => $self->{animspeed} * int $::NOW / $self->{animspeed}, 3440 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2813 hard => 1, 3441 hard => 1,
2814 interval => $self->{animspeed}, 3442 interval => $self->{animspeed},
2815 cb => sub { 3443 cb => sub {
3444 return unless $::CONN;
3445
2816 ++$widget->{frame}; 3446 ++$widget->{frame};
3447 $self->update_face;
2817 $widget->update; 3448 $self->update;
2818 }, 3449 },
2819 ); 3450 );
3451
3452 $self->update_face;
2820 } 3453 }
2821 3454
2822 $self 3455 $self
2823} 3456}
2824 3457
3458sub update_face {
3459 my ($self) = @_;
3460
3461 return unless $::CONN;
3462
3463 if (my $anim = $::CONN->{anim}[$self->{anim}]) {
3464 if ($anim && @$anim) {
3465 delete $self->{wait_face};
3466 $self->{face} = $anim->[ $self->{frame} % @$anim ];
3467 }
3468 }
3469}
3470
2825sub size_request { 3471sub size_request {
2826 (32, 8) 3472 my ($self) = @_;
3473
3474 if ($::CONN) {
3475 if (my $faceid = $::CONN->{faceid}[$self->{face}]) {
3476 if (my $tex = $::CONN->{texture}[$faceid]) {
3477 return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
3478 } else {
3479 $self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub {
3480 $self->realloc;
3481 });
3482 }
3483 }
3484 }
3485
3486 ($self->{size_w} || 8, $self->{size_h} || 8)
2827} 3487}
2828 3488
2829sub update { 3489sub update {
2830 my ($self) = @_; 3490 my ($self) = @_;
2831 3491
… …
2837sub _draw { 3497sub _draw {
2838 my ($self) = @_; 3498 my ($self) = @_;
2839 3499
2840 return unless $::CONN; 3500 return unless $::CONN;
2841 3501
2842 my $face; 3502 $self->SUPER::_draw;
2843 3503
2844 if ($self->{frame}) {
2845 my $anim = $::CONN->{anim}[$self->{anim}]; 3504 my $faceid = $::CONN->{faceid}[$self->{face}]
2846 3505 or return;
2847 $face = $anim->[ $self->{frame} % @$anim ]
2848 if $anim && @$anim;
2849 }
2850 3506
2851 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 3507 my $tex = $::CONN->{texture}[$faceid];
2852 3508
2853 if ($tex) { 3509 if ($tex) {
2854 glEnable GL_TEXTURE_2D; 3510 glEnable GL_TEXTURE_2D;
2855 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3511 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2856 glColor 0, 0, 0, 1; 3512 glColor 0, 0, 0, 1;
2857 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3513 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2858 glDisable GL_TEXTURE_2D; 3514 glDisable GL_TEXTURE_2D;
2859 } 3515 }
2860} 3516}
2861 3517
2862sub DESTROY { 3518sub destroy {
2863 my ($self) = @_; 3519 my ($self) = @_;
2864 3520
2865 $self->{timer}->cancel 3521 $self->{timer}->cancel
2866 if $self->{timer}; 3522 if $self->{timer};
2867 3523
2868 $self->SUPER::DESTROY; 3524 $self->SUPER::destroy;
2869} 3525}
2870 3526
2871############################################################################# 3527#############################################################################
2872 3528
2873package CFClient::UI::Buttonbar; 3529package CFPlus::UI::Buttonbar;
2874 3530
2875our @ISA = CFClient::UI::HBox::; 3531our @ISA = CFPlus::UI::HBox::;
2876 3532
2877# TODO: should actualyl wrap buttons and other goodies. 3533# TODO: should actually wrap buttons and other goodies.
2878 3534
2879############################################################################# 3535#############################################################################
2880 3536
2881package CFClient::UI::Menu; 3537package CFPlus::UI::Menu;
2882 3538
2883our @ISA = CFClient::UI::FancyFrame::; 3539our @ISA = CFPlus::UI::Toplevel::;
2884 3540
2885use CFClient::OpenGL; 3541use CFPlus::OpenGL;
2886 3542
2887sub new { 3543sub new {
2888 my $class = shift; 3544 my $class = shift;
2889 3545
2890 my $self = $class->SUPER::new ( 3546 my $self = $class->SUPER::new (
2891 items => [], 3547 items => [],
2892 z => 100, 3548 z => 100,
2893 @_, 3549 @_,
2894 ); 3550 );
2895 3551
2896 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3552 $self->add ($self->{vbox} = new CFPlus::UI::VBox);
2897 3553
2898 for my $item (@{ $self->{items} }) { 3554 for my $item (@{ $self->{items} }) {
2899 my ($widget, $cb) = @$item; 3555 my ($widget, $cb, $tooltip) = @$item;
2900 3556
2901 # handle various types of items, only text for now 3557 # handle various types of items, only text for now
2902 if (!ref $widget) { 3558 if (!ref $widget) {
3559 if ($widget =~ /\t/) {
3560 my ($left, $right) = split /\t/, $widget, 2;
3561
2903 $widget = new CFClient::UI::Label 3562 $widget = new CFPlus::UI::HBox
2904 can_hover => 1, 3563 can_hover => 1,
2905 can_events => 1, 3564 can_events => 1,
3565 tooltip => $tooltip,
3566 children => [
3567 (new CFPlus::UI::Label markup => $left, expand => 1),
3568 (new CFPlus::UI::Label markup => $right, align => +1),
3569 ],
3570 ;
3571
3572 } else {
3573 $widget = new CFPlus::UI::Label
3574 can_hover => 1,
3575 can_events => 1,
2906 text => $widget; 3576 markup => $widget,
3577 tooltip => $tooltip;
3578 }
2907 } 3579 }
2908 3580
2909 $self->{item}{$widget} = $item; 3581 $self->{item}{$widget} = $item;
2910 3582
2911 $self->{vbox}->add ($widget); 3583 $self->{vbox}->add ($widget);
… …
2916 3588
2917# popup given the event (must be a mouse button down event currently) 3589# popup given the event (must be a mouse button down event currently)
2918sub popup { 3590sub popup {
2919 my ($self, $ev) = @_; 3591 my ($self, $ev) = @_;
2920 3592
2921 $self->_emit ("popdown"); 3593 $self->emit ("popdown");
2922 3594
2923 # maybe save $GRAB? must be careful about events... 3595 # maybe save $GRAB? must be careful about events...
2924 $GRAB = $self; 3596 $GRAB = $self;
2925 $self->{button} = $ev->{button}; 3597 $self->{button} = $ev->{button};
2926 3598
2927 $self->show; 3599 $self->show;
2928 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 3600 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2929} 3601}
2930 3602
2931sub mouse_motion { 3603sub invoke_mouse_motion {
2932 my ($self, $ev, $x, $y) = @_; 3604 my ($self, $ev, $x, $y) = @_;
2933 3605
2934 # TODO: should use vbox->find_widget or so 3606 # TODO: should use vbox->find_widget or so
2935 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 3607 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2936 $self->{hover} = $self->{item}{$HOVER}; 3608 $self->{hover} = $self->{item}{$HOVER};
2937 3609
2938 0 3610 0
2939} 3611}
2940 3612
2941sub button_up { 3613sub invoke_button_up {
2942 my ($self, $ev, $x, $y) = @_; 3614 my ($self, $ev, $x, $y) = @_;
2943 3615
2944 if ($ev->{button} == $self->{button}) { 3616 if ($ev->{button} == $self->{button}) {
2945 undef $GRAB; 3617 undef $GRAB;
2946 $self->hide; 3618 $self->hide;
2947 3619
2948 $self->_emit ("popdown"); 3620 $self->emit ("popdown");
2949 $self->{hover}[1]->() if $self->{hover}; 3621 $self->{hover}[1]->() if $self->{hover};
2950 } else { 3622 } else {
2951 return 0 3623 return 0
2952 } 3624 }
2953 3625
2954 1 3626 1
2955} 3627}
2956 3628
2957############################################################################# 3629#############################################################################
2958 3630
2959package CFClient::UI::Multiplexer; 3631package CFPlus::UI::Multiplexer;
2960 3632
2961our @ISA = CFClient::UI::Container::; 3633our @ISA = CFPlus::UI::Container::;
2962 3634
2963sub new { 3635sub new {
2964 my $class = shift; 3636 my $class = shift;
2965 3637
2966 my $self = $class->SUPER::new ( 3638 my $self = $class->SUPER::new (
… …
2980 3652
2981 $self->{current} = $self->{children}[0] 3653 $self->{current} = $self->{children}[0]
2982 if @{ $self->{children} }; 3654 if @{ $self->{children} };
2983} 3655}
2984 3656
3657sub get_current_page {
3658 my ($self) = @_;
3659
3660 $self->{current}
3661}
3662
2985sub set_current_page { 3663sub set_current_page {
2986 my ($self, $page_or_widget) = @_; 3664 my ($self, $page_or_widget) = @_;
2987 3665
2988 my $widget = ref $page_or_widget 3666 my $widget = ref $page_or_widget
2989 ? $page_or_widget 3667 ? $page_or_widget
2990 : $self->{children}[$page_or_widget]; 3668 : $self->{children}[$page_or_widget];
2991 3669
2992 $self->{current} = $widget; 3670 $self->{current} = $widget;
2993 $self->{current}->configure (0, 0, $self->{w}, $self->{h}); 3671 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
2994 3672
2995 $self->_emit (page_changed => $self->{current}); 3673 $self->emit (page_changed => $self->{current});
2996 3674
2997 $self->realloc; 3675 $self->realloc;
2998} 3676}
2999 3677
3000sub visible_children { 3678sub visible_children {
… …
3005 my ($self) = @_; 3683 my ($self) = @_;
3006 3684
3007 $self->{current}->size_request 3685 $self->{current}->size_request
3008} 3686}
3009 3687
3010sub size_allocate { 3688sub invoke_size_allocate {
3011 my ($self, $w, $h) = @_; 3689 my ($self, $w, $h) = @_;
3012 3690
3013 $self->{current}->configure (0, 0, $w, $h); 3691 $self->{current}->configure (0, 0, $w, $h);
3692
3693 1
3014} 3694}
3015 3695
3016sub _draw { 3696sub _draw {
3017 my ($self) = @_; 3697 my ($self) = @_;
3018 3698
3019 $self->{current}->draw; 3699 $self->{current}->draw;
3020} 3700}
3021 3701
3022############################################################################# 3702#############################################################################
3023 3703
3024package CFClient::UI::Notebook; 3704package CFPlus::UI::Notebook;
3025 3705
3026our @ISA = CFClient::UI::VBox::; 3706our @ISA = CFPlus::UI::VBox::;
3027 3707
3028sub new { 3708sub new {
3029 my $class = shift; 3709 my $class = shift;
3030 3710
3031 my $self = $class->SUPER::new ( 3711 my $self = $class->SUPER::new (
3032 buttonbar => (new CFClient::UI::Buttonbar), 3712 buttonbar => (new CFPlus::UI::Buttonbar),
3033 multiplexer => (new CFClient::UI::Multiplexer expand => 1), 3713 multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3034 # filter => # will be put between multiplexer and $self 3714 # filter => # will be put between multiplexer and $self
3035 @_, 3715 @_,
3036 ); 3716 );
3037 3717
3038 $self->{filter}->add ($self->{multiplexer}) if $self->{filter}; 3718 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
… …
3042} 3722}
3043 3723
3044sub add { 3724sub add {
3045 my ($self, $title, $widget, $tooltip) = @_; 3725 my ($self, $title, $widget, $tooltip) = @_;
3046 3726
3047 Scalar::Util::weaken $self; 3727 CFPlus::weaken $self;
3048 3728
3049 $self->{buttonbar}->add (new CFClient::UI::Button 3729 $self->{buttonbar}->add (new CFPlus::UI::Button
3050 markup => $title, 3730 markup => $title,
3051 tooltip => $tooltip, 3731 tooltip => $tooltip,
3052 on_activate => sub { $self->set_current_page ($widget) }, 3732 on_activate => sub { $self->set_current_page ($widget) },
3053 ); 3733 );
3054 3734
3055 $self->{multiplexer}->add ($widget); 3735 $self->{multiplexer}->add ($widget);
3056} 3736}
3057 3737
3738sub get_current_page {
3739 my ($self) = @_;
3740
3741 $self->{multiplexer}->get_current_page
3742}
3743
3058sub set_current_page { 3744sub set_current_page {
3059 my ($self, $page) = @_; 3745 my ($self, $page) = @_;
3060 3746
3061 $self->{multiplexer}->set_current_page ($page); 3747 $self->{multiplexer}->set_current_page ($page);
3062 $self->_emit (page_changed => $self->{multiplexer}{current}); 3748 $self->emit (page_changed => $self->{multiplexer}{current});
3063} 3749}
3064 3750
3065############################################################################# 3751#############################################################################
3066 3752
3753package CFPlus::UI::Selector;
3754
3755use utf8;
3756
3757our @ISA = CFPlus::UI::Button::;
3758
3759sub new {
3760 my $class = shift;
3761
3762 my $self = $class->SUPER::new (
3763 options => [], # [value, title, longdesc], ...
3764 value => undef,
3765 @_,
3766 );
3767
3768 $self->_set_value ($self->{value});
3769
3770 $self
3771}
3772
3773sub invoke_button_down {
3774 my ($self, $ev) = @_;
3775
3776 my @menu_items;
3777
3778 for (@{ $self->{options} }) {
3779 my ($value, $title, $tooltip) = @$_;
3780
3781 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3782 }
3783
3784 CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
3785}
3786
3787sub _set_value {
3788 my ($self, $value) = @_;
3789
3790 my ($item) = grep $_->[0] eq $value, @{ $self->{options} }
3791 or return;
3792
3793 $self->{value} = $item->[0];
3794 $self->set_markup ("$item->[1] ⇓");
3795 $self->set_tooltip ($item->[2]);
3796}
3797
3798sub set_value {
3799 my ($self, $value) = @_;
3800
3801 return unless $self->{value} ne $value;
3802
3803 $self->_set_value ($value);
3804 $self->emit (changed => $value);
3805}
3806
3807#############################################################################
3808
3067package CFClient::UI::Statusbox; 3809package CFPlus::UI::Statusbox;
3068 3810
3069our @ISA = CFClient::UI::VBox::; 3811our @ISA = CFPlus::UI::VBox::;
3070 3812
3071sub new { 3813sub new {
3072 my $class = shift; 3814 my $class = shift;
3073 3815
3074 my $self = $class->SUPER::new ( 3816 my $self = $class->SUPER::new (
3075 fontsize => 0.8, 3817 fontsize => 0.8,
3076 @_, 3818 @_,
3077 ); 3819 );
3078 3820
3079 Scalar::Util::weaken (my $this = $self); 3821 CFPlus::weaken (my $this = $self);
3080 3822
3081 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder }); 3823 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3082 3824
3083 $self 3825 $self
3084} 3826}
… …
3086sub reorder { 3828sub reorder {
3087 my ($self) = @_; 3829 my ($self) = @_;
3088 my $NOW = Time::HiRes::time; 3830 my $NOW = Time::HiRes::time;
3089 3831
3090 # freeze display when hovering over any label 3832 # freeze display when hovering over any label
3091 return if $CFClient::UI::TOOLTIP->{owner} 3833 return if $CFPlus::UI::TOOLTIP->{owner}
3092 && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label}, 3834 && grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},
3093 values %{ $self->{item} }; 3835 values %{ $self->{item} };
3094 3836
3095 while (my ($k, $v) = each %{ $self->{item} }) { 3837 while (my ($k, $v) = each %{ $self->{item} }) {
3096 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3838 delete $self->{item}{$k} if $v->{timeout} < $NOW;
3097 } 3839 }
… …
3118 for ($short) { 3860 for ($short) {
3119 s/^\s+//; 3861 s/^\s+//;
3120 s/\s+/ /g; 3862 s/\s+/ /g;
3121 } 3863 }
3122 3864
3123 new CFClient::UI::Label 3865 new CFPlus::UI::Label
3124 markup => $short, 3866 markup => $short,
3125 tooltip => $item->{tooltip}, 3867 tooltip => $item->{tooltip},
3126 tooltip_font => $::FONT_PROP, 3868 tooltip_font => $::FONT_PROP,
3127 tooltip_width => 0.67, 3869 tooltip_width => 0.67,
3128 fontsize => $item->{fontsize} || $self->{fontsize}, 3870 fontsize => $item->{fontsize} || $self->{fontsize},
… …
3166 $item->{count}++; 3908 $item->{count}++;
3167 } else { 3909 } else {
3168 $item->{count} = 1; 3910 $item->{count} = 1;
3169 $item->{text} = $item->{tooltip} = $text; 3911 $item->{text} = $item->{tooltip} = $text;
3170 } 3912 }
3171 $item->{id} = ++$self->{id}; 3913 $item->{id} += 0.2;#d#
3172 $item->{timeout} = $timeout; 3914 $item->{timeout} = $timeout;
3173 delete $item->{label}; 3915 delete $item->{label};
3174 } else { 3916 } else {
3175 $self->{item}{$group} = { 3917 $self->{item}{$group} = {
3176 id => ++$self->{id}, 3918 id => ++$self->{id},
… …
3182 count => 1, 3924 count => 1,
3183 %arg, 3925 %arg,
3184 }; 3926 };
3185 } 3927 }
3186 3928
3929 $ROOT->on_refresh (reorder => sub {
3187 $self->reorder; 3930 $self->reorder;
3931 });
3188} 3932}
3189 3933
3190sub reconfigure { 3934sub reconfigure {
3191 my ($self) = @_; 3935 my ($self) = @_;
3192 3936
… …
3195 3939
3196 $self->reorder; 3940 $self->reorder;
3197 $self->SUPER::reconfigure; 3941 $self->SUPER::reconfigure;
3198} 3942}
3199 3943
3200sub DESTROY { 3944sub destroy {
3201 my ($self) = @_; 3945 my ($self) = @_;
3202 3946
3203 $self->{timer}->cancel; 3947 $self->{timer}->cancel;
3204 3948
3205 $self->SUPER::DESTROY; 3949 $self->SUPER::destroy;
3206} 3950}
3207 3951
3208############################################################################# 3952#############################################################################
3209 3953
3210package CFClient::UI::Inventory;
3211
3212our @ISA = CFClient::UI::ScrolledWindow::;
3213
3214sub new {
3215 my $class = shift;
3216
3217 my $self = $class->SUPER::new (
3218 child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
3219 @_,
3220 );
3221
3222 $self
3223}
3224
3225sub set_items {
3226 my ($self, $items) = @_;
3227
3228 $self->{child}->clear;
3229 return unless $items;
3230
3231 my @items = sort {
3232 ($a->{type} <=> $b->{type})
3233 or ($a->{name} cmp $b->{name})
3234 } @$items;
3235
3236 $self->{real_items} = \@items;
3237
3238 my $row = 0;
3239 for my $item (@items) {
3240 CFClient::Item::update_widgets $item;
3241
3242 $self->{child}->add (0, $row, $item->{face_widget});
3243 $self->{child}->add (1, $row, $item->{desc_widget});
3244 $self->{child}->add (2, $row, $item->{weight_widget});
3245
3246 $row++;
3247 }
3248}
3249
3250#############################################################################
3251
3252package CFClient::UI::BindEditor;
3253
3254our @ISA = CFClient::UI::FancyFrame::;
3255
3256sub new {
3257 my $class = shift;
3258
3259 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3260
3261 $self->add (my $vb = new CFClient::UI::VBox);
3262
3263
3264 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3265 text => "start recording",
3266 tooltip => "Start/Stops recording of actions."
3267 ."All subsequent actions after the recording started will be captured."
3268 ."The actions are displayed after the record was stopped."
3269 ."To bind the action you have to click on the 'Bind' button",
3270 on_activate => sub {
3271 unless ($self->{recording}) {
3272 $self->start;
3273 } else {
3274 $self->stop;
3275 }
3276 });
3277
3278 $vb->add (new CFClient::UI::Label text => "Actions:");
3279 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3280
3281 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3282 $vb->add (my $hb = new CFClient::UI::HBox);
3283 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3284 $hb->add (new CFClient::UI::Button
3285 text => "bind",
3286 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3287 on_activate => sub {
3288 $self->ask_for_bind;
3289 });
3290
3291 $vb->add (my $hb = new CFClient::UI::HBox);
3292 $hb->add (new CFClient::UI::Button
3293 text => "ok",
3294 expand => 1,
3295 tooltip => "This closes the binding editor and saves the binding",
3296 on_activate => sub {
3297 $self->hide;
3298 $self->commit;
3299 });
3300
3301 $hb->add (new CFClient::UI::Button
3302 text => "cancel",
3303 expand => 1,
3304 tooltip => "This closes the binding editor without saving",
3305 on_activate => sub {
3306 $self->hide;
3307 $self->{binding_cancel}->()
3308 if $self->{binding_cancel};
3309 });
3310
3311 $self->update_binding_widgets;
3312
3313 $self
3314}
3315
3316sub commit {
3317 my ($self) = @_;
3318 my ($mod, $sym, $cmds) = $self->get_binding;
3319 if ($sym != 0 && @$cmds > 0) {
3320 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3321 ."'. Don't forget 'Save Config'!");
3322 $self->{binding_change}->($mod, $sym, $cmds)
3323 if $self->{binding_change};
3324 } else {
3325 $::STATUSBOX->add ("No action bound, no key or action specified!");
3326 $self->{binding_cancel}->()
3327 if $self->{binding_cancel};
3328 }
3329}
3330
3331sub start {
3332 my ($self) = @_;
3333
3334 $self->{rec_btn}->set_text ("stop recording");
3335 $self->{recording} = 1;
3336 $self->clear_command_list;
3337 $::CONN->start_record if $::CONN;
3338}
3339
3340sub stop {
3341 my ($self) = @_;
3342
3343 $self->{rec_btn}->set_text ("start recording");
3344 $self->{recording} = 0;
3345
3346 my $rec;
3347 $rec = $::CONN->stop_record if $::CONN;
3348 return unless ref $rec eq 'ARRAY';
3349 $self->set_command_list ($rec);
3350}
3351
3352
3353sub ask_for_bind_and_commit {
3354 my ($self) = @_;
3355 $self->ask_for_bind (1);
3356}
3357
3358sub ask_for_bind {
3359 my ($self, $commit) = @_;
3360
3361 CFClient::Binder::open_binding_dialog (sub {
3362 my ($mod, $sym) = @_;
3363 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3364 $self->update_binding_widgets;
3365 $self->commit if $commit;
3366 });
3367}
3368
3369# $mod and $sym are the modifiers and key symbol
3370# $cmds is a array ref of strings (the commands)
3371# $cb is the callback that is executed on OK
3372# $ccb is the callback that is executed on CANCEL and
3373# when the binding was unsuccessful on OK
3374sub set_binding {
3375 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3376
3377 $self->clear_command_list;
3378 $self->{recording} = 0;
3379 $self->{rec_btn}->set_text ("start recording");
3380
3381 $self->{binding} = [$mod, $sym];
3382 $self->{commands} = $cmds;
3383
3384 $self->{binding_change} = $cb;
3385 $self->{binding_cancel} = $ccb;
3386
3387 $self->update_binding_widgets;
3388}
3389
3390# this is a shortcut method that asks for a binding
3391# and then just binds it.
3392sub do_quick_binding {
3393 my ($self, $cmds) = @_;
3394 $self->set_binding (undef, undef, $cmds, sub {
3395 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3396 });
3397 $self->ask_for_bind (1);
3398}
3399
3400sub update_binding_widgets {
3401 my ($self) = @_;
3402 my ($mod, $sym, $cmds) = $self->get_binding;
3403 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3404 $self->set_command_list ($cmds);
3405}
3406
3407sub get_binding {
3408 my ($self) = @_;
3409 return (
3410 $self->{binding}->[0],
3411 $self->{binding}->[1],
3412 [ grep { defined $_ } @{$self->{commands}} ]
3413 );
3414}
3415
3416sub clear_command_list {
3417 my ($self) = @_;
3418 $self->{cmdbox}->clear ();
3419}
3420
3421sub set_command_list {
3422 my ($self, $cmds) = @_;
3423
3424 $self->{cmdbox}->clear ();
3425 $self->{commands} = $cmds;
3426
3427 my $idx = 0;
3428
3429 for (@$cmds) {
3430 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3431
3432 my $i = $idx;
3433 $hb->add (new CFClient::UI::Label text => $_);
3434 $hb->add (new CFClient::UI::Button
3435 text => "delete",
3436 tooltip => "Deletes the action from the record",
3437 on_activate => sub {
3438 $self->{cmdbox}->remove ($hb);
3439 $cmds->[$i] = undef;
3440 });
3441
3442
3443 $idx++
3444 }
3445}
3446
3447#############################################################################
3448
3449package CFClient::UI::SpellList;
3450
3451our @ISA = CFClient::UI::Table::;
3452
3453sub new {
3454 my $class = shift;
3455
3456 my $self = $class->SUPER::new (
3457 binding => [],
3458 commands => [],
3459 @_,
3460 )
3461}
3462
3463# XXX: Do sorting? Argl...
3464sub add_spell {
3465 my ($self, $spell) = @_;
3466 $self->{spells}->{$spell->{name}} = $spell;
3467
3468 $self->add (0, $self->{tbl_idx}, new CFClient::UI::Face
3469 face => $spell->{face},
3470 can_hover => 1,
3471 can_events => 1,
3472 tooltip => $spell->{message});
3473
3474 $self->add (1, $self->{tbl_idx}, new CFClient::UI::Label
3475 text => $spell->{name},
3476 can_hover => 1,
3477 can_events => 1,
3478 tooltip => $spell->{message},
3479 expand => 1);
3480
3481 $self->add (2, $self->{tbl_idx}, new CFClient::UI::Label
3482 text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
3483 $spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
3484 expand => 1);
3485
3486 $self->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
3487 text => "bind to key",
3488 on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
3489}
3490
3491sub rebuild_spell_list {
3492 my ($self) = @_;
3493 $self->{tbl_idx} = 0;
3494 $self->add_spell ($_) for values %{$self->{spells}};
3495}
3496
3497sub remove_spell {
3498 my ($self, $spell) = @_;
3499 delete $self->{spells}->{$spell->{name}};
3500 $self->rebuild_spell_list;
3501}
3502
3503#############################################################################
3504
3505package CFClient::UI::Root; 3954package CFPlus::UI::Root;
3506 3955
3507our @ISA = CFClient::UI::Container::; 3956our @ISA = CFPlus::UI::Container::;
3508 3957
3509use List::Util qw(min max); 3958use List::Util qw(min max);
3510 3959
3511use CFClient::OpenGL; 3960use CFPlus::OpenGL;
3512 3961
3513sub new { 3962sub new {
3514 my $class = shift; 3963 my $class = shift;
3515 3964
3516 my $self = $class->SUPER::new ( 3965 my $self = $class->SUPER::new (
3517 visible => 1, 3966 visible => 1,
3518 @_, 3967 @_,
3519 ); 3968 );
3520 3969
3521 Scalar::Util::weaken ($self->{root} = $self); 3970 CFPlus::weaken ($self->{root} = $self);
3522 3971
3523 $self 3972 $self
3524} 3973}
3525 3974
3526sub size_request { 3975sub size_request {
… …
3541 $coord = $max - $size if $coord > $max - $size; 3990 $coord = $max - $size if $coord > $max - $size;
3542 3991
3543 int $coord + 0.5 3992 int $coord + 0.5
3544} 3993}
3545 3994
3546sub size_allocate { 3995sub invoke_size_allocate {
3547 my ($self, $w, $h) = @_; 3996 my ($self, $w, $h) = @_;
3548 3997
3549 for my $child ($self->children) { 3998 for my $child ($self->children) {
3550 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3999 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3551 4000
… …
3555 $X = _to_pixel $X, $W, $self->{w}; 4004 $X = _to_pixel $X, $W, $self->{w};
3556 $Y = _to_pixel $Y, $H, $self->{h}; 4005 $Y = _to_pixel $Y, $H, $self->{h};
3557 4006
3558 $child->configure ($X, $Y, $W, $H); 4007 $child->configure ($X, $Y, $W, $H);
3559 } 4008 }
4009
4010 1
3560} 4011}
3561 4012
3562sub coord2local { 4013sub coord2local {
3563 my ($self, $x, $y) = @_; 4014 my ($self, $x, $y) = @_;
3564 4015
… …
3690 my ($w, $h) = @$widget{qw(alloc_w alloc_h)}; 4141 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3691 4142
3692 $w = 0 if $w < 0; 4143 $w = 0 if $w < 0;
3693 $h = 0 if $h < 0; 4144 $h = 0 if $h < 0;
3694 4145
4146 $w = max $widget->{min_w}, $w;
4147 $h = max $widget->{min_h}, $h;
4148
4149# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
4150# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
4151
4152 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
4153 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
4154
3695 $w = int $w + 0.5; 4155 $w = int $w + 0.5;
3696 $h = int $h + 0.5; 4156 $h = int $h + 0.5;
3697 4157
3698 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) { 4158 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3699 $widget->{old_w} = $widget->{w}; 4159 $widget->{old_w} = $widget->{w};
… …
3722 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 4182 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3723 glMatrixMode GL_MODELVIEW; 4183 glMatrixMode GL_MODELVIEW;
3724 glLoadIdentity; 4184 glLoadIdentity;
3725 4185
3726 { 4186 {
3727 package CFClient::UI::Base; 4187 package CFPlus::UI::Base;
3728 4188
3729 ($draw_x, $draw_y, $draw_w, $draw_h) = 4189 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3730 (0, 0, $self->{w}, $self->{h}); 4190 (0, 0, $self->{w}, $self->{h});
3731 }
3732 4191
3733 $self->_draw; 4192 $self->_draw;
4193 }
3734} 4194}
3735 4195
3736############################################################################# 4196#############################################################################
3737 4197
3738package CFClient::UI; 4198package CFPlus::UI;
3739 4199
3740$ROOT = new CFClient::UI::Root; 4200$ROOT = new CFPlus::UI::Root;
3741$TOOLTIP = new CFClient::UI::Tooltip z => 900; 4201$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
3742 4202
37431 42031
3744 4204

Diff Legend

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