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.268 by root, Thu Jun 1 05:04:41 2006 UTC vs.
Revision 1.347 by root, Mon Aug 14 03:41:28 2006 UTC

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

Diff Legend

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