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.276 by root, Sun Jun 4 00:16:01 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
… …
1160 my $dy = $ev->{y} - $oy; 1369 my $dy = $ev->{y} - $oy;
1161 1370
1162 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1); 1371 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
1163 $self->{force_h} = $bh + $dy * ($my ? -1 : 1); 1372 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1164 1373
1374 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1165 $self->realloc; 1375 $self->realloc;
1166 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1167 }; 1376 };
1168 1377
1169 } elsif ($lr ^ $td) { 1378 } elsif ($lr ^ $td) {
1170 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1379 my ($ox, $oy) = ($ev->{x}, $ev->{y});
1171 my ($bx, $by) = ($self->{x}, $self->{y}); 1380 my ($bx, $by) = ($self->{x}, $self->{y});
… …
1174 my ($ev, $x, $y) = @_; 1383 my ($ev, $x, $y) = @_;
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);
1388 # HACK: the next line is required to enforce placement
1389 $self->{parent}->invoke_size_allocate ($self->{parent}{w}, $self->{parent}{h});
1179 }; 1390 };
1180 } else { 1391 } else {
1181 return 0; 1392 return 0;
1182 } 1393 }
1183 1394
1184 1 1395 1
1185} 1396}
1186 1397
1187sub button_up { 1398sub invoke_button_up {
1188 my ($self, $ev, $x, $y) = @_; 1399 my ($self, $ev, $x, $y) = @_;
1189 1400
1190 !!delete $self->{motion} 1401 ! ! delete $self->{motion}
1191} 1402}
1192 1403
1193sub mouse_motion { 1404sub invoke_mouse_motion {
1194 my ($self, $ev, $x, $y) = @_; 1405 my ($self, $ev, $x, $y) = @_;
1195 1406
1196 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1407 $self->{motion}->($ev, $x, $y) if $self->{motion};
1197 1408
1198 !!$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
1199} 1418}
1200 1419
1201sub _draw { 1420sub _draw {
1202 my ($self) = @_; 1421 my ($self) = @_;
1203 1422
… …
1229 1448
1230 glDisable GL_TEXTURE_2D; 1449 glDisable GL_TEXTURE_2D;
1231 1450
1232 $child->draw; 1451 $child->draw;
1233 1452
1234 if ($self->{title}) { 1453 if ($self->{title_widget}) {
1235 glTranslate 0, $border - $self->{h}; 1454 glTranslate 0, $border - $self->{h};
1236 $self->{title}->_draw; 1455 $self->{title_widget}->_draw;
1456
1457 glTranslate 0, - ($border - $self->{h});
1237 } 1458 }
1459
1460 $self->{close_button}->draw
1461 if $self->{close_button};
1238} 1462}
1239 1463
1240############################################################################# 1464#############################################################################
1241 1465
1242package CFClient::UI::Table; 1466package CFPlus::UI::Table;
1243 1467
1244our @ISA = CFClient::UI::Base::; 1468our @ISA = CFPlus::UI::Base::;
1245 1469
1246use List::Util qw(max sum); 1470use List::Util qw(max sum);
1247 1471
1248use CFClient::OpenGL; 1472use CFPlus::OpenGL;
1249 1473
1250sub new { 1474sub new {
1251 my $class = shift; 1475 my $class = shift;
1252 1476
1253 $class->SUPER::new ( 1477 $class->SUPER::new (
… …
1259sub children { 1483sub children {
1260 grep $_, map @$_, grep $_, @{ $_[0]{children} } 1484 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1261} 1485}
1262 1486
1263sub add { 1487sub add {
1264 my ($self, $x, $y, $child) = @_; 1488 my ($self) = shift;
1265 1489
1490 while (@_) {
1491 my ($x, $y, $child) = splice @_, 0, 3, ();
1266 $child->set_parent ($self); 1492 $child->set_parent ($self);
1267 $self->{children}[$y][$x] = $child; 1493 $self->{children}[$y][$x] = $child;
1494 }
1268 1495
1496 $self->{force_realloc} = 1;
1497 $self->{force_size_alloc} = 1;
1269 $self->realloc; 1498 $self->realloc;
1499}
1500
1501sub remove {
1502 my ($self, $child) = @_;
1503
1504 # TODO: not yet implemented
1270} 1505}
1271 1506
1272# 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?
1273sub clear { 1508sub clear {
1274 my ($self) = @_; 1509 my ($self) = @_;
… …
1315 (sum @$ws), 1550 (sum @$ws),
1316 (sum @$hs), 1551 (sum @$hs),
1317 ) 1552 )
1318} 1553}
1319 1554
1320sub size_allocate { 1555sub invoke_size_allocate {
1321 my ($self, $w, $h) = @_; 1556 my ($self, $w, $h) = @_;
1322 1557
1323 my ($ws, $hs) = $self->get_wh; 1558 my ($ws, $hs) = $self->get_wh;
1324 1559
1325 my $req_w = (sum @$ws) || 1; 1560 my $req_w = (sum @$ws) || 1;
… …
1332 1567
1333 # linearly scale sizes 1568 # linearly scale sizes
1334 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 1569 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1335 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs; 1570 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1336 1571
1337 CFClient::UI::harmonize $ws; 1572 CFPlus::UI::harmonize $ws;
1338 CFClient::UI::harmonize $hs; 1573 CFPlus::UI::harmonize $hs;
1339 1574
1340 my $y; 1575 my $y;
1341 1576
1342 for my $r (0 .. $#{$self->{children}}) { 1577 for my $r (0 .. $#{$self->{children}}) {
1343 my $row = $self->{children}[$r] 1578 my $row = $self->{children}[$r]
… …
1357 } 1592 }
1358 1593
1359 $y += $row_h; 1594 $y += $row_h;
1360 } 1595 }
1361 1596
1597 1
1362} 1598}
1363 1599
1364sub find_widget { 1600sub find_widget {
1365 my ($self, $x, $y) = @_; 1601 my ($self, $x, $y) = @_;
1366 1602
… …
1385 } 1621 }
1386} 1622}
1387 1623
1388############################################################################# 1624#############################################################################
1389 1625
1390package CFClient::UI::Box; 1626package CFPlus::UI::Box;
1391 1627
1392our @ISA = CFClient::UI::Container::; 1628our @ISA = CFPlus::UI::Container::;
1393 1629
1394sub size_request { 1630sub size_request {
1395 my ($self) = @_; 1631 my ($self) = @_;
1396 1632
1397 $self->{vertical} 1633 $self->{vertical}
… …
1403 (List::Util::sum map $_->{req_w}, @{$self->{children}}), 1639 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1404 (List::Util::max map $_->{req_h}, @{$self->{children}}), 1640 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1405 ) 1641 )
1406} 1642}
1407 1643
1408sub size_allocate { 1644sub invoke_size_allocate {
1409 my ($self, $w, $h) = @_; 1645 my ($self, $w, $h) = @_;
1410 1646
1411 my $space = $self->{vertical} ? $h : $w; 1647 my $space = $self->{vertical} ? $h : $w;
1412 my $children = $self->{children}; 1648 my @children = $self->visible_children;
1413 1649
1414 my @req; 1650 my @req;
1415 1651
1416 if ($self->{homogeneous}) { 1652 if ($self->{homogeneous}) {
1417 @req = ($space / (@$children || 1)) x @$children; 1653 @req = ($space / (@children || 1)) x @children;
1418 } else { 1654 } else {
1419 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children; 1655 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @children;
1420 my $req = List::Util::sum @req; 1656 my $req = List::Util::sum @req;
1421 1657
1422 if ($req > $space) { 1658 if ($req > $space) {
1423 # ah well, not enough space 1659 # ah well, not enough space
1424 $_ *= $space / $req for @req; 1660 $_ *= $space / $req for @req;
1425 } else { 1661 } else {
1426 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1; 1662 my $expand = (List::Util::sum map $_->{expand}, @children) || 1;
1427 1663
1428 $space = ($space - $req) / $expand; # remaining space to give away 1664 $space = ($space - $req) / $expand; # remaining space to give away
1429 1665
1430 $req[$_] += $space * $children->[$_]{expand} 1666 $req[$_] += $space * $children[$_]{expand}
1431 for 0 .. $#$children; 1667 for 0 .. $#children;
1432 } 1668 }
1433 } 1669 }
1434 1670
1435 CFClient::UI::harmonize \@req; 1671 CFPlus::UI::harmonize \@req;
1436 1672
1437 my $pos = 0; 1673 my $pos = 0;
1438 for (0 .. $#$children) { 1674 for (0 .. $#children) {
1439 my $alloc = $req[$_]; 1675 my $alloc = $req[$_];
1440 $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));
1441 1677
1442 $pos += $alloc; 1678 $pos += $alloc;
1443 } 1679 }
1444 1680
1445 1 1681 1
1446} 1682}
1447 1683
1448############################################################################# 1684#############################################################################
1449 1685
1450package CFClient::UI::HBox; 1686package CFPlus::UI::HBox;
1451 1687
1452our @ISA = CFClient::UI::Box::; 1688our @ISA = CFPlus::UI::Box::;
1453 1689
1454sub new { 1690sub new {
1455 my $class = shift; 1691 my $class = shift;
1456 1692
1457 $class->SUPER::new ( 1693 $class->SUPER::new (
… …
1460 ) 1696 )
1461} 1697}
1462 1698
1463############################################################################# 1699#############################################################################
1464 1700
1465package CFClient::UI::VBox; 1701package CFPlus::UI::VBox;
1466 1702
1467our @ISA = CFClient::UI::Box::; 1703our @ISA = CFPlus::UI::Box::;
1468 1704
1469sub new { 1705sub new {
1470 my $class = shift; 1706 my $class = shift;
1471 1707
1472 $class->SUPER::new ( 1708 $class->SUPER::new (
… …
1475 ) 1711 )
1476} 1712}
1477 1713
1478############################################################################# 1714#############################################################################
1479 1715
1480package CFClient::UI::Label; 1716package CFPlus::UI::Label;
1481 1717
1482our @ISA = CFClient::UI::DrawBG::; 1718our @ISA = CFPlus::UI::DrawBG::;
1483 1719
1484use CFClient::OpenGL; 1720use CFPlus::OpenGL;
1485 1721
1486sub new { 1722sub new {
1487 my ($class, %arg) = @_; 1723 my ($class, %arg) = @_;
1488 1724
1489 my $self = $class->SUPER::new ( 1725 my $self = $class->SUPER::new (
… …
1492 #active_bg => none 1728 #active_bg => none
1493 #font => default_font 1729 #font => default_font
1494 #text => initial text 1730 #text => initial text
1495 #markup => initial narkup 1731 #markup => initial narkup
1496 #max_w => maximum pixel width 1732 #max_w => maximum pixel width
1733 #style => 0, # render flags
1497 ellipsise => 3, # end 1734 ellipsise => 3, # end
1498 layout => (new CFClient::Layout), 1735 layout => (new CFPlus::Layout),
1499 fontsize => 1, 1736 fontsize => 1,
1500 align => -1, 1737 align => -1,
1501 valign => -1, 1738 valign => -1,
1502 padding_x => 2, 1739 padding_x => 2,
1503 padding_y => 2, 1740 padding_y => 2,
1504 can_events => 0, 1741 can_events => 0,
1505 %arg 1742 %arg
1506 ); 1743 );
1507 1744
1508 if (exists $self->{template}) { 1745 if (exists $self->{template}) {
1509 my $layout = new CFClient::Layout; 1746 my $layout = new CFPlus::Layout;
1510 $layout->set_text (delete $self->{template}); 1747 $layout->set_text (delete $self->{template});
1511 $self->{template} = $layout; 1748 $self->{template} = $layout;
1512 } 1749 }
1513 1750
1514 if (exists $self->{markup}) { 1751 if (exists $self->{markup}) {
… …
1518 } 1755 }
1519 1756
1520 $self 1757 $self
1521} 1758}
1522 1759
1523sub escape($) {
1524 local $_ = $_[0];
1525
1526 s/&/&amp;/g;
1527 s/>/&gt;/g;
1528 s/</&lt;/g;
1529
1530 $_
1531}
1532
1533sub update { 1760sub update {
1534 my ($self) = @_; 1761 my ($self) = @_;
1535 1762
1536 delete $self->{texture}; 1763 delete $self->{texture};
1537 $self->SUPER::update; 1764 $self->SUPER::update;
1538} 1765}
1539 1766
1767sub realloc {
1768 my ($self) = @_;
1769
1770 delete $self->{ox};
1771 $self->SUPER::realloc;
1772}
1773
1540sub set_text { 1774sub set_text {
1541 my ($self, $text) = @_; 1775 my ($self, $text) = @_;
1542 1776
1543 return if $self->{text} eq "T$text"; 1777 return if $self->{text} eq "T$text";
1544 $self->{text} = "T$text"; 1778 $self->{text} = "T$text";
1545 1779
1546 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1547 $self->{layout}->set_text ($text); 1780 $self->{layout}->set_text ($text);
1548 1781
1782 delete $self->{size_req};
1549 $self->realloc; 1783 $self->realloc;
1550 $self->update; 1784 $self->update;
1551} 1785}
1552 1786
1553sub set_markup { 1787sub set_markup {
… …
1556 return if $self->{text} eq "M$markup"; 1790 return if $self->{text} eq "M$markup";
1557 $self->{text} = "M$markup"; 1791 $self->{text} = "M$markup";
1558 1792
1559 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1793 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1560 1794
1561 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1562 $self->{layout}->set_markup ($markup); 1795 $self->{layout}->set_markup ($markup);
1563 1796
1797 delete $self->{size_req};
1564 $self->realloc; 1798 $self->realloc;
1565 $self->update; 1799 $self->update;
1566} 1800}
1567 1801
1568sub size_request { 1802sub size_request {
1569 my ($self) = @_; 1803 my ($self) = @_;
1570 1804
1805 $self->{size_req} ||= do {
1571 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1806 $self->{layout}->set_font ($self->{font}) if $self->{font};
1572 $self->{layout}->set_width ($self->{max_w} || -1); 1807 $self->{layout}->set_width ($self->{max_w} || -1);
1573 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1808 $self->{layout}->set_ellipsise ($self->{ellipsise});
1574 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1809 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1575 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1810 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1576 1811
1577 my ($w, $h) = $self->{layout}->size; 1812 my ($w, $h) = $self->{layout}->size;
1578 1813
1579 if (exists $self->{template}) { 1814 if (exists $self->{template}) {
1580 $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);
1581 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1817 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1582 1818
1583 my ($w2, $h2) = $self->{template}->size; 1819 my ($w2, $h2) = $self->{template}->size;
1584 1820
1585 $w = List::Util::max $w, $w2; 1821 $w = List::Util::max $w, $w2;
1586 $h = List::Util::max $h, $h2; 1822 $h = List::Util::max $h, $h2;
1823 }
1824
1825 [$w, $h]
1587 } 1826 };
1588 1827
1589 ($w, $h) 1828 @{ $self->{size_req} }
1590} 1829}
1591 1830
1831sub baseline_shift {
1832 $_[0]{layout}->descent
1833}
1834
1592sub size_allocate { 1835sub invoke_size_allocate {
1593 my ($self, $w, $h) = @_; 1836 my ($self, $w, $h) = @_;
1594 1837
1595 delete $self->{ox}; 1838 delete $self->{ox};
1596 1839
1597 delete $self->{texture} 1840 delete $self->{texture}
1598 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
1599} 1844}
1600 1845
1601sub set_fontsize { 1846sub set_fontsize {
1602 my ($self, $fontsize) = @_; 1847 my ($self, $fontsize) = @_;
1603 1848
1604 $self->{fontsize} = $fontsize; 1849 $self->{fontsize} = $fontsize;
1850 delete $self->{size_req};
1605 delete $self->{texture}; 1851 delete $self->{texture};
1606 1852
1607 $self->realloc; 1853 $self->realloc;
1608} 1854}
1609 1855
1856sub reconfigure {
1857 my ($self) = @_;
1858
1859 delete $self->{size_req};
1860 delete $self->{texture};
1861
1862 $self->SUPER::reconfigure;
1863}
1864
1610sub _draw { 1865sub _draw {
1611 my ($self) = @_; 1866 my ($self) = @_;
1612 1867
1613 $self->SUPER::_draw; # draw background, if applicable 1868 $self->SUPER::_draw; # draw background, if applicable
1614 1869
1615 my $tex = $self->{texture} ||= do { 1870 my $size = $self->{texture} ||= do {
1616 $self->{layout}->set_foreground (@{$self->{fg}}); 1871 $self->{layout}->set_foreground (@{$self->{fg}});
1617 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1872 $self->{layout}->set_font ($self->{font}) if $self->{font};
1618 $self->{layout}->set_width ($self->{w}); 1873 $self->{layout}->set_width ($self->{w});
1619 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1874 $self->{layout}->set_ellipsise ($self->{ellipsise});
1620 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1875 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1621 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1876 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1622 1877
1623 new_from_layout CFClient::Texture $self->{layout} 1878 [$self->{layout}->size]
1624 }; 1879 };
1625 1880
1626 unless (exists $self->{ox}) { 1881 unless (exists $self->{ox}) {
1627 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x} 1882 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1628 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x} 1883 : $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
1629 : ($self->{w} - $tex->{w}) * 0.5); 1884 : ($self->{w} - $size->[0]) * 0.5);
1630 1885
1631 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 1886 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1632 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y} 1887 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1633 : ($self->{h} - $tex->{h}) * 0.5); 1888 : ($self->{h} - $size->[1]) * 0.5);
1634 }; 1889 };
1635 1890
1636 glEnable GL_TEXTURE_2D; 1891 my $w = List::Util::min $self->{w} + 4, $size->[0];
1637 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1892 my $h = List::Util::min $self->{h} + 2, $size->[1];
1638 1893
1639 if ($tex->{format} == GL_ALPHA) { 1894 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1640 glColor @{$self->{fg}};
1641 $tex->draw_quad_alpha ($self->{ox}, $self->{oy});
1642 } else {
1643 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1644 }
1645
1646 glDisable GL_TEXTURE_2D;
1647} 1895}
1648 1896
1649############################################################################# 1897#############################################################################
1650 1898
1651package CFClient::UI::EntryBase; 1899package CFPlus::UI::EntryBase;
1652 1900
1653our @ISA = CFClient::UI::Label::; 1901our @ISA = CFPlus::UI::Label::;
1654 1902
1655use CFClient::OpenGL; 1903use CFPlus::OpenGL;
1656 1904
1657sub new { 1905sub new {
1658 my $class = shift; 1906 my $class = shift;
1659 1907
1660 $class->SUPER::new ( 1908 $class->SUPER::new (
… …
1664 active_fg => [0, 0, 0], 1912 active_fg => [0, 0, 0],
1665 can_hover => 1, 1913 can_hover => 1,
1666 can_focus => 1, 1914 can_focus => 1,
1667 valign => 0, 1915 valign => 0,
1668 can_events => 1, 1916 can_events => 1,
1917 ellipsise => 0,
1669 #text => ... 1918 #text => ...
1919 #hidden => "*",
1670 @_ 1920 @_
1671 ) 1921 )
1672} 1922}
1673 1923
1674sub _set_text { 1924sub _set_text {
… …
1681 $self->{last_activity} = $::NOW; 1931 $self->{last_activity} = $::NOW;
1682 $self->{text} = $text; 1932 $self->{text} = $text;
1683 1933
1684 $text =~ s/./*/g if $self->{hidden}; 1934 $text =~ s/./*/g if $self->{hidden};
1685 $self->{layout}->set_text ("$text "); 1935 $self->{layout}->set_text ("$text ");
1936 delete $self->{size_req};
1686 1937
1687 $self->_emit (changed => $self->{text}); 1938 $self->emit (changed => $self->{text});
1939
1940 $self->realloc;
1688 $self->update; 1941 $self->update;
1689} 1942}
1690 1943
1691sub set_text { 1944sub set_text {
1692 my ($self, $text) = @_; 1945 my ($self, $text) = @_;
1693 1946
1694 $self->{cursor} = length $text; 1947 $self->{cursor} = length $text;
1695 $self->_set_text ($text); 1948 $self->_set_text ($text);
1696
1697 $self->realloc;
1698} 1949}
1699 1950
1700sub get_text { 1951sub get_text {
1701 $_[0]{text} 1952 $_[0]{text}
1702} 1953}
… …
1707 my ($w, $h) = $self->SUPER::size_request; 1958 my ($w, $h) = $self->SUPER::size_request;
1708 1959
1709 ($w + 1, $h) # add 1 for cursor 1960 ($w + 1, $h) # add 1 for cursor
1710} 1961}
1711 1962
1712sub key_down { 1963sub invoke_key_down {
1713 my ($self, $ev) = @_; 1964 my ($self, $ev) = @_;
1714 1965
1715 my $mod = $ev->{mod}; 1966 my $mod = $ev->{mod};
1716 my $sym = $ev->{sym}; 1967 my $sym = $ev->{sym};
1717 my $uni = $ev->{unicode}; 1968 my $uni = $ev->{unicode};
… …
1720 1971
1721 if ($uni == 8) { 1972 if ($uni == 8) {
1722 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 1973 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1723 } elsif ($uni == 127) { 1974 } elsif ($uni == 127) {
1724 substr $text, $self->{cursor}, 1, ""; 1975 substr $text, $self->{cursor}, 1, "";
1725 } elsif ($sym == CFClient::SDLK_LEFT) { 1976 } elsif ($sym == CFPlus::SDLK_LEFT) {
1726 --$self->{cursor} if $self->{cursor}; 1977 --$self->{cursor} if $self->{cursor};
1727 } elsif ($sym == CFClient::SDLK_RIGHT) { 1978 } elsif ($sym == CFPlus::SDLK_RIGHT) {
1728 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1979 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1729 } 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 = "";
1730 $self->{cursor} = 0; 1994 $self->{cursor} = 0;
1731 } elsif ($sym == CFClient::SDLK_END) {
1732 $self->{cursor} = length $text;
1733 } elsif ($uni == 27) { 1995 } elsif ($uni == 27) {
1734 $self->_emit ('escape'); 1996 $self->emit ('escape');
1735 } elsif ($uni) { 1997 } elsif ($uni == 0x0d) {
1998 substr $text, $self->{cursor}++, 0, "\012";
1999 } elsif ($uni >= 0x20) {
1736 substr $text, $self->{cursor}++, 0, chr $uni; 2000 substr $text, $self->{cursor}++, 0, chr $uni;
1737 } else { 2001 } else {
1738 return 0; 2002 return 0;
1739 } 2003 }
1740 2004
1741 $self->_set_text ($text); 2005 $self->_set_text ($text);
1742 2006
1743 $self->realloc; 2007 $self->realloc;
2008 $self->update;
1744 2009
1745 1 2010 1
1746} 2011}
1747 2012
1748sub focus_in { 2013sub invoke_focus_in {
1749 my ($self) = @_; 2014 my ($self) = @_;
1750 2015
1751 $self->{last_activity} = $::NOW; 2016 $self->{last_activity} = $::NOW;
1752 2017
1753 $self->SUPER::focus_in; 2018 $self->SUPER::invoke_focus_in
1754} 2019}
1755 2020
1756sub button_down { 2021sub invoke_button_down {
1757 my ($self, $ev, $x, $y) = @_; 2022 my ($self, $ev, $x, $y) = @_;
1758 2023
1759 $self->SUPER::button_down ($ev, $x, $y); 2024 $self->SUPER::invoke_button_down ($ev, $x, $y);
1760 2025
1761 my $idx = $self->{layout}->xy_to_index ($x, $y); 2026 my $idx = $self->{layout}->xy_to_index ($x, $y);
1762 2027
1763 # byte-index to char-index 2028 # byte-index to char-index
1764 my $text = $self->{text}; 2029 my $text = $self->{text};
1765 utf8::encode $text; 2030 utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1766 $self->{cursor} = length substr $text, 0, $idx; 2031 $self->{cursor} = length $text;
1767 2032
1768 $self->_set_text ($self->{text}); 2033 $self->_set_text ($self->{text});
1769 $self->update; 2034 $self->update;
1770 2035
1771 1 2036 1
1772} 2037}
1773 2038
1774sub mouse_motion { 2039sub invoke_mouse_motion {
1775 my ($self, $ev, $x, $y) = @_; 2040 my ($self, $ev, $x, $y) = @_;
1776# 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#
1777 2042
1778 0 2043 1
1779} 2044}
1780 2045
1781sub _draw { 2046sub _draw {
1782 my ($self) = @_; 2047 my ($self) = @_;
1783 2048
1784 local $self->{fg} = $self->{fg}; 2049 local $self->{fg} = $self->{fg};
1785 2050
1786 if ($FOCUS == $self) { 2051 if ($FOCUS == $self) {
1787 glColor @{$self->{active_bg}}; 2052 glColor_premultiply @{$self->{active_bg}};
1788 $self->{fg} = $self->{active_fg}; 2053 $self->{fg} = $self->{active_fg};
1789 } else { 2054 } else {
1790 glColor @{$self->{bg}}; 2055 glColor_premultiply @{$self->{bg}};
1791 } 2056 }
1792 2057
1793 glEnable GL_BLEND; 2058 glEnable GL_BLEND;
1794 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2059 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1795 glBegin GL_QUADS; 2060 glBegin GL_QUADS;
1796 glVertex 0 , 0; 2061 glVertex 0 , 0;
1797 glVertex 0 , $self->{h}; 2062 glVertex 0 , $self->{h};
1798 glVertex $self->{w}, $self->{h}; 2063 glVertex $self->{w}, $self->{h};
1799 glVertex $self->{w}, 0; 2064 glVertex $self->{w}, 0;
… …
1810 utf8::encode $text; 2075 utf8::encode $text;
1811 2076
1812 @$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)
1813 } 2078 }
1814 2079
1815 glColor @{$self->{fg}};
1816 glBegin GL_LINES; 2080 glBegin GL_LINES;
1817 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};
1818 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};
1819 glEnd; 2083 glEnd;
1820 } 2084 }
1821} 2085}
1822 2086
2087#############################################################################
2088
1823package CFClient::UI::Entry; 2089package CFPlus::UI::Entry;
1824 2090
1825our @ISA = CFClient::UI::EntryBase::; 2091our @ISA = CFPlus::UI::EntryBase::;
1826 2092
1827use CFClient::OpenGL; 2093use CFPlus::OpenGL;
1828 2094
1829sub key_down { 2095sub invoke_key_down {
1830 my ($self, $ev) = @_; 2096 my ($self, $ev) = @_;
1831 2097
1832 my $sym = $ev->{sym}; 2098 my $sym = $ev->{sym};
1833 2099
1834 if ($sym == 13) { 2100 if ($ev->{uni} == 0x0d || $sym == 13) {
1835 unshift @{$self->{history}}, 2101 unshift @{$self->{history}},
1836 my $txt = $self->get_text; 2102 my $txt = $self->get_text;
2103
1837 $self->{history_pointer} = -1; 2104 $self->{history_pointer} = -1;
1838 $self->{history_saveback} = ''; 2105 $self->{history_saveback} = '';
1839 $self->_emit (activate => $txt); 2106 $self->emit (activate => $txt);
1840 $self->update; 2107 $self->update;
1841 2108
1842 } elsif ($sym == CFClient::SDLK_UP) { 2109 } elsif ($sym == CFPlus::SDLK_UP) {
1843 if ($self->{history_pointer} < 0) { 2110 if ($self->{history_pointer} < 0) {
1844 $self->{history_saveback} = $self->get_text; 2111 $self->{history_saveback} = $self->get_text;
1845 } 2112 }
1846 if (@{$self->{history} || []} > 0) { 2113 if (@{$self->{history} || []} > 0) {
1847 $self->{history_pointer}++; 2114 $self->{history_pointer}++;
… …
1849 $self->{history_pointer} = @{$self->{history} || []} - 1; 2116 $self->{history_pointer} = @{$self->{history} || []} - 1;
1850 } 2117 }
1851 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2118 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1852 } 2119 }
1853 2120
1854 } elsif ($sym == CFClient::SDLK_DOWN) { 2121 } elsif ($sym == CFPlus::SDLK_DOWN) {
1855 $self->{history_pointer}--; 2122 $self->{history_pointer}--;
1856 $self->{history_pointer} = -1 if $self->{history_pointer} < 0; 2123 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1857 2124
1858 if ($self->{history_pointer} >= 0) { 2125 if ($self->{history_pointer} >= 0) {
1859 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2126 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1860 } else { 2127 } else {
1861 $self->set_text ($self->{history_saveback}); 2128 $self->set_text ($self->{history_saveback});
1862 } 2129 }
1863 2130
1864 } else { 2131 } else {
1865 return $self->SUPER::key_down ($ev) 2132 return $self->SUPER::invoke_key_down ($ev)
1866 } 2133 }
1867 2134
1868 1 2135 1
1869} 2136}
1870 2137
1871############################################################################# 2138#############################################################################
1872 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
1873package CFClient::UI::Button; 2179package CFPlus::UI::Button;
1874 2180
1875our @ISA = CFClient::UI::Label::; 2181our @ISA = CFPlus::UI::Label::;
1876 2182
1877use CFClient::OpenGL; 2183use CFPlus::OpenGL;
1878 2184
1879my @tex = 2185my @tex =
1880 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2186 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1881 qw(b1_button_active.png); 2187 qw(b1_button_active.png);
1882 2188
1883sub new { 2189sub new {
1884 my $class = shift; 2190 my $class = shift;
1885 2191
… …
1894 can_events => 1, 2200 can_events => 1,
1895 @_ 2201 @_
1896 ) 2202 )
1897} 2203}
1898 2204
1899sub activate { }
1900
1901sub button_up { 2205sub invoke_button_up {
1902 my ($self, $ev, $x, $y) = @_; 2206 my ($self, $ev, $x, $y) = @_;
1903 2207
1904 $self->emit ("activate") 2208 $self->emit ("activate")
1905 if $x >= 0 && $x < $self->{w} 2209 if $x >= 0 && $x < $self->{w}
1906 && $y >= 0 && $y < $self->{h}; 2210 && $y >= 0 && $y < $self->{h};
… …
1909} 2213}
1910 2214
1911sub _draw { 2215sub _draw {
1912 my ($self) = @_; 2216 my ($self) = @_;
1913 2217
1914 local $self->{fg} = $self->{fg}; 2218 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1915
1916 if ($GRAB == $self) {
1917 $self->{fg} = $self->{active_fg};
1918 }
1919 2219
1920 glEnable GL_TEXTURE_2D; 2220 glEnable GL_TEXTURE_2D;
1921 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2221 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1922 glColor 0, 0, 0, 1; 2222 glColor 0, 0, 0, 1;
1923 2223
… …
1928 $self->SUPER::_draw; 2228 $self->SUPER::_draw;
1929} 2229}
1930 2230
1931############################################################################# 2231#############################################################################
1932 2232
1933package CFClient::UI::CheckBox; 2233package CFPlus::UI::CheckBox;
1934 2234
1935our @ISA = CFClient::UI::DrawBG::; 2235our @ISA = CFPlus::UI::DrawBG::;
1936 2236
1937my @tex = 2237my @tex =
1938 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2238 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1939 qw(c1_checkbox_bg.png c1_checkbox_active.png); 2239 qw(c1_checkbox_bg.png c1_checkbox_active.png);
1940 2240
1941use CFClient::OpenGL; 2241use CFPlus::OpenGL;
1942 2242
1943sub new { 2243sub new {
1944 my $class = shift; 2244 my $class = shift;
1945 2245
1946 $class->SUPER::new ( 2246 $class->SUPER::new (
… …
1960 my ($self) = @_; 2260 my ($self) = @_;
1961 2261
1962 (6) x 2 2262 (6) x 2
1963} 2263}
1964 2264
2265sub toggle {
2266 my ($self) = @_;
2267
2268 $self->{state} = !$self->{state};
2269 $self->emit (changed => $self->{state});
2270 $self->update;
2271}
2272
1965sub button_down { 2273sub invoke_button_down {
1966 my ($self, $ev, $x, $y) = @_; 2274 my ($self, $ev, $x, $y) = @_;
1967 2275
1968 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x} 2276 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1969 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) { 2277 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1970 $self->{state} = !$self->{state}; 2278 $self->toggle;
1971 $self->_emit (changed => $self->{state});
1972 } else { 2279 } else {
1973 return 0 2280 return 0
1974 } 2281 }
1975 2282
1976 1 2283 1
… …
1996 glDisable GL_TEXTURE_2D; 2303 glDisable GL_TEXTURE_2D;
1997} 2304}
1998 2305
1999############################################################################# 2306#############################################################################
2000 2307
2001package CFClient::UI::Image; 2308package CFPlus::UI::Image;
2002 2309
2003our @ISA = CFClient::UI::Base::; 2310our @ISA = CFPlus::UI::Base::;
2004 2311
2005use CFClient::OpenGL; 2312use CFPlus::OpenGL;
2006use Carp qw/confess/;
2007 2313
2008our %loaded_images; 2314our %texture_cache;
2009 2315
2010sub new { 2316sub new {
2011 my $class = shift; 2317 my $class = shift;
2012 2318
2013 my $self = $class->SUPER::new (can_events => 0, @_); 2319 my $self = $class->SUPER::new (
2320 can_events => 0,
2321 @_,
2322 );
2014 2323
2015 $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";
2016 2326
2017 $loaded_images{$self->{image}} ||= 2327 $self->{tex} ||= $texture_cache{$self->{path}} ||=
2018 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;
2019 2329
2020 my $tex = $self->{tex} = $loaded_images{$self->{image}}; 2330 CFPlus::weaken $texture_cache{$self->{path}};
2021 2331
2022 Scalar::Util::weaken $loaded_images{$self->{image}}; 2332 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2023
2024 $self->{aspect} = $tex->{w} / $tex->{h};
2025 2333
2026 $self 2334 $self
2027} 2335}
2028 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
2029sub size_request { 2352sub size_request {
2030 my ($self) = @_; 2353 my ($self) = @_;
2031 2354
2032 ($self->{tex}->{w}, $self->{tex}->{h}) 2355 ($self->{tex}{w}, $self->{tex}{h})
2033} 2356}
2034 2357
2035sub _draw { 2358sub _draw {
2036 my ($self) = @_; 2359 my ($self) = @_;
2037 2360
… …
2047 } 2370 }
2048 2371
2049 glEnable GL_TEXTURE_2D; 2372 glEnable GL_TEXTURE_2D;
2050 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2373 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2051 2374
2052 $tex->draw_quad_alpha (0, 0, $w, $h); 2375 $tex->draw_quad (0, 0, $w, $h);
2053 2376
2054 glDisable GL_TEXTURE_2D; 2377 glDisable GL_TEXTURE_2D;
2055} 2378}
2056 2379
2057############################################################################# 2380#############################################################################
2058 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
2059package CFClient::UI::VGauge; 2418package CFPlus::UI::VGauge;
2060 2419
2061our @ISA = CFClient::UI::Base::; 2420our @ISA = CFPlus::UI::Base::;
2062 2421
2063use List::Util qw(min max); 2422use List::Util qw(min max);
2064 2423
2065use CFClient::OpenGL; 2424use CFPlus::OpenGL;
2066 2425
2067my %tex = ( 2426my %tex = (
2068 food => [ 2427 food => [
2069 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2428 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2070 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ 2429 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2071 ], 2430 ],
2072 grace => [ 2431 grace => [
2073 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2432 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2074 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/
2075 ], 2434 ],
2076 hp => [ 2435 hp => [
2077 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2436 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2078 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/ 2437 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2079 ], 2438 ],
2080 mana => [ 2439 mana => [
2081 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2440 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2082 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/
2083 ], 2442 ],
2084); 2443);
2085 2444
2086# eg. VGauge->new (gauge => 'food'), default gauge: food 2445# eg. VGauge->new (gauge => 'food'), default gauge: food
… …
2146 my $ycut1 = max 0, min 1, $ycut; 2505 my $ycut1 = max 0, min 1, $ycut;
2147 my $ycut2 = max 0, min 1, $ycut - 1; 2506 my $ycut2 = max 0, min 1, $ycut - 1;
2148 2507
2149 my $h1 = $self->{h} * (1 - $ycut1); 2508 my $h1 = $self->{h} * (1 - $ycut1);
2150 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);
2151 2513
2152 glEnable GL_BLEND; 2514 glEnable GL_BLEND;
2153 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;
2154 glEnable GL_TEXTURE_2D; 2517 glEnable GL_TEXTURE_2D;
2155 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2518 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2156 2519
2157 glBindTexture GL_TEXTURE_2D, $t1->{name}; 2520 glBindTexture GL_TEXTURE_2D, $t1->{name};
2158 glBegin GL_QUADS; 2521 glBegin GL_QUADS;
… …
2173 2536
2174 if ($t3) { 2537 if ($t3) {
2175 glBindTexture GL_TEXTURE_2D, $t3->{name}; 2538 glBindTexture GL_TEXTURE_2D, $t3->{name};
2176 glBegin GL_QUADS; 2539 glBegin GL_QUADS;
2177 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2; 2540 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2178 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h}; 2541 glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2179 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h}; 2542 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2180 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2; 2543 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2181 glEnd; 2544 glEnd;
2182 } 2545 }
2183 2546
2184 glDisable GL_BLEND; 2547 glDisable GL_BLEND;
2185 glDisable GL_TEXTURE_2D; 2548 glDisable GL_TEXTURE_2D;
2186} 2549}
2187 2550
2188############################################################################# 2551#############################################################################
2189 2552
2190package CFClient::UI::Gauge; 2553package CFPlus::UI::Gauge;
2191 2554
2192our @ISA = CFClient::UI::VBox::; 2555our @ISA = CFPlus::UI::VBox::;
2193 2556
2194sub new { 2557sub new {
2195 my ($class, %arg) = @_; 2558 my ($class, %arg) = @_;
2196 2559
2197 my $self = $class->SUPER::new ( 2560 my $self = $class->SUPER::new (
… …
2199 can_hover => 1, 2562 can_hover => 1,
2200 can_events => 1, 2563 can_events => 1,
2201 %arg, 2564 %arg,
2202 ); 2565 );
2203 2566
2204 $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");
2205 $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);
2206 $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");
2207 2570
2208 $self 2571 $self
2209} 2572}
2210 2573
2211sub set_fontsize { 2574sub set_fontsize {
… …
2232 $self->{value}->set_text ($val); 2595 $self->{value}->set_text ($val);
2233} 2596}
2234 2597
2235############################################################################# 2598#############################################################################
2236 2599
2237package CFClient::UI::Slider; 2600package CFPlus::UI::Slider;
2238 2601
2239use strict; 2602use strict;
2240 2603
2241use CFClient::OpenGL; 2604use CFPlus::OpenGL;
2242 2605
2243our @ISA = CFClient::UI::DrawBG::; 2606our @ISA = CFPlus::UI::DrawBG::;
2244 2607
2245my @tex = 2608my @tex =
2246 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 2609 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
2247 qw(s1_slider.png s1_slider_bg.png); 2610 qw(s1_slider.png s1_slider_bg.png);
2248 2611
2249sub new { 2612sub new {
2250 my $class = shift; 2613 my $class = shift;
2251 2614
… …
2272 $self->update; 2635 $self->update;
2273 2636
2274 $self 2637 $self
2275} 2638}
2276 2639
2277sub changed { }
2278
2279sub set_range { 2640sub set_range {
2280 my ($self, $range) = @_; 2641 my ($self, $range) = @_;
2281 2642
2282 ($range, $self->{range}) = ($self->{range}, $range); 2643 ($range, $self->{range}) = ($self->{range}, $range);
2283 2644
2284 $self->update
2285 if "@$range" ne "@{$self->{range}}"; 2645 if ("@$range" ne "@{$self->{range}}") {
2646 $self->update;
2647 $self->set_value ($self->{range}[0]);
2648 }
2286} 2649}
2287 2650
2288sub set_value { 2651sub set_value {
2289 my ($self, $value) = @_; 2652 my ($self, $value) = @_;
2290 2653
… …
2301 if $unit; 2664 if $unit;
2302 2665
2303 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2666 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2304 2667
2305 if ($value != $old_value) { 2668 if ($value != $old_value) {
2306 $self->_emit (changed => $value); 2669 $self->emit (changed => $value);
2307 $self->update; 2670 $self->update;
2308 } 2671 }
2309} 2672}
2310 2673
2311sub size_request { 2674sub size_request {
2312 my ($self) = @_; 2675 my ($self) = @_;
2313 2676
2314 ($self->{req_w}, $self->{req_h}) 2677 ($self->{req_w}, $self->{req_h})
2315} 2678}
2316 2679
2317sub button_down { 2680sub invoke_button_down {
2318 my ($self, $ev, $x, $y) = @_; 2681 my ($self, $ev, $x, $y) = @_;
2319 2682
2320 $self->SUPER::button_down ($ev, $x, $y); 2683 $self->SUPER::invoke_button_down ($ev, $x, $y);
2321 2684
2322 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2685 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2323 2686
2324 $self->mouse_motion ($ev, $x, $y) 2687 $self->invoke_mouse_motion ($ev, $x, $y)
2325} 2688}
2326 2689
2327sub mouse_motion { 2690sub invoke_mouse_motion {
2328 my ($self, $ev, $x, $y) = @_; 2691 my ($self, $ev, $x, $y) = @_;
2329 2692
2330 if ($GRAB == $self) { 2693 if ($GRAB == $self) {
2331 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2694 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2332 2695
… …
2338 } else { 2701 } else {
2339 return 0; 2702 return 0;
2340 } 2703 }
2341 2704
2342 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
2343} 2718}
2344 2719
2345sub update { 2720sub update {
2346 my ($self) = @_; 2721 my ($self) = @_;
2347 2722
… …
2396 glDisable GL_TEXTURE_2D; 2771 glDisable GL_TEXTURE_2D;
2397} 2772}
2398 2773
2399############################################################################# 2774#############################################################################
2400 2775
2401package CFClient::UI::ValSlider; 2776package CFPlus::UI::ValSlider;
2402 2777
2403our @ISA = CFClient::UI::HBox::; 2778our @ISA = CFPlus::UI::HBox::;
2404 2779
2405sub new { 2780sub new {
2406 my ($class, %arg) = @_; 2781 my ($class, %arg) = @_;
2407 2782
2408 my $range = delete $arg{range}; 2783 my $range = delete $arg{range};
2409 2784
2410 my $self = $class->SUPER::new ( 2785 my $self = $class->SUPER::new (
2411 slider => (new CFClient::UI::Slider expand => 1, range => $range), 2786 slider => (new CFPlus::UI::Slider expand => 1, range => $range),
2412 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}), 2787 entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
2413 to_value => sub { shift }, 2788 to_value => sub { shift },
2414 from_value => sub { shift }, 2789 from_value => sub { shift },
2415 %arg, 2790 %arg,
2416 ); 2791 );
2417 2792
… …
2437sub set_range { shift->{slider}->set_range (@_) } 2812sub set_range { shift->{slider}->set_range (@_) }
2438sub set_value { shift->{slider}->set_value (@_) } 2813sub set_value { shift->{slider}->set_value (@_) }
2439 2814
2440############################################################################# 2815#############################################################################
2441 2816
2442package CFClient::UI::TextView; 2817package CFPlus::UI::TextScroller;
2443 2818
2444our @ISA = CFClient::UI::HBox::; 2819our @ISA = CFPlus::UI::HBox::;
2445 2820
2446use CFClient::OpenGL; 2821use CFPlus::OpenGL;
2447 2822
2448sub new { 2823sub new {
2449 my $class = shift; 2824 my $class = shift;
2450 2825
2451 my $self = $class->SUPER::new ( 2826 my $self = $class->SUPER::new (
2452 fontsize => 1, 2827 fontsize => 1,
2453 can_events => 0, 2828 can_events => 1,
2829 indent => 0,
2454 #font => default_font 2830 #font => default_font
2455 @_, 2831 @_,
2456 2832
2457 layout => (new CFClient::Layout 1), 2833 layout => (new CFPlus::Layout),
2458 par => [], 2834 par => [],
2459 height => 0, 2835 height => 0,
2460 children => [ 2836 children => [
2461 (new CFClient::UI::Empty expand => 1), 2837 (new CFPlus::UI::Empty expand => 1),
2462 (new CFClient::UI::Slider vertical => 1), 2838 (new CFPlus::UI::Slider vertical => 1),
2463 ], 2839 ],
2464 ); 2840 );
2465 2841
2466 $self->{children}[1]->connect (changed => sub { $self->update }); 2842 $self->{children}[1]->connect (changed => sub { $self->update });
2467 2843
… …
2473 2849
2474 $self->{fontsize} = $fontsize; 2850 $self->{fontsize} = $fontsize;
2475 $self->reflow; 2851 $self->reflow;
2476} 2852}
2477 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
2478sub size_allocate { 2863sub invoke_size_allocate {
2479 my ($self, $w, $h) = @_; 2864 my ($self, $w, $h) = @_;
2480 2865
2481 $self->SUPER::size_allocate ($w, $h); 2866 my ($empty, $slider, @other) = @{ $self->{children} };
2867 $_->configure (@$_{qw(x y req_w req_h)}) for @other;
2482 2868
2483 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2869 $self->{layout}->set_font ($self->{font}) if $self->{font};
2484 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2870 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2485 $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});
2486 2873
2487 $self->reflow; 2874 $self->reflow;
2488}
2489 2875
2490sub text_size { 2876 local $self->{children} = [$empty, $slider];
2877 $self->SUPER::invoke_size_allocate ($w, $h)
2878}
2879
2880sub invoke_mouse_wheel {
2491 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) = @_;
2492 2892
2493 my $layout = $self->{layout}; 2893 my $layout = $self->{layout};
2494 2894
2895 $layout->set_font ($self->{font}) if $self->{font};
2896 $layout->set_foreground (@{$para->{fg}});
2495 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2897 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2496 $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});
2497 $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}}
2498 2906 );
2907
2499 $layout->size 2908 $layout
2500} 2909}
2501 2910
2502sub reflow { 2911sub reflow {
2503 my ($self) = @_; 2912 my ($self) = @_;
2504 2913
… …
2511 2920
2512 # todo: base offset on lines or so, not on pixels 2921 # todo: base offset on lines or so, not on pixels
2513 $self->{children}[1]->set_value ($offset); 2922 $self->{children}[1]->set_value ($offset);
2514} 2923}
2515 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
2516sub clear { 2940sub clear {
2517 my ($self) = @_; 2941 my ($self) = @_;
2942
2943 my (undef, undef, @other) = @{ $self->{children} };
2944 $self->remove ($_) for @other;
2518 2945
2519 $self->{par} = []; 2946 $self->{par} = [];
2520 $self->{height} = 0; 2947 $self->{height} = 0;
2521 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]); 2948 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2522} 2949}
2523 2950
2524sub add_paragraph { 2951sub add_paragraph {
2525 my ($self, $color, $text, $indent) = @_; 2952 my $self = shift;
2526 2953
2527 for my $line (split /\n/, $text) { 2954 for my $para (@_) {
2528 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
2529 $self->{height} += $h; 3002 $self->{height} = $height;
2530 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line]; 3003 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2531 }
2532 3004
2533 $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 }
2534} 3011}
2535 3012
2536sub update { 3013sub update {
2537 my ($self) = @_; 3014 my ($self) = @_;
2538 3015
… …
2540 3017
2541 return unless $self->{h} > 0; 3018 return unless $self->{h} > 0;
2542 3019
2543 delete $self->{texture}; 3020 delete $self->{texture};
2544 3021
2545 $ROOT->on_post_alloc ($self, sub { 3022 $ROOT->on_post_alloc ($self => sub {
3023 $self->force_uptodate;
3024
2546 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 3025 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2547 3026
2548 if (delete $self->{need_reflow}) {
2549 my $height = 0;
2550
2551 my $layout = $self->{layout};
2552
2553 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2554
2555 for (@{$self->{par}}) {
2556 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2557 $layout->set_width ($W - $_->[3]);
2558 $layout->set_markup ($_->[4]);
2559 my ($w, $h) = $layout->size;
2560 $_->[0] = $w + $_->[3];
2561 $_->[1] = $h;
2562 }
2563
2564 $height += $_->[1];
2565 }
2566
2567 $self->{height} = $height;
2568
2569 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2570
2571 delete $self->{texture};
2572 }
2573
2574 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 3027 $self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2575 glClearColor 0.5, 0.5, 0.5, 0; 3028 glClearColor 0, 0, 0, 0;
2576 glClear GL_COLOR_BUFFER_BIT; 3029 glClear GL_COLOR_BUFFER_BIT;
2577 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;
2578 my $top = int $self->{children}[1]{range}[0]; 3039 my $top = int $self->{children}[1]{range}[0];
2579 3040
2580 my $y0 = $top; 3041 my $y0 = $top;
2581 my $y1 = $top + $H; 3042 my $y1 = $top + $H;
2582 3043
2583 my $y = 0;
2584
2585 my $layout = $self->{layout};
2586
2587 $layout->set_font ($self->{font}) if $self->{font};
2588
2589 glEnable GL_BLEND;
2590 #TODO# not correct in windows where rgba is forced off
2591 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2592
2593 for my $par (@{$self->{par}}) { 3044 for my $para (@{$self->{par}}) {
2594 my $h = $par->[1]; 3045 my $h = $para->{h};
3046 my $y = $para->{y};
2595 3047
2596 if ($y0 < $y + $h && $y < $y1) { 3048 if ($y0 < $y + $h && $y < $y1) {
2597 $layout->set_foreground (@{ $par->[2] }); 3049 my $layout = $self->get_layout ($para);
2598 $layout->set_width ($W - $par->[3]);
2599 $layout->set_markup ($par->[4]);
2600 3050
2601 my ($w, $h, $data, $format, $internalformat) = $layout->render; 3051 $layout->render ($para->{indent}, $y - $y0);
2602 3052
2603 glRasterPos $par->[3], $y - $y0; 3053 if (my @w = @{ $para->{widget} }) {
2604 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 }
2605 } 3065 }
2606 3066
2607 $y += $h; 3067 $paridx++;
3068 $top_paragraph ||= $paridx if $y >= $top;
2608 } 3069 }
2609 3070
2610 glDisable GL_BLEND; 3071 $self->{top_paragraph} = $top_paragraph;
2611 }; 3072 };
2612 }); 3073 });
2613} 3074}
2614 3075
3076sub reconfigure {
3077 my ($self) = @_;
3078
3079 $self->SUPER::reconfigure;
3080
3081 $_->{w} = 1e10 for @{ $self->{par} };
3082 $self->reflow;
3083}
3084
2615sub _draw { 3085sub _draw {
2616 my ($self) = @_; 3086 my ($self) = @_;
2617 3087
2618 glEnable GL_TEXTURE_2D; 3088 glEnable GL_TEXTURE_2D;
2619 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3089 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2620 glColor 1, 1, 1, 1; 3090 glColor 0, 0, 0, 1;
2621 $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});
2622 glDisable GL_TEXTURE_2D; 3092 glDisable GL_TEXTURE_2D;
2623 3093
2624 $self->{children}[1]->draw; 3094 $self->{children}[1]->draw;
2625
2626} 3095}
2627 3096
2628############################################################################# 3097#############################################################################
2629 3098
2630package CFClient::UI::Animator; 3099package CFPlus::UI::Animator;
2631 3100
2632use CFClient::OpenGL; 3101use CFPlus::OpenGL;
2633 3102
2634our @ISA = CFClient::UI::Bin::; 3103our @ISA = CFPlus::UI::Bin::;
2635 3104
2636sub moveto { 3105sub moveto {
2637 my ($self, $x, $y) = @_; 3106 my ($self, $x, $y) = @_;
2638 3107
2639 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y]; 3108 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
… …
2667 glPopMatrix; 3136 glPopMatrix;
2668} 3137}
2669 3138
2670############################################################################# 3139#############################################################################
2671 3140
2672package CFClient::UI::Flopper; 3141package CFPlus::UI::Flopper;
2673 3142
2674our @ISA = CFClient::UI::Button::; 3143our @ISA = CFPlus::UI::Button::;
2675 3144
2676sub new { 3145sub new {
2677 my $class = shift; 3146 my $class = shift;
2678 3147
2679 my $self = $class->SUPER::new ( 3148 my $self = $class->SUPER::new (
… …
2691 $self->{other}->toggle_visibility; 3160 $self->{other}->toggle_visibility;
2692} 3161}
2693 3162
2694############################################################################# 3163#############################################################################
2695 3164
2696package CFClient::UI::Tooltip; 3165package CFPlus::UI::Tooltip;
2697 3166
2698our @ISA = CFClient::UI::Bin::; 3167our @ISA = CFPlus::UI::Bin::;
2699 3168
2700use CFClient::OpenGL; 3169use CFPlus::OpenGL;
2701 3170
2702sub new { 3171sub new {
2703 my $class = shift; 3172 my $class = shift;
2704 3173
2705 $class->SUPER::new ( 3174 $class->SUPER::new (
… …
2708 ) 3177 )
2709} 3178}
2710 3179
2711sub set_tooltip_from { 3180sub set_tooltip_from {
2712 my ($self, $widget) = @_; 3181 my ($self, $widget) = @_;
3182
3183 $widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
3184 if $widget->{tooltip} =~ /^#(.*)$/;
2713 3185
2714 my $tooltip = $widget->{tooltip}; 3186 my $tooltip = $widget->{tooltip};
2715 3187
2716 if ($ENV{CFPLUS_DEBUG} & 2) { 3188 if ($ENV{CFPLUS_DEBUG} & 2) {
2717 $tooltip .= "\n\n" . (ref $widget) . "\n" 3189 $tooltip .= "\n\n" . (ref $widget) . "\n"
2718 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n" 3190 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2719 . "req $widget->{req_w} $widget->{req_h}\n" 3191 . "req $widget->{req_w} $widget->{req_h}\n"
2720 . "visible $widget->{visible}"; 3192 . "visible $widget->{visible}";
2721 } 3193 }
2722 3194
3195 $tooltip =~ s/^\n+//;
3196 $tooltip =~ s/\n+$//;
3197
2723 $self->add (new CFClient::UI::Label 3198 $self->add (new CFPlus::UI::Label
2724 markup => $tooltip, 3199 markup => $tooltip,
2725 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 3200 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2726 fontsize => 0.8, 3201 fontsize => 0.8,
2727 fg => [0, 0, 0, 1], 3202 style => 1, # FLAG_INVERSE
2728 ellipsise => 0, 3203 ellipsise => 0,
2729 font => ($widget->{tooltip_font} || $::FONT_PROP), 3204 font => ($widget->{tooltip_font} || $::FONT_PROP),
2730 ); 3205 );
2731} 3206}
2732 3207
… …
2736 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 3211 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2737 3212
2738 ($w + 4, $h + 4) 3213 ($w + 4, $h + 4)
2739} 3214}
2740 3215
2741sub size_allocate { 3216sub invoke_size_allocate {
2742 my ($self, $w, $h) = @_; 3217 my ($self, $w, $h) = @_;
2743 3218
2744 $self->SUPER::size_allocate ($w - 4, $h - 4); 3219 $self->SUPER::invoke_size_allocate ($w - 4, $h - 4)
2745} 3220}
2746 3221
2747sub visibility_change { 3222sub invoke_visibility_change {
2748 my ($self, $visible) = @_; 3223 my ($self, $visible) = @_;
2749 3224
2750 return unless $visible; 3225 return unless $visible;
2751 3226
2752 $self->{root}->on_post_alloc ("move_$self" => sub { 3227 $self->{root}->on_post_alloc ("move_$self" => sub {
2753 my $widget = $self->{owner} 3228 my $widget = $self->{owner}
2754 or return; 3229 or return;
2755 3230
3231 if ($widget->{visible}) {
2756 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 3232 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2757 3233
2758 ($x, $y) = $widget->coord2global (-$self->{w}, 0) 3234 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2759 if $x + $self->{w} > $::WIDTH; 3235 if $x + $self->{w} > $self->{root}{w};
2760 3236
2761 $self->move_abs ($x, $y); 3237 $self->move_abs ($x, $y);
3238 } else {
3239 $self->hide;
3240 }
2762 }); 3241 });
2763} 3242}
2764 3243
2765sub _draw { 3244sub _draw {
2766 my ($self) = @_; 3245 my ($self) = @_;
… …
2790 $self->SUPER::_draw; 3269 $self->SUPER::_draw;
2791} 3270}
2792 3271
2793############################################################################# 3272#############################################################################
2794 3273
2795package CFClient::UI::Face; 3274package CFPlus::UI::Face;
2796 3275
2797our @ISA = CFClient::UI::Base::; 3276our @ISA = CFPlus::UI::DrawBG::;
2798 3277
2799use CFClient::OpenGL; 3278use CFPlus::OpenGL;
2800 3279
2801sub new { 3280sub new {
2802 my $class = shift; 3281 my $class = shift;
2803 3282
2804 my $self = $class->SUPER::new ( 3283 my $self = $class->SUPER::new (
… …
2806 can_events => 0, 3285 can_events => 0,
2807 @_, 3286 @_,
2808 ); 3287 );
2809 3288
2810 if ($self->{anim} && $self->{animspeed}) { 3289 if ($self->{anim} && $self->{animspeed}) {
2811 Scalar::Util::weaken (my $widget = $self); 3290 CFPlus::weaken (my $widget = $self);
2812 3291
2813 $self->{timer} = Event->timer ( 3292 $self->{timer} = Event->timer (
2814 at => $self->{animspeed} * int $::NOW / $self->{animspeed}, 3293 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2815 hard => 1, 3294 hard => 1,
2816 interval => $self->{animspeed}, 3295 interval => $self->{animspeed},
… …
2839sub _draw { 3318sub _draw {
2840 my ($self) = @_; 3319 my ($self) = @_;
2841 3320
2842 return unless $::CONN; 3321 return unless $::CONN;
2843 3322
3323 $self->SUPER::_draw;
3324
2844 my $face; 3325 my $face;
2845 3326
2846 if ($self->{frame}) { 3327 if ($self->{frame}) {
2847 my $anim = $::CONN->{anim}[$self->{anim}]; 3328 my $anim = $::CONN->{anim}[$self->{anim}];
2848 3329
… …
2853 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 3334 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2854 3335
2855 if ($tex) { 3336 if ($tex) {
2856 glEnable GL_TEXTURE_2D; 3337 glEnable GL_TEXTURE_2D;
2857 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3338 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2858 glColor 1, 1, 1, 1; 3339 glColor 0, 0, 0, 1;
2859 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3340 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2860 glDisable GL_TEXTURE_2D; 3341 glDisable GL_TEXTURE_2D;
2861 } 3342 }
2862} 3343}
2863 3344
2864sub DESTROY { 3345sub destroy {
2865 my ($self) = @_; 3346 my ($self) = @_;
2866 3347
2867 $self->{timer}->cancel 3348 $self->{timer}->cancel
2868 if $self->{timer}; 3349 if $self->{timer};
2869 3350
2870 $self->SUPER::DESTROY; 3351 $self->SUPER::destroy;
2871} 3352}
2872 3353
2873############################################################################# 3354#############################################################################
2874 3355
2875package CFClient::UI::Buttonbar; 3356package CFPlus::UI::Buttonbar;
2876 3357
2877our @ISA = CFClient::UI::HBox::; 3358our @ISA = CFPlus::UI::HBox::;
2878 3359
2879# TODO: should actualyl wrap buttons and other goodies. 3360# TODO: should actually wrap buttons and other goodies.
2880 3361
2881############################################################################# 3362#############################################################################
2882 3363
2883package CFClient::UI::Menu; 3364package CFPlus::UI::Menu;
2884 3365
2885our @ISA = CFClient::UI::FancyFrame::; 3366our @ISA = CFPlus::UI::Toplevel::;
2886 3367
2887use CFClient::OpenGL; 3368use CFPlus::OpenGL;
2888 3369
2889sub new { 3370sub new {
2890 my $class = shift; 3371 my $class = shift;
2891 3372
2892 my $self = $class->SUPER::new ( 3373 my $self = $class->SUPER::new (
2893 items => [], 3374 items => [],
2894 z => 100, 3375 z => 100,
2895 @_, 3376 @_,
2896 ); 3377 );
2897 3378
2898 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3379 $self->add ($self->{vbox} = new CFPlus::UI::VBox);
2899 3380
2900 for my $item (@{ $self->{items} }) { 3381 for my $item (@{ $self->{items} }) {
2901 my ($widget, $cb) = @$item; 3382 my ($widget, $cb, $tooltip) = @$item;
2902 3383
2903 # handle various types of items, only text for now 3384 # handle various types of items, only text for now
2904 if (!ref $widget) { 3385 if (!ref $widget) {
3386 if ($widget =~ /\t/) {
3387 my ($left, $right) = split /\t/, $widget, 2;
3388
2905 $widget = new CFClient::UI::Label 3389 $widget = new CFPlus::UI::HBox
2906 can_hover => 1, 3390 can_hover => 1,
2907 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,
2908 text => $widget; 3403 markup => $widget,
3404 tooltip => $tooltip;
3405 }
2909 } 3406 }
2910 3407
2911 $self->{item}{$widget} = $item; 3408 $self->{item}{$widget} = $item;
2912 3409
2913 $self->{vbox}->add ($widget); 3410 $self->{vbox}->add ($widget);
… …
2918 3415
2919# 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)
2920sub popup { 3417sub popup {
2921 my ($self, $ev) = @_; 3418 my ($self, $ev) = @_;
2922 3419
2923 $self->_emit ("popdown"); 3420 $self->emit ("popdown");
2924 3421
2925 # maybe save $GRAB? must be careful about events... 3422 # maybe save $GRAB? must be careful about events...
2926 $GRAB = $self; 3423 $GRAB = $self;
2927 $self->{button} = $ev->{button}; 3424 $self->{button} = $ev->{button};
2928 3425
2929 $self->show; 3426 $self->show;
2930 $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);
2931} 3428}
2932 3429
2933sub mouse_motion { 3430sub invoke_mouse_motion {
2934 my ($self, $ev, $x, $y) = @_; 3431 my ($self, $ev, $x, $y) = @_;
2935 3432
2936 # TODO: should use vbox->find_widget or so 3433 # TODO: should use vbox->find_widget or so
2937 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 3434 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2938 $self->{hover} = $self->{item}{$HOVER}; 3435 $self->{hover} = $self->{item}{$HOVER};
2939 3436
2940 0 3437 0
2941} 3438}
2942 3439
2943sub button_up { 3440sub invoke_button_up {
2944 my ($self, $ev, $x, $y) = @_; 3441 my ($self, $ev, $x, $y) = @_;
2945 3442
2946 if ($ev->{button} == $self->{button}) { 3443 if ($ev->{button} == $self->{button}) {
2947 undef $GRAB; 3444 undef $GRAB;
2948 $self->hide; 3445 $self->hide;
2949 3446
2950 $self->_emit ("popdown"); 3447 $self->emit ("popdown");
2951 $self->{hover}[1]->() if $self->{hover}; 3448 $self->{hover}[1]->() if $self->{hover};
2952 } else { 3449 } else {
2953 return 0 3450 return 0
2954 } 3451 }
2955 3452
2956 1 3453 1
2957} 3454}
2958 3455
2959############################################################################# 3456#############################################################################
2960 3457
2961package CFClient::UI::Multiplexer; 3458package CFPlus::UI::Multiplexer;
2962 3459
2963our @ISA = CFClient::UI::Container::; 3460our @ISA = CFPlus::UI::Container::;
2964 3461
2965sub new { 3462sub new {
2966 my $class = shift; 3463 my $class = shift;
2967 3464
2968 my $self = $class->SUPER::new ( 3465 my $self = $class->SUPER::new (
… …
2982 3479
2983 $self->{current} = $self->{children}[0] 3480 $self->{current} = $self->{children}[0]
2984 if @{ $self->{children} }; 3481 if @{ $self->{children} };
2985} 3482}
2986 3483
3484sub get_current_page {
3485 my ($self) = @_;
3486
3487 $self->{current}
3488}
3489
2987sub set_current_page { 3490sub set_current_page {
2988 my ($self, $page_or_widget) = @_; 3491 my ($self, $page_or_widget) = @_;
2989 3492
2990 my $widget = ref $page_or_widget 3493 my $widget = ref $page_or_widget
2991 ? $page_or_widget 3494 ? $page_or_widget
2992 : $self->{children}[$page_or_widget]; 3495 : $self->{children}[$page_or_widget];
2993 3496
2994 $self->{current} = $widget; 3497 $self->{current} = $widget;
2995 $self->{current}->configure (0, 0, $self->{w}, $self->{h}); 3498 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
2996 3499
2997 $self->_emit (page_changed => $self->{current}); 3500 $self->emit (page_changed => $self->{current});
2998 3501
2999 $self->realloc; 3502 $self->realloc;
3000} 3503}
3001 3504
3002sub visible_children { 3505sub visible_children {
… …
3007 my ($self) = @_; 3510 my ($self) = @_;
3008 3511
3009 $self->{current}->size_request 3512 $self->{current}->size_request
3010} 3513}
3011 3514
3012sub size_allocate { 3515sub invoke_size_allocate {
3013 my ($self, $w, $h) = @_; 3516 my ($self, $w, $h) = @_;
3014 3517
3015 $self->{current}->configure (0, 0, $w, $h); 3518 $self->{current}->configure (0, 0, $w, $h);
3519
3520 1
3016} 3521}
3017 3522
3018sub _draw { 3523sub _draw {
3019 my ($self) = @_; 3524 my ($self) = @_;
3020 3525
3021 $self->{current}->draw; 3526 $self->{current}->draw;
3022} 3527}
3023 3528
3024############################################################################# 3529#############################################################################
3025 3530
3026package CFClient::UI::Notebook; 3531package CFPlus::UI::Notebook;
3027 3532
3028our @ISA = CFClient::UI::VBox::; 3533our @ISA = CFPlus::UI::VBox::;
3029 3534
3030sub new { 3535sub new {
3031 my $class = shift; 3536 my $class = shift;
3032 3537
3033 my $self = $class->SUPER::new ( 3538 my $self = $class->SUPER::new (
3034 buttonbar => (new CFClient::UI::Buttonbar), 3539 buttonbar => (new CFPlus::UI::Buttonbar),
3035 multiplexer => (new CFClient::UI::Multiplexer expand => 1), 3540 multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3036 # filter => # will be put between multiplexer and $self 3541 # filter => # will be put between multiplexer and $self
3037 @_, 3542 @_,
3038 ); 3543 );
3039 3544
3040 $self->{filter}->add ($self->{multiplexer}) if $self->{filter}; 3545 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
… …
3044} 3549}
3045 3550
3046sub add { 3551sub add {
3047 my ($self, $title, $widget, $tooltip) = @_; 3552 my ($self, $title, $widget, $tooltip) = @_;
3048 3553
3049 Scalar::Util::weaken $self; 3554 CFPlus::weaken $self;
3050 3555
3051 $self->{buttonbar}->add (new CFClient::UI::Button 3556 $self->{buttonbar}->add (new CFPlus::UI::Button
3052 markup => $title, 3557 markup => $title,
3053 tooltip => $tooltip, 3558 tooltip => $tooltip,
3054 on_activate => sub { $self->set_current_page ($widget) }, 3559 on_activate => sub { $self->set_current_page ($widget) },
3055 ); 3560 );
3056 3561
3057 $self->{multiplexer}->add ($widget); 3562 $self->{multiplexer}->add ($widget);
3058} 3563}
3059 3564
3565sub get_current_page {
3566 my ($self) = @_;
3567
3568 $self->{multiplexer}->get_current_page
3569}
3570
3060sub set_current_page { 3571sub set_current_page {
3061 my ($self, $page) = @_; 3572 my ($self, $page) = @_;
3062 3573
3063 $self->{multiplexer}->set_current_page ($page); 3574 $self->{multiplexer}->set_current_page ($page);
3064 $self->_emit (page_changed => $self->{multiplexer}{current}); 3575 $self->emit (page_changed => $self->{multiplexer}{current});
3065} 3576}
3066 3577
3067############################################################################# 3578#############################################################################
3068 3579
3069package CFClient::UI::Statusbox; 3580package CFPlus::UI::Selector;
3070 3581
3582use utf8;
3583
3071our @ISA = CFClient::UI::VBox::; 3584our @ISA = CFPlus::UI::Button::;
3072 3585
3073sub new { 3586sub new {
3074 my $class = shift; 3587 my $class = shift;
3075 3588
3076 $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 (
3077 fontsize => 0.8, 3644 fontsize => 0.8,
3078 @_, 3645 @_,
3079 ) 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
3080} 3653}
3081 3654
3082sub reorder { 3655sub reorder {
3083 my ($self) = @_; 3656 my ($self) = @_;
3084 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} };
3085 3663
3086 while (my ($k, $v) = each %{ $self->{item} }) { 3664 while (my ($k, $v) = each %{ $self->{item} }) {
3087 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3665 delete $self->{item}{$k} if $v->{timeout} < $NOW;
3088 } 3666 }
3089 3667
… …
3092 my @items = sort { 3670 my @items = sort {
3093 $a->{pri} <=> $b->{pri} 3671 $a->{pri} <=> $b->{pri}
3094 or $b->{id} <=> $a->{id} 3672 or $b->{id} <=> $a->{id}
3095 } values %{ $self->{item} }; 3673 } values %{ $self->{item} };
3096 3674
3675 $self->{timer}->interval (1);
3676
3097 my $count = 10 + 1; 3677 my $count = 10 + 1;
3098 for my $item (@items) { 3678 for my $item (@items) {
3099 last unless --$count; 3679 last unless --$count;
3100 3680
3101 push @widgets, $item->{label} ||= do { 3681 my $label = $item->{label} ||= do {
3102 # TODO: doesn't handle markup well (read as: at all) 3682 # TODO: doesn't handle markup well (read as: at all)
3103 my $short = $item->{count} > 1 3683 my $short = $item->{count} > 1
3104 ? "<b>$item->{count} ×</b> $item->{text}" 3684 ? "<b>$item->{count} ×</b> $item->{text}"
3105 : $item->{text}; 3685 : $item->{text};
3106 3686
3107 for ($short) { 3687 for ($short) {
3108 s/^\s+//; 3688 s/^\s+//;
3109 s/\s+/ /g; 3689 s/\s+/ /g;
3110 } 3690 }
3111 3691
3112 new CFClient::UI::Label 3692 new CFPlus::UI::Label
3113 markup => $short, 3693 markup => $short,
3114 tooltip => $item->{tooltip}, 3694 tooltip => $item->{tooltip},
3115 tooltip_font => $::FONT_PROP, 3695 tooltip_font => $::FONT_PROP,
3116 tooltip_width => 0.67, 3696 tooltip_width => 0.67,
3117 fontsize => $item->{fontsize} || $self->{fontsize}, 3697 fontsize => $item->{fontsize} || $self->{fontsize},
3118 max_w => $::WIDTH * 0.44, 3698 max_w => $::WIDTH * 0.44,
3119 fg => $item->{fg}, 3699 fg => [@{ $item->{fg} }],
3120 can_events => 1, 3700 can_events => 1,
3121 can_hover => 1 3701 can_hover => 1
3122 }; 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;
3123 } 3715 }
3124 3716
3125 $self->clear; 3717 $self->clear;
3126 $self->SUPER::add (reverse @widgets); 3718 $self->SUPER::add (reverse @widgets);
3127} 3719}
… …
3132 $text =~ s/^\s+//; 3724 $text =~ s/^\s+//;
3133 $text =~ s/\s+$//; 3725 $text =~ s/\s+$//;
3134 3726
3135 return unless $text; 3727 return unless $text;
3136 3728
3137 my $timeout = time + ((delete $arg{timeout}) || 60); 3729 my $timeout = (int time) + ((delete $arg{timeout}) || 60);
3138 3730
3139 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 3731 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
3140 3732
3141 if (my $item = $self->{item}{$group}) { 3733 if (my $item = $self->{item}{$group}) {
3142 if ($item->{text} eq $text) { 3734 if ($item->{text} eq $text) {
3143 $item->{count}++; 3735 $item->{count}++;
3144 } else { 3736 } else {
3145 $item->{count} = 1; 3737 $item->{count} = 1;
3146 $item->{text} = $item->{tooltip} = $text; 3738 $item->{text} = $item->{tooltip} = $text;
3147 } 3739 }
3148 $item->{id} = ++$self->{id}; 3740 $item->{id} += 0.2;#d#
3149 $item->{timeout} = $timeout; 3741 $item->{timeout} = $timeout;
3150 delete $item->{label}; 3742 delete $item->{label};
3151 } else { 3743 } else {
3152 $self->{item}{$group} = { 3744 $self->{item}{$group} = {
3153 id => ++$self->{id}, 3745 id => ++$self->{id},
… …
3159 count => 1, 3751 count => 1,
3160 %arg, 3752 %arg,
3161 }; 3753 };
3162 } 3754 }
3163 3755
3756 $ROOT->on_refresh (reorder => sub {
3164 $self->reorder; 3757 $self->reorder;
3758 });
3165} 3759}
3166 3760
3167sub reconfigure { 3761sub reconfigure {
3168 my ($self) = @_; 3762 my ($self) = @_;
3169 3763
… …
3172 3766
3173 $self->reorder; 3767 $self->reorder;
3174 $self->SUPER::reconfigure; 3768 $self->SUPER::reconfigure;
3175} 3769}
3176 3770
3771sub destroy {
3772 my ($self) = @_;
3773
3774 $self->{timer}->cancel;
3775
3776 $self->SUPER::destroy;
3777}
3778
3177############################################################################# 3779#############################################################################
3178 3780
3179package CFClient::UI::Inventory;
3180
3181our @ISA = CFClient::UI::ScrolledWindow::;
3182
3183sub new {
3184 my $class = shift;
3185
3186 my $self = $class->SUPER::new (
3187 child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
3188 @_,
3189 );
3190
3191 $self
3192}
3193
3194sub set_items {
3195 my ($self, $items) = @_;
3196
3197 $self->{child}->clear;
3198 return unless $items;
3199
3200 my @items = sort {
3201 ($a->{type} <=> $b->{type})
3202 or ($a->{name} cmp $b->{name})
3203 } @$items;
3204
3205 $self->{real_items} = \@items;
3206
3207 my $row = 0;
3208 for my $item (@items) {
3209 CFClient::Item::update_widgets $item;
3210
3211 $self->{child}->add (0, $row, $item->{face_widget});
3212 $self->{child}->add (1, $row, $item->{desc_widget});
3213 $self->{child}->add (2, $row, $item->{weight_widget});
3214
3215 $row++;
3216 }
3217}
3218
3219#############################################################################
3220
3221package CFClient::UI::BindEditor;
3222
3223our @ISA = CFClient::UI::FancyFrame::;
3224
3225sub new {
3226 my $class = shift;
3227
3228 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3229
3230 $self->add (my $vb = new CFClient::UI::VBox);
3231
3232
3233 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3234 text => "start recording",
3235 tooltip => "Start/Stops recording of actions."
3236 ."All subsequent actions after the recording started will be captured."
3237 ."The actions are displayed after the record was stopped."
3238 ."To bind the action you have to click on the 'Bind' button",
3239 on_activate => sub {
3240 unless ($self->{recording}) {
3241 $self->start;
3242 } else {
3243 $self->stop;
3244 }
3245 });
3246
3247 $vb->add (new CFClient::UI::Label text => "Actions:");
3248 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3249
3250 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3251 $vb->add (my $hb = new CFClient::UI::HBox);
3252 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3253 $hb->add (new CFClient::UI::Button
3254 text => "bind",
3255 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3256 on_activate => sub {
3257 $self->ask_for_bind;
3258 });
3259
3260 $vb->add (my $hb = new CFClient::UI::HBox);
3261 $hb->add (new CFClient::UI::Button
3262 text => "ok",
3263 expand => 1,
3264 tooltip => "This closes the binding editor and saves the binding",
3265 on_activate => sub {
3266 $self->hide;
3267 $self->commit;
3268 });
3269
3270 $hb->add (new CFClient::UI::Button
3271 text => "cancel",
3272 expand => 1,
3273 tooltip => "This closes the binding editor without saving",
3274 on_activate => sub {
3275 $self->hide;
3276 $self->{binding_cancel}->()
3277 if $self->{binding_cancel};
3278 });
3279
3280 $self->update_binding_widgets;
3281
3282 $self
3283}
3284
3285sub commit {
3286 my ($self) = @_;
3287 my ($mod, $sym, $cmds) = $self->get_binding;
3288 if ($sym != 0 && @$cmds > 0) {
3289 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3290 ."'. Don't forget 'Save Config'!");
3291 $self->{binding_change}->($mod, $sym, $cmds)
3292 if $self->{binding_change};
3293 } else {
3294 $::STATUSBOX->add ("No action bound, no key or action specified!");
3295 $self->{binding_cancel}->()
3296 if $self->{binding_cancel};
3297 }
3298}
3299
3300sub start {
3301 my ($self) = @_;
3302
3303 $self->{rec_btn}->set_text ("stop recording");
3304 $self->{recording} = 1;
3305 $self->clear_command_list;
3306 $::CONN->start_record if $::CONN;
3307}
3308
3309sub stop {
3310 my ($self) = @_;
3311
3312 $self->{rec_btn}->set_text ("start recording");
3313 $self->{recording} = 0;
3314
3315 my $rec;
3316 $rec = $::CONN->stop_record if $::CONN;
3317 return unless ref $rec eq 'ARRAY';
3318 $self->set_command_list ($rec);
3319}
3320
3321
3322sub ask_for_bind_and_commit {
3323 my ($self) = @_;
3324 $self->ask_for_bind (1);
3325}
3326
3327sub ask_for_bind {
3328 my ($self, $commit) = @_;
3329
3330 CFClient::Binder::open_binding_dialog (sub {
3331 my ($mod, $sym) = @_;
3332 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3333 $self->update_binding_widgets;
3334 $self->commit if $commit;
3335 });
3336}
3337
3338# $mod and $sym are the modifiers and key symbol
3339# $cmds is a array ref of strings (the commands)
3340# $cb is the callback that is executed on OK
3341# $ccb is the callback that is executed on CANCEL and
3342# when the binding was unsuccessful on OK
3343sub set_binding {
3344 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3345
3346 $self->clear_command_list;
3347 $self->{recording} = 0;
3348 $self->{rec_btn}->set_text ("start recording");
3349
3350 $self->{binding} = [$mod, $sym];
3351 $self->{commands} = $cmds;
3352
3353 $self->{binding_change} = $cb;
3354 $self->{binding_cancel} = $ccb;
3355
3356 $self->update_binding_widgets;
3357}
3358
3359# this is a shortcut method that asks for a binding
3360# and then just binds it.
3361sub do_quick_binding {
3362 my ($self, $cmds) = @_;
3363 $self->set_binding (undef, undef, $cmds, sub {
3364 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3365 });
3366 $self->ask_for_bind (1);
3367}
3368
3369sub update_binding_widgets {
3370 my ($self) = @_;
3371 my ($mod, $sym, $cmds) = $self->get_binding;
3372 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3373 $self->set_command_list ($cmds);
3374}
3375
3376sub get_binding {
3377 my ($self) = @_;
3378 return (
3379 $self->{binding}->[0],
3380 $self->{binding}->[1],
3381 [ grep { defined $_ } @{$self->{commands}} ]
3382 );
3383}
3384
3385sub clear_command_list {
3386 my ($self) = @_;
3387 $self->{cmdbox}->clear ();
3388}
3389
3390sub set_command_list {
3391 my ($self, $cmds) = @_;
3392
3393 $self->{cmdbox}->clear ();
3394 $self->{commands} = $cmds;
3395
3396 my $idx = 0;
3397
3398 for (@$cmds) {
3399 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3400
3401 my $i = $idx;
3402 $hb->add (new CFClient::UI::Label text => $_);
3403 $hb->add (new CFClient::UI::Button
3404 text => "delete",
3405 tooltip => "Deletes the action from the record",
3406 on_activate => sub {
3407 $self->{cmdbox}->remove ($hb);
3408 $cmds->[$i] = undef;
3409 });
3410
3411
3412 $idx++
3413 }
3414}
3415
3416#############################################################################
3417
3418package CFClient::UI::SpellList;
3419
3420our @ISA = CFClient::UI::Table::;
3421
3422sub new {
3423 my $class = shift;
3424
3425 my $self = $class->SUPER::new (
3426 binding => [],
3427 commands => [],
3428 @_,
3429 )
3430}
3431
3432# XXX: Do sorting? Argl...
3433sub add_spell {
3434 my ($self, $spell) = @_;
3435 $self->{spells}->{$spell->{name}} = $spell;
3436
3437 $self->add (0, $self->{tbl_idx}, new CFClient::UI::Face
3438 face => $spell->{face},
3439 can_hover => 1,
3440 can_events => 1,
3441 tooltip => $spell->{message});
3442
3443 $self->add (1, $self->{tbl_idx}, new CFClient::UI::Label
3444 text => $spell->{name},
3445 can_hover => 1,
3446 can_events => 1,
3447 tooltip => $spell->{message},
3448 expand => 1);
3449
3450 $self->add (2, $self->{tbl_idx}, new CFClient::UI::Label
3451 text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
3452 $spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
3453 expand => 1);
3454
3455 $self->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
3456 text => "bind to key",
3457 on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
3458}
3459
3460sub rebuild_spell_list {
3461 my ($self) = @_;
3462 $self->{tbl_idx} = 0;
3463 $self->add_spell ($_) for values %{$self->{spells}};
3464}
3465
3466sub remove_spell {
3467 my ($self, $spell) = @_;
3468 delete $self->{spells}->{$spell->{name}};
3469 $self->rebuild_spell_list;
3470}
3471
3472#############################################################################
3473
3474package CFClient::UI::Root; 3781package CFPlus::UI::Root;
3475 3782
3476our @ISA = CFClient::UI::Container::; 3783our @ISA = CFPlus::UI::Container::;
3477 3784
3785use List::Util qw(min max);
3786
3478use CFClient::OpenGL; 3787use CFPlus::OpenGL;
3479 3788
3480sub new { 3789sub new {
3481 my $class = shift; 3790 my $class = shift;
3482 3791
3483 my $self = $class->SUPER::new ( 3792 my $self = $class->SUPER::new (
3484 visible => 1, 3793 visible => 1,
3485 @_, 3794 @_,
3486 ); 3795 );
3487 3796
3488 Scalar::Util::weaken ($self->{root} = $self); 3797 CFPlus::weaken ($self->{root} = $self);
3489 3798
3490 $self 3799 $self
3491} 3800}
3492 3801
3493sub size_request { 3802sub size_request {
… …
3508 $coord = $max - $size if $coord > $max - $size; 3817 $coord = $max - $size if $coord > $max - $size;
3509 3818
3510 int $coord + 0.5 3819 int $coord + 0.5
3511} 3820}
3512 3821
3513sub size_allocate { 3822sub invoke_size_allocate {
3514 my ($self, $w, $h) = @_; 3823 my ($self, $w, $h) = @_;
3515 3824
3516 for my $child ($self->children) { 3825 for my $child ($self->children) {
3517 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)};
3518 3827
… …
3522 $X = _to_pixel $X, $W, $self->{w}; 3831 $X = _to_pixel $X, $W, $self->{w};
3523 $Y = _to_pixel $Y, $H, $self->{h}; 3832 $Y = _to_pixel $Y, $H, $self->{h};
3524 3833
3525 $child->configure ($X, $Y, $W, $H); 3834 $child->configure ($X, $Y, $W, $H);
3526 } 3835 }
3836
3837 1
3527} 3838}
3528 3839
3529sub coord2local { 3840sub coord2local {
3530 my ($self, $x, $y) = @_; 3841 my ($self, $x, $y) = @_;
3531 3842
… …
3616 3927
3617 delete $queue{$widget+0}; 3928 delete $queue{$widget+0};
3618 3929
3619 my ($w, $h) = $widget->size_request; 3930 my ($w, $h) = $widget->size_request;
3620 3931
3621 $w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2; 3932 $w = max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3622 $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};
3623 3937
3624 $w = $widget->{force_w} if exists $widget->{force_w}; 3938 $w = $widget->{force_w} if exists $widget->{force_w};
3625 $h = $widget->{force_h} if exists $widget->{force_h}; 3939 $h = $widget->{force_h} if exists $widget->{force_h};
3626 3940
3627 if ($widget->{req_w} != $w || $widget->{req_h} != $h 3941 if ($widget->{req_w} != $w || $widget->{req_h} != $h
… …
3653 3967
3654 my ($w, $h) = @$widget{qw(alloc_w alloc_h)}; 3968 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3655 3969
3656 $w = 0 if $w < 0; 3970 $w = 0 if $w < 0;
3657 $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};
3658 3981
3659 $w = int $w + 0.5; 3982 $w = int $w + 0.5;
3660 $h = int $h + 0.5; 3983 $h = int $h + 0.5;
3661 3984
3662 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}) {
… …
3686 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 4009 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3687 glMatrixMode GL_MODELVIEW; 4010 glMatrixMode GL_MODELVIEW;
3688 glLoadIdentity; 4011 glLoadIdentity;
3689 4012
3690 { 4013 {
3691 package CFClient::UI::Base; 4014 package CFPlus::UI::Base;
3692 4015
3693 ($draw_x, $draw_y, $draw_w, $draw_h) = 4016 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3694 (0, 0, $self->{w}, $self->{h}); 4017 (0, 0, $self->{w}, $self->{h});
3695 }
3696 4018
3697 $self->_draw; 4019 $self->_draw;
4020 }
3698} 4021}
3699 4022
3700############################################################################# 4023#############################################################################
3701 4024
3702package CFClient::UI; 4025package CFPlus::UI;
3703 4026
3704$ROOT = new CFClient::UI::Root; 4027$ROOT = new CFPlus::UI::Root;
3705$TOOLTIP = new CFClient::UI::Tooltip z => 900; 4028$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
3706 4029
37071 40301
3708 4031

Diff Legend

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