ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/DC/UI.pm
(Generate patch)

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

Diff Legend

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