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.270 by elmex, Fri Jun 2 09:02:49 2006 UTC vs.
Revision 1.365 by root, Thu Apr 12 07:53:31 2007 UTC

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

Diff Legend

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