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

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

Diff Legend

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