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

Diff Legend

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