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

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.272 by root, Sat Jun 3 01:47:14 2006 UTC vs.
Revision 1.364 by root, Sat Dec 23 10:18:27 2006 UTC

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

Diff Legend

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