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.271 by root, Fri Jun 2 22:13:47 2006 UTC vs.
Revision 1.364 by root, Sat Dec 23 10:18:27 2006 UTC

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

Diff Legend

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