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.296 by root, Wed Jun 7 05:48:53 2006 UTC vs.
Revision 1.474 by root, Sun Jan 11 22:11:23 2009 UTC

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

Diff Legend

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