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.275 by root, Sat Jun 3 22:50:48 2006 UTC vs.
Revision 1.363 by root, Sun Dec 10 00:06:49 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 {
… …
1676 1926
1677 delete $self->{cur_h}; 1927 delete $self->{cur_h};
1678 1928
1679 return if $self->{text} eq $text; 1929 return if $self->{text} eq $text;
1680 1930
1681 delete $self->{texture};
1682
1683 $self->{last_activity} = $::NOW; 1931 $self->{last_activity} = $::NOW;
1684 $self->{text} = $text; 1932 $self->{text} = $text;
1685 1933
1686 $text =~ s/./*/g if $self->{hidden}; 1934 $text =~ s/./*/g if $self->{hidden};
1687 $self->{layout}->set_text ("$text "); 1935 $self->{layout}->set_text ("$text ");
1936 delete $self->{size_req};
1688 1937
1689 $self->_emit (changed => $self->{text}); 1938 $self->emit (changed => $self->{text});
1939
1940 $self->realloc;
1941 $self->update;
1690} 1942}
1691 1943
1692sub set_text { 1944sub set_text {
1693 my ($self, $text) = @_; 1945 my ($self, $text) = @_;
1694 1946
1695 $self->{cursor} = length $text; 1947 $self->{cursor} = length $text;
1696 $self->_set_text ($text); 1948 $self->_set_text ($text);
1697
1698 $self->realloc;
1699} 1949}
1700 1950
1701sub get_text { 1951sub get_text {
1702 $_[0]{text} 1952 $_[0]{text}
1703} 1953}
… …
1708 my ($w, $h) = $self->SUPER::size_request; 1958 my ($w, $h) = $self->SUPER::size_request;
1709 1959
1710 ($w + 1, $h) # add 1 for cursor 1960 ($w + 1, $h) # add 1 for cursor
1711} 1961}
1712 1962
1713sub key_down { 1963sub invoke_key_down {
1714 my ($self, $ev) = @_; 1964 my ($self, $ev) = @_;
1715 1965
1716 my $mod = $ev->{mod}; 1966 my $mod = $ev->{mod};
1717 my $sym = $ev->{sym}; 1967 my $sym = $ev->{sym};
1718 my $uni = $ev->{unicode}; 1968 my $uni = $ev->{unicode};
… …
1721 1971
1722 if ($uni == 8) { 1972 if ($uni == 8) {
1723 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 1973 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1724 } elsif ($uni == 127) { 1974 } elsif ($uni == 127) {
1725 substr $text, $self->{cursor}, 1, ""; 1975 substr $text, $self->{cursor}, 1, "";
1726 } elsif ($sym == CFClient::SDLK_LEFT) { 1976 } elsif ($sym == CFPlus::SDLK_LEFT) {
1727 --$self->{cursor} if $self->{cursor}; 1977 --$self->{cursor} if $self->{cursor};
1728 } elsif ($sym == CFClient::SDLK_RIGHT) { 1978 } elsif ($sym == CFPlus::SDLK_RIGHT) {
1729 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1979 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1730 } 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 = "";
1731 $self->{cursor} = 0; 1994 $self->{cursor} = 0;
1732 } elsif ($sym == CFClient::SDLK_END) {
1733 $self->{cursor} = length $text;
1734 } elsif ($uni == 27) { 1995 } elsif ($uni == 27) {
1735 $self->_emit ('escape'); 1996 $self->emit ('escape');
1736 } elsif ($uni) { 1997 } elsif ($uni == 0x0d) {
1998 substr $text, $self->{cursor}++, 0, "\012";
1999 } elsif ($uni >= 0x20) {
1737 substr $text, $self->{cursor}++, 0, chr $uni; 2000 substr $text, $self->{cursor}++, 0, chr $uni;
1738 } else { 2001 } else {
1739 return 0; 2002 return 0;
1740 } 2003 }
1741 2004
1742 $self->_set_text ($text); 2005 $self->_set_text ($text);
1743 2006
1744 $self->realloc; 2007 $self->realloc;
2008 $self->update;
1745 2009
1746 1 2010 1
1747} 2011}
1748 2012
1749sub focus_in { 2013sub invoke_focus_in {
1750 my ($self) = @_; 2014 my ($self) = @_;
1751 2015
1752 $self->{last_activity} = $::NOW; 2016 $self->{last_activity} = $::NOW;
1753 2017
1754 $self->SUPER::focus_in; 2018 $self->SUPER::invoke_focus_in
1755} 2019}
1756 2020
1757sub button_down { 2021sub invoke_button_down {
1758 my ($self, $ev, $x, $y) = @_; 2022 my ($self, $ev, $x, $y) = @_;
1759 2023
1760 $self->SUPER::button_down ($ev, $x, $y); 2024 $self->SUPER::invoke_button_down ($ev, $x, $y);
1761 2025
1762 my $idx = $self->{layout}->xy_to_index ($x, $y); 2026 my $idx = $self->{layout}->xy_to_index ($x, $y);
1763 2027
1764 # byte-index to char-index 2028 # byte-index to char-index
1765 my $text = $self->{text}; 2029 my $text = $self->{text};
1766 utf8::encode $text; 2030 utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1767 $self->{cursor} = length substr $text, 0, $idx; 2031 $self->{cursor} = length $text;
1768 2032
1769 $self->_set_text ($self->{text}); 2033 $self->_set_text ($self->{text});
1770 $self->update; 2034 $self->update;
1771 2035
1772 1 2036 1
1773} 2037}
1774 2038
1775sub mouse_motion { 2039sub invoke_mouse_motion {
1776 my ($self, $ev, $x, $y) = @_; 2040 my ($self, $ev, $x, $y) = @_;
1777# 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#
1778 2042
1779 0 2043 1
1780} 2044}
1781 2045
1782sub _draw { 2046sub _draw {
1783 my ($self) = @_; 2047 my ($self) = @_;
1784 2048
1785 local $self->{fg} = $self->{fg}; 2049 local $self->{fg} = $self->{fg};
1786 2050
1787 if ($FOCUS == $self) { 2051 if ($FOCUS == $self) {
1788 glColor @{$self->{active_bg}}; 2052 glColor_premultiply @{$self->{active_bg}};
1789 $self->{fg} = $self->{active_fg}; 2053 $self->{fg} = $self->{active_fg};
1790 } else { 2054 } else {
1791 glColor @{$self->{bg}}; 2055 glColor_premultiply @{$self->{bg}};
1792 } 2056 }
1793 2057
1794 glEnable GL_BLEND; 2058 glEnable GL_BLEND;
1795 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2059 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1796 glBegin GL_QUADS; 2060 glBegin GL_QUADS;
1797 glVertex 0 , 0; 2061 glVertex 0 , 0;
1798 glVertex 0 , $self->{h}; 2062 glVertex 0 , $self->{h};
1799 glVertex $self->{w}, $self->{h}; 2063 glVertex $self->{w}, $self->{h};
1800 glVertex $self->{w}, 0; 2064 glVertex $self->{w}, 0;
… …
1811 utf8::encode $text; 2075 utf8::encode $text;
1812 2076
1813 @$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)
1814 } 2078 }
1815 2079
1816 glColor @{$self->{fg}};
1817 glBegin GL_LINES; 2080 glBegin GL_LINES;
1818 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};
1819 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};
1820 glEnd; 2083 glEnd;
1821 } 2084 }
1822} 2085}
1823 2086
2087#############################################################################
2088
1824package CFClient::UI::Entry; 2089package CFPlus::UI::Entry;
1825 2090
1826our @ISA = CFClient::UI::EntryBase::; 2091our @ISA = CFPlus::UI::EntryBase::;
1827 2092
1828use CFClient::OpenGL; 2093use CFPlus::OpenGL;
1829 2094
1830sub key_down { 2095sub invoke_key_down {
1831 my ($self, $ev) = @_; 2096 my ($self, $ev) = @_;
1832 2097
1833 my $sym = $ev->{sym}; 2098 my $sym = $ev->{sym};
1834 2099
1835 if ($sym == 13) { 2100 if ($ev->{uni} == 0x0d || $sym == 13) {
1836 unshift @{$self->{history}}, 2101 unshift @{$self->{history}},
1837 my $txt = $self->get_text; 2102 my $txt = $self->get_text;
2103
1838 $self->{history_pointer} = -1; 2104 $self->{history_pointer} = -1;
1839 $self->{history_saveback} = ''; 2105 $self->{history_saveback} = '';
1840 $self->_emit (activate => $txt); 2106 $self->emit (activate => $txt);
1841 $self->update; 2107 $self->update;
1842 2108
1843 } elsif ($sym == CFClient::SDLK_UP) { 2109 } elsif ($sym == CFPlus::SDLK_UP) {
1844 if ($self->{history_pointer} < 0) { 2110 if ($self->{history_pointer} < 0) {
1845 $self->{history_saveback} = $self->get_text; 2111 $self->{history_saveback} = $self->get_text;
1846 } 2112 }
1847 if (@{$self->{history} || []} > 0) { 2113 if (@{$self->{history} || []} > 0) {
1848 $self->{history_pointer}++; 2114 $self->{history_pointer}++;
… …
1850 $self->{history_pointer} = @{$self->{history} || []} - 1; 2116 $self->{history_pointer} = @{$self->{history} || []} - 1;
1851 } 2117 }
1852 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2118 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1853 } 2119 }
1854 2120
1855 } elsif ($sym == CFClient::SDLK_DOWN) { 2121 } elsif ($sym == CFPlus::SDLK_DOWN) {
1856 $self->{history_pointer}--; 2122 $self->{history_pointer}--;
1857 $self->{history_pointer} = -1 if $self->{history_pointer} < 0; 2123 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1858 2124
1859 if ($self->{history_pointer} >= 0) { 2125 if ($self->{history_pointer} >= 0) {
1860 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2126 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1861 } else { 2127 } else {
1862 $self->set_text ($self->{history_saveback}); 2128 $self->set_text ($self->{history_saveback});
1863 } 2129 }
1864 2130
1865 } else { 2131 } else {
1866 return $self->SUPER::key_down ($ev) 2132 return $self->SUPER::invoke_key_down ($ev)
1867 } 2133 }
1868 2134
1869 1 2135 1
1870} 2136}
1871 2137
1872############################################################################# 2138#############################################################################
1873 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
1874package CFClient::UI::Button; 2179package CFPlus::UI::Button;
1875 2180
1876our @ISA = CFClient::UI::Label::; 2181our @ISA = CFPlus::UI::Label::;
1877 2182
1878use CFClient::OpenGL; 2183use CFPlus::OpenGL;
1879 2184
1880my @tex = 2185my @tex =
1881 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2186 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1882 qw(b1_button_active.png); 2187 qw(b1_button_active.png);
1883 2188
1884sub new { 2189sub new {
1885 my $class = shift; 2190 my $class = shift;
1886 2191
… …
1895 can_events => 1, 2200 can_events => 1,
1896 @_ 2201 @_
1897 ) 2202 )
1898} 2203}
1899 2204
1900sub activate { }
1901
1902sub button_up { 2205sub invoke_button_up {
1903 my ($self, $ev, $x, $y) = @_; 2206 my ($self, $ev, $x, $y) = @_;
1904 2207
1905 $self->emit ("activate") 2208 $self->emit ("activate")
1906 if $x >= 0 && $x < $self->{w} 2209 if $x >= 0 && $x < $self->{w}
1907 && $y >= 0 && $y < $self->{h}; 2210 && $y >= 0 && $y < $self->{h};
… …
1910} 2213}
1911 2214
1912sub _draw { 2215sub _draw {
1913 my ($self) = @_; 2216 my ($self) = @_;
1914 2217
1915 local $self->{fg} = $self->{fg}; 2218 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1916
1917 if ($GRAB == $self) {
1918 $self->{fg} = $self->{active_fg};
1919 }
1920 2219
1921 glEnable GL_TEXTURE_2D; 2220 glEnable GL_TEXTURE_2D;
1922 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2221 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1923 glColor 0, 0, 0, 1; 2222 glColor 0, 0, 0, 1;
1924 2223
… …
1929 $self->SUPER::_draw; 2228 $self->SUPER::_draw;
1930} 2229}
1931 2230
1932############################################################################# 2231#############################################################################
1933 2232
1934package CFClient::UI::CheckBox; 2233package CFPlus::UI::CheckBox;
1935 2234
1936our @ISA = CFClient::UI::DrawBG::; 2235our @ISA = CFPlus::UI::DrawBG::;
1937 2236
1938my @tex = 2237my @tex =
1939 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2238 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1940 qw(c1_checkbox_bg.png c1_checkbox_active.png); 2239 qw(c1_checkbox_bg.png c1_checkbox_active.png);
1941 2240
1942use CFClient::OpenGL; 2241use CFPlus::OpenGL;
1943 2242
1944sub new { 2243sub new {
1945 my $class = shift; 2244 my $class = shift;
1946 2245
1947 $class->SUPER::new ( 2246 $class->SUPER::new (
… …
1961 my ($self) = @_; 2260 my ($self) = @_;
1962 2261
1963 (6) x 2 2262 (6) x 2
1964} 2263}
1965 2264
2265sub toggle {
2266 my ($self) = @_;
2267
2268 $self->{state} = !$self->{state};
2269 $self->emit (changed => $self->{state});
2270 $self->update;
2271}
2272
1966sub button_down { 2273sub invoke_button_down {
1967 my ($self, $ev, $x, $y) = @_; 2274 my ($self, $ev, $x, $y) = @_;
1968 2275
1969 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x} 2276 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1970 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) { 2277 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1971 $self->{state} = !$self->{state}; 2278 $self->toggle;
1972 $self->_emit (changed => $self->{state});
1973 } else { 2279 } else {
1974 return 0 2280 return 0
1975 } 2281 }
1976 2282
1977 1 2283 1
… …
1997 glDisable GL_TEXTURE_2D; 2303 glDisable GL_TEXTURE_2D;
1998} 2304}
1999 2305
2000############################################################################# 2306#############################################################################
2001 2307
2002package CFClient::UI::Image; 2308package CFPlus::UI::Image;
2003 2309
2004our @ISA = CFClient::UI::Base::; 2310our @ISA = CFPlus::UI::Base::;
2005 2311
2006use CFClient::OpenGL; 2312use CFPlus::OpenGL;
2007use Carp qw/confess/;
2008 2313
2009our %loaded_images; 2314our %texture_cache;
2010 2315
2011sub new { 2316sub new {
2012 my $class = shift; 2317 my $class = shift;
2013 2318
2014 my $self = $class->SUPER::new (can_events => 0, @_); 2319 my $self = $class->SUPER::new (
2320 can_events => 0,
2321 @_,
2322 );
2015 2323
2016 $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";
2017 2326
2018 $loaded_images{$self->{image}} ||= 2327 $self->{tex} ||= $texture_cache{$self->{path}} ||=
2019 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;
2020 2329
2021 my $tex = $self->{tex} = $loaded_images{$self->{image}}; 2330 CFPlus::weaken $texture_cache{$self->{path}};
2022 2331
2023 Scalar::Util::weaken $loaded_images{$self->{image}}; 2332 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2024
2025 $self->{aspect} = $tex->{w} / $tex->{h};
2026 2333
2027 $self 2334 $self
2028} 2335}
2029 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
2030sub size_request { 2352sub size_request {
2031 my ($self) = @_; 2353 my ($self) = @_;
2032 2354
2033 ($self->{tex}->{w}, $self->{tex}->{h}) 2355 ($self->{tex}{w}, $self->{tex}{h})
2034} 2356}
2035 2357
2036sub _draw { 2358sub _draw {
2037 my ($self) = @_; 2359 my ($self) = @_;
2038 2360
… …
2048 } 2370 }
2049 2371
2050 glEnable GL_TEXTURE_2D; 2372 glEnable GL_TEXTURE_2D;
2051 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2373 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2052 2374
2053 $tex->draw_quad_alpha (0, 0, $w, $h); 2375 $tex->draw_quad (0, 0, $w, $h);
2054 2376
2055 glDisable GL_TEXTURE_2D; 2377 glDisable GL_TEXTURE_2D;
2056} 2378}
2057 2379
2058############################################################################# 2380#############################################################################
2059 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
2060package CFClient::UI::VGauge; 2418package CFPlus::UI::VGauge;
2061 2419
2062our @ISA = CFClient::UI::Base::; 2420our @ISA = CFPlus::UI::Base::;
2063 2421
2064use List::Util qw(min max); 2422use List::Util qw(min max);
2065 2423
2066use CFClient::OpenGL; 2424use CFPlus::OpenGL;
2067 2425
2068my %tex = ( 2426my %tex = (
2069 food => [ 2427 food => [
2070 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2428 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2071 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ 2429 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2072 ], 2430 ],
2073 grace => [ 2431 grace => [
2074 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2432 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2075 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/
2076 ], 2434 ],
2077 hp => [ 2435 hp => [
2078 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2436 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2079 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/ 2437 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2080 ], 2438 ],
2081 mana => [ 2439 mana => [
2082 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2440 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2083 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/
2084 ], 2442 ],
2085); 2443);
2086 2444
2087# eg. VGauge->new (gauge => 'food'), default gauge: food 2445# eg. VGauge->new (gauge => 'food'), default gauge: food
… …
2147 my $ycut1 = max 0, min 1, $ycut; 2505 my $ycut1 = max 0, min 1, $ycut;
2148 my $ycut2 = max 0, min 1, $ycut - 1; 2506 my $ycut2 = max 0, min 1, $ycut - 1;
2149 2507
2150 my $h1 = $self->{h} * (1 - $ycut1); 2508 my $h1 = $self->{h} * (1 - $ycut1);
2151 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);
2152 2513
2153 glEnable GL_BLEND; 2514 glEnable GL_BLEND;
2154 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;
2155 glEnable GL_TEXTURE_2D; 2517 glEnable GL_TEXTURE_2D;
2156 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2518 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2157 2519
2158 glBindTexture GL_TEXTURE_2D, $t1->{name}; 2520 glBindTexture GL_TEXTURE_2D, $t1->{name};
2159 glBegin GL_QUADS; 2521 glBegin GL_QUADS;
… …
2174 2536
2175 if ($t3) { 2537 if ($t3) {
2176 glBindTexture GL_TEXTURE_2D, $t3->{name}; 2538 glBindTexture GL_TEXTURE_2D, $t3->{name};
2177 glBegin GL_QUADS; 2539 glBegin GL_QUADS;
2178 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2; 2540 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2179 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h}; 2541 glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2180 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h}; 2542 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2181 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2; 2543 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2182 glEnd; 2544 glEnd;
2183 } 2545 }
2184 2546
2185 glDisable GL_BLEND; 2547 glDisable GL_BLEND;
2186 glDisable GL_TEXTURE_2D; 2548 glDisable GL_TEXTURE_2D;
2187} 2549}
2188 2550
2189############################################################################# 2551#############################################################################
2190 2552
2191package CFClient::UI::Gauge; 2553package CFPlus::UI::Gauge;
2192 2554
2193our @ISA = CFClient::UI::VBox::; 2555our @ISA = CFPlus::UI::VBox::;
2194 2556
2195sub new { 2557sub new {
2196 my ($class, %arg) = @_; 2558 my ($class, %arg) = @_;
2197 2559
2198 my $self = $class->SUPER::new ( 2560 my $self = $class->SUPER::new (
… …
2200 can_hover => 1, 2562 can_hover => 1,
2201 can_events => 1, 2563 can_events => 1,
2202 %arg, 2564 %arg,
2203 ); 2565 );
2204 2566
2205 $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");
2206 $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);
2207 $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");
2208 2570
2209 $self 2571 $self
2210} 2572}
2211 2573
2212sub set_fontsize { 2574sub set_fontsize {
… …
2233 $self->{value}->set_text ($val); 2595 $self->{value}->set_text ($val);
2234} 2596}
2235 2597
2236############################################################################# 2598#############################################################################
2237 2599
2238package CFClient::UI::Slider; 2600package CFPlus::UI::Slider;
2239 2601
2240use strict; 2602use strict;
2241 2603
2242use CFClient::OpenGL; 2604use CFPlus::OpenGL;
2243 2605
2244our @ISA = CFClient::UI::DrawBG::; 2606our @ISA = CFPlus::UI::DrawBG::;
2245 2607
2246my @tex = 2608my @tex =
2247 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 2609 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
2248 qw(s1_slider.png s1_slider_bg.png); 2610 qw(s1_slider.png s1_slider_bg.png);
2249 2611
2250sub new { 2612sub new {
2251 my $class = shift; 2613 my $class = shift;
2252 2614
… …
2273 $self->update; 2635 $self->update;
2274 2636
2275 $self 2637 $self
2276} 2638}
2277 2639
2278sub changed { }
2279
2280sub set_range { 2640sub set_range {
2281 my ($self, $range) = @_; 2641 my ($self, $range) = @_;
2282 2642
2283 ($range, $self->{range}) = ($self->{range}, $range); 2643 ($range, $self->{range}) = ($self->{range}, $range);
2284 2644
2285 $self->update
2286 if "@$range" ne "@{$self->{range}}"; 2645 if ("@$range" ne "@{$self->{range}}") {
2646 $self->update;
2647 $self->set_value ($self->{range}[0]);
2648 }
2287} 2649}
2288 2650
2289sub set_value { 2651sub set_value {
2290 my ($self, $value) = @_; 2652 my ($self, $value) = @_;
2291 2653
… …
2302 if $unit; 2664 if $unit;
2303 2665
2304 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2666 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2305 2667
2306 if ($value != $old_value) { 2668 if ($value != $old_value) {
2307 $self->_emit (changed => $value); 2669 $self->emit (changed => $value);
2308 $self->update; 2670 $self->update;
2309 } 2671 }
2310} 2672}
2311 2673
2312sub size_request { 2674sub size_request {
2313 my ($self) = @_; 2675 my ($self) = @_;
2314 2676
2315 ($self->{req_w}, $self->{req_h}) 2677 ($self->{req_w}, $self->{req_h})
2316} 2678}
2317 2679
2318sub button_down { 2680sub invoke_button_down {
2319 my ($self, $ev, $x, $y) = @_; 2681 my ($self, $ev, $x, $y) = @_;
2320 2682
2321 $self->SUPER::button_down ($ev, $x, $y); 2683 $self->SUPER::invoke_button_down ($ev, $x, $y);
2322 2684
2323 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2685 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2324 2686
2325 $self->mouse_motion ($ev, $x, $y) 2687 $self->invoke_mouse_motion ($ev, $x, $y)
2326} 2688}
2327 2689
2328sub mouse_motion { 2690sub invoke_mouse_motion {
2329 my ($self, $ev, $x, $y) = @_; 2691 my ($self, $ev, $x, $y) = @_;
2330 2692
2331 if ($GRAB == $self) { 2693 if ($GRAB == $self) {
2332 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2694 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2333 2695
… …
2339 } else { 2701 } else {
2340 return 0; 2702 return 0;
2341 } 2703 }
2342 2704
2343 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 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * 0.2);
2714
2715 ! ! $delta
2344} 2716}
2345 2717
2346sub update { 2718sub update {
2347 my ($self) = @_; 2719 my ($self) = @_;
2348 2720
… …
2397 glDisable GL_TEXTURE_2D; 2769 glDisable GL_TEXTURE_2D;
2398} 2770}
2399 2771
2400############################################################################# 2772#############################################################################
2401 2773
2402package CFClient::UI::ValSlider; 2774package CFPlus::UI::ValSlider;
2403 2775
2404our @ISA = CFClient::UI::HBox::; 2776our @ISA = CFPlus::UI::HBox::;
2405 2777
2406sub new { 2778sub new {
2407 my ($class, %arg) = @_; 2779 my ($class, %arg) = @_;
2408 2780
2409 my $range = delete $arg{range}; 2781 my $range = delete $arg{range};
2410 2782
2411 my $self = $class->SUPER::new ( 2783 my $self = $class->SUPER::new (
2412 slider => (new CFClient::UI::Slider expand => 1, range => $range), 2784 slider => (new CFPlus::UI::Slider expand => 1, range => $range),
2413 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}), 2785 entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
2414 to_value => sub { shift }, 2786 to_value => sub { shift },
2415 from_value => sub { shift }, 2787 from_value => sub { shift },
2416 %arg, 2788 %arg,
2417 ); 2789 );
2418 2790
… …
2438sub set_range { shift->{slider}->set_range (@_) } 2810sub set_range { shift->{slider}->set_range (@_) }
2439sub set_value { shift->{slider}->set_value (@_) } 2811sub set_value { shift->{slider}->set_value (@_) }
2440 2812
2441############################################################################# 2813#############################################################################
2442 2814
2443package CFClient::UI::TextView; 2815package CFPlus::UI::TextScroller;
2444 2816
2445our @ISA = CFClient::UI::HBox::; 2817our @ISA = CFPlus::UI::HBox::;
2446 2818
2447use CFClient::OpenGL; 2819use CFPlus::OpenGL;
2448 2820
2449sub new { 2821sub new {
2450 my $class = shift; 2822 my $class = shift;
2451 2823
2452 my $self = $class->SUPER::new ( 2824 my $self = $class->SUPER::new (
2453 fontsize => 1, 2825 fontsize => 1,
2454 can_events => 0, 2826 can_events => 1,
2827 indent => 0,
2455 #font => default_font 2828 #font => default_font
2456 @_, 2829 @_,
2457 2830
2458 layout => (new CFClient::Layout 1), 2831 layout => (new CFPlus::Layout),
2459 par => [], 2832 par => [],
2460 height => 0, 2833 height => 0,
2461 children => [ 2834 children => [
2462 (new CFClient::UI::Empty expand => 1), 2835 (new CFPlus::UI::Empty expand => 1),
2463 (new CFClient::UI::Slider vertical => 1), 2836 (new CFPlus::UI::Slider vertical => 1),
2464 ], 2837 ],
2465 ); 2838 );
2466 2839
2467 $self->{children}[1]->connect (changed => sub { $self->update }); 2840 $self->{children}[1]->connect (changed => sub { $self->update });
2468 2841
… …
2474 2847
2475 $self->{fontsize} = $fontsize; 2848 $self->{fontsize} = $fontsize;
2476 $self->reflow; 2849 $self->reflow;
2477} 2850}
2478 2851
2852sub size_request {
2853 my ($self) = @_;
2854
2855 my ($empty, $slider) = @{ $self->{children} };
2856
2857 local $self->{children} = [$empty, $slider];
2858 $self->SUPER::size_request
2859}
2860
2479sub size_allocate { 2861sub invoke_size_allocate {
2480 my ($self, $w, $h) = @_; 2862 my ($self, $w, $h) = @_;
2481 2863
2482 $self->SUPER::size_allocate ($w, $h); 2864 my ($empty, $slider, @other) = @{ $self->{children} };
2865 $_->configure (@$_{qw(x y req_w req_h)}) for @other;
2483 2866
2484 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2867 $self->{layout}->set_font ($self->{font}) if $self->{font};
2485 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2868 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2486 $self->{layout}->set_width ($self->{children}[0]{w}); 2869 $self->{layout}->set_width ($empty->{w});
2870 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2487 2871
2488 $self->reflow; 2872 $self->reflow;
2489}
2490 2873
2491sub text_size { 2874 local $self->{children} = [$empty, $slider];
2875 $self->SUPER::invoke_size_allocate ($w, $h)
2876}
2877
2878sub invoke_mouse_wheel {
2492 my ($self, $text, $indent) = @_; 2879 my ($self, $ev) = @_;
2880
2881 return 0 unless $ev->{dy}; # only vertical movements
2882
2883 $self->{children}[1]->emit (mouse_wheel => $ev);
2884
2885 1
2886}
2887
2888sub get_layout {
2889 my ($self, $para) = @_;
2493 2890
2494 my $layout = $self->{layout}; 2891 my $layout = $self->{layout};
2495 2892
2893 $layout->set_font ($self->{font}) if $self->{font};
2894 $layout->set_foreground (@{$para->{fg}});
2496 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2895 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2497 $layout->set_width ($self->{children}[0]{w} - $indent); 2896 $layout->set_width ($self->{children}[0]{w} - $para->{indent});
2897 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2498 $layout->set_markup ($text); 2898 $layout->set_markup ($para->{markup});
2899
2900 $layout->set_shapes (
2901 map
2902 +(0, $_->baseline_shift +$_->{padding_y} - $_->{h}, $_->{w}, $_->{h}),
2903 @{$para->{widget}}
2499 2904 );
2905
2500 $layout->size 2906 $layout
2501} 2907}
2502 2908
2503sub reflow { 2909sub reflow {
2504 my ($self) = @_; 2910 my ($self) = @_;
2505 2911
… …
2512 2918
2513 # todo: base offset on lines or so, not on pixels 2919 # todo: base offset on lines or so, not on pixels
2514 $self->{children}[1]->set_value ($offset); 2920 $self->{children}[1]->set_value ($offset);
2515} 2921}
2516 2922
2923sub current_paragraph {
2924 my ($self) = @_;
2925
2926 $self->{top_paragraph} - 1
2927}
2928
2929sub scroll_to {
2930 my ($self, $para) = @_;
2931
2932 $para = List::Util::max 0, List::Util::min $#{$self->{par}}, $para;
2933
2934 $self->{scroll_to} = $para;
2935 $self->update;
2936}
2937
2517sub clear { 2938sub clear {
2518 my ($self) = @_; 2939 my ($self) = @_;
2940
2941 my (undef, undef, @other) = @{ $self->{children} };
2942 $self->remove ($_) for @other;
2519 2943
2520 $self->{par} = []; 2944 $self->{par} = [];
2521 $self->{height} = 0; 2945 $self->{height} = 0;
2522 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]); 2946 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2523} 2947}
2524 2948
2525sub add_paragraph { 2949sub add_paragraph {
2526 my ($self, $color, $text, $indent) = @_; 2950 my $self = shift;
2527 2951
2528 for my $line (split /\n/, $text) { 2952 for my $para (@_) {
2529 my ($w, $h) = $self->text_size ($line); 2953 $para = {
2954 fg => [1, 1, 1, 1],
2955 indent => 0,
2956 markup => "",
2957 widget => [],
2958 ref $para ? %$para : (markup => $para),
2959 w => 1e10,
2960 wrapped => 1,
2961 };
2962
2963 $self->add (@{ $para->{widget} }) if @{ $para->{widget} };
2964 push @{$self->{par}}, $para;
2965 }
2966
2967 $self->{need_reflow}++;
2968 $self->update;
2969}
2970
2971sub scroll_to_bottom {
2972 my ($self) = @_;
2973
2974 $self->{scroll_to} = $#{$self->{par}};
2975 $self->update;
2976}
2977
2978sub force_uptodate {
2979 my ($self) = @_;
2980
2981 if (delete $self->{need_reflow}) {
2982 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2983
2984 my $height = 0;
2985
2986 for my $para (@{$self->{par}}) {
2987 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2988 my $layout = $self->get_layout ($para);
2989 my ($w, $h) = $layout->size;
2990
2991 $para->{w} = $w + $para->{indent};
2992 $para->{h} = $h;
2993 $para->{wrapped} = $layout->has_wrapped;
2994 }
2995
2996 $para->{y} = $height;
2997 $height += $para->{h};
2998 }
2999
2530 $self->{height} += $h; 3000 $self->{height} = $height;
2531 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line]; 3001 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2532 }
2533 3002
2534 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]); 3003 delete $self->{texture};
3004 }
3005
3006 if (my $paridx = delete $self->{scroll_to}) {
3007 $self->{children}[1]->set_value ($self->{par}[$paridx]{y});
3008 }
2535} 3009}
2536 3010
2537sub update { 3011sub update {
2538 my ($self) = @_; 3012 my ($self) = @_;
2539 3013
… …
2541 3015
2542 return unless $self->{h} > 0; 3016 return unless $self->{h} > 0;
2543 3017
2544 delete $self->{texture}; 3018 delete $self->{texture};
2545 3019
2546 $ROOT->on_post_alloc ($self, sub { 3020 $ROOT->on_post_alloc ($self => sub {
3021 $self->force_uptodate;
3022
2547 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 3023 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2548 3024
2549 if (delete $self->{need_reflow}) {
2550 my $height = 0;
2551
2552 my $layout = $self->{layout};
2553
2554 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2555
2556 for (@{$self->{par}}) {
2557 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2558 $layout->set_width ($W - $_->[3]);
2559 $layout->set_markup ($_->[4]);
2560 my ($w, $h) = $layout->size;
2561 $_->[0] = $w + $_->[3];
2562 $_->[1] = $h;
2563 }
2564
2565 $height += $_->[1];
2566 }
2567
2568 $self->{height} = $height;
2569
2570 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2571
2572 delete $self->{texture};
2573 }
2574
2575 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 3025 $self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2576 glClearColor 0.5, 0.5, 0.5, 0; 3026 glClearColor 0, 0, 0, 0;
2577 glClear GL_COLOR_BUFFER_BIT; 3027 glClear GL_COLOR_BUFFER_BIT;
2578 3028
3029 package CFPlus::UI::Base;
3030 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3031 (0, 0, $self->{w}, $self->{h});
3032
3033 my $top = int $self->{children}[1]{range}[0];
3034
3035 my $paridx = 0;
3036 my $top_paragraph;
2579 my $top = int $self->{children}[1]{range}[0]; 3037 my $top = int $self->{children}[1]{range}[0];
2580 3038
2581 my $y0 = $top; 3039 my $y0 = $top;
2582 my $y1 = $top + $H; 3040 my $y1 = $top + $H;
2583 3041
2584 my $y = 0;
2585
2586 my $layout = $self->{layout};
2587
2588 $layout->set_font ($self->{font}) if $self->{font};
2589
2590 glEnable GL_BLEND;
2591 #TODO# not correct in windows where rgba is forced off
2592 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2593
2594 for my $par (@{$self->{par}}) { 3042 for my $para (@{$self->{par}}) {
2595 my $h = $par->[1]; 3043 my $h = $para->{h};
3044 my $y = $para->{y};
2596 3045
2597 if ($y0 < $y + $h && $y < $y1) { 3046 if ($y0 < $y + $h && $y < $y1) {
2598 $layout->set_foreground (@{ $par->[2] }); 3047 my $layout = $self->get_layout ($para);
2599 $layout->set_width ($W - $par->[3]);
2600 $layout->set_markup ($par->[4]);
2601 3048
2602 my ($w, $h, $data, $format, $internalformat) = $layout->render; 3049 $layout->render ($para->{indent}, $y - $y0);
2603 3050
2604 glRasterPos $par->[3], $y - $y0; 3051 if (my @w = @{ $para->{widget} }) {
2605 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data; 3052 my @s = $layout->get_shapes;
3053
3054 for (@w) {
3055 my ($dx, $dy) = splice @s, 0, 2, ();
3056
3057 $_->{x} = $dx + $para->{indent};
3058 $_->{y} = $dy + $y - $y0;
3059
3060 $_->draw;
3061 }
3062 }
2606 } 3063 }
2607 3064
2608 $y += $h; 3065 $paridx++;
3066 $top_paragraph ||= $paridx if $y >= $top;
2609 } 3067 }
2610 3068
2611 glDisable GL_BLEND; 3069 $self->{top_paragraph} = $top_paragraph;
2612 }; 3070 };
2613 }); 3071 });
2614} 3072}
2615 3073
3074sub reconfigure {
3075 my ($self) = @_;
3076
3077 $self->SUPER::reconfigure;
3078
3079 $_->{w} = 1e10 for @{ $self->{par} };
3080 $self->reflow;
3081}
3082
2616sub _draw { 3083sub _draw {
2617 my ($self) = @_; 3084 my ($self) = @_;
2618 3085
2619 glEnable GL_TEXTURE_2D; 3086 glEnable GL_TEXTURE_2D;
2620 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3087 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2621 glColor 1, 1, 1, 1; 3088 glColor 0, 0, 0, 1;
2622 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 3089 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2623 glDisable GL_TEXTURE_2D; 3090 glDisable GL_TEXTURE_2D;
2624 3091
2625 $self->{children}[1]->draw; 3092 $self->{children}[1]->draw;
2626
2627} 3093}
2628 3094
2629############################################################################# 3095#############################################################################
2630 3096
2631package CFClient::UI::Animator; 3097package CFPlus::UI::Animator;
2632 3098
2633use CFClient::OpenGL; 3099use CFPlus::OpenGL;
2634 3100
2635our @ISA = CFClient::UI::Bin::; 3101our @ISA = CFPlus::UI::Bin::;
2636 3102
2637sub moveto { 3103sub moveto {
2638 my ($self, $x, $y) = @_; 3104 my ($self, $x, $y) = @_;
2639 3105
2640 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y]; 3106 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
… …
2668 glPopMatrix; 3134 glPopMatrix;
2669} 3135}
2670 3136
2671############################################################################# 3137#############################################################################
2672 3138
2673package CFClient::UI::Flopper; 3139package CFPlus::UI::Flopper;
2674 3140
2675our @ISA = CFClient::UI::Button::; 3141our @ISA = CFPlus::UI::Button::;
2676 3142
2677sub new { 3143sub new {
2678 my $class = shift; 3144 my $class = shift;
2679 3145
2680 my $self = $class->SUPER::new ( 3146 my $self = $class->SUPER::new (
… …
2692 $self->{other}->toggle_visibility; 3158 $self->{other}->toggle_visibility;
2693} 3159}
2694 3160
2695############################################################################# 3161#############################################################################
2696 3162
2697package CFClient::UI::Tooltip; 3163package CFPlus::UI::Tooltip;
2698 3164
2699our @ISA = CFClient::UI::Bin::; 3165our @ISA = CFPlus::UI::Bin::;
2700 3166
2701use CFClient::OpenGL; 3167use CFPlus::OpenGL;
2702 3168
2703sub new { 3169sub new {
2704 my $class = shift; 3170 my $class = shift;
2705 3171
2706 $class->SUPER::new ( 3172 $class->SUPER::new (
… …
2709 ) 3175 )
2710} 3176}
2711 3177
2712sub set_tooltip_from { 3178sub set_tooltip_from {
2713 my ($self, $widget) = @_; 3179 my ($self, $widget) = @_;
3180
3181 $widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
3182 if $widget->{tooltip} =~ /^#(.*)$/;
2714 3183
2715 my $tooltip = $widget->{tooltip}; 3184 my $tooltip = $widget->{tooltip};
2716 3185
2717 if ($ENV{CFPLUS_DEBUG} & 2) { 3186 if ($ENV{CFPLUS_DEBUG} & 2) {
2718 $tooltip .= "\n\n" . (ref $widget) . "\n" 3187 $tooltip .= "\n\n" . (ref $widget) . "\n"
2719 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n" 3188 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2720 . "req $widget->{req_w} $widget->{req_h}\n" 3189 . "req $widget->{req_w} $widget->{req_h}\n"
2721 . "visible $widget->{visible}"; 3190 . "visible $widget->{visible}";
2722 } 3191 }
2723 3192
3193 $tooltip =~ s/^\n+//;
3194 $tooltip =~ s/\n+$//;
3195
2724 $self->add (new CFClient::UI::Label 3196 $self->add (new CFPlus::UI::Label
2725 markup => $tooltip, 3197 markup => $tooltip,
2726 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 3198 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2727 fontsize => 0.8, 3199 fontsize => 0.8,
2728 fg => [0, 0, 0, 1], 3200 style => 1, # FLAG_INVERSE
2729 ellipsise => 0, 3201 ellipsise => 0,
2730 font => ($widget->{tooltip_font} || $::FONT_PROP), 3202 font => ($widget->{tooltip_font} || $::FONT_PROP),
2731 ); 3203 );
2732} 3204}
2733 3205
… …
2737 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 3209 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2738 3210
2739 ($w + 4, $h + 4) 3211 ($w + 4, $h + 4)
2740} 3212}
2741 3213
2742sub size_allocate { 3214sub invoke_size_allocate {
2743 my ($self, $w, $h) = @_; 3215 my ($self, $w, $h) = @_;
2744 3216
2745 $self->SUPER::size_allocate ($w - 4, $h - 4); 3217 $self->SUPER::invoke_size_allocate ($w - 4, $h - 4)
2746} 3218}
2747 3219
2748sub visibility_change { 3220sub invoke_visibility_change {
2749 my ($self, $visible) = @_; 3221 my ($self, $visible) = @_;
2750 3222
2751 return unless $visible; 3223 return unless $visible;
2752 3224
2753 $self->{root}->on_post_alloc ("move_$self" => sub { 3225 $self->{root}->on_post_alloc ("move_$self" => sub {
2754 my $widget = $self->{owner} 3226 my $widget = $self->{owner}
2755 or return; 3227 or return;
2756 3228
3229 if ($widget->{visible}) {
2757 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 3230 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2758 3231
2759 ($x, $y) = $widget->coord2global (-$self->{w}, 0) 3232 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2760 if $x + $self->{w} > $::WIDTH; 3233 if $x + $self->{w} > $self->{root}{w};
2761 3234
2762 $self->move_abs ($x, $y); 3235 $self->move_abs ($x, $y);
3236 } else {
3237 $self->hide;
3238 }
2763 }); 3239 });
2764} 3240}
2765 3241
2766sub _draw { 3242sub _draw {
2767 my ($self) = @_; 3243 my ($self) = @_;
… …
2791 $self->SUPER::_draw; 3267 $self->SUPER::_draw;
2792} 3268}
2793 3269
2794############################################################################# 3270#############################################################################
2795 3271
2796package CFClient::UI::Face; 3272package CFPlus::UI::Face;
2797 3273
2798our @ISA = CFClient::UI::Base::; 3274our @ISA = CFPlus::UI::DrawBG::;
2799 3275
2800use CFClient::OpenGL; 3276use CFPlus::OpenGL;
2801 3277
2802sub new { 3278sub new {
2803 my $class = shift; 3279 my $class = shift;
2804 3280
2805 my $self = $class->SUPER::new ( 3281 my $self = $class->SUPER::new (
… …
2807 can_events => 0, 3283 can_events => 0,
2808 @_, 3284 @_,
2809 ); 3285 );
2810 3286
2811 if ($self->{anim} && $self->{animspeed}) { 3287 if ($self->{anim} && $self->{animspeed}) {
2812 Scalar::Util::weaken (my $widget = $self); 3288 CFPlus::weaken (my $widget = $self);
2813 3289
2814 $self->{timer} = Event->timer ( 3290 $self->{timer} = Event->timer (
2815 at => $self->{animspeed} * int $::NOW / $self->{animspeed}, 3291 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2816 hard => 1, 3292 hard => 1,
2817 interval => $self->{animspeed}, 3293 interval => $self->{animspeed},
… …
2840sub _draw { 3316sub _draw {
2841 my ($self) = @_; 3317 my ($self) = @_;
2842 3318
2843 return unless $::CONN; 3319 return unless $::CONN;
2844 3320
3321 $self->SUPER::_draw;
3322
2845 my $face; 3323 my $face;
2846 3324
2847 if ($self->{frame}) { 3325 if ($self->{frame}) {
2848 my $anim = $::CONN->{anim}[$self->{anim}]; 3326 my $anim = $::CONN->{anim}[$self->{anim}];
2849 3327
… …
2854 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 3332 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2855 3333
2856 if ($tex) { 3334 if ($tex) {
2857 glEnable GL_TEXTURE_2D; 3335 glEnable GL_TEXTURE_2D;
2858 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3336 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2859 glColor 1, 1, 1, 1; 3337 glColor 0, 0, 0, 1;
2860 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3338 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2861 glDisable GL_TEXTURE_2D; 3339 glDisable GL_TEXTURE_2D;
2862 } 3340 }
2863} 3341}
2864 3342
2865sub DESTROY { 3343sub destroy {
2866 my ($self) = @_; 3344 my ($self) = @_;
2867 3345
2868 $self->{timer}->cancel 3346 $self->{timer}->cancel
2869 if $self->{timer}; 3347 if $self->{timer};
2870 3348
2871 $self->SUPER::DESTROY; 3349 $self->SUPER::destroy;
2872} 3350}
2873 3351
2874############################################################################# 3352#############################################################################
2875 3353
2876package CFClient::UI::Buttonbar; 3354package CFPlus::UI::Buttonbar;
2877 3355
2878our @ISA = CFClient::UI::HBox::; 3356our @ISA = CFPlus::UI::HBox::;
2879 3357
2880# TODO: should actualyl wrap buttons and other goodies. 3358# TODO: should actually wrap buttons and other goodies.
2881 3359
2882############################################################################# 3360#############################################################################
2883 3361
2884package CFClient::UI::Menu; 3362package CFPlus::UI::Menu;
2885 3363
2886our @ISA = CFClient::UI::FancyFrame::; 3364our @ISA = CFPlus::UI::Toplevel::;
2887 3365
2888use CFClient::OpenGL; 3366use CFPlus::OpenGL;
2889 3367
2890sub new { 3368sub new {
2891 my $class = shift; 3369 my $class = shift;
2892 3370
2893 my $self = $class->SUPER::new ( 3371 my $self = $class->SUPER::new (
2894 items => [], 3372 items => [],
2895 z => 100, 3373 z => 100,
2896 @_, 3374 @_,
2897 ); 3375 );
2898 3376
2899 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3377 $self->add ($self->{vbox} = new CFPlus::UI::VBox);
2900 3378
2901 for my $item (@{ $self->{items} }) { 3379 for my $item (@{ $self->{items} }) {
2902 my ($widget, $cb) = @$item; 3380 my ($widget, $cb, $tooltip) = @$item;
2903 3381
2904 # handle various types of items, only text for now 3382 # handle various types of items, only text for now
2905 if (!ref $widget) { 3383 if (!ref $widget) {
3384 if ($widget =~ /\t/) {
3385 my ($left, $right) = split /\t/, $widget, 2;
3386
2906 $widget = new CFClient::UI::Label 3387 $widget = new CFPlus::UI::HBox
2907 can_hover => 1, 3388 can_hover => 1,
2908 can_events => 1, 3389 can_events => 1,
3390 tooltip => $tooltip,
3391 children => [
3392 (new CFPlus::UI::Label markup => $left, expand => 1),
3393 (new CFPlus::UI::Label markup => $right, align => +1),
3394 ],
3395 ;
3396
3397 } else {
3398 $widget = new CFPlus::UI::Label
3399 can_hover => 1,
3400 can_events => 1,
2909 text => $widget; 3401 markup => $widget,
3402 tooltip => $tooltip;
3403 }
2910 } 3404 }
2911 3405
2912 $self->{item}{$widget} = $item; 3406 $self->{item}{$widget} = $item;
2913 3407
2914 $self->{vbox}->add ($widget); 3408 $self->{vbox}->add ($widget);
… …
2919 3413
2920# popup given the event (must be a mouse button down event currently) 3414# popup given the event (must be a mouse button down event currently)
2921sub popup { 3415sub popup {
2922 my ($self, $ev) = @_; 3416 my ($self, $ev) = @_;
2923 3417
2924 $self->_emit ("popdown"); 3418 $self->emit ("popdown");
2925 3419
2926 # maybe save $GRAB? must be careful about events... 3420 # maybe save $GRAB? must be careful about events...
2927 $GRAB = $self; 3421 $GRAB = $self;
2928 $self->{button} = $ev->{button}; 3422 $self->{button} = $ev->{button};
2929 3423
2930 $self->show; 3424 $self->show;
2931 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 3425 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2932} 3426}
2933 3427
2934sub mouse_motion { 3428sub invoke_mouse_motion {
2935 my ($self, $ev, $x, $y) = @_; 3429 my ($self, $ev, $x, $y) = @_;
2936 3430
2937 # TODO: should use vbox->find_widget or so 3431 # TODO: should use vbox->find_widget or so
2938 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 3432 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2939 $self->{hover} = $self->{item}{$HOVER}; 3433 $self->{hover} = $self->{item}{$HOVER};
2940 3434
2941 0 3435 0
2942} 3436}
2943 3437
2944sub button_up { 3438sub invoke_button_up {
2945 my ($self, $ev, $x, $y) = @_; 3439 my ($self, $ev, $x, $y) = @_;
2946 3440
2947 if ($ev->{button} == $self->{button}) { 3441 if ($ev->{button} == $self->{button}) {
2948 undef $GRAB; 3442 undef $GRAB;
2949 $self->hide; 3443 $self->hide;
2950 3444
2951 $self->_emit ("popdown"); 3445 $self->emit ("popdown");
2952 $self->{hover}[1]->() if $self->{hover}; 3446 $self->{hover}[1]->() if $self->{hover};
2953 } else { 3447 } else {
2954 return 0 3448 return 0
2955 } 3449 }
2956 3450
2957 1 3451 1
2958} 3452}
2959 3453
2960############################################################################# 3454#############################################################################
2961 3455
2962package CFClient::UI::Multiplexer; 3456package CFPlus::UI::Multiplexer;
2963 3457
2964our @ISA = CFClient::UI::Container::; 3458our @ISA = CFPlus::UI::Container::;
2965 3459
2966sub new { 3460sub new {
2967 my $class = shift; 3461 my $class = shift;
2968 3462
2969 my $self = $class->SUPER::new ( 3463 my $self = $class->SUPER::new (
… …
2983 3477
2984 $self->{current} = $self->{children}[0] 3478 $self->{current} = $self->{children}[0]
2985 if @{ $self->{children} }; 3479 if @{ $self->{children} };
2986} 3480}
2987 3481
3482sub get_current_page {
3483 my ($self) = @_;
3484
3485 $self->{current}
3486}
3487
2988sub set_current_page { 3488sub set_current_page {
2989 my ($self, $page_or_widget) = @_; 3489 my ($self, $page_or_widget) = @_;
2990 3490
2991 my $widget = ref $page_or_widget 3491 my $widget = ref $page_or_widget
2992 ? $page_or_widget 3492 ? $page_or_widget
2993 : $self->{children}[$page_or_widget]; 3493 : $self->{children}[$page_or_widget];
2994 3494
2995 $self->{current} = $widget; 3495 $self->{current} = $widget;
2996 $self->{current}->configure (0, 0, $self->{w}, $self->{h}); 3496 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
2997 3497
2998 $self->_emit (page_changed => $self->{current}); 3498 $self->emit (page_changed => $self->{current});
2999 3499
3000 $self->realloc; 3500 $self->realloc;
3001} 3501}
3002 3502
3003sub visible_children { 3503sub visible_children {
… …
3008 my ($self) = @_; 3508 my ($self) = @_;
3009 3509
3010 $self->{current}->size_request 3510 $self->{current}->size_request
3011} 3511}
3012 3512
3013sub size_allocate { 3513sub invoke_size_allocate {
3014 my ($self, $w, $h) = @_; 3514 my ($self, $w, $h) = @_;
3015 3515
3016 $self->{current}->configure (0, 0, $w, $h); 3516 $self->{current}->configure (0, 0, $w, $h);
3517
3518 1
3017} 3519}
3018 3520
3019sub _draw { 3521sub _draw {
3020 my ($self) = @_; 3522 my ($self) = @_;
3021 3523
3022 $self->{current}->draw; 3524 $self->{current}->draw;
3023} 3525}
3024 3526
3025############################################################################# 3527#############################################################################
3026 3528
3027package CFClient::UI::Notebook; 3529package CFPlus::UI::Notebook;
3028 3530
3029our @ISA = CFClient::UI::VBox::; 3531our @ISA = CFPlus::UI::VBox::;
3030 3532
3031sub new { 3533sub new {
3032 my $class = shift; 3534 my $class = shift;
3033 3535
3034 my $self = $class->SUPER::new ( 3536 my $self = $class->SUPER::new (
3035 buttonbar => (new CFClient::UI::Buttonbar), 3537 buttonbar => (new CFPlus::UI::Buttonbar),
3036 multiplexer => (new CFClient::UI::Multiplexer expand => 1), 3538 multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3037 # filter => # will be put between multiplexer and $self 3539 # filter => # will be put between multiplexer and $self
3038 @_, 3540 @_,
3039 ); 3541 );
3040 3542
3041 $self->{filter}->add ($self->{multiplexer}) if $self->{filter}; 3543 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
… …
3045} 3547}
3046 3548
3047sub add { 3549sub add {
3048 my ($self, $title, $widget, $tooltip) = @_; 3550 my ($self, $title, $widget, $tooltip) = @_;
3049 3551
3050 Scalar::Util::weaken $self; 3552 CFPlus::weaken $self;
3051 3553
3052 $self->{buttonbar}->add (new CFClient::UI::Button 3554 $self->{buttonbar}->add (new CFPlus::UI::Button
3053 markup => $title, 3555 markup => $title,
3054 tooltip => $tooltip, 3556 tooltip => $tooltip,
3055 on_activate => sub { $self->set_current_page ($widget) }, 3557 on_activate => sub { $self->set_current_page ($widget) },
3056 ); 3558 );
3057 3559
3058 $self->{multiplexer}->add ($widget); 3560 $self->{multiplexer}->add ($widget);
3059} 3561}
3060 3562
3563sub get_current_page {
3564 my ($self) = @_;
3565
3566 $self->{multiplexer}->get_current_page
3567}
3568
3061sub set_current_page { 3569sub set_current_page {
3062 my ($self, $page) = @_; 3570 my ($self, $page) = @_;
3063 3571
3064 $self->{multiplexer}->set_current_page ($page); 3572 $self->{multiplexer}->set_current_page ($page);
3065 $self->_emit (page_changed => $self->{multiplexer}{current}); 3573 $self->emit (page_changed => $self->{multiplexer}{current});
3066} 3574}
3067 3575
3068############################################################################# 3576#############################################################################
3069 3577
3070package CFClient::UI::Statusbox; 3578package CFPlus::UI::Selector;
3071 3579
3580use utf8;
3581
3072our @ISA = CFClient::UI::VBox::; 3582our @ISA = CFPlus::UI::Button::;
3073 3583
3074sub new { 3584sub new {
3075 my $class = shift; 3585 my $class = shift;
3076 3586
3077 $class->SUPER::new ( 3587 my $self = $class->SUPER::new (
3588 options => [], # [value, title, longdesc], ...
3589 value => undef,
3590 @_,
3591 );
3592
3593 $self->_set_value ($self->{value});
3594
3595 $self
3596}
3597
3598sub invoke_button_down {
3599 my ($self, $ev) = @_;
3600
3601 my @menu_items;
3602
3603 for (@{ $self->{options} }) {
3604 my ($value, $title, $tooltip) = @$_;
3605
3606 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3607 }
3608
3609 CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
3610}
3611
3612sub _set_value {
3613 my ($self, $value) = @_;
3614
3615 my ($item) = grep $_->[0] eq $value, @{ $self->{options} }
3616 or return;
3617
3618 $self->{value} = $item->[0];
3619 $self->set_markup ("$item->[1] ⇓");
3620 $self->set_tooltip ($item->[2]);
3621}
3622
3623sub set_value {
3624 my ($self, $value) = @_;
3625
3626 return unless $self->{value} ne $value;
3627
3628 $self->_set_value ($value);
3629 $self->emit (changed => $value);
3630}
3631
3632#############################################################################
3633
3634package CFPlus::UI::Statusbox;
3635
3636our @ISA = CFPlus::UI::VBox::;
3637
3638sub new {
3639 my $class = shift;
3640
3641 my $self = $class->SUPER::new (
3078 fontsize => 0.8, 3642 fontsize => 0.8,
3079 @_, 3643 @_,
3080 ) 3644 );
3645
3646 CFPlus::weaken (my $this = $self);
3647
3648 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3649
3650 $self
3081} 3651}
3082 3652
3083sub reorder { 3653sub reorder {
3084 my ($self) = @_; 3654 my ($self) = @_;
3085 my $NOW = time; 3655 my $NOW = Time::HiRes::time;
3656
3657 # freeze display when hovering over any label
3658 return if $CFPlus::UI::TOOLTIP->{owner}
3659 && grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},
3660 values %{ $self->{item} };
3086 3661
3087 while (my ($k, $v) = each %{ $self->{item} }) { 3662 while (my ($k, $v) = each %{ $self->{item} }) {
3088 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3663 delete $self->{item}{$k} if $v->{timeout} < $NOW;
3089 } 3664 }
3090 3665
… …
3093 my @items = sort { 3668 my @items = sort {
3094 $a->{pri} <=> $b->{pri} 3669 $a->{pri} <=> $b->{pri}
3095 or $b->{id} <=> $a->{id} 3670 or $b->{id} <=> $a->{id}
3096 } values %{ $self->{item} }; 3671 } values %{ $self->{item} };
3097 3672
3673 $self->{timer}->interval (1);
3674
3098 my $count = 10 + 1; 3675 my $count = 10 + 1;
3099 for my $item (@items) { 3676 for my $item (@items) {
3100 last unless --$count; 3677 last unless --$count;
3101 3678
3102 push @widgets, $item->{label} ||= do { 3679 my $label = $item->{label} ||= do {
3103 # TODO: doesn't handle markup well (read as: at all) 3680 # TODO: doesn't handle markup well (read as: at all)
3104 my $short = $item->{count} > 1 3681 my $short = $item->{count} > 1
3105 ? "<b>$item->{count} ×</b> $item->{text}" 3682 ? "<b>$item->{count} ×</b> $item->{text}"
3106 : $item->{text}; 3683 : $item->{text};
3107 3684
3108 for ($short) { 3685 for ($short) {
3109 s/^\s+//; 3686 s/^\s+//;
3110 s/\s+/ /g; 3687 s/\s+/ /g;
3111 } 3688 }
3112 3689
3113 new CFClient::UI::Label 3690 new CFPlus::UI::Label
3114 markup => $short, 3691 markup => $short,
3115 tooltip => $item->{tooltip}, 3692 tooltip => $item->{tooltip},
3116 tooltip_font => $::FONT_PROP, 3693 tooltip_font => $::FONT_PROP,
3117 tooltip_width => 0.67, 3694 tooltip_width => 0.67,
3118 fontsize => $item->{fontsize} || $self->{fontsize}, 3695 fontsize => $item->{fontsize} || $self->{fontsize},
3119 max_w => $::WIDTH * 0.44, 3696 max_w => $::WIDTH * 0.44,
3120 fg => $item->{fg}, 3697 fg => [@{ $item->{fg} }],
3121 can_events => 1, 3698 can_events => 1,
3122 can_hover => 1 3699 can_hover => 1
3123 }; 3700 };
3701
3702 if ((my $diff = $item->{timeout} - $NOW) < 2) {
3703 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
3704 $label->update;
3705 $label->set_max_size (undef, $label->{req_h} * $diff)
3706 if $diff < 1;
3707 $self->{timer}->interval (1/30);
3708 } else {
3709 $label->{fg}[3] = $item->{fg}[3] || 1;
3710 }
3711
3712 push @widgets, $label;
3124 } 3713 }
3125 3714
3126 $self->clear; 3715 $self->clear;
3127 $self->SUPER::add (reverse @widgets); 3716 $self->SUPER::add (reverse @widgets);
3128} 3717}
… …
3133 $text =~ s/^\s+//; 3722 $text =~ s/^\s+//;
3134 $text =~ s/\s+$//; 3723 $text =~ s/\s+$//;
3135 3724
3136 return unless $text; 3725 return unless $text;
3137 3726
3138 my $timeout = time + ((delete $arg{timeout}) || 60); 3727 my $timeout = (int time) + ((delete $arg{timeout}) || 60);
3139 3728
3140 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 3729 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
3141 3730
3142 if (my $item = $self->{item}{$group}) { 3731 if (my $item = $self->{item}{$group}) {
3143 if ($item->{text} eq $text) { 3732 if ($item->{text} eq $text) {
3144 $item->{count}++; 3733 $item->{count}++;
3145 } else { 3734 } else {
3146 $item->{count} = 1; 3735 $item->{count} = 1;
3147 $item->{text} = $item->{tooltip} = $text; 3736 $item->{text} = $item->{tooltip} = $text;
3148 } 3737 }
3149 $item->{id} = ++$self->{id}; 3738 $item->{id} += 0.2;#d#
3150 $item->{timeout} = $timeout; 3739 $item->{timeout} = $timeout;
3151 delete $item->{label}; 3740 delete $item->{label};
3152 } else { 3741 } else {
3153 $self->{item}{$group} = { 3742 $self->{item}{$group} = {
3154 id => ++$self->{id}, 3743 id => ++$self->{id},
… …
3160 count => 1, 3749 count => 1,
3161 %arg, 3750 %arg,
3162 }; 3751 };
3163 } 3752 }
3164 3753
3754 $ROOT->on_refresh (reorder => sub {
3165 $self->reorder; 3755 $self->reorder;
3756 });
3166} 3757}
3167 3758
3168sub reconfigure { 3759sub reconfigure {
3169 my ($self) = @_; 3760 my ($self) = @_;
3170 3761
… …
3173 3764
3174 $self->reorder; 3765 $self->reorder;
3175 $self->SUPER::reconfigure; 3766 $self->SUPER::reconfigure;
3176} 3767}
3177 3768
3769sub destroy {
3770 my ($self) = @_;
3771
3772 $self->{timer}->cancel;
3773
3774 $self->SUPER::destroy;
3775}
3776
3178############################################################################# 3777#############################################################################
3179 3778
3180package CFClient::UI::Inventory;
3181
3182our @ISA = CFClient::UI::ScrolledWindow::;
3183
3184sub new {
3185 my $class = shift;
3186
3187 my $self = $class->SUPER::new (
3188 child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
3189 @_,
3190 );
3191
3192 $self
3193}
3194
3195sub set_items {
3196 my ($self, $items) = @_;
3197
3198 $self->{child}->clear;
3199 return unless $items;
3200
3201 my @items = sort {
3202 ($a->{type} <=> $b->{type})
3203 or ($a->{name} cmp $b->{name})
3204 } @$items;
3205
3206 $self->{real_items} = \@items;
3207
3208 my $row = 0;
3209 for my $item (@items) {
3210 CFClient::Item::update_widgets $item;
3211
3212 $self->{child}->add (0, $row, $item->{face_widget});
3213 $self->{child}->add (1, $row, $item->{desc_widget});
3214 $self->{child}->add (2, $row, $item->{weight_widget});
3215
3216 $row++;
3217 }
3218}
3219
3220#############################################################################
3221
3222package CFClient::UI::BindEditor;
3223
3224our @ISA = CFClient::UI::FancyFrame::;
3225
3226sub new {
3227 my $class = shift;
3228
3229 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3230
3231 $self->add (my $vb = new CFClient::UI::VBox);
3232
3233
3234 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3235 text => "start recording",
3236 tooltip => "Start/Stops recording of actions."
3237 ."All subsequent actions after the recording started will be captured."
3238 ."The actions are displayed after the record was stopped."
3239 ."To bind the action you have to click on the 'Bind' button",
3240 on_activate => sub {
3241 unless ($self->{recording}) {
3242 $self->start;
3243 } else {
3244 $self->stop;
3245 }
3246 });
3247
3248 $vb->add (new CFClient::UI::Label text => "Actions:");
3249 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3250
3251 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3252 $vb->add (my $hb = new CFClient::UI::HBox);
3253 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3254 $hb->add (new CFClient::UI::Button
3255 text => "bind",
3256 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3257 on_activate => sub {
3258 $self->ask_for_bind;
3259 });
3260
3261 $vb->add (my $hb = new CFClient::UI::HBox);
3262 $hb->add (new CFClient::UI::Button
3263 text => "ok",
3264 expand => 1,
3265 tooltip => "This closes the binding editor and saves the binding",
3266 on_activate => sub {
3267 $self->hide;
3268 $self->commit;
3269 });
3270
3271 $hb->add (new CFClient::UI::Button
3272 text => "cancel",
3273 expand => 1,
3274 tooltip => "This closes the binding editor without saving",
3275 on_activate => sub {
3276 $self->hide;
3277 $self->{binding_cancel}->()
3278 if $self->{binding_cancel};
3279 });
3280
3281 $self->update_binding_widgets;
3282
3283 $self
3284}
3285
3286sub commit {
3287 my ($self) = @_;
3288 my ($mod, $sym, $cmds) = $self->get_binding;
3289 if ($sym != 0 && @$cmds > 0) {
3290 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3291 ."'. Don't forget 'Save Config'!");
3292 $self->{binding_change}->($mod, $sym, $cmds)
3293 if $self->{binding_change};
3294 } else {
3295 $::STATUSBOX->add ("No action bound, no key or action specified!");
3296 $self->{binding_cancel}->()
3297 if $self->{binding_cancel};
3298 }
3299}
3300
3301sub start {
3302 my ($self) = @_;
3303
3304 $self->{rec_btn}->set_text ("stop recording");
3305 $self->{recording} = 1;
3306 $self->clear_command_list;
3307 $::CONN->start_record if $::CONN;
3308}
3309
3310sub stop {
3311 my ($self) = @_;
3312
3313 $self->{rec_btn}->set_text ("start recording");
3314 $self->{recording} = 0;
3315
3316 my $rec;
3317 $rec = $::CONN->stop_record if $::CONN;
3318 return unless ref $rec eq 'ARRAY';
3319 $self->set_command_list ($rec);
3320}
3321
3322
3323sub ask_for_bind_and_commit {
3324 my ($self) = @_;
3325 $self->ask_for_bind (1);
3326}
3327
3328sub ask_for_bind {
3329 my ($self, $commit) = @_;
3330
3331 CFClient::Binder::open_binding_dialog (sub {
3332 my ($mod, $sym) = @_;
3333 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3334 $self->update_binding_widgets;
3335 $self->commit if $commit;
3336 });
3337}
3338
3339# $mod and $sym are the modifiers and key symbol
3340# $cmds is a array ref of strings (the commands)
3341# $cb is the callback that is executed on OK
3342# $ccb is the callback that is executed on CANCEL and
3343# when the binding was unsuccessful on OK
3344sub set_binding {
3345 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3346
3347 $self->clear_command_list;
3348 $self->{recording} = 0;
3349 $self->{rec_btn}->set_text ("start recording");
3350
3351 $self->{binding} = [$mod, $sym];
3352 $self->{commands} = $cmds;
3353
3354 $self->{binding_change} = $cb;
3355 $self->{binding_cancel} = $ccb;
3356
3357 $self->update_binding_widgets;
3358}
3359
3360# this is a shortcut method that asks for a binding
3361# and then just binds it.
3362sub do_quick_binding {
3363 my ($self, $cmds) = @_;
3364 $self->set_binding (undef, undef, $cmds, sub {
3365 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3366 });
3367 $self->ask_for_bind (1);
3368}
3369
3370sub update_binding_widgets {
3371 my ($self) = @_;
3372 my ($mod, $sym, $cmds) = $self->get_binding;
3373 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3374 $self->set_command_list ($cmds);
3375}
3376
3377sub get_binding {
3378 my ($self) = @_;
3379 return (
3380 $self->{binding}->[0],
3381 $self->{binding}->[1],
3382 [ grep { defined $_ } @{$self->{commands}} ]
3383 );
3384}
3385
3386sub clear_command_list {
3387 my ($self) = @_;
3388 $self->{cmdbox}->clear ();
3389}
3390
3391sub set_command_list {
3392 my ($self, $cmds) = @_;
3393
3394 $self->{cmdbox}->clear ();
3395 $self->{commands} = $cmds;
3396
3397 my $idx = 0;
3398
3399 for (@$cmds) {
3400 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3401
3402 my $i = $idx;
3403 $hb->add (new CFClient::UI::Label text => $_);
3404 $hb->add (new CFClient::UI::Button
3405 text => "delete",
3406 tooltip => "Deletes the action from the record",
3407 on_activate => sub {
3408 $self->{cmdbox}->remove ($hb);
3409 $cmds->[$i] = undef;
3410 });
3411
3412
3413 $idx++
3414 }
3415}
3416
3417#############################################################################
3418
3419package CFClient::UI::SpellList;
3420
3421our @ISA = CFClient::UI::Table::;
3422
3423sub new {
3424 my $class = shift;
3425
3426 my $self = $class->SUPER::new (
3427 binding => [],
3428 commands => [],
3429 @_,
3430 )
3431}
3432
3433# XXX: Do sorting? Argl...
3434sub add_spell {
3435 my ($self, $spell) = @_;
3436 $self->{spells}->{$spell->{name}} = $spell;
3437
3438 $self->add (0, $self->{tbl_idx}, new CFClient::UI::Face
3439 face => $spell->{face},
3440 can_hover => 1,
3441 can_events => 1,
3442 tooltip => $spell->{message});
3443
3444 $self->add (1, $self->{tbl_idx}, new CFClient::UI::Label
3445 text => $spell->{name},
3446 can_hover => 1,
3447 can_events => 1,
3448 tooltip => $spell->{message},
3449 expand => 1);
3450
3451 $self->add (2, $self->{tbl_idx}, new CFClient::UI::Label
3452 text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
3453 $spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
3454 expand => 1);
3455
3456 $self->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
3457 text => "bind to key",
3458 on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
3459}
3460
3461sub rebuild_spell_list {
3462 my ($self) = @_;
3463 $self->{tbl_idx} = 0;
3464 $self->add_spell ($_) for values %{$self->{spells}};
3465}
3466
3467sub remove_spell {
3468 my ($self, $spell) = @_;
3469 delete $self->{spells}->{$spell->{name}};
3470 $self->rebuild_spell_list;
3471}
3472
3473#############################################################################
3474
3475package CFClient::UI::Root; 3779package CFPlus::UI::Root;
3476 3780
3477our @ISA = CFClient::UI::Container::; 3781our @ISA = CFPlus::UI::Container::;
3478 3782
3783use List::Util qw(min max);
3784
3479use CFClient::OpenGL; 3785use CFPlus::OpenGL;
3480 3786
3481sub new { 3787sub new {
3482 my $class = shift; 3788 my $class = shift;
3483 3789
3484 my $self = $class->SUPER::new ( 3790 my $self = $class->SUPER::new (
3485 visible => 1, 3791 visible => 1,
3486 @_, 3792 @_,
3487 ); 3793 );
3488 3794
3489 Scalar::Util::weaken ($self->{root} = $self); 3795 CFPlus::weaken ($self->{root} = $self);
3490 3796
3491 $self 3797 $self
3492} 3798}
3493 3799
3494sub size_request { 3800sub size_request {
… …
3509 $coord = $max - $size if $coord > $max - $size; 3815 $coord = $max - $size if $coord > $max - $size;
3510 3816
3511 int $coord + 0.5 3817 int $coord + 0.5
3512} 3818}
3513 3819
3514sub size_allocate { 3820sub invoke_size_allocate {
3515 my ($self, $w, $h) = @_; 3821 my ($self, $w, $h) = @_;
3516 3822
3517 for my $child ($self->children) { 3823 for my $child ($self->children) {
3518 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3824 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3519 3825
… …
3523 $X = _to_pixel $X, $W, $self->{w}; 3829 $X = _to_pixel $X, $W, $self->{w};
3524 $Y = _to_pixel $Y, $H, $self->{h}; 3830 $Y = _to_pixel $Y, $H, $self->{h};
3525 3831
3526 $child->configure ($X, $Y, $W, $H); 3832 $child->configure ($X, $Y, $W, $H);
3527 } 3833 }
3834
3835 1
3528} 3836}
3529 3837
3530sub coord2local { 3838sub coord2local {
3531 my ($self, $x, $y) = @_; 3839 my ($self, $x, $y) = @_;
3532 3840
… …
3617 3925
3618 delete $queue{$widget+0}; 3926 delete $queue{$widget+0};
3619 3927
3620 my ($w, $h) = $widget->size_request; 3928 my ($w, $h) = $widget->size_request;
3621 3929
3622 $w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2; 3930 $w = max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3623 $h = List::Util::max $widget->{min_h}, $h + $widget->{padding_y} * 2; 3931 $h = max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3932
3933 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3934 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3624 3935
3625 $w = $widget->{force_w} if exists $widget->{force_w}; 3936 $w = $widget->{force_w} if exists $widget->{force_w};
3626 $h = $widget->{force_h} if exists $widget->{force_h}; 3937 $h = $widget->{force_h} if exists $widget->{force_h};
3627 3938
3628 if ($widget->{req_w} != $w || $widget->{req_h} != $h 3939 if ($widget->{req_w} != $w || $widget->{req_h} != $h
… …
3654 3965
3655 my ($w, $h) = @$widget{qw(alloc_w alloc_h)}; 3966 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3656 3967
3657 $w = 0 if $w < 0; 3968 $w = 0 if $w < 0;
3658 $h = 0 if $h < 0; 3969 $h = 0 if $h < 0;
3970
3971 $w = max $widget->{min_w}, $w;
3972 $h = max $widget->{min_h}, $h;
3973
3974# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
3975# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
3976
3977 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3978 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3659 3979
3660 $w = int $w + 0.5; 3980 $w = int $w + 0.5;
3661 $h = int $h + 0.5; 3981 $h = int $h + 0.5;
3662 3982
3663 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) { 3983 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
… …
3687 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 4007 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3688 glMatrixMode GL_MODELVIEW; 4008 glMatrixMode GL_MODELVIEW;
3689 glLoadIdentity; 4009 glLoadIdentity;
3690 4010
3691 { 4011 {
3692 package CFClient::UI::Base; 4012 package CFPlus::UI::Base;
3693 4013
3694 ($draw_x, $draw_y, $draw_w, $draw_h) = 4014 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3695 (0, 0, $self->{w}, $self->{h}); 4015 (0, 0, $self->{w}, $self->{h});
3696 }
3697 4016
3698 $self->_draw; 4017 $self->_draw;
4018 }
3699} 4019}
3700 4020
3701############################################################################# 4021#############################################################################
3702 4022
3703package CFClient::UI; 4023package CFPlus::UI;
3704 4024
3705$ROOT = new CFClient::UI::Root; 4025$ROOT = new CFPlus::UI::Root;
3706$TOOLTIP = new CFClient::UI::Tooltip z => 900; 4026$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
3707 4027
37081 40281
3709 4029

Diff Legend

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