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.282 by root, Mon Jun 5 02:25:10 2006 UTC vs.
Revision 1.417 by root, Tue Jul 24 18:24:04 2007 UTC

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

Diff Legend

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