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.283 by root, Mon Jun 5 02:28:30 2006 UTC vs.
Revision 1.436 by root, Wed Aug 22 21:40:57 2007 UTC

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

Diff Legend

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