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.316 by root, Sun Jul 2 13:57:58 2006 UTC vs.
Revision 1.488 by root, Fri Nov 23 12:39:05 2012 UTC

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

Diff Legend

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