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

Diff Legend

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