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.273 by root, Sat Jun 3 02:32:35 2006 UTC vs.
Revision 1.365 by root, Thu Apr 12 07:53:31 2007 UTC

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

Diff Legend

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