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

Diff Legend

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