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

Diff Legend

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