ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/DC/UI.pm
(Generate patch)

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

Diff Legend

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