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

Diff Legend

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