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.272 by root, Sat Jun 3 01:47:14 2006 UTC vs.
Revision 1.354 by root, Sat Nov 18 23:31:23 2006 UTC

1package CFClient::UI; 1package CFPlus::UI;
2 2
3use utf8; 3use utf8;
4use strict; 4use strict;
5 5
6use Scalar::Util (); 6use Scalar::Util ();
7use List::Util (); 7use List::Util ();
8use Event;
8 9
9use CFClient; 10use CFPlus;
11use CFPlus::Pod;
10use CFClient::Texture; 12use CFPlus::Texture;
11 13
12our ($FOCUS, $HOVER, $GRAB); # various widgets 14our ($FOCUS, $HOVER, $GRAB); # various widgets
13 15
14our $LAYOUT; 16our $LAYOUT;
15our $ROOT; 17our $ROOT;
16our $TOOLTIP; 18our $TOOLTIP;
17our $BUTTON_STATE; 19our $BUTTON_STATE;
18 20
19our %WIDGET; # all widgets, weak-referenced 21our %WIDGET; # all widgets, weak-referenced
22
23our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub {
24 if (!$GRAB) {
25 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
26 if (length $widget->{tooltip}) {
27 if ($TOOLTIP->{owner} != $widget) {
28 $TOOLTIP->hide;
29
30 $TOOLTIP->{owner} = $widget;
31
32 return if $ENV{CFPLUS_DEBUG} & 8;
33
34 my $tip = $widget->{tooltip};
35
36 $tip = $tip->($widget) if CODE:: eq ref $tip;
37
38 $TOOLTIP->set_tooltip_from ($widget);
39 $TOOLTIP->show;
40 }
41
42 return;
43 }
44 }
45 }
46
47 $TOOLTIP->hide;
48 delete $TOOLTIP->{owner};
49});
20 50
21sub get_layout { 51sub get_layout {
22 my $layout; 52 my $layout;
23 53
24 for (grep { $_->{name} } values %WIDGET) { 54 for (grep { $_->{name} } values %WIDGET) {
… …
39 my ($layout) = @_; 69 my ($layout) = @_;
40 70
41 $LAYOUT = $layout; 71 $LAYOUT = $layout;
42} 72}
43 73
44sub check_tooltip {
45 return if $ENV{CFPLUS_DEBUG} & 8;
46
47 if (!$GRAB) {
48 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
49 if (length $widget->{tooltip}) {
50 if ($TOOLTIP->{owner} != $widget) {
51 $TOOLTIP->hide;
52
53 $TOOLTIP->{owner} = $widget;
54
55 my $tip = $widget->{tooltip};
56
57 $tip = $tip->($widget) if CODE:: eq ref $tip;
58
59 $TOOLTIP->set_tooltip_from ($widget);
60 $TOOLTIP->show;
61 }
62
63 return;
64 }
65 }
66 }
67
68 $TOOLTIP->hide;
69 delete $TOOLTIP->{owner};
70}
71
72# class methods for events 74# class methods for events
73sub feed_sdl_key_down_event { 75sub feed_sdl_key_down_event {
74 $FOCUS->emit (key_down => $_[0]) 76 $FOCUS->emit (key_down => $_[0])
75 if $FOCUS; 77 if $FOCUS;
76} 78}
… …
78sub feed_sdl_key_up_event { 80sub feed_sdl_key_up_event {
79 $FOCUS->emit (key_up => $_[0]) 81 $FOCUS->emit (key_up => $_[0])
80 if $FOCUS; 82 if $FOCUS;
81} 83}
82 84
85sub check_hover {
86 my ($widget) = @_;
87
88 if ($widget != $HOVER) {
89 my $hover = $HOVER; $HOVER = $widget;
90
91 $hover->update if $hover && $hover->{can_hover};
92 $HOVER->update if $HOVER && $HOVER->{can_hover};
93
94 $TOOLTIP_WATCHER->start;
95 }
96}
97
83sub feed_sdl_button_down_event { 98sub feed_sdl_button_down_event {
84 my ($ev) = @_; 99 my ($ev) = @_;
85 my ($x, $y) = ($ev->{x}, $ev->{y}); 100 my ($x, $y) = ($ev->{x}, $ev->{y});
86 101
87 if (!$BUTTON_STATE) { 102 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
103
104 unless ($GRAB) {
88 my $widget = $ROOT->find_widget ($x, $y); 105 my $widget = $ROOT->find_widget ($x, $y);
89 106
90 $GRAB = $widget; 107 $GRAB = $widget;
91 $GRAB->update if $GRAB; 108 $GRAB->update if $GRAB;
92 109
93 check_tooltip; 110 $TOOLTIP_WATCHER->cb->();
94 } 111 }
95 112
96 $BUTTON_STATE |= 1 << ($ev->{button} - 1); 113 if ($GRAB) {
97 114 if ($ev->{button} == 4 || $ev->{button} == 5) {
98 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y)) 115 # mousewheel
99 if $GRAB; 116 $ev->{dx} = 0;
117 $ev->{dy} = $ev->{button} * 2 - 9;
118 $GRAB->emit (mouse_wheel => $ev);
119 } else {
120 $GRAB->emit (button_down => $ev)
121 }
122 }
100} 123}
101 124
102sub feed_sdl_button_up_event { 125sub feed_sdl_button_up_event {
103 my ($ev) = @_; 126 my ($ev) = @_;
104 my ($x, $y) = ($ev->{x}, $ev->{y});
105 127
106 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 128 my $widget = $GRAB || $ROOT->find_widget ($ev->{x}, $ev->{y});
107 129
108 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1)); 130 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
109 131
110 $GRAB->emit (button_up => $ev, $GRAB->coord2local ($x, $y)) 132 $GRAB->emit (button_up => $ev)
111 if $GRAB; 133 if $GRAB && $ev->{button} != 4 && $ev->{button} != 5;
112 134
113 if (!$BUTTON_STATE) { 135 unless ($BUTTON_STATE) {
114 my $grab = $GRAB; undef $GRAB; 136 my $grab = $GRAB; undef $GRAB;
115 $grab->update if $grab; 137 $grab->update if $grab;
116 $GRAB->update if $GRAB; 138 $GRAB->update if $GRAB;
117 139
118 check_tooltip; 140 check_hover $widget;
141 $TOOLTIP_WATCHER->cb->();
119 } 142 }
120} 143}
121 144
122sub feed_sdl_motion_event { 145sub feed_sdl_motion_event {
123 my ($ev) = @_; 146 my ($ev) = @_;
124 my ($x, $y) = ($ev->{x}, $ev->{y}); 147 my ($x, $y) = ($ev->{x}, $ev->{y});
125 148
126 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 149 my $widget = $GRAB || $ROOT->find_widget ($x, $y);
127 150
128 if ($widget != $HOVER) { 151 check_hover $widget;
129 my $hover = $HOVER; $HOVER = $widget;
130 152
131 $hover->update if $hover && $hover->{can_hover}; 153 $HOVER->emit (mouse_motion => $ev)
132 $HOVER->update if $HOVER && $HOVER->{can_hover};
133
134 check_tooltip;
135 }
136
137 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
138 if $HOVER; 154 if $HOVER;
139} 155}
140 156
141# convert position array to integers 157# convert position array to integers
142sub harmonize { 158sub harmonize {
… …
192 reconfigure_widgets; 208 reconfigure_widgets;
193} 209}
194 210
195############################################################################# 211#############################################################################
196 212
213package CFPlus::UI::Event;
214
215sub xy {
216 $_[1]->coord2local ($_[0]{x}, $_[0]{y})
217}
218
219#############################################################################
220
197package CFClient::UI::Base; 221package CFPlus::UI::Base;
198 222
199use strict; 223use strict;
200 224
201use CFClient::OpenGL; 225use CFPlus::OpenGL;
202 226
203sub new { 227sub new {
204 my $class = shift; 228 my $class = shift;
205 229
206 my $self = bless { 230 my $self = bless {
… …
211 h => undef, 235 h => undef,
212 can_events => 1, 236 can_events => 1,
213 @_ 237 @_
214 }, $class; 238 }, $class;
215 239
216 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self); 240 Scalar::Util::weaken ($CFPlus::UI::WIDGET{$self+0} = $self);
217 241
218 for (keys %$self) { 242 for (keys %$self) {
219 if (/^on_(.*)$/) { 243 if (/^on_(.*)$/) {
220 $self->connect ($1 => delete $self->{$_}); 244 $self->connect ($1 => delete $self->{$_});
221 } 245 }
222 } 246 }
223 247
224 if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) { 248 if (my $layout = $CFPlus::UI::LAYOUT->{$self->{name}}) {
225 $self->{x} = $layout->{x} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{x}; 249 $self->{x} = $layout->{x} * $CFPlus::UI::ROOT->{alloc_w} if exists $layout->{x};
226 $self->{y} = $layout->{y} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{y}; 250 $self->{y} = $layout->{y} * $CFPlus::UI::ROOT->{alloc_h} if exists $layout->{y};
227 $self->{force_w} = $layout->{w} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{w}; 251 $self->{force_w} = $layout->{w} * $CFPlus::UI::ROOT->{alloc_w} if exists $layout->{w};
228 $self->{force_h} = $layout->{h} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{h}; 252 $self->{force_h} = $layout->{h} * $CFPlus::UI::ROOT->{alloc_h} if exists $layout->{h};
229 253
230 $self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x}; 254 $self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
231 $self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y}; 255 $self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
232 256
233 $self->show if $layout->{show}; 257 $self->show if $layout->{show};
… …
246sub show { 270sub show {
247 my ($self) = @_; 271 my ($self) = @_;
248 272
249 return if $self->{parent}; 273 return if $self->{parent};
250 274
251 $CFClient::UI::ROOT->add ($self); 275 $CFPlus::UI::ROOT->add ($self);
252} 276}
253 277
254sub set_visible { 278sub set_visible {
255 my ($self) = @_; 279 my ($self) = @_;
256 280
… …
271 295
272 return unless $self->{visible}; 296 return unless $self->{visible};
273 297
274 $_->set_invisible for $self->children; 298 $_->set_invisible for $self->children;
275 299
300 delete $self->{visible};
276 delete $self->{root}; 301 delete $self->{root};
277 delete $self->{visible};
278 302
279 undef $GRAB if $GRAB == $self; 303 undef $GRAB if $GRAB == $self;
280 undef $HOVER if $HOVER == $self; 304 undef $HOVER if $HOVER == $self;
281 305
282 CFClient::UI::check_tooltip 306 $CFPlus::UI::TOOLTIP_WATCHER->cb->()
283 if $TOOLTIP->{owner} == $self; 307 if $TOOLTIP->{owner} == $self;
284 308
285 $self->focus_out; 309 $self->emit ("focus_out");
286
287 $self->emit (visibility_change => 0); 310 $self->emit (visibility_change => 0);
288} 311}
289 312
290sub set_visibility { 313sub set_visibility {
291 my ($self, $visible) = @_; 314 my ($self, $visible) = @_;
… …
314} 337}
315 338
316sub move_abs { 339sub move_abs {
317 my ($self, $x, $y, $z) = @_; 340 my ($self, $x, $y, $z) = @_;
318 341
319 $self->{x} = List::Util::max 0, int $x; 342 $self->{x} = List::Util::max 0, List::Util::min $self->{root}{w} - $self->{w}, int $x;
320 $self->{y} = List::Util::max 0, int $y; 343 $self->{y} = List::Util::max 0, List::Util::min $self->{root}{h} - $self->{h}, int $y;
321 $self->{z} = $z if defined $z; 344 $self->{z} = $z if defined $z;
322 345
323 $self->update; 346 $self->update;
324} 347}
325 348
… …
335sub size_request { 358sub size_request {
336 require Carp; 359 require Carp;
337 Carp::confess "size_request is abstract"; 360 Carp::confess "size_request is abstract";
338} 361}
339 362
363sub baseline_shift {
364 0
365}
366
340sub configure { 367sub configure {
341 my ($self, $x, $y, $w, $h) = @_; 368 my ($self, $x, $y, $w, $h) = @_;
342 369
343 if ($self->{aspect}) { 370 if ($self->{aspect}) {
344 my ($ow, $oh) = ($w, $h); 371 my ($ow, $oh) = ($w, $h);
345 372
346 $w = List::Util::min $w, int $h * $self->{aspect}; 373 $w = List::Util::min $w, CFPlus::ceil $h * $self->{aspect};
347 $h = List::Util::min $h, int $w / $self->{aspect}; 374 $h = List::Util::min $h, CFPlus::ceil $w / $self->{aspect};
348 375
349 # use alignment to adjust x, y 376 # use alignment to adjust x, y
350 377
351 $x += int 0.5 * ($ow - $w); 378 $x += int 0.5 * ($ow - $w);
352 $y += int 0.5 * ($oh - $h); 379 $y += int 0.5 * ($oh - $h);
… …
366 393
367 $self->{root}{size_alloc}{$self+0} = $self; 394 $self->{root}{size_alloc}{$self+0} = $self;
368 } 395 }
369} 396}
370 397
371sub size_allocate {
372 # nothing to be done
373}
374
375sub children { 398sub children {
376 # nop 399 # nop
377} 400}
378 401
379sub visible_children { 402sub visible_children {
… …
381} 404}
382 405
383sub set_max_size { 406sub set_max_size {
384 my ($self, $w, $h) = @_; 407 my ($self, $w, $h) = @_;
385 408
386 delete $self->{max_w}; $self->{max_w} = $w if $w; 409 $self->{max_w} = int $w if defined $w;
387 delete $self->{max_h}; $self->{max_h} = $h if $h; 410 $self->{max_h} = int $h if defined $h;
411
412 $self->realloc;
388} 413}
389 414
390sub set_tooltip { 415sub set_tooltip {
391 my ($self, $tooltip) = @_; 416 my ($self, $tooltip) = @_;
392 417
… …
395 420
396 return if $self->{tooltip} eq $tooltip; 421 return if $self->{tooltip} eq $tooltip;
397 422
398 $self->{tooltip} = $tooltip; 423 $self->{tooltip} = $tooltip;
399 424
400 if ($CFClient::UI::TOOLTIP->{owner} == $self) { 425 if ($CFPlus::UI::TOOLTIP->{owner} == $self) {
401 delete $CFClient::UI::TOOLTIP->{owner}; 426 delete $CFPlus::UI::TOOLTIP->{owner};
402 CFClient::UI::check_tooltip; 427 $CFPlus::UI::TOOLTIP_WATCHER->cb->();
403 } 428 }
404} 429}
405 430
406# translate global coordinates to local coordinate system 431# translate global coordinates to local coordinate system
407sub coord2local { 432sub coord2local {
408 my ($self, $x, $y) = @_; 433 my ($self, $x, $y) = @_;
409 434
435 Carp::confess unless $self->{parent};#d#
436
410 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y}) 437 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
411} 438}
412 439
413# translate local coordinates to global coordinate system 440# translate local coordinates to global coordinate system
414sub coord2global { 441sub coord2global {
415 my ($self, $x, $y) = @_; 442 my ($self, $x, $y) = @_;
416 443
444 Carp::confess unless $self->{parent};#d#
445
417 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y}) 446 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
418} 447}
419 448
420sub focus_in { 449sub invoke_focus_in {
421 my ($self) = @_; 450 my ($self) = @_;
422 451
423 return if $FOCUS == $self; 452 return if $FOCUS == $self;
424 return unless $self->{can_focus}; 453 return unless $self->{can_focus};
425 454
426 my $focus = $FOCUS; $FOCUS = $self; 455 $FOCUS = $self;
427 456
428 $self->_emit (focus_in => $focus); 457 $self->update;
429 458
430 $focus->update if $focus; 459 0
431 $FOCUS->update;
432} 460}
433 461
434sub focus_out { 462sub invoke_focus_out {
435 my ($self) = @_; 463 my ($self) = @_;
436 464
437 return unless $FOCUS == $self; 465 return unless $FOCUS == $self;
438 466
439 my $focus = $FOCUS; undef $FOCUS; 467 undef $FOCUS;
440 468
441 $self->_emit (focus_out => $focus); 469 $self->update;
442 470
443 $focus->update if $focus; #?
444
445 $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus 471 $::MAPWIDGET->grab_focus #d# focus mapwidget if no other widget has focus
446 unless $FOCUS; 472 unless $FOCUS;
447}
448 473
474 0
475}
476
477sub grab_focus {
478 my ($self) = @_;
479
480 $FOCUS->emit ("focus_out") if $FOCUS;
481 $self->emit ("focus_in");
482}
483
449sub mouse_motion { 0 } 484sub invoke_mouse_motion { 0 }
450sub button_up { 0 } 485sub invoke_button_up { 0 }
451sub key_down { 0 } 486sub invoke_key_down { 0 }
452sub key_up { 0 } 487sub invoke_key_up { 0 }
488sub invoke_mouse_wheel { 0 }
453 489
454sub button_down { 490sub invoke_button_down {
455 my ($self, $ev, $x, $y) = @_; 491 my ($self, $ev, $x, $y) = @_;
456 492
457 $self->focus_in; 493 $self->grab_focus;
458 494
459 0 495 0
496}
497
498sub connect {
499 my ($self, $signal, $cb) = @_;
500
501 push @{ $self->{signal_cb}{$signal} }, $cb;
502
503 defined wantarray and CFPlus::guard {
504 @{ $self->{signal_cb}{$signal} } = grep $_ != $cb,
505 @{ $self->{signal_cb}{$signal} };
506 }
507}
508
509my %has_coords = (
510 button_down => 1,
511 button_up => 1,
512 mouse_motion => 1,
513 mouse_wheel => 1,
514);
515
516sub emit {
517 my ($self, $signal, @args) = @_;
518
519 # I do not really like this solution, but I do not like duplication
520 # and needlessly verbose code, either.
521 my @append
522 = $has_coords{$signal}
523 ? $args[0]->xy ($self)
524 : ();
525
526 #warn +(caller(1))[3] . "emit $signal on $self (parent $self->{parent})\n";#d#
527
528 if ($self->{tooltip} =~ /Apply.*audio/) {
529 warn "2 ", join ":", @{ $self->{signal_cb}{$signal} || []}, "\n";#d#
530 warn "3 $self->{parent}\n";#d#
531 }
532
533 #d##TODO# stop propagating at first true, do not use sum
534 my $res =
535 (List::Util::sum map $_->($self, @args, @append), @{$self->{signal_cb}{$signal} || []}) # before
536 || ($self->can ("invoke_$signal") || sub { 1 })->($self, @args, @append) # closure
537 || ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent
538 ;
539 if ($self->{tooltip} =~ /Apply.*audio/) {
540 warn "4 ", join ":", @{ $self->{signal_cb}{$signal} || []}, "\n";#d#
541 warn "5 $self->{parent}\n";#d#
542 }
543
544 $res
460} 545}
461 546
462sub find_widget { 547sub find_widget {
463 my ($self, $x, $y) = @_; 548 my ($self, $x, $y) = @_;
464 549
… …
474sub set_parent { 559sub set_parent {
475 my ($self, $parent) = @_; 560 my ($self, $parent) = @_;
476 561
477 Scalar::Util::weaken ($self->{parent} = $parent); 562 Scalar::Util::weaken ($self->{parent} = $parent);
478 $self->set_visible if $parent->{visible}; 563 $self->set_visible if $parent->{visible};
479}
480
481sub connect {
482 my ($self, $signal, $cb) = @_;
483
484 push @{ $self->{signal_cb}{$signal} }, $cb;
485}
486
487sub _emit {
488 my ($self, $signal, @args) = @_;
489
490 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
491}
492
493sub emit {
494 my ($self, $signal, @args) = @_;
495
496 $self->_emit ($signal, @args)
497 || $self->$signal (@args);
498}
499
500sub visibility_change {
501 #my ($self, $visible) = @_;
502} 564}
503 565
504sub realloc { 566sub realloc {
505 my ($self) = @_; 567 my ($self) = @_;
506 568
… …
539 return unless $self->{h} && $self->{w}; 601 return unless $self->{h} && $self->{w};
540 602
541 # update screen rectangle 603 # update screen rectangle
542 local $draw_x = $draw_x + $self->{x}; 604 local $draw_x = $draw_x + $self->{x};
543 local $draw_y = $draw_y + $self->{y}; 605 local $draw_y = $draw_y + $self->{y};
544 local $draw_w = $draw_x + $self->{w};
545 local $draw_h = $draw_y + $self->{h};
546 606
547 # skip widgets that are entirely outside the drawing area 607 # skip widgets that are entirely outside the drawing area
548 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w) 608 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
549 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h); 609 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
550 610
551 glPushMatrix; 611 glPushMatrix;
552 glTranslate $self->{x}, $self->{y}, 0; 612 glTranslate $self->{x}, $self->{y}, 0;
553 $self->_draw;
554 glPopMatrix;
555 613
556 if ($self == $HOVER && $self->{can_hover}) { 614 if ($self == $HOVER && $self->{can_hover}) {
557 my ($x, $y) = @$self{qw(x y)};
558
559 glColor 1, 0.8, 0.5, 0.2; 615 glColor 1*0.2, 0.8*0.2, 0.5*0.2, 0.2;
560 glEnable GL_BLEND; 616 glEnable GL_BLEND;
561 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 617 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
562 glBegin GL_QUADS; 618 glBegin GL_QUADS;
563 glVertex $x , $y; 619 glVertex 0 , 0;
564 glVertex $x + $self->{w}, $y; 620 glVertex $self->{w}, 0;
565 glVertex $x + $self->{w}, $y + $self->{h}; 621 glVertex $self->{w}, $self->{h};
566 glVertex $x , $y + $self->{h}; 622 glVertex 0 , $self->{h};
567 glEnd; 623 glEnd;
568 glDisable GL_BLEND; 624 glDisable GL_BLEND;
569 } 625 }
570 626
571 if ($ENV{CFPLUS_DEBUG} & 1) { 627 if ($ENV{CFPLUS_DEBUG} & 1) {
572 glPushMatrix; 628 glPushMatrix;
573 glColor 1, 1, 0, 1; 629 glColor 1, 1, 0, 1;
574 glTranslate $self->{x} + 0.375, $self->{y} + 0.375; 630 glTranslate 0.375, 0.375;
575 glBegin GL_LINE_LOOP; 631 glBegin GL_LINE_LOOP;
576 glVertex 0 , 0; 632 glVertex 0 , 0;
577 glVertex $self->{w} - 1, 0; 633 glVertex $self->{w} - 1, 0;
578 glVertex $self->{w} - 1, $self->{h} - 1; 634 glVertex $self->{w} - 1, $self->{h} - 1;
579 glVertex 0 , $self->{h} - 1; 635 glVertex 0 , $self->{h} - 1;
580 glEnd; 636 glEnd;
581 glPopMatrix; 637 glPopMatrix;
582 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw; 638 #CFPlus::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
583 } 639 }
640
641 $self->_draw;
642 glPopMatrix;
584} 643}
585 644
586sub _draw { 645sub _draw {
587 my ($self) = @_; 646 my ($self) = @_;
588 647
… …
590} 649}
591 650
592sub DESTROY { 651sub DESTROY {
593 my ($self) = @_; 652 my ($self) = @_;
594 653
654 return if CFPlus::in_destruct;
655
595 delete $WIDGET{$self+0}; 656 delete $WIDGET{$self+0};
596 #$self->deactivate; 657
658 eval { $self->destroy };
659 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
597} 660}
598 661
599############################################################################# 662#############################################################################
600 663
601package CFClient::UI::DrawBG; 664package CFPlus::UI::DrawBG;
602 665
603our @ISA = CFClient::UI::Base::; 666our @ISA = CFPlus::UI::Base::;
604 667
605use strict; 668use strict;
606use CFClient::OpenGL; 669use CFPlus::OpenGL;
607 670
608sub new { 671sub new {
609 my $class = shift; 672 my $class = shift;
610 673
611 # range [value, low, high, page] 674 # range [value, low, high, page]
… …
626 689
627 if ($color && (@$color < 4 || $color->[3])) { 690 if ($color && (@$color < 4 || $color->[3])) {
628 my ($w, $h) = @$self{qw(w h)}; 691 my ($w, $h) = @$self{qw(w h)};
629 692
630 glEnable GL_BLEND; 693 glEnable GL_BLEND;
631 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 694 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
632 glColor @$color; 695 glColor_premultiply @$color;
633 696
634 glBegin GL_QUADS; 697 glBegin GL_QUADS;
635 glVertex 0 , 0; 698 glVertex 0 , 0;
636 glVertex 0 , $h; 699 glVertex 0 , $h;
637 glVertex $w, $h; 700 glVertex $w, $h;
… …
642 } 705 }
643} 706}
644 707
645############################################################################# 708#############################################################################
646 709
647package CFClient::UI::Empty; 710package CFPlus::UI::Empty;
648 711
649our @ISA = CFClient::UI::Base::; 712our @ISA = CFPlus::UI::Base::;
650 713
651sub new { 714sub new {
652 my ($class, %arg) = @_; 715 my ($class, %arg) = @_;
653 $class->SUPER::new (can_events => 0, %arg); 716 $class->SUPER::new (can_events => 0, %arg);
654} 717}
… …
661 724
662sub draw { } 725sub draw { }
663 726
664############################################################################# 727#############################################################################
665 728
666package CFClient::UI::Container; 729package CFPlus::UI::Container;
667 730
668our @ISA = CFClient::UI::Base::; 731our @ISA = CFPlus::UI::Base::;
669 732
670sub new { 733sub new {
671 my ($class, %arg) = @_; 734 my ($class, %arg) = @_;
672 735
673 my $children = delete $arg{children}; 736 my $children = delete $arg{children};
… …
682 if $children; 745 if $children;
683 746
684 $self 747 $self
685} 748}
686 749
750sub realloc {
751 my ($self) = @_;
752
753 $self->{force_realloc} = 1;
754 $self->{force_size_alloc} = 1;
755 $self->SUPER::realloc;
756}
757
687sub add { 758sub add {
688 my ($self, @widgets) = @_; 759 my ($self, @widgets) = @_;
689 760
690 $_->set_parent ($self) 761 $_->set_parent ($self)
691 for @widgets; 762 for @widgets;
… …
751 $_->draw for @{$self->{children}}; 822 $_->draw for @{$self->{children}};
752} 823}
753 824
754############################################################################# 825#############################################################################
755 826
756package CFClient::UI::Bin; 827package CFPlus::UI::Bin;
757 828
758our @ISA = CFClient::UI::Container::; 829our @ISA = CFPlus::UI::Container::;
759 830
760sub new { 831sub new {
761 my ($class, %arg) = @_; 832 my ($class, %arg) = @_;
762 833
763 my $child = (delete $arg{child}) || new CFClient::UI::Empty::; 834 my $child = (delete $arg{child}) || new CFPlus::UI::Empty::;
764 835
765 $class->SUPER::new (children => [$child], %arg) 836 $class->SUPER::new (children => [$child], %arg)
766} 837}
767 838
768sub add { 839sub add {
769 my ($self, $child) = @_; 840 my ($self, $child) = @_;
770 841
771 $self->{children} = []; 842 $self->SUPER::remove ($_) for @{ $self->{children} };
772
773 $self->SUPER::add ($child); 843 $self->SUPER::add ($child);
774} 844}
775 845
776sub remove { 846sub remove {
777 my ($self, $widget) = @_; 847 my ($self, $widget) = @_;
778 848
779 $self->SUPER::remove ($widget); 849 $self->SUPER::remove ($widget);
780 850
781 $self->{children} = [new CFClient::UI::Empty] 851 $self->{children} = [new CFPlus::UI::Empty]
782 unless @{$self->{children}}; 852 unless @{$self->{children}};
783} 853}
784 854
785sub child { $_[0]->{children}[0] } 855sub child { $_[0]->{children}[0] }
786 856
787sub size_request { 857sub size_request {
788 $_[0]{children}[0]->size_request 858 $_[0]{children}[0]->size_request
789} 859}
790 860
791sub size_allocate { 861sub invoke_size_allocate {
792 my ($self, $w, $h) = @_; 862 my ($self, $w, $h) = @_;
793 863
794 $self->{children}[0]->configure (0, 0, $w, $h); 864 $self->{children}[0]->configure (0, 0, $w, $h);
865
866 1
795} 867}
796 868
797############################################################################# 869#############################################################################
798 870
871# back-buffered drawing area
872
799package CFClient::UI::Window; 873package CFPlus::UI::Window;
800 874
801our @ISA = CFClient::UI::Bin::; 875our @ISA = CFPlus::UI::Bin::;
802 876
803use CFClient::OpenGL; 877use CFPlus::OpenGL;
804 878
805sub new { 879sub new {
806 my ($class, %arg) = @_; 880 my ($class, %arg) = @_;
807 881
808 my $self = $class->SUPER::new (%arg); 882 my $self = $class->SUPER::new (%arg);
… …
813 887
814 $ROOT->on_post_alloc ($self => sub { $self->render_child }); 888 $ROOT->on_post_alloc ($self => sub { $self->render_child });
815 $self->SUPER::update; 889 $self->SUPER::update;
816} 890}
817 891
818sub size_allocate { 892sub invoke_size_allocate {
819 my ($self, $w, $h) = @_; 893 my ($self, $w, $h) = @_;
820 894
821 $self->SUPER::size_allocate ($w, $h);
822 $self->update; 895 $self->update;
896
897 $self->SUPER::invoke_size_allocate ($w, $h)
823} 898}
824 899
825sub _render { 900sub _render {
826 my ($self) = @_; 901 my ($self) = @_;
827 902
… …
829} 904}
830 905
831sub render_child { 906sub render_child {
832 my ($self) = @_; 907 my ($self) = @_;
833 908
834 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 909 $self->{texture} = new_from_opengl CFPlus::Texture $self->{w}, $self->{h}, sub {
835 glClearColor 0, 0, 0, 0; 910 glClearColor 0, 0, 0, 0;
836 glClear GL_COLOR_BUFFER_BIT; 911 glClear GL_COLOR_BUFFER_BIT;
837 912
838 { 913 {
839 package CFClient::UI::Base; 914 package CFPlus::UI::Base;
840 915
841 ($draw_x, $draw_y, $draw_w, $draw_h) = 916 local ($draw_x, $draw_y, $draw_w, $draw_h) =
842 (0, 0, $self->{w}, $self->{h}); 917 (0, 0, $self->{w}, $self->{h});
918
919 $self->_render;
843 } 920 }
844
845 $self->_render;
846 }; 921 };
847} 922}
848 923
849sub _draw { 924sub _draw {
850 my ($self) = @_; 925 my ($self) = @_;
851
852 my ($w, $h) = @$self{qw(w h)};
853 926
854 my $tex = $self->{texture} 927 my $tex = $self->{texture}
855 or return; 928 or return;
856 929
857 glEnable GL_TEXTURE_2D; 930 glEnable GL_TEXTURE_2D;
858 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 931 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
859 glColor 1, 1, 1, 1; 932 glColor 0, 0, 0, 1;
860 933
861 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 934 $tex->draw_quad_alpha_premultiplied (0, 0);
862 935
863 glDisable GL_TEXTURE_2D; 936 glDisable GL_TEXTURE_2D;
864} 937}
865 938
866############################################################################# 939#############################################################################
867 940
868package CFClient::UI::ViewPort; 941package CFPlus::UI::ViewPort;
869 942
870our @ISA = CFClient::UI::Window::; 943our @ISA = CFPlus::UI::Window::;
871 944
872sub new { 945sub new {
873 my $class = shift; 946 my $class = shift;
874 947
875 $class->SUPER::new ( 948 $class->SUPER::new (
… …
888 $h = 10 if $self->{scroll_y}; 961 $h = 10 if $self->{scroll_y};
889 962
890 ($w, $h) 963 ($w, $h)
891} 964}
892 965
893sub size_allocate { 966sub invoke_size_allocate {
894 my ($self, $w, $h) = @_; 967 my ($self, $w, $h) = @_;
895 968
896 my $child = $self->child; 969 my $child = $self->child;
897 970
898 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w}; 971 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
899 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h}; 972 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
900 973
901 $self->child->configure (0, 0, $w, $h); 974 $self->child->configure (0, 0, $w, $h);
902 $self->update; 975 $self->update;
976
977 1
903} 978}
904 979
905sub set_offset { 980sub set_offset {
906 my ($self, $x, $y) = @_; 981 my ($self, $x, $y) = @_;
907 982
… …
933 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w} 1008 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
934 && $y >= $self->{y} && $y < $self->{y} + $self->{h} 1009 && $y >= $self->{y} && $y < $self->{y} + $self->{h}
935 ) { 1010 ) {
936 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y}) 1011 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
937 } else { 1012 } else {
938 $self->CFClient::UI::Base::find_widget ($x, $y) 1013 $self->CFPlus::UI::Base::find_widget ($x, $y)
939 } 1014 }
940} 1015}
941 1016
942sub _render { 1017sub _render {
943 my ($self) = @_; 1018 my ($self) = @_;
944 1019
945 local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x}; 1020 local $CFPlus::UI::Base::draw_x = $CFPlus::UI::Base::draw_x - $self->{view_x};
946 local $CFClient::UI::Base::draw_y = $CFClient::UI::Base::draw_y - $self->{view_y}; 1021 local $CFPlus::UI::Base::draw_y = $CFPlus::UI::Base::draw_y - $self->{view_y};
947 1022
948 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 1023 CFPlus::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
949 1024
950 $self->SUPER::_render; 1025 $self->SUPER::_render;
951} 1026}
952 1027
953############################################################################# 1028#############################################################################
954 1029
955package CFClient::UI::ScrolledWindow; 1030package CFPlus::UI::ScrolledWindow;
956 1031
957our @ISA = CFClient::UI::HBox::; 1032our @ISA = CFPlus::UI::HBox::;
958 1033
959sub new { 1034sub new {
960 my $class = shift; 1035 my ($class, %arg) = @_;
1036
1037 my $child = delete $arg{child};
961 1038
962 my $self; 1039 my $self;
963 1040
964 my $slider = new CFClient::UI::Slider 1041 my $slider = new CFPlus::UI::Slider
965 vertical => 1, 1042 vertical => 1,
966 range => [0, 0, 1, 0.01], # HACK fix 1043 range => [0, 0, 1, 0.01], # HACK fix
967 on_changed => sub { 1044 on_changed => sub {
968 $self->{vp}->set_offset (0, $_[1]); 1045 $self->{vp}->set_offset (0, $_[1]);
969 }, 1046 },
970 ; 1047 ;
971 1048
972 $self = $class->SUPER::new ( 1049 $self = $class->SUPER::new (
973 vp => (new CFClient::UI::ViewPort expand => 1), 1050 vp => (new CFPlus::UI::ViewPort expand => 1),
1051 can_events => 1,
974 slider => $slider, 1052 slider => $slider,
975 @_, 1053 %arg,
976 ); 1054 );
977 1055
978 $self->{vp}->add ($self->{scrolled});
979 $self->add ($self->{vp});
980 $self->add ($self->{slider}); 1056 $self->SUPER::add ($self->{vp}, $self->{slider});
1057 $self->add ($child) if $child;
981 1058
982 $self 1059 $self
983} 1060}
984 1061
1062#TODO# update range on size_allocate depending on child
1063
1064sub add {
1065 my ($self, $widget) = @_;
1066
1067 $self->{vp}->add ($self->{child} = $widget);
1068}
1069
1070sub invoke_mouse_wheel {
1071 my ($self, $ev) = @_;
1072
1073 return 0 unless $ev->{dy}; # only vertical movements
1074
1075 $self->{slider}->emit (mouse_wheel => $ev);
1076
1077 1
1078}
1079
1080sub update_slider {
1081 my ($self) = @_;
1082
1083 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $self->{vp}->child->{h}, $self->{vp}{h}, 1]);
1084}
1085
985sub update { 1086sub update {
986 my ($self) = @_; 1087 my ($self) = @_;
987 1088
988 $self->SUPER::update; 1089 $self->SUPER::update;
989 1090
990 # todo: overwrite size_allocate of child 1091 $self->update_slider;
991 my $child = $self->{vp}->child;
992 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
993} 1092}
994 1093
995sub size_allocate { 1094sub invoke_size_allocate {
996 my ($self, $w, $h) = @_; 1095 my ($self, $w, $h) = @_;
997 1096
1097 $self->update_slider;
1098
998 $self->SUPER::size_allocate ($w, $h); 1099 $self->SUPER::invoke_size_allocate ($w, $h)
999
1000 my $child = $self->{vp}->child;
1001 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
1002} 1100}
1003
1004#TODO# update range on size_allocate depending on child
1005# update viewport offset on scroll
1006 1101
1007############################################################################# 1102#############################################################################
1008 1103
1009package CFClient::UI::Frame; 1104package CFPlus::UI::Frame;
1010 1105
1011our @ISA = CFClient::UI::Bin::; 1106our @ISA = CFPlus::UI::Bin::;
1012 1107
1013use CFClient::OpenGL; 1108use CFPlus::OpenGL;
1014 1109
1015sub new { 1110sub new {
1016 my $class = shift; 1111 my $class = shift;
1017 1112
1018 $class->SUPER::new ( 1113 $class->SUPER::new (
… …
1026 1121
1027 if ($self->{bg}) { 1122 if ($self->{bg}) {
1028 my ($w, $h) = @$self{qw(w h)}; 1123 my ($w, $h) = @$self{qw(w h)};
1029 1124
1030 glEnable GL_BLEND; 1125 glEnable GL_BLEND;
1031 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1126 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1032 glColor @{ $self->{bg} }; 1127 glColor_premultiply @{ $self->{bg} };
1033 1128
1034 glBegin GL_QUADS; 1129 glBegin GL_QUADS;
1035 glVertex 0 , 0; 1130 glVertex 0 , 0;
1036 glVertex 0 , $h; 1131 glVertex 0 , $h;
1037 glVertex $w, $h; 1132 glVertex $w, $h;
… …
1044 $self->SUPER::_draw; 1139 $self->SUPER::_draw;
1045} 1140}
1046 1141
1047############################################################################# 1142#############################################################################
1048 1143
1049package CFClient::UI::FancyFrame; 1144package CFPlus::UI::FancyFrame;
1050 1145
1051our @ISA = CFClient::UI::Bin::; 1146our @ISA = CFPlus::UI::Bin::;
1052 1147
1053use CFClient::OpenGL; 1148use CFPlus::OpenGL;
1054
1055my $bg =
1056 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
1057 mipmap => 1, wrap => 1;
1058
1059my @border =
1060 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1061 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1062 1149
1063sub new { 1150sub new {
1064 my ($class, %arg) = @_; 1151 my ($class, %arg) = @_;
1065 1152
1066 my $title = delete $arg{title}; 1153 if ((exists $arg{label}) && !ref $arg{label}) {
1154 $arg{label} = new CFPlus::UI::Label
1155 align => 1,
1156 valign => 0,
1157 text => $arg{label},
1158 fontsize => ($arg{border} || 0.8) * 0.75;
1159 }
1160
1161 my $self = $class->SUPER::new (
1162 # label => "",
1163 fg => [0.6, 0.3, 0.1],
1164 border => 0.8,
1165 style => 'single',
1166 %arg,
1167 );
1168
1169 $self
1170}
1171
1172sub add {
1173 my ($self, @widgets) = @_;
1174
1175 $self->SUPER::add (@widgets);
1176 $self->CFPlus::UI::Container::add ($self->{label}) if $self->{label};
1177}
1178
1179sub border {
1180 int $_[0]{border} * $::FONTSIZE
1181}
1182
1183sub size_request {
1184 my ($self) = @_;
1185
1186 ($self->{label_w}, undef) = $self->{label}->size_request
1187 if $self->{label};
1188
1189 my ($w, $h) = $self->SUPER::size_request;
1190
1191 (
1192 $w + $self->border * 2,
1193 $h + $self->border * 2,
1194 )
1195}
1196
1197sub invoke_size_allocate {
1198 my ($self, $w, $h) = @_;
1199
1200 my $border = $self->border;
1201
1202 $w -= List::Util::max 0, $border * 2;
1203 $h -= List::Util::max 0, $border * 2;
1204
1205 if (my $label = $self->{label}) {
1206 $label->{w} = List::Util::max 0, List::Util::min $self->{label_w}, $w - $border * 2;
1207 $label->{h} = List::Util::min $h, $border;
1208 $label->invoke_size_allocate ($label->{w}, $label->{h});
1209 }
1210
1211 $self->child->configure ($border, $border, $w, $h);
1212
1213 1
1214}
1215
1216sub _draw {
1217 my ($self) = @_;
1218
1219 my $child = $self->{children}[0];
1220
1221 my $border = $self->border;
1222 my ($w, $h) = ($self->{w}, $self->{h});
1223
1224 $child->draw;
1225
1226 glColor @{$self->{fg}};
1227 glBegin GL_LINE_STRIP;
1228 glVertex $border * 1.5 , $border * 0.5 + 0.5;
1229 glVertex $border * 0.5 + 0.5, $border * 0.5 + 0.5;
1230 glVertex $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
1231 glVertex $w - $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
1232 glVertex $w - $border * 0.5 + 0.5, $border * 0.5 + 0.5;
1233 glVertex $self->{label} ? $border * 2 + $self->{label}{w} : $border * 1.5, $border * 0.5 + 0.5;
1234 glEnd;
1235
1236 if ($self->{label}) {
1237 glTranslate $border * 2, 0;
1238 $self->{label}->_draw;
1239 }
1240}
1241
1242#############################################################################
1243
1244package CFPlus::UI::Toplevel;
1245
1246our @ISA = CFPlus::UI::Bin::;
1247
1248use CFPlus::OpenGL;
1249
1250my $bg =
1251 new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png",
1252 mipmap => 1, wrap => 1;
1253
1254my @border =
1255 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1256 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1257
1258sub new {
1259 my ($class, %arg) = @_;
1067 1260
1068 my $self = $class->SUPER::new ( 1261 my $self = $class->SUPER::new (
1069 bg => [1, 1, 1, 1], 1262 bg => [1, 1, 1, 1],
1070 border_bg => [1, 1, 1, 1], 1263 border_bg => [1, 1, 1, 1],
1071 border => 0.6, 1264 border => 0.6,
1072 can_events => 1, 1265 can_events => 1,
1073 min_w => 16, 1266 min_w => 64,
1074 min_h => 16, 1267 min_h => 32,
1075 %arg, 1268 %arg,
1076 ); 1269 );
1077 1270
1078 $self->{title} = new CFClient::UI::Label 1271 $self->{title_widget} = new CFPlus::UI::Label
1079 align => 0, 1272 align => 0,
1080 valign => 1, 1273 valign => 1,
1081 text => $title, 1274 text => $self->{title},
1082 fontsize => $self->{border} 1275 fontsize => $self->{border},
1083 if defined $title; 1276 if exists $self->{title};
1277
1278 if ($self->{has_close_button}) {
1279 $self->{close_button} =
1280 new CFPlus::UI::ImageButton
1281 path => 'x1_close.png',
1282 on_activate => sub { $self->emit ("delete") };
1283
1284 $self->CFPlus::UI::Container::add ($self->{close_button});
1285 }
1084 1286
1085 $self 1287 $self
1086} 1288}
1087 1289
1088sub add { 1290sub add {
1089 my ($self, @widgets) = @_; 1291 my ($self, @widgets) = @_;
1090 1292
1091 $self->SUPER::add (@widgets); 1293 $self->SUPER::add (@widgets);
1294 $self->CFPlus::UI::Container::add ($self->{close_button}) if $self->{close_button};
1092 $self->CFClient::UI::Container::add ($self->{title}) if $self->{title}; 1295 $self->CFPlus::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1093} 1296}
1094 1297
1095sub border { 1298sub border {
1096 int $_[0]{border} * $::FONTSIZE 1299 int $_[0]{border} * $::FONTSIZE
1097} 1300}
1098 1301
1099sub size_request { 1302sub size_request {
1100 my ($self) = @_; 1303 my ($self) = @_;
1101 1304
1102 $self->{title}->size_request 1305 $self->{title_widget}->size_request
1103 if $self->{title}; 1306 if $self->{title_widget};
1307
1308 $self->{close_button}->size_request
1309 if $self->{close_button};
1104 1310
1105 my ($w, $h) = $self->SUPER::size_request; 1311 my ($w, $h) = $self->SUPER::size_request;
1106 1312
1107 ( 1313 (
1108 $w + $self->border * 2, 1314 $w + $self->border * 2,
1109 $h + $self->border * 2, 1315 $h + $self->border * 2,
1110 ) 1316 )
1111} 1317}
1112 1318
1113sub size_allocate { 1319sub invoke_size_allocate {
1114 my ($self, $w, $h) = @_; 1320 my ($self, $w, $h) = @_;
1115 1321
1116 if ($self->{title}) { 1322 if ($self->{title_widget}) {
1117 $self->{title}{w} = $w; 1323 $self->{title_widget}{w} = $w;
1118 $self->{title}{h} = $h; 1324 $self->{title_widget}{h} = $h;
1119 $self->{title}->size_allocate ($w, $h); 1325 $self->{title_widget}->invoke_size_allocate ($w, $h);
1120 } 1326 }
1121 1327
1122 my $border = $self->border; 1328 my $border = $self->border;
1123 1329
1124 $h -= List::Util::max 0, $border * 2; 1330 $h -= List::Util::max 0, $border * 2;
1125 $w -= List::Util::max 0, $border * 2; 1331 $w -= List::Util::max 0, $border * 2;
1332
1333 $self->child->configure ($border, $border, $w, $h);
1334
1335 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
1336 if $self->{close_button};
1337
1338 1
1339}
1340
1341sub invoke_delete {
1342 my ($self) = @_;
1343
1344 $self->hide;
1126 1345
1127 $self->child->configure ($border, $border, $w, $h); 1346 1
1128} 1347}
1129 1348
1130sub button_down { 1349sub invoke_button_down {
1131 my ($self, $ev, $x, $y) = @_; 1350 my ($self, $ev, $x, $y) = @_;
1132 1351
1133 my ($w, $h) = @$self{qw(w h)}; 1352 my ($w, $h) = @$self{qw(w h)};
1134 my $border = $self->border; 1353 my $border = $self->border;
1135 1354
… …
1151 my $dy = $ev->{y} - $oy; 1370 my $dy = $ev->{y} - $oy;
1152 1371
1153 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1); 1372 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
1154 $self->{force_h} = $bh + $dy * ($my ? -1 : 1); 1373 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1155 1374
1375 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1156 $self->realloc; 1376 $self->realloc;
1157 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1158 }; 1377 };
1159 1378
1160 } elsif ($lr ^ $td) { 1379 } elsif ($lr ^ $td) {
1161 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1380 my ($ox, $oy) = ($ev->{x}, $ev->{y});
1162 my ($bx, $by) = ($self->{x}, $self->{y}); 1381 my ($bx, $by) = ($self->{x}, $self->{y});
… …
1165 my ($ev, $x, $y) = @_; 1384 my ($ev, $x, $y) = @_;
1166 1385
1167 ($x, $y) = ($ev->{x}, $ev->{y}); 1386 ($x, $y) = ($ev->{x}, $ev->{y});
1168 1387
1169 $self->move_abs ($bx + $x - $ox, $by + $y - $oy); 1388 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1389 # HACK: the next line is required to enforce placement
1390 $self->{parent}->invoke_size_allocate ($self->{parent}{w}, $self->{parent}{h});
1170 }; 1391 };
1171 } else { 1392 } else {
1172 return 0; 1393 return 0;
1173 } 1394 }
1174 1395
1175 1 1396 1
1176} 1397}
1177 1398
1178sub button_up { 1399sub invoke_button_up {
1179 my ($self, $ev, $x, $y) = @_; 1400 my ($self, $ev, $x, $y) = @_;
1180 1401
1181 !!delete $self->{motion} 1402 ! ! delete $self->{motion}
1182} 1403}
1183 1404
1184sub mouse_motion { 1405sub invoke_mouse_motion {
1185 my ($self, $ev, $x, $y) = @_; 1406 my ($self, $ev, $x, $y) = @_;
1186 1407
1187 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1408 $self->{motion}->($ev, $x, $y) if $self->{motion};
1188 1409
1189 !!$self->{motion} 1410 ! ! $self->{motion}
1411}
1412
1413sub invoke_visibility_change {
1414 my ($self, $visible) = @_;
1415
1416 delete $self->{motion} unless $visible;
1417
1418 0
1190} 1419}
1191 1420
1192sub _draw { 1421sub _draw {
1193 my ($self) = @_; 1422 my ($self) = @_;
1194 1423
… …
1220 1449
1221 glDisable GL_TEXTURE_2D; 1450 glDisable GL_TEXTURE_2D;
1222 1451
1223 $child->draw; 1452 $child->draw;
1224 1453
1225 if ($self->{title}) { 1454 if ($self->{title_widget}) {
1226 glTranslate 0, $border - $self->{h}; 1455 glTranslate 0, $border - $self->{h};
1227 $self->{title}->_draw; 1456 $self->{title_widget}->_draw;
1457
1458 glTranslate 0, - ($border - $self->{h});
1228 } 1459 }
1460
1461 $self->{close_button}->draw
1462 if $self->{close_button};
1229} 1463}
1230 1464
1231############################################################################# 1465#############################################################################
1232 1466
1233package CFClient::UI::Table; 1467package CFPlus::UI::Table;
1234 1468
1235our @ISA = CFClient::UI::Base::; 1469our @ISA = CFPlus::UI::Base::;
1236 1470
1237use List::Util qw(max sum); 1471use List::Util qw(max sum);
1238 1472
1239use CFClient::OpenGL; 1473use CFPlus::OpenGL;
1240 1474
1241sub new { 1475sub new {
1242 my $class = shift; 1476 my $class = shift;
1243 1477
1244 $class->SUPER::new ( 1478 $class->SUPER::new (
… …
1250sub children { 1484sub children {
1251 grep $_, map @$_, grep $_, @{ $_[0]{children} } 1485 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1252} 1486}
1253 1487
1254sub add { 1488sub add {
1255 my ($self, $x, $y, $child) = @_; 1489 my ($self) = shift;
1256 1490
1491 while (@_) {
1492 my ($x, $y, $child) = splice @_, 0, 3, ();
1257 $child->set_parent ($self); 1493 $child->set_parent ($self);
1258 $self->{children}[$y][$x] = $child; 1494 $self->{children}[$y][$x] = $child;
1495 }
1259 1496
1497 $self->{force_realloc} = 1;
1498 $self->{force_size_alloc} = 1;
1260 $self->realloc; 1499 $self->realloc;
1500}
1501
1502sub remove {
1503 my ($self, $child) = @_;
1504
1505 # TODO: not yet implemented
1261} 1506}
1262 1507
1263# TODO: move to container class maybe? send children a signal on removal? 1508# TODO: move to container class maybe? send children a signal on removal?
1264sub clear { 1509sub clear {
1265 my ($self) = @_; 1510 my ($self) = @_;
… …
1306 (sum @$ws), 1551 (sum @$ws),
1307 (sum @$hs), 1552 (sum @$hs),
1308 ) 1553 )
1309} 1554}
1310 1555
1311sub size_allocate { 1556sub invoke_size_allocate {
1312 my ($self, $w, $h) = @_; 1557 my ($self, $w, $h) = @_;
1313 1558
1314 my ($ws, $hs) = $self->get_wh; 1559 my ($ws, $hs) = $self->get_wh;
1315 1560
1316 my $req_w = (sum @$ws) || 1; 1561 my $req_w = (sum @$ws) || 1;
… …
1323 1568
1324 # linearly scale sizes 1569 # linearly scale sizes
1325 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 1570 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1326 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs; 1571 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1327 1572
1328 CFClient::UI::harmonize $ws; 1573 CFPlus::UI::harmonize $ws;
1329 CFClient::UI::harmonize $hs; 1574 CFPlus::UI::harmonize $hs;
1330 1575
1331 my $y; 1576 my $y;
1332 1577
1333 for my $r (0 .. $#{$self->{children}}) { 1578 for my $r (0 .. $#{$self->{children}}) {
1334 my $row = $self->{children}[$r] 1579 my $row = $self->{children}[$r]
… …
1348 } 1593 }
1349 1594
1350 $y += $row_h; 1595 $y += $row_h;
1351 } 1596 }
1352 1597
1598 1
1353} 1599}
1354 1600
1355sub find_widget { 1601sub find_widget {
1356 my ($self, $x, $y) = @_; 1602 my ($self, $x, $y) = @_;
1357 1603
… …
1376 } 1622 }
1377} 1623}
1378 1624
1379############################################################################# 1625#############################################################################
1380 1626
1381package CFClient::UI::Box; 1627package CFPlus::UI::Box;
1382 1628
1383our @ISA = CFClient::UI::Container::; 1629our @ISA = CFPlus::UI::Container::;
1384 1630
1385sub size_request { 1631sub size_request {
1386 my ($self) = @_; 1632 my ($self) = @_;
1387 1633
1388 $self->{vertical} 1634 $self->{vertical}
… …
1394 (List::Util::sum map $_->{req_w}, @{$self->{children}}), 1640 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1395 (List::Util::max map $_->{req_h}, @{$self->{children}}), 1641 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1396 ) 1642 )
1397} 1643}
1398 1644
1399sub size_allocate { 1645sub invoke_size_allocate {
1400 my ($self, $w, $h) = @_; 1646 my ($self, $w, $h) = @_;
1401 1647
1402 my $space = $self->{vertical} ? $h : $w; 1648 my $space = $self->{vertical} ? $h : $w;
1403 my $children = $self->{children}; 1649 my @children = $self->visible_children;
1404 1650
1405 my @req; 1651 my @req;
1406 1652
1407 if ($self->{homogeneous}) { 1653 if ($self->{homogeneous}) {
1408 @req = ($space / (@$children || 1)) x @$children; 1654 @req = ($space / (@children || 1)) x @children;
1409 } else { 1655 } else {
1410 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children; 1656 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @children;
1411 my $req = List::Util::sum @req; 1657 my $req = List::Util::sum @req;
1412 1658
1413 if ($req > $space) { 1659 if ($req > $space) {
1414 # ah well, not enough space 1660 # ah well, not enough space
1415 $_ *= $space / $req for @req; 1661 $_ *= $space / $req for @req;
1416 } else { 1662 } else {
1417 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1; 1663 my $expand = (List::Util::sum map $_->{expand}, @children) || 1;
1418 1664
1419 $space = ($space - $req) / $expand; # remaining space to give away 1665 $space = ($space - $req) / $expand; # remaining space to give away
1420 1666
1421 $req[$_] += $space * $children->[$_]{expand} 1667 $req[$_] += $space * $children[$_]{expand}
1422 for 0 .. $#$children; 1668 for 0 .. $#children;
1423 } 1669 }
1424 } 1670 }
1425 1671
1426 CFClient::UI::harmonize \@req; 1672 CFPlus::UI::harmonize \@req;
1427 1673
1428 my $pos = 0; 1674 my $pos = 0;
1429 for (0 .. $#$children) { 1675 for (0 .. $#children) {
1430 my $alloc = $req[$_]; 1676 my $alloc = $req[$_];
1431 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h)); 1677 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1432 1678
1433 $pos += $alloc; 1679 $pos += $alloc;
1434 } 1680 }
1435 1681
1436 1 1682 1
1437} 1683}
1438 1684
1439############################################################################# 1685#############################################################################
1440 1686
1441package CFClient::UI::HBox; 1687package CFPlus::UI::HBox;
1442 1688
1443our @ISA = CFClient::UI::Box::; 1689our @ISA = CFPlus::UI::Box::;
1444 1690
1445sub new { 1691sub new {
1446 my $class = shift; 1692 my $class = shift;
1447 1693
1448 $class->SUPER::new ( 1694 $class->SUPER::new (
… …
1451 ) 1697 )
1452} 1698}
1453 1699
1454############################################################################# 1700#############################################################################
1455 1701
1456package CFClient::UI::VBox; 1702package CFPlus::UI::VBox;
1457 1703
1458our @ISA = CFClient::UI::Box::; 1704our @ISA = CFPlus::UI::Box::;
1459 1705
1460sub new { 1706sub new {
1461 my $class = shift; 1707 my $class = shift;
1462 1708
1463 $class->SUPER::new ( 1709 $class->SUPER::new (
… …
1466 ) 1712 )
1467} 1713}
1468 1714
1469############################################################################# 1715#############################################################################
1470 1716
1471package CFClient::UI::Label; 1717package CFPlus::UI::Label;
1472 1718
1473our @ISA = CFClient::UI::DrawBG::; 1719our @ISA = CFPlus::UI::DrawBG::;
1474 1720
1475use CFClient::OpenGL; 1721use CFPlus::OpenGL;
1476 1722
1477sub new { 1723sub new {
1478 my ($class, %arg) = @_; 1724 my ($class, %arg) = @_;
1479 1725
1480 my $self = $class->SUPER::new ( 1726 my $self = $class->SUPER::new (
… …
1483 #active_bg => none 1729 #active_bg => none
1484 #font => default_font 1730 #font => default_font
1485 #text => initial text 1731 #text => initial text
1486 #markup => initial narkup 1732 #markup => initial narkup
1487 #max_w => maximum pixel width 1733 #max_w => maximum pixel width
1734 #style => 0, # render flags
1488 ellipsise => 3, # end 1735 ellipsise => 3, # end
1489 layout => (new CFClient::Layout), 1736 layout => (new CFPlus::Layout),
1490 fontsize => 1, 1737 fontsize => 1,
1491 align => -1, 1738 align => -1,
1492 valign => -1, 1739 valign => -1,
1493 padding_x => 2, 1740 padding_x => 2,
1494 padding_y => 2, 1741 padding_y => 2,
1495 can_events => 0, 1742 can_events => 0,
1496 %arg 1743 %arg
1497 ); 1744 );
1498 1745
1499 if (exists $self->{template}) { 1746 if (exists $self->{template}) {
1500 my $layout = new CFClient::Layout; 1747 my $layout = new CFPlus::Layout;
1501 $layout->set_text (delete $self->{template}); 1748 $layout->set_text (delete $self->{template});
1502 $self->{template} = $layout; 1749 $self->{template} = $layout;
1503 } 1750 }
1504 1751
1505 if (exists $self->{markup}) { 1752 if (exists $self->{markup}) {
… …
1509 } 1756 }
1510 1757
1511 $self 1758 $self
1512} 1759}
1513 1760
1514sub escape($) {
1515 local $_ = $_[0];
1516
1517 s/&/&amp;/g;
1518 s/>/&gt;/g;
1519 s/</&lt;/g;
1520
1521 $_
1522}
1523
1524sub update { 1761sub update {
1525 my ($self) = @_; 1762 my ($self) = @_;
1526 1763
1527 delete $self->{texture}; 1764 delete $self->{texture};
1528 $self->SUPER::update; 1765 $self->SUPER::update;
1529} 1766}
1530 1767
1768sub realloc {
1769 my ($self) = @_;
1770
1771 delete $self->{ox};
1772 $self->SUPER::realloc;
1773}
1774
1531sub set_text { 1775sub set_text {
1532 my ($self, $text) = @_; 1776 my ($self, $text) = @_;
1533 1777
1534 return if $self->{text} eq "T$text"; 1778 return if $self->{text} eq "T$text";
1535 $self->{text} = "T$text"; 1779 $self->{text} = "T$text";
1536 1780
1537 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1538 $self->{layout}->set_text ($text); 1781 $self->{layout}->set_text ($text);
1539 1782
1783 delete $self->{size_req};
1540 $self->realloc; 1784 $self->realloc;
1541 $self->update; 1785 $self->update;
1542} 1786}
1543 1787
1544sub set_markup { 1788sub set_markup {
… …
1547 return if $self->{text} eq "M$markup"; 1791 return if $self->{text} eq "M$markup";
1548 $self->{text} = "M$markup"; 1792 $self->{text} = "M$markup";
1549 1793
1550 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1794 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1551 1795
1552 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1553 $self->{layout}->set_markup ($markup); 1796 $self->{layout}->set_markup ($markup);
1554 1797
1798 delete $self->{size_req};
1555 $self->realloc; 1799 $self->realloc;
1556 $self->update; 1800 $self->update;
1557} 1801}
1558 1802
1559sub size_request { 1803sub size_request {
1560 my ($self) = @_; 1804 my ($self) = @_;
1561 1805
1806 $self->{size_req} ||= do {
1562 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1807 $self->{layout}->set_font ($self->{font}) if $self->{font};
1563 $self->{layout}->set_width ($self->{max_w} || -1); 1808 $self->{layout}->set_width ($self->{max_w} || -1);
1564 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1809 $self->{layout}->set_ellipsise ($self->{ellipsise});
1565 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1810 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1566 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1811 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1567 1812
1568 my ($w, $h) = $self->{layout}->size; 1813 my ($w, $h) = $self->{layout}->size;
1569 1814
1570 if (exists $self->{template}) { 1815 if (exists $self->{template}) {
1571 $self->{template}->set_font ($self->{font}) if $self->{font}; 1816 $self->{template}->set_font ($self->{font}) if $self->{font};
1817 $self->{template}->set_width ($self->{max_w} || -1);
1572 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1818 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1573 1819
1574 my ($w2, $h2) = $self->{template}->size; 1820 my ($w2, $h2) = $self->{template}->size;
1575 1821
1576 $w = List::Util::max $w, $w2; 1822 $w = List::Util::max $w, $w2;
1577 $h = List::Util::max $h, $h2; 1823 $h = List::Util::max $h, $h2;
1824 }
1825
1826 [$w, $h]
1578 } 1827 };
1579 1828
1580 ($w, $h) 1829 @{ $self->{size_req} }
1581} 1830}
1582 1831
1832sub baseline_shift {
1833 $_[0]{layout}->descent
1834}
1835
1583sub size_allocate { 1836sub invoke_size_allocate {
1584 my ($self, $w, $h) = @_; 1837 my ($self, $w, $h) = @_;
1585 1838
1586 delete $self->{ox}; 1839 delete $self->{ox};
1587 1840
1588 delete $self->{texture} 1841 delete $self->{texture}
1589 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w}; 1842 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1843
1844 1
1590} 1845}
1591 1846
1592sub set_fontsize { 1847sub set_fontsize {
1593 my ($self, $fontsize) = @_; 1848 my ($self, $fontsize) = @_;
1594 1849
1595 $self->{fontsize} = $fontsize; 1850 $self->{fontsize} = $fontsize;
1851 delete $self->{size_req};
1596 delete $self->{texture}; 1852 delete $self->{texture};
1597 1853
1598 $self->realloc; 1854 $self->realloc;
1599} 1855}
1600 1856
1857sub reconfigure {
1858 my ($self) = @_;
1859
1860 delete $self->{size_req};
1861 delete $self->{texture};
1862
1863 $self->SUPER::reconfigure;
1864}
1865
1601sub _draw { 1866sub _draw {
1602 my ($self) = @_; 1867 my ($self) = @_;
1603 1868
1604 $self->SUPER::_draw; # draw background, if applicable 1869 $self->SUPER::_draw; # draw background, if applicable
1605 1870
1606 my $tex = $self->{texture} ||= do { 1871 my $size = $self->{texture} ||= do {
1607 $self->{layout}->set_foreground (@{$self->{fg}}); 1872 $self->{layout}->set_foreground (@{$self->{fg}});
1608 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1873 $self->{layout}->set_font ($self->{font}) if $self->{font};
1609 $self->{layout}->set_width ($self->{w}); 1874 $self->{layout}->set_width ($self->{w});
1610 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1875 $self->{layout}->set_ellipsise ($self->{ellipsise});
1611 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1876 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1612 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1877 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1613 1878
1614 new_from_layout CFClient::Texture $self->{layout} 1879 [$self->{layout}->size]
1615 }; 1880 };
1616 1881
1617 unless (exists $self->{ox}) { 1882 unless (exists $self->{ox}) {
1618 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x} 1883 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1619 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x} 1884 : $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
1620 : ($self->{w} - $tex->{w}) * 0.5); 1885 : ($self->{w} - $size->[0]) * 0.5);
1621 1886
1622 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 1887 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1623 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y} 1888 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1624 : ($self->{h} - $tex->{h}) * 0.5); 1889 : ($self->{h} - $size->[1]) * 0.5);
1625 }; 1890 };
1626 1891
1627 glEnable GL_TEXTURE_2D; 1892 my $w = List::Util::min $self->{w} + 4, $size->[0];
1628 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1893 my $h = List::Util::min $self->{h} + 2, $size->[1];
1629 1894
1630 if ($tex->{format} == GL_ALPHA) { 1895 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1631 glColor @{$self->{fg}};
1632 $tex->draw_quad_alpha ($self->{ox}, $self->{oy});
1633 } else {
1634 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1635 }
1636
1637 glDisable GL_TEXTURE_2D;
1638} 1896}
1639 1897
1640############################################################################# 1898#############################################################################
1641 1899
1642package CFClient::UI::EntryBase; 1900package CFPlus::UI::EntryBase;
1643 1901
1644our @ISA = CFClient::UI::Label::; 1902our @ISA = CFPlus::UI::Label::;
1645 1903
1646use CFClient::OpenGL; 1904use CFPlus::OpenGL;
1647 1905
1648sub new { 1906sub new {
1649 my $class = shift; 1907 my $class = shift;
1650 1908
1651 $class->SUPER::new ( 1909 $class->SUPER::new (
… …
1656 can_hover => 1, 1914 can_hover => 1,
1657 can_focus => 1, 1915 can_focus => 1,
1658 valign => 0, 1916 valign => 0,
1659 can_events => 1, 1917 can_events => 1,
1660 #text => ... 1918 #text => ...
1919 #hidden => "*",
1661 @_ 1920 @_
1662 ) 1921 )
1663} 1922}
1664 1923
1665sub _set_text { 1924sub _set_text {
… …
1667 1926
1668 delete $self->{cur_h}; 1927 delete $self->{cur_h};
1669 1928
1670 return if $self->{text} eq $text; 1929 return if $self->{text} eq $text;
1671 1930
1672 delete $self->{texture};
1673
1674 $self->{last_activity} = $::NOW; 1931 $self->{last_activity} = $::NOW;
1675 $self->{text} = $text; 1932 $self->{text} = $text;
1676 1933
1677 $text =~ s/./*/g if $self->{hidden}; 1934 $text =~ s/./*/g if $self->{hidden};
1678 $self->{layout}->set_text ("$text "); 1935 $self->{layout}->set_text ("$text ");
1936 delete $self->{size_req};
1679 1937
1680 $self->_emit (changed => $self->{text}); 1938 $self->emit (changed => $self->{text});
1939
1940 $self->realloc;
1941 $self->update;
1681} 1942}
1682 1943
1683sub set_text { 1944sub set_text {
1684 my ($self, $text) = @_; 1945 my ($self, $text) = @_;
1685 1946
1686 $self->{cursor} = length $text; 1947 $self->{cursor} = length $text;
1687 $self->_set_text ($text); 1948 $self->_set_text ($text);
1688
1689 $self->realloc;
1690} 1949}
1691 1950
1692sub get_text { 1951sub get_text {
1693 $_[0]{text} 1952 $_[0]{text}
1694} 1953}
… …
1699 my ($w, $h) = $self->SUPER::size_request; 1958 my ($w, $h) = $self->SUPER::size_request;
1700 1959
1701 ($w + 1, $h) # add 1 for cursor 1960 ($w + 1, $h) # add 1 for cursor
1702} 1961}
1703 1962
1704sub key_down { 1963sub invoke_key_down {
1705 my ($self, $ev) = @_; 1964 my ($self, $ev) = @_;
1706 1965
1707 my $mod = $ev->{mod}; 1966 my $mod = $ev->{mod};
1708 my $sym = $ev->{sym}; 1967 my $sym = $ev->{sym};
1709 my $uni = $ev->{unicode}; 1968 my $uni = $ev->{unicode};
… …
1712 1971
1713 if ($uni == 8) { 1972 if ($uni == 8) {
1714 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 1973 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1715 } elsif ($uni == 127) { 1974 } elsif ($uni == 127) {
1716 substr $text, $self->{cursor}, 1, ""; 1975 substr $text, $self->{cursor}, 1, "";
1717 } elsif ($sym == CFClient::SDLK_LEFT) { 1976 } elsif ($sym == CFPlus::SDLK_LEFT) {
1718 --$self->{cursor} if $self->{cursor}; 1977 --$self->{cursor} if $self->{cursor};
1719 } elsif ($sym == CFClient::SDLK_RIGHT) { 1978 } elsif ($sym == CFPlus::SDLK_RIGHT) {
1720 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1979 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1721 } elsif ($sym == CFClient::SDLK_HOME) { 1980 } elsif ($sym == CFPlus::SDLK_HOME) {
1722 $self->{cursor} = 0; 1981 $self->{cursor} = 0;
1723 } elsif ($sym == CFClient::SDLK_END) { 1982 } elsif ($sym == CFPlus::SDLK_END) {
1724 $self->{cursor} = length $text; 1983 $self->{cursor} = length $text;
1984 } elsif ($uni == 21) { # ctrl-u
1985 $text = "";
1986 $self->{cursor} = 0;
1725 } elsif ($uni == 27) { 1987 } elsif ($uni == 27) {
1726 $self->_emit ('escape'); 1988 $self->emit ('escape');
1727 } elsif ($uni) { 1989 } elsif ($uni) {
1728 substr $text, $self->{cursor}++, 0, chr $uni; 1990 substr $text, $self->{cursor}++, 0, chr $uni;
1729 } else { 1991 } else {
1730 return 0; 1992 return 0;
1731 } 1993 }
… …
1735 $self->realloc; 1997 $self->realloc;
1736 1998
1737 1 1999 1
1738} 2000}
1739 2001
1740sub focus_in { 2002sub invoke_focus_in {
1741 my ($self) = @_; 2003 my ($self) = @_;
1742 2004
1743 $self->{last_activity} = $::NOW; 2005 $self->{last_activity} = $::NOW;
1744 2006
1745 $self->SUPER::focus_in; 2007 $self->SUPER::invoke_focus_in
1746} 2008}
1747 2009
1748sub button_down { 2010sub invoke_button_down {
1749 my ($self, $ev, $x, $y) = @_; 2011 my ($self, $ev, $x, $y) = @_;
1750 2012
1751 $self->SUPER::button_down ($ev, $x, $y); 2013 $self->SUPER::invoke_button_down ($ev, $x, $y);
1752 2014
1753 my $idx = $self->{layout}->xy_to_index ($x, $y); 2015 my $idx = $self->{layout}->xy_to_index ($x, $y);
1754 2016
1755 # byte-index to char-index 2017 # byte-index to char-index
1756 my $text = $self->{text}; 2018 my $text = $self->{text};
1757 utf8::encode $text; 2019 utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1758 $self->{cursor} = length substr $text, 0, $idx; 2020 $self->{cursor} = length $text;
1759 2021
1760 $self->_set_text ($self->{text}); 2022 $self->_set_text ($self->{text});
1761 $self->update; 2023 $self->update;
1762 2024
1763 1 2025 1
1764} 2026}
1765 2027
1766sub mouse_motion { 2028sub invoke_mouse_motion {
1767 my ($self, $ev, $x, $y) = @_; 2029 my ($self, $ev, $x, $y) = @_;
1768# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 2030# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1769 2031
1770 0 2032 1
1771} 2033}
1772 2034
1773sub _draw { 2035sub _draw {
1774 my ($self) = @_; 2036 my ($self) = @_;
1775 2037
1776 local $self->{fg} = $self->{fg}; 2038 local $self->{fg} = $self->{fg};
1777 2039
1778 if ($FOCUS == $self) { 2040 if ($FOCUS == $self) {
1779 glColor @{$self->{active_bg}}; 2041 glColor_premultiply @{$self->{active_bg}};
1780 $self->{fg} = $self->{active_fg}; 2042 $self->{fg} = $self->{active_fg};
1781 } else { 2043 } else {
1782 glColor @{$self->{bg}}; 2044 glColor_premultiply @{$self->{bg}};
1783 } 2045 }
1784 2046
1785 glEnable GL_BLEND; 2047 glEnable GL_BLEND;
1786 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2048 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1787 glBegin GL_QUADS; 2049 glBegin GL_QUADS;
1788 glVertex 0 , 0; 2050 glVertex 0 , 0;
1789 glVertex 0 , $self->{h}; 2051 glVertex 0 , $self->{h};
1790 glVertex $self->{w}, $self->{h}; 2052 glVertex $self->{w}, $self->{h};
1791 glVertex $self->{w}, 0; 2053 glVertex $self->{w}, 0;
… …
1802 utf8::encode $text; 2064 utf8::encode $text;
1803 2065
1804 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text) 2066 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)
1805 } 2067 }
1806 2068
1807 glColor @{$self->{fg}};
1808 glBegin GL_LINES; 2069 glBegin GL_LINES;
1809 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy}; 2070 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};
1810 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h}; 2071 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1811 glEnd; 2072 glEnd;
1812 } 2073 }
1813} 2074}
1814 2075
1815package CFClient::UI::Entry; 2076package CFPlus::UI::Entry;
1816 2077
1817our @ISA = CFClient::UI::EntryBase::; 2078our @ISA = CFPlus::UI::EntryBase::;
1818 2079
1819use CFClient::OpenGL; 2080use CFPlus::OpenGL;
1820 2081
1821sub key_down { 2082sub invoke_key_down {
1822 my ($self, $ev) = @_; 2083 my ($self, $ev) = @_;
1823 2084
1824 my $sym = $ev->{sym}; 2085 my $sym = $ev->{sym};
1825 2086
1826 if ($sym == 13) { 2087 if ($sym == 13) {
1827 unshift @{$self->{history}}, 2088 unshift @{$self->{history}},
1828 my $txt = $self->get_text; 2089 my $txt = $self->get_text;
2090
1829 $self->{history_pointer} = -1; 2091 $self->{history_pointer} = -1;
1830 $self->{history_saveback} = ''; 2092 $self->{history_saveback} = '';
1831 $self->_emit (activate => $txt); 2093 $self->emit (activate => $txt);
1832 $self->update; 2094 $self->update;
1833 2095
1834 } elsif ($sym == CFClient::SDLK_UP) { 2096 } elsif ($sym == CFPlus::SDLK_UP) {
1835 if ($self->{history_pointer} < 0) { 2097 if ($self->{history_pointer} < 0) {
1836 $self->{history_saveback} = $self->get_text; 2098 $self->{history_saveback} = $self->get_text;
1837 } 2099 }
1838 if (@{$self->{history} || []} > 0) { 2100 if (@{$self->{history} || []} > 0) {
1839 $self->{history_pointer}++; 2101 $self->{history_pointer}++;
… …
1841 $self->{history_pointer} = @{$self->{history} || []} - 1; 2103 $self->{history_pointer} = @{$self->{history} || []} - 1;
1842 } 2104 }
1843 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2105 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1844 } 2106 }
1845 2107
1846 } elsif ($sym == CFClient::SDLK_DOWN) { 2108 } elsif ($sym == CFPlus::SDLK_DOWN) {
1847 $self->{history_pointer}--; 2109 $self->{history_pointer}--;
1848 $self->{history_pointer} = -1 if $self->{history_pointer} < 0; 2110 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1849 2111
1850 if ($self->{history_pointer} >= 0) { 2112 if ($self->{history_pointer} >= 0) {
1851 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2113 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1852 } else { 2114 } else {
1853 $self->set_text ($self->{history_saveback}); 2115 $self->set_text ($self->{history_saveback});
1854 } 2116 }
1855 2117
1856 } else { 2118 } else {
1857 return $self->SUPER::key_down ($ev) 2119 return $self->SUPER::invoke_key_down ($ev)
1858 } 2120 }
1859 2121
1860 1 2122 1
1861} 2123}
1862 2124
1863############################################################################# 2125#############################################################################
1864 2126
1865package CFClient::UI::Button; 2127package CFPlus::UI::Button;
1866 2128
1867our @ISA = CFClient::UI::Label::; 2129our @ISA = CFPlus::UI::Label::;
1868 2130
1869use CFClient::OpenGL; 2131use CFPlus::OpenGL;
1870 2132
1871my @tex = 2133my @tex =
1872 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2134 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1873 qw(b1_button_active.png); 2135 qw(b1_button_active.png);
1874 2136
1875sub new { 2137sub new {
1876 my $class = shift; 2138 my $class = shift;
1877 2139
… …
1886 can_events => 1, 2148 can_events => 1,
1887 @_ 2149 @_
1888 ) 2150 )
1889} 2151}
1890 2152
1891sub activate { }
1892
1893sub button_up { 2153sub invoke_button_up {
1894 my ($self, $ev, $x, $y) = @_; 2154 my ($self, $ev, $x, $y) = @_;
1895 2155
1896 $self->emit ("activate") 2156 $self->emit ("activate")
1897 if $x >= 0 && $x < $self->{w} 2157 if $x >= 0 && $x < $self->{w}
1898 && $y >= 0 && $y < $self->{h}; 2158 && $y >= 0 && $y < $self->{h};
… …
1901} 2161}
1902 2162
1903sub _draw { 2163sub _draw {
1904 my ($self) = @_; 2164 my ($self) = @_;
1905 2165
1906 local $self->{fg} = $self->{fg}; 2166 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1907
1908 if ($GRAB == $self) {
1909 $self->{fg} = $self->{active_fg};
1910 }
1911 2167
1912 glEnable GL_TEXTURE_2D; 2168 glEnable GL_TEXTURE_2D;
1913 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2169 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1914 glColor 0, 0, 0, 1; 2170 glColor 0, 0, 0, 1;
1915 2171
… …
1920 $self->SUPER::_draw; 2176 $self->SUPER::_draw;
1921} 2177}
1922 2178
1923############################################################################# 2179#############################################################################
1924 2180
1925package CFClient::UI::CheckBox; 2181package CFPlus::UI::CheckBox;
1926 2182
1927our @ISA = CFClient::UI::DrawBG::; 2183our @ISA = CFPlus::UI::DrawBG::;
1928 2184
1929my @tex = 2185my @tex =
1930 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2186 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1931 qw(c1_checkbox_bg.png c1_checkbox_active.png); 2187 qw(c1_checkbox_bg.png c1_checkbox_active.png);
1932 2188
1933use CFClient::OpenGL; 2189use CFPlus::OpenGL;
1934 2190
1935sub new { 2191sub new {
1936 my $class = shift; 2192 my $class = shift;
1937 2193
1938 $class->SUPER::new ( 2194 $class->SUPER::new (
… …
1952 my ($self) = @_; 2208 my ($self) = @_;
1953 2209
1954 (6) x 2 2210 (6) x 2
1955} 2211}
1956 2212
2213sub toggle {
2214 my ($self) = @_;
2215
2216 $self->{state} = !$self->{state};
2217 $self->emit (changed => $self->{state});
2218 $self->update;
2219}
2220
1957sub button_down { 2221sub invoke_button_down {
1958 my ($self, $ev, $x, $y) = @_; 2222 my ($self, $ev, $x, $y) = @_;
1959 2223
1960 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x} 2224 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1961 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) { 2225 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1962 $self->{state} = !$self->{state}; 2226 $self->toggle;
1963 $self->_emit (changed => $self->{state});
1964 } else { 2227 } else {
1965 return 0 2228 return 0
1966 } 2229 }
1967 2230
1968 1 2231 1
… …
1988 glDisable GL_TEXTURE_2D; 2251 glDisable GL_TEXTURE_2D;
1989} 2252}
1990 2253
1991############################################################################# 2254#############################################################################
1992 2255
1993package CFClient::UI::Image; 2256package CFPlus::UI::Image;
1994 2257
1995our @ISA = CFClient::UI::Base::; 2258our @ISA = CFPlus::UI::Base::;
1996 2259
1997use CFClient::OpenGL; 2260use CFPlus::OpenGL;
1998use Carp qw/confess/;
1999 2261
2000our %loaded_images; 2262our %texture_cache;
2001 2263
2002sub new { 2264sub new {
2003 my $class = shift; 2265 my $class = shift;
2004 2266
2005 my $self = $class->SUPER::new (can_events => 0, @_); 2267 my $self = $class->SUPER::new (
2268 can_events => 0,
2269 @_,
2270 );
2006 2271
2007 $self->{image} or confess "Image has 'image' not set. This is a fatal error!"; 2272 $self->{path} || $self->{tex}
2273 or Carp::croak "'path' or 'tex' attributes required";
2008 2274
2009 $loaded_images{$self->{image}} ||= 2275 $self->{tex} ||= $texture_cache{$self->{path}} ||=
2010 new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1; 2276 new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;
2011 2277
2012 my $tex = $self->{tex} = $loaded_images{$self->{image}}; 2278 Scalar::Util::weaken $texture_cache{$self->{path}};
2013 2279
2014 Scalar::Util::weaken $loaded_images{$self->{image}}; 2280 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2015
2016 $self->{aspect} = $tex->{w} / $tex->{h};
2017 2281
2018 $self 2282 $self
2019} 2283}
2020 2284
2285sub STORABLE_freeze {
2286 my ($self, $cloning) = @_;
2287
2288 $self->{path}
2289 or die "cannot serialise CFPlus::UI::Image on non-loadable images\n";
2290
2291 $self->{path}
2292}
2293
2294sub STORABLE_attach {
2295 my ($self, $cloning, $path) = @_;
2296
2297 $self->new (path => $path)
2298}
2299
2021sub size_request { 2300sub size_request {
2022 my ($self) = @_; 2301 my ($self) = @_;
2023 2302
2024 ($self->{tex}->{w}, $self->{tex}->{h}) 2303 ($self->{tex}{w}, $self->{tex}{h})
2025} 2304}
2026 2305
2027sub _draw { 2306sub _draw {
2028 my ($self) = @_; 2307 my ($self) = @_;
2029 2308
… …
2039 } 2318 }
2040 2319
2041 glEnable GL_TEXTURE_2D; 2320 glEnable GL_TEXTURE_2D;
2042 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2321 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2043 2322
2044 $tex->draw_quad_alpha (0, 0, $w, $h); 2323 $tex->draw_quad (0, 0, $w, $h);
2045 2324
2046 glDisable GL_TEXTURE_2D; 2325 glDisable GL_TEXTURE_2D;
2047} 2326}
2048 2327
2049############################################################################# 2328#############################################################################
2050 2329
2330package CFPlus::UI::ImageButton;
2331
2332our @ISA = CFPlus::UI::Image::;
2333
2334use CFPlus::OpenGL;
2335
2336my %textures;
2337
2338sub new {
2339 my $class = shift;
2340
2341 my $self = $class->SUPER::new (
2342 padding_x => 4,
2343 padding_y => 4,
2344 fg => [1, 1, 1],
2345 active_fg => [0, 0, 1],
2346 can_hover => 1,
2347 align => 0,
2348 valign => 0,
2349 can_events => 1,
2350 @_
2351 );
2352}
2353
2354sub invoke_button_up {
2355 my ($self, $ev, $x, $y) = @_;
2356
2357 $self->emit ("activate")
2358 if $x >= 0 && $x < $self->{w}
2359 && $y >= 0 && $y < $self->{h};
2360
2361 1
2362}
2363
2364#############################################################################
2365
2051package CFClient::UI::VGauge; 2366package CFPlus::UI::VGauge;
2052 2367
2053our @ISA = CFClient::UI::Base::; 2368our @ISA = CFPlus::UI::Base::;
2054 2369
2055use List::Util qw(min max); 2370use List::Util qw(min max);
2056 2371
2057use CFClient::OpenGL; 2372use CFPlus::OpenGL;
2058 2373
2059my %tex = ( 2374my %tex = (
2060 food => [ 2375 food => [
2061 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2376 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2062 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ 2377 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2063 ], 2378 ],
2064 grace => [ 2379 grace => [
2065 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2380 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2066 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/ 2381 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
2067 ], 2382 ],
2068 hp => [ 2383 hp => [
2069 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2384 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2070 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/ 2385 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2071 ], 2386 ],
2072 mana => [ 2387 mana => [
2073 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2388 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2074 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/ 2389 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
2075 ], 2390 ],
2076); 2391);
2077 2392
2078# eg. VGauge->new (gauge => 'food'), default gauge: food 2393# eg. VGauge->new (gauge => 'food'), default gauge: food
… …
2138 my $ycut1 = max 0, min 1, $ycut; 2453 my $ycut1 = max 0, min 1, $ycut;
2139 my $ycut2 = max 0, min 1, $ycut - 1; 2454 my $ycut2 = max 0, min 1, $ycut - 1;
2140 2455
2141 my $h1 = $self->{h} * (1 - $ycut1); 2456 my $h1 = $self->{h} * (1 - $ycut1);
2142 my $h2 = $self->{h} * (1 - $ycut2); 2457 my $h2 = $self->{h} * (1 - $ycut2);
2458 my $h3 = $self->{h};
2459
2460 $_ = $_ * (284-4)/288 + 4/288 for ($h1, $h2, $h3);
2143 2461
2144 glEnable GL_BLEND; 2462 glEnable GL_BLEND;
2145 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2463 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2464 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2146 glEnable GL_TEXTURE_2D; 2465 glEnable GL_TEXTURE_2D;
2147 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2466 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2148 2467
2149 glBindTexture GL_TEXTURE_2D, $t1->{name}; 2468 glBindTexture GL_TEXTURE_2D, $t1->{name};
2150 glBegin GL_QUADS; 2469 glBegin GL_QUADS;
… …
2165 2484
2166 if ($t3) { 2485 if ($t3) {
2167 glBindTexture GL_TEXTURE_2D, $t3->{name}; 2486 glBindTexture GL_TEXTURE_2D, $t3->{name};
2168 glBegin GL_QUADS; 2487 glBegin GL_QUADS;
2169 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2; 2488 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2170 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h}; 2489 glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2171 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h}; 2490 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2172 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2; 2491 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2173 glEnd; 2492 glEnd;
2174 } 2493 }
2175 2494
2176 glDisable GL_BLEND; 2495 glDisable GL_BLEND;
2177 glDisable GL_TEXTURE_2D; 2496 glDisable GL_TEXTURE_2D;
2178} 2497}
2179 2498
2180############################################################################# 2499#############################################################################
2181 2500
2182package CFClient::UI::Gauge; 2501package CFPlus::UI::Gauge;
2183 2502
2184our @ISA = CFClient::UI::VBox::; 2503our @ISA = CFPlus::UI::VBox::;
2185 2504
2186sub new { 2505sub new {
2187 my ($class, %arg) = @_; 2506 my ($class, %arg) = @_;
2188 2507
2189 my $self = $class->SUPER::new ( 2508 my $self = $class->SUPER::new (
… …
2191 can_hover => 1, 2510 can_hover => 1,
2192 can_events => 1, 2511 can_events => 1,
2193 %arg, 2512 %arg,
2194 ); 2513 );
2195 2514
2196 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999"); 2515 $self->add ($self->{value} = new CFPlus::UI::Label valign => +1, align => 0, template => "999");
2197 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1); 2516 $self->add ($self->{gauge} = new CFPlus::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
2198 $self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999"); 2517 $self->add ($self->{max} = new CFPlus::UI::Label valign => -1, align => 0, template => "999");
2199 2518
2200 $self 2519 $self
2201} 2520}
2202 2521
2203sub set_fontsize { 2522sub set_fontsize {
… …
2224 $self->{value}->set_text ($val); 2543 $self->{value}->set_text ($val);
2225} 2544}
2226 2545
2227############################################################################# 2546#############################################################################
2228 2547
2229package CFClient::UI::Slider; 2548package CFPlus::UI::Slider;
2230 2549
2231use strict; 2550use strict;
2232 2551
2233use CFClient::OpenGL; 2552use CFPlus::OpenGL;
2234 2553
2235our @ISA = CFClient::UI::DrawBG::; 2554our @ISA = CFPlus::UI::DrawBG::;
2236 2555
2237my @tex = 2556my @tex =
2238 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 2557 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
2239 qw(s1_slider.png s1_slider_bg.png); 2558 qw(s1_slider.png s1_slider_bg.png);
2240 2559
2241sub new { 2560sub new {
2242 my $class = shift; 2561 my $class = shift;
2243 2562
… …
2264 $self->update; 2583 $self->update;
2265 2584
2266 $self 2585 $self
2267} 2586}
2268 2587
2269sub changed { }
2270
2271sub set_range { 2588sub set_range {
2272 my ($self, $range) = @_; 2589 my ($self, $range) = @_;
2273 2590
2274 ($range, $self->{range}) = ($self->{range}, $range); 2591 ($range, $self->{range}) = ($self->{range}, $range);
2275 2592
2276 $self->update
2277 if "@$range" ne "@{$self->{range}}"; 2593 if ("@$range" ne "@{$self->{range}}") {
2594 $self->update;
2595 $self->set_value ($self->{range}[0]);
2596 }
2278} 2597}
2279 2598
2280sub set_value { 2599sub set_value {
2281 my ($self, $value) = @_; 2600 my ($self, $value) = @_;
2282 2601
… …
2293 if $unit; 2612 if $unit;
2294 2613
2295 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2614 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2296 2615
2297 if ($value != $old_value) { 2616 if ($value != $old_value) {
2298 $self->_emit (changed => $value); 2617 $self->emit (changed => $value);
2299 $self->update; 2618 $self->update;
2300 } 2619 }
2301} 2620}
2302 2621
2303sub size_request { 2622sub size_request {
2304 my ($self) = @_; 2623 my ($self) = @_;
2305 2624
2306 ($self->{req_w}, $self->{req_h}) 2625 ($self->{req_w}, $self->{req_h})
2307} 2626}
2308 2627
2309sub button_down { 2628sub invoke_button_down {
2310 my ($self, $ev, $x, $y) = @_; 2629 my ($self, $ev, $x, $y) = @_;
2311 2630
2312 $self->SUPER::button_down ($ev, $x, $y); 2631 $self->SUPER::invoke_button_down ($ev, $x, $y);
2313 2632
2314 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2633 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2315 2634
2316 $self->mouse_motion ($ev, $x, $y) 2635 $self->invoke_mouse_motion ($ev, $x, $y)
2317} 2636}
2318 2637
2319sub mouse_motion { 2638sub invoke_mouse_motion {
2320 my ($self, $ev, $x, $y) = @_; 2639 my ($self, $ev, $x, $y) = @_;
2321 2640
2322 if ($GRAB == $self) { 2641 if ($GRAB == $self) {
2323 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2642 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2324 2643
… …
2332 } 2651 }
2333 2652
2334 1 2653 1
2335} 2654}
2336 2655
2656sub invoke_mouse_wheel {
2657 my ($self, $ev) = @_;
2658
2659 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
2660
2661 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * 0.2);
2662
2663 ! ! $delta
2664}
2665
2337sub update { 2666sub update {
2338 my ($self) = @_; 2667 my ($self) = @_;
2339 2668
2340 $CFClient::UI::ROOT->on_post_alloc ($self => sub { 2669 delete $self->{knob_w};
2670 $self->SUPER::update;
2671}
2672
2673sub _draw {
2674 my ($self) = @_;
2675
2676 unless ($self->{knob_w}) {
2341 $self->set_value ($self->{range}[0]); 2677 $self->set_value ($self->{range}[0]);
2342 2678
2343 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2679 my ($value, $lo, $hi, $page) = @{$self->{range}};
2344 my $range = ($hi - $page - $lo) || 1e-100; 2680 my $range = ($hi - $page - $lo) || 1e-100;
2345 2681
… …
2351 $value = ($value - $lo) / $range; 2687 $value = ($value - $lo) / $range;
2352 $value = $value * $self->{scale} + $self->{offset}; 2688 $value = $value * $self->{scale} + $self->{offset};
2353 2689
2354 $self->{knob_x} = $value - $knob_w * 0.5; 2690 $self->{knob_x} = $value - $knob_w * 0.5;
2355 $self->{knob_w} = $knob_w; 2691 $self->{knob_w} = $knob_w;
2356 }); 2692 }
2357
2358 $self->SUPER::update;
2359}
2360
2361sub _draw {
2362 my ($self) = @_;
2363 2693
2364 $self->SUPER::_draw (); 2694 $self->SUPER::_draw ();
2365 2695
2366 glScale $self->{w}, $self->{h}; 2696 glScale $self->{w}, $self->{h};
2367 2697
… …
2387 glDisable GL_TEXTURE_2D; 2717 glDisable GL_TEXTURE_2D;
2388} 2718}
2389 2719
2390############################################################################# 2720#############################################################################
2391 2721
2392package CFClient::UI::ValSlider; 2722package CFPlus::UI::ValSlider;
2393 2723
2394our @ISA = CFClient::UI::HBox::; 2724our @ISA = CFPlus::UI::HBox::;
2395 2725
2396sub new { 2726sub new {
2397 my ($class, %arg) = @_; 2727 my ($class, %arg) = @_;
2398 2728
2399 my $range = delete $arg{range}; 2729 my $range = delete $arg{range};
2400 2730
2401 my $self = $class->SUPER::new ( 2731 my $self = $class->SUPER::new (
2402 slider => (new CFClient::UI::Slider expand => 1, range => $range), 2732 slider => (new CFPlus::UI::Slider expand => 1, range => $range),
2403 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}), 2733 entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
2404 to_value => sub { shift }, 2734 to_value => sub { shift },
2405 from_value => sub { shift }, 2735 from_value => sub { shift },
2406 %arg, 2736 %arg,
2407 ); 2737 );
2408 2738
… …
2428sub set_range { shift->{slider}->set_range (@_) } 2758sub set_range { shift->{slider}->set_range (@_) }
2429sub set_value { shift->{slider}->set_value (@_) } 2759sub set_value { shift->{slider}->set_value (@_) }
2430 2760
2431############################################################################# 2761#############################################################################
2432 2762
2433package CFClient::UI::TextView; 2763package CFPlus::UI::TextScroller;
2434 2764
2435our @ISA = CFClient::UI::HBox::; 2765our @ISA = CFPlus::UI::HBox::;
2436 2766
2437use CFClient::OpenGL; 2767use CFPlus::OpenGL;
2438 2768
2439sub new { 2769sub new {
2440 my $class = shift; 2770 my $class = shift;
2441 2771
2442 my $self = $class->SUPER::new ( 2772 my $self = $class->SUPER::new (
2443 fontsize => 1, 2773 fontsize => 1,
2444 can_events => 0, 2774 can_events => 1,
2775 indent => 0,
2445 #font => default_font 2776 #font => default_font
2446 @_, 2777 @_,
2447 2778
2448 layout => (new CFClient::Layout 1), 2779 layout => (new CFPlus::Layout),
2449 par => [], 2780 par => [],
2450 height => 0, 2781 height => 0,
2451 children => [ 2782 children => [
2452 (new CFClient::UI::Empty expand => 1), 2783 (new CFPlus::UI::Empty expand => 1),
2453 (new CFClient::UI::Slider vertical => 1), 2784 (new CFPlus::UI::Slider vertical => 1),
2454 ], 2785 ],
2455 ); 2786 );
2456 2787
2457 $self->{children}[1]->connect (changed => sub { $self->update }); 2788 $self->{children}[1]->connect (changed => sub { $self->update });
2458 2789
… …
2464 2795
2465 $self->{fontsize} = $fontsize; 2796 $self->{fontsize} = $fontsize;
2466 $self->reflow; 2797 $self->reflow;
2467} 2798}
2468 2799
2800sub size_request {
2801 my ($self) = @_;
2802
2803 my ($empty, $slider) = @{ $self->{children} };
2804
2805 local $self->{children} = [$empty, $slider];
2806 $self->SUPER::size_request
2807}
2808
2469sub size_allocate { 2809sub invoke_size_allocate {
2470 my ($self, $w, $h) = @_; 2810 my ($self, $w, $h) = @_;
2471 2811
2472 $self->SUPER::size_allocate ($w, $h); 2812 my ($empty, $slider, @other) = @{ $self->{children} };
2813 $_->configure (@$_{qw(x y req_w req_h)}) for @other;
2473 2814
2474 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2815 $self->{layout}->set_font ($self->{font}) if $self->{font};
2475 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2816 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2476 $self->{layout}->set_width ($self->{children}[0]{w}); 2817 $self->{layout}->set_width ($empty->{w});
2818 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2477 2819
2478 $self->reflow; 2820 $self->reflow;
2479}
2480 2821
2481sub text_size { 2822 local $self->{children} = [$empty, $slider];
2823 $self->SUPER::invoke_size_allocate ($w, $h)
2824}
2825
2826sub invoke_mouse_wheel {
2482 my ($self, $text, $indent) = @_; 2827 my ($self, $ev) = @_;
2828
2829 return 0 unless $ev->{dy}; # only vertical movements
2830
2831 $self->{children}[1]->emit (mouse_wheel => $ev);
2832
2833 1
2834}
2835
2836sub get_layout {
2837 my ($self, $para) = @_;
2483 2838
2484 my $layout = $self->{layout}; 2839 my $layout = $self->{layout};
2485 2840
2841 $layout->set_font ($self->{font}) if $self->{font};
2842 $layout->set_foreground (@{$para->{fg}});
2486 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2843 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2487 $layout->set_width ($self->{children}[0]{w} - $indent); 2844 $layout->set_width ($self->{children}[0]{w} - $para->{indent});
2845 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2488 $layout->set_markup ($text); 2846 $layout->set_markup ($para->{markup});
2847
2848 $layout->set_shapes (
2849 map
2850 +(0, $_->baseline_shift +$_->{padding_y} - $_->{h}, $_->{w}, $_->{h}),
2851 @{$para->{widget}}
2489 2852 );
2853
2490 $layout->size 2854 $layout
2491} 2855}
2492 2856
2493sub reflow { 2857sub reflow {
2494 my ($self) = @_; 2858 my ($self) = @_;
2495 2859
… …
2502 2866
2503 # todo: base offset on lines or so, not on pixels 2867 # todo: base offset on lines or so, not on pixels
2504 $self->{children}[1]->set_value ($offset); 2868 $self->{children}[1]->set_value ($offset);
2505} 2869}
2506 2870
2871sub current_paragraph {
2872 my ($self) = @_;
2873
2874 $self->{top_paragraph} - 1
2875}
2876
2877sub scroll_to {
2878 my ($self, $para) = @_;
2879
2880 $para = List::Util::max 0, List::Util::min $#{$self->{par}}, $para;
2881
2882 $self->{scroll_to} = $para;
2883 $self->update;
2884}
2885
2507sub clear { 2886sub clear {
2508 my ($self) = @_; 2887 my ($self) = @_;
2888
2889 my (undef, undef, @other) = @{ $self->{children} };
2890 $self->remove ($_) for @other;
2509 2891
2510 $self->{par} = []; 2892 $self->{par} = [];
2511 $self->{height} = 0; 2893 $self->{height} = 0;
2512 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]); 2894 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2513} 2895}
2514 2896
2515sub add_paragraph { 2897sub add_paragraph {
2516 my ($self, $color, $text, $indent) = @_; 2898 my $self = shift;
2517 2899
2518 for my $line (split /\n/, $text) { 2900 for my $para (@_) {
2519 my ($w, $h) = $self->text_size ($line); 2901 $para = {
2902 fg => [1, 1, 1, 1],
2903 indent => 0,
2904 markup => "",
2905 widget => [],
2906 ref $para ? %$para : (markup => $para),
2907 w => 1e10,
2908 wrapped => 1,
2909 };
2910
2911 $self->add (@{ $para->{widget} }) if @{ $para->{widget} };
2912 push @{$self->{par}}, $para;
2913 }
2914
2915 $self->{need_reflow}++;
2916 $self->update;
2917}
2918
2919sub scroll_to_bottom {
2920 my ($self) = @_;
2921
2922 $self->{scroll_to} = $#{$self->{par}};
2923 $self->update;
2924}
2925
2926sub force_uptodate {
2927 my ($self) = @_;
2928
2929 if (delete $self->{need_reflow}) {
2930 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2931
2932 my $height = 0;
2933
2934 for my $para (@{$self->{par}}) {
2935 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2936 my $layout = $self->get_layout ($para);
2937 my ($w, $h) = $layout->size;
2938
2939 $para->{w} = $w + $para->{indent};
2940 $para->{h} = $h;
2941 $para->{wrapped} = $layout->has_wrapped;
2942 }
2943
2944 $para->{y} = $height;
2945 $height += $para->{h};
2946 }
2947
2520 $self->{height} += $h; 2948 $self->{height} = $height;
2521 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line]; 2949 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2522 }
2523 2950
2524 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]); 2951 delete $self->{texture};
2952 }
2953
2954 if (my $paridx = delete $self->{scroll_to}) {
2955 $self->{children}[1]->set_value ($self->{par}[$paridx]{y});
2956 }
2525} 2957}
2526 2958
2527sub update { 2959sub update {
2528 my ($self) = @_; 2960 my ($self) = @_;
2529 2961
… …
2531 2963
2532 return unless $self->{h} > 0; 2964 return unless $self->{h} > 0;
2533 2965
2534 delete $self->{texture}; 2966 delete $self->{texture};
2535 2967
2536 $ROOT->on_post_alloc ($self, sub { 2968 $ROOT->on_post_alloc ($self => sub {
2969 $self->force_uptodate;
2970
2537 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 2971 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2538 2972
2539 if (delete $self->{need_reflow}) {
2540 my $height = 0;
2541
2542 my $layout = $self->{layout};
2543
2544 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2545
2546 for (@{$self->{par}}) {
2547 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2548 $layout->set_width ($W - $_->[3]);
2549 $layout->set_markup ($_->[4]);
2550 my ($w, $h) = $layout->size;
2551 $_->[0] = $w + $_->[3];
2552 $_->[1] = $h;
2553 }
2554
2555 $height += $_->[1];
2556 }
2557
2558 $self->{height} = $height;
2559
2560 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2561
2562 delete $self->{texture};
2563 }
2564
2565 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 2973 $self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2566 glClearColor 0.5, 0.5, 0.5, 0; 2974 glClearColor 0, 0, 0, 0;
2567 glClear GL_COLOR_BUFFER_BIT; 2975 glClear GL_COLOR_BUFFER_BIT;
2568 2976
2977 package CFPlus::UI::Base;
2978 local ($draw_x, $draw_y, $draw_w, $draw_h) =
2979 (0, 0, $self->{w}, $self->{h});
2980
2981 my $top = int $self->{children}[1]{range}[0];
2982
2983 my $paridx = 0;
2984 my $top_paragraph;
2569 my $top = int $self->{children}[1]{range}[0]; 2985 my $top = int $self->{children}[1]{range}[0];
2570 2986
2571 my $y0 = $top; 2987 my $y0 = $top;
2572 my $y1 = $top + $H; 2988 my $y1 = $top + $H;
2573 2989
2574 my $y = 0;
2575
2576 my $layout = $self->{layout};
2577
2578 $layout->set_font ($self->{font}) if $self->{font};
2579
2580 glEnable GL_BLEND;
2581 #TODO# not correct in windows where rgba is forced off
2582 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2583
2584 for my $par (@{$self->{par}}) { 2990 for my $para (@{$self->{par}}) {
2585 my $h = $par->[1]; 2991 my $h = $para->{h};
2992 my $y = $para->{y};
2586 2993
2587 if ($y0 < $y + $h && $y < $y1) { 2994 if ($y0 < $y + $h && $y < $y1) {
2588 $layout->set_foreground (@{ $par->[2] }); 2995 my $layout = $self->get_layout ($para);
2589 $layout->set_width ($W - $par->[3]);
2590 $layout->set_markup ($par->[4]);
2591 2996
2592 my ($w, $h, $data, $format, $internalformat) = $layout->render; 2997 $layout->render ($para->{indent}, $y - $y0);
2593 2998
2594 glRasterPos $par->[3], $y - $y0; 2999 if (my @w = @{ $para->{widget} }) {
2595 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data; 3000 my @s = $layout->get_shapes;
3001
3002 for (@w) {
3003 my ($dx, $dy) = splice @s, 0, 2, ();
3004
3005 $_->{x} = $dx + $para->{indent};
3006 $_->{y} = $dy + $y - $y0;
3007
3008 $_->draw;
3009 }
3010 }
2596 } 3011 }
2597 3012
2598 $y += $h; 3013 $paridx++;
3014 $top_paragraph ||= $paridx if $y >= $top;
2599 } 3015 }
2600 3016
2601 glDisable GL_BLEND; 3017 $self->{top_paragraph} = $top_paragraph;
2602 }; 3018 };
2603 }); 3019 });
2604} 3020}
2605 3021
3022sub reconfigure {
3023 my ($self) = @_;
3024
3025 $self->SUPER::reconfigure;
3026
3027 $_->{w} = 1e10 for @{ $self->{par} };
3028 $self->reflow;
3029}
3030
2606sub _draw { 3031sub _draw {
2607 my ($self) = @_; 3032 my ($self) = @_;
2608 3033
2609 glEnable GL_TEXTURE_2D; 3034 glEnable GL_TEXTURE_2D;
2610 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3035 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2611 glColor 1, 1, 1, 1; 3036 glColor 0, 0, 0, 1;
2612 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 3037 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2613 glDisable GL_TEXTURE_2D; 3038 glDisable GL_TEXTURE_2D;
2614 3039
2615 $self->{children}[1]->draw; 3040 $self->{children}[1]->draw;
2616
2617} 3041}
2618 3042
2619############################################################################# 3043#############################################################################
2620 3044
2621package CFClient::UI::Animator; 3045package CFPlus::UI::Animator;
2622 3046
2623use CFClient::OpenGL; 3047use CFPlus::OpenGL;
2624 3048
2625our @ISA = CFClient::UI::Bin::; 3049our @ISA = CFPlus::UI::Bin::;
2626 3050
2627sub moveto { 3051sub moveto {
2628 my ($self, $x, $y) = @_; 3052 my ($self, $x, $y) = @_;
2629 3053
2630 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y]; 3054 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
… …
2658 glPopMatrix; 3082 glPopMatrix;
2659} 3083}
2660 3084
2661############################################################################# 3085#############################################################################
2662 3086
2663package CFClient::UI::Flopper; 3087package CFPlus::UI::Flopper;
2664 3088
2665our @ISA = CFClient::UI::Button::; 3089our @ISA = CFPlus::UI::Button::;
2666 3090
2667sub new { 3091sub new {
2668 my $class = shift; 3092 my $class = shift;
2669 3093
2670 my $self = $class->SUPER::new ( 3094 my $self = $class->SUPER::new (
… …
2682 $self->{other}->toggle_visibility; 3106 $self->{other}->toggle_visibility;
2683} 3107}
2684 3108
2685############################################################################# 3109#############################################################################
2686 3110
2687package CFClient::UI::Tooltip; 3111package CFPlus::UI::Tooltip;
2688 3112
2689our @ISA = CFClient::UI::Bin::; 3113our @ISA = CFPlus::UI::Bin::;
2690 3114
2691use CFClient::OpenGL; 3115use CFPlus::OpenGL;
2692 3116
2693sub new { 3117sub new {
2694 my $class = shift; 3118 my $class = shift;
2695 3119
2696 $class->SUPER::new ( 3120 $class->SUPER::new (
… …
2699 ) 3123 )
2700} 3124}
2701 3125
2702sub set_tooltip_from { 3126sub set_tooltip_from {
2703 my ($self, $widget) = @_; 3127 my ($self, $widget) = @_;
3128
3129 $widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
3130 if $widget->{tooltip} =~ /^#(.*)$/;
2704 3131
2705 my $tooltip = $widget->{tooltip}; 3132 my $tooltip = $widget->{tooltip};
2706 3133
2707 if ($ENV{CFPLUS_DEBUG} & 2) { 3134 if ($ENV{CFPLUS_DEBUG} & 2) {
2708 $tooltip .= "\n\n" . (ref $widget) . "\n" 3135 $tooltip .= "\n\n" . (ref $widget) . "\n"
2709 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n" 3136 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2710 . "req $widget->{req_w} $widget->{req_h}\n" 3137 . "req $widget->{req_w} $widget->{req_h}\n"
2711 . "visible $widget->{visible}"; 3138 . "visible $widget->{visible}";
2712 } 3139 }
2713 3140
3141 $tooltip =~ s/^\n+//;
3142 $tooltip =~ s/\n+$//;
3143
2714 $self->add (new CFClient::UI::Label 3144 $self->add (new CFPlus::UI::Label
2715 markup => $tooltip, 3145 markup => $tooltip,
2716 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 3146 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2717 fontsize => 0.8, 3147 fontsize => 0.8,
2718 fg => [0, 0, 0, 1], 3148 style => 1, # FLAG_INVERSE
2719 ellipsise => 0, 3149 ellipsise => 0,
2720 font => ($widget->{tooltip_font} || $::FONT_PROP), 3150 font => ($widget->{tooltip_font} || $::FONT_PROP),
2721 ); 3151 );
2722} 3152}
2723 3153
… …
2727 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 3157 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2728 3158
2729 ($w + 4, $h + 4) 3159 ($w + 4, $h + 4)
2730} 3160}
2731 3161
2732sub size_allocate { 3162sub invoke_size_allocate {
2733 my ($self, $w, $h) = @_; 3163 my ($self, $w, $h) = @_;
2734 3164
2735 $self->SUPER::size_allocate ($w - 4, $h - 4); 3165 $self->SUPER::invoke_size_allocate ($w - 4, $h - 4)
2736} 3166}
2737 3167
2738sub visibility_change { 3168sub invoke_visibility_change {
2739 my ($self, $visible) = @_; 3169 my ($self, $visible) = @_;
2740 3170
2741 return unless $visible; 3171 return unless $visible;
2742 3172
2743 $self->{root}->on_post_alloc ("move_$self" => sub { 3173 $self->{root}->on_post_alloc ("move_$self" => sub {
2744 my $widget = $self->{owner} 3174 my $widget = $self->{owner}
2745 or return; 3175 or return;
2746 3176
3177 if ($widget->{visible}) {
2747 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 3178 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2748 3179
2749 ($x, $y) = $widget->coord2global (-$self->{w}, 0) 3180 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2750 if $x + $self->{w} > $::WIDTH; 3181 if $x + $self->{w} > $self->{root}{w};
2751 3182
2752 $self->move_abs ($x, $y); 3183 $self->move_abs ($x, $y);
3184 } else {
3185 $self->hide;
3186 }
2753 }); 3187 });
2754} 3188}
2755 3189
2756sub _draw { 3190sub _draw {
2757 my ($self) = @_; 3191 my ($self) = @_;
… …
2781 $self->SUPER::_draw; 3215 $self->SUPER::_draw;
2782} 3216}
2783 3217
2784############################################################################# 3218#############################################################################
2785 3219
2786package CFClient::UI::Face; 3220package CFPlus::UI::Face;
2787 3221
2788our @ISA = CFClient::UI::Base::; 3222our @ISA = CFPlus::UI::DrawBG::;
2789 3223
2790use CFClient::OpenGL; 3224use CFPlus::OpenGL;
2791 3225
2792sub new { 3226sub new {
2793 my $class = shift; 3227 my $class = shift;
2794 3228
2795 my $self = $class->SUPER::new ( 3229 my $self = $class->SUPER::new (
… …
2830sub _draw { 3264sub _draw {
2831 my ($self) = @_; 3265 my ($self) = @_;
2832 3266
2833 return unless $::CONN; 3267 return unless $::CONN;
2834 3268
3269 $self->SUPER::_draw;
3270
2835 my $face; 3271 my $face;
2836 3272
2837 if ($self->{frame}) { 3273 if ($self->{frame}) {
2838 my $anim = $::CONN->{anim}[$self->{anim}]; 3274 my $anim = $::CONN->{anim}[$self->{anim}];
2839 3275
… …
2844 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 3280 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2845 3281
2846 if ($tex) { 3282 if ($tex) {
2847 glEnable GL_TEXTURE_2D; 3283 glEnable GL_TEXTURE_2D;
2848 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3284 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2849 glColor 1, 1, 1, 1; 3285 glColor 0, 0, 0, 1;
2850 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3286 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2851 glDisable GL_TEXTURE_2D; 3287 glDisable GL_TEXTURE_2D;
2852 } 3288 }
2853} 3289}
2854 3290
2855sub DESTROY { 3291sub destroy {
2856 my ($self) = @_; 3292 my ($self) = @_;
2857 3293
2858 $self->{timer}->cancel 3294 $self->{timer}->cancel
2859 if $self->{timer}; 3295 if $self->{timer};
2860 3296
2861 $self->SUPER::DESTROY; 3297 $self->SUPER::destroy;
2862} 3298}
2863 3299
2864############################################################################# 3300#############################################################################
2865 3301
2866package CFClient::UI::Buttonbar; 3302package CFPlus::UI::Buttonbar;
2867 3303
2868our @ISA = CFClient::UI::HBox::; 3304our @ISA = CFPlus::UI::HBox::;
2869 3305
2870# TODO: should actualyl wrap buttons and other goodies. 3306# TODO: should actually wrap buttons and other goodies.
2871 3307
2872############################################################################# 3308#############################################################################
2873 3309
2874package CFClient::UI::Menu; 3310package CFPlus::UI::Menu;
2875 3311
2876our @ISA = CFClient::UI::FancyFrame::; 3312our @ISA = CFPlus::UI::Toplevel::;
2877 3313
2878use CFClient::OpenGL; 3314use CFPlus::OpenGL;
2879 3315
2880sub new { 3316sub new {
2881 my $class = shift; 3317 my $class = shift;
2882 3318
2883 my $self = $class->SUPER::new ( 3319 my $self = $class->SUPER::new (
2884 items => [], 3320 items => [],
2885 z => 100, 3321 z => 100,
2886 @_, 3322 @_,
2887 ); 3323 );
2888 3324
2889 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3325 $self->add ($self->{vbox} = new CFPlus::UI::VBox);
2890 3326
2891 for my $item (@{ $self->{items} }) { 3327 for my $item (@{ $self->{items} }) {
2892 my ($widget, $cb) = @$item; 3328 my ($widget, $cb, $tooltip) = @$item;
2893 3329
2894 # handle various types of items, only text for now 3330 # handle various types of items, only text for now
2895 if (!ref $widget) { 3331 if (!ref $widget) {
3332 if ($widget =~ /\t/) {
3333 my ($left, $right) = split /\t/, $widget, 2;
3334
2896 $widget = new CFClient::UI::Label 3335 $widget = new CFPlus::UI::HBox
2897 can_hover => 1, 3336 can_hover => 1,
2898 can_events => 1, 3337 can_events => 1,
3338 tooltip => $tooltip,
3339 children => [
3340 (new CFPlus::UI::Label markup => $left, expand => 1),
3341 (new CFPlus::UI::Label markup => $right, align => +1),
3342 ],
3343 ;
3344
3345 } else {
3346 $widget = new CFPlus::UI::Label
3347 can_hover => 1,
3348 can_events => 1,
2899 text => $widget; 3349 markup => $widget,
3350 tooltip => $tooltip;
3351 }
2900 } 3352 }
2901 3353
2902 $self->{item}{$widget} = $item; 3354 $self->{item}{$widget} = $item;
2903 3355
2904 $self->{vbox}->add ($widget); 3356 $self->{vbox}->add ($widget);
… …
2909 3361
2910# popup given the event (must be a mouse button down event currently) 3362# popup given the event (must be a mouse button down event currently)
2911sub popup { 3363sub popup {
2912 my ($self, $ev) = @_; 3364 my ($self, $ev) = @_;
2913 3365
2914 $self->_emit ("popdown"); 3366 $self->emit ("popdown");
2915 3367
2916 # maybe save $GRAB? must be careful about events... 3368 # maybe save $GRAB? must be careful about events...
2917 $GRAB = $self; 3369 $GRAB = $self;
2918 $self->{button} = $ev->{button}; 3370 $self->{button} = $ev->{button};
2919 3371
2920 $self->show; 3372 $self->show;
2921 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 3373 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2922} 3374}
2923 3375
2924sub mouse_motion { 3376sub invoke_mouse_motion {
2925 my ($self, $ev, $x, $y) = @_; 3377 my ($self, $ev, $x, $y) = @_;
2926 3378
2927 # TODO: should use vbox->find_widget or so 3379 # TODO: should use vbox->find_widget or so
2928 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 3380 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2929 $self->{hover} = $self->{item}{$HOVER}; 3381 $self->{hover} = $self->{item}{$HOVER};
2930 3382
2931 0 3383 0
2932} 3384}
2933 3385
2934sub button_up { 3386sub invoke_button_up {
2935 my ($self, $ev, $x, $y) = @_; 3387 my ($self, $ev, $x, $y) = @_;
2936 3388
2937 if ($ev->{button} == $self->{button}) { 3389 if ($ev->{button} == $self->{button}) {
2938 undef $GRAB; 3390 undef $GRAB;
2939 $self->hide; 3391 $self->hide;
2940 3392
2941 $self->_emit ("popdown"); 3393 $self->emit ("popdown");
2942 $self->{hover}[1]->() if $self->{hover}; 3394 $self->{hover}[1]->() if $self->{hover};
2943 } else { 3395 } else {
2944 return 0 3396 return 0
2945 } 3397 }
2946 3398
2947 1 3399 1
2948} 3400}
2949 3401
2950############################################################################# 3402#############################################################################
2951 3403
2952package CFClient::UI::Multiplexer; 3404package CFPlus::UI::Multiplexer;
2953 3405
2954our @ISA = CFClient::UI::Container::; 3406our @ISA = CFPlus::UI::Container::;
2955 3407
2956sub new { 3408sub new {
2957 my $class = shift; 3409 my $class = shift;
2958 3410
2959 my $self = $class->SUPER::new ( 3411 my $self = $class->SUPER::new (
… …
2973 3425
2974 $self->{current} = $self->{children}[0] 3426 $self->{current} = $self->{children}[0]
2975 if @{ $self->{children} }; 3427 if @{ $self->{children} };
2976} 3428}
2977 3429
3430sub get_current_page {
3431 my ($self) = @_;
3432
3433 $self->{current}
3434}
3435
2978sub set_current_page { 3436sub set_current_page {
2979 my ($self, $page_or_widget) = @_; 3437 my ($self, $page_or_widget) = @_;
2980 3438
2981 my $widget = ref $page_or_widget 3439 my $widget = ref $page_or_widget
2982 ? $page_or_widget 3440 ? $page_or_widget
2983 : $self->{children}[$page_or_widget]; 3441 : $self->{children}[$page_or_widget];
2984 3442
2985 $self->{current} = $widget; 3443 $self->{current} = $widget;
2986 $self->{current}->configure (0, 0, $self->{w}, $self->{h}); 3444 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
2987 3445
2988 $self->_emit (page_changed => $self->{current}); 3446 $self->emit (page_changed => $self->{current});
2989 3447
2990 $self->realloc; 3448 $self->realloc;
2991} 3449}
2992 3450
2993sub visible_children { 3451sub visible_children {
… …
2998 my ($self) = @_; 3456 my ($self) = @_;
2999 3457
3000 $self->{current}->size_request 3458 $self->{current}->size_request
3001} 3459}
3002 3460
3003sub size_allocate { 3461sub invoke_size_allocate {
3004 my ($self, $w, $h) = @_; 3462 my ($self, $w, $h) = @_;
3005 3463
3006 $self->{current}->configure (0, 0, $w, $h); 3464 $self->{current}->configure (0, 0, $w, $h);
3465
3466 1
3007} 3467}
3008 3468
3009sub _draw { 3469sub _draw {
3010 my ($self) = @_; 3470 my ($self) = @_;
3011 3471
3012 $self->{current}->draw; 3472 $self->{current}->draw;
3013} 3473}
3014 3474
3015############################################################################# 3475#############################################################################
3016 3476
3017package CFClient::UI::Notebook; 3477package CFPlus::UI::Notebook;
3018 3478
3019our @ISA = CFClient::UI::VBox::; 3479our @ISA = CFPlus::UI::VBox::;
3020 3480
3021sub new { 3481sub new {
3022 my $class = shift; 3482 my $class = shift;
3023 3483
3024 my $self = $class->SUPER::new ( 3484 my $self = $class->SUPER::new (
3025 buttonbar => (new CFClient::UI::Buttonbar), 3485 buttonbar => (new CFPlus::UI::Buttonbar),
3026 multiplexer => (new CFClient::UI::Multiplexer expand => 1), 3486 multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3487 # filter => # will be put between multiplexer and $self
3027 @_, 3488 @_,
3028 ); 3489 );
3029 3490
3491 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3030 $self->SUPER::add ($self->{buttonbar}, $self->{multiplexer}); 3492 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3031 3493
3032 $self 3494 $self
3033} 3495}
3034 3496
3035sub add { 3497sub add {
3036 my ($self, $title, $widget, $tooltip) = @_; 3498 my ($self, $title, $widget, $tooltip) = @_;
3037 3499
3038 Scalar::Util::weaken $self; 3500 Scalar::Util::weaken $self;
3039 3501
3040 $self->{buttonbar}->add (new CFClient::UI::Button 3502 $self->{buttonbar}->add (new CFPlus::UI::Button
3041 markup => $title, 3503 markup => $title,
3042 tooltip => $tooltip, 3504 tooltip => $tooltip,
3043 on_activate => sub { $self->set_current_page ($widget) }, 3505 on_activate => sub { $self->set_current_page ($widget) },
3044 ); 3506 );
3045 3507
3046 $self->{multiplexer}->add ($widget); 3508 $self->{multiplexer}->add ($widget);
3047} 3509}
3048 3510
3511sub get_current_page {
3512 my ($self) = @_;
3513
3514 $self->{multiplexer}->get_current_page
3515}
3516
3049sub set_current_page { 3517sub set_current_page {
3050 my ($self, $page) = @_; 3518 my ($self, $page) = @_;
3051 3519
3052 $self->{multiplexer}->set_current_page ($page); 3520 $self->{multiplexer}->set_current_page ($page);
3053 $self->_emit (page_changed => $self->{multiplexer}{current}); 3521 $self->emit (page_changed => $self->{multiplexer}{current});
3054} 3522}
3055 3523
3056############################################################################# 3524#############################################################################
3057 3525
3058package CFClient::UI::Statusbox; 3526package CFPlus::UI::Selector;
3059 3527
3528use utf8;
3529
3060our @ISA = CFClient::UI::VBox::; 3530our @ISA = CFPlus::UI::Button::;
3061 3531
3062sub new { 3532sub new {
3063 my $class = shift; 3533 my $class = shift;
3064 3534
3065 $class->SUPER::new ( 3535 my $self = $class->SUPER::new (
3536 options => [], # [value, title, longdesc], ...
3537 value => undef,
3538 @_,
3539 );
3540
3541 $self->_set_value ($self->{value});
3542
3543 $self
3544}
3545
3546sub invoke_button_down {
3547 my ($self, $ev) = @_;
3548
3549 my @menu_items;
3550
3551 for (@{ $self->{options} }) {
3552 my ($value, $title, $tooltip) = @$_;
3553
3554 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3555 }
3556
3557 CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
3558}
3559
3560sub _set_value {
3561 my ($self, $value) = @_;
3562
3563 my ($item) = grep $_->[0] eq $value, @{ $self->{options} }
3564 or return;
3565
3566 $self->{value} = $item->[0];
3567 $self->set_markup ("$item->[1] ⇓");
3568 $self->set_tooltip ($item->[2]);
3569}
3570
3571sub set_value {
3572 my ($self, $value) = @_;
3573
3574 return unless $self->{value} ne $value;
3575
3576 $self->_set_value ($value);
3577 $self->emit (changed => $value);
3578}
3579
3580#############################################################################
3581
3582package CFPlus::UI::Statusbox;
3583
3584our @ISA = CFPlus::UI::VBox::;
3585
3586sub new {
3587 my $class = shift;
3588
3589 my $self = $class->SUPER::new (
3066 fontsize => 0.8, 3590 fontsize => 0.8,
3067 @_, 3591 @_,
3068 ) 3592 );
3593
3594 Scalar::Util::weaken (my $this = $self);
3595
3596 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3597
3598 $self
3069} 3599}
3070 3600
3071sub reorder { 3601sub reorder {
3072 my ($self) = @_; 3602 my ($self) = @_;
3073 my $NOW = time; 3603 my $NOW = Time::HiRes::time;
3604
3605 # freeze display when hovering over any label
3606 return if $CFPlus::UI::TOOLTIP->{owner}
3607 && grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},
3608 values %{ $self->{item} };
3074 3609
3075 while (my ($k, $v) = each %{ $self->{item} }) { 3610 while (my ($k, $v) = each %{ $self->{item} }) {
3076 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3611 delete $self->{item}{$k} if $v->{timeout} < $NOW;
3077 } 3612 }
3078 3613
… …
3081 my @items = sort { 3616 my @items = sort {
3082 $a->{pri} <=> $b->{pri} 3617 $a->{pri} <=> $b->{pri}
3083 or $b->{id} <=> $a->{id} 3618 or $b->{id} <=> $a->{id}
3084 } values %{ $self->{item} }; 3619 } values %{ $self->{item} };
3085 3620
3621 $self->{timer}->interval (1);
3622
3086 my $count = 10 + 1; 3623 my $count = 10 + 1;
3087 for my $item (@items) { 3624 for my $item (@items) {
3088 last unless --$count; 3625 last unless --$count;
3089 3626
3090 push @widgets, $item->{label} ||= do { 3627 my $label = $item->{label} ||= do {
3091 # TODO: doesn't handle markup well (read as: at all) 3628 # TODO: doesn't handle markup well (read as: at all)
3092 my $short = $item->{count} > 1 3629 my $short = $item->{count} > 1
3093 ? "<b>$item->{count} ×</b> $item->{text}" 3630 ? "<b>$item->{count} ×</b> $item->{text}"
3094 : $item->{text}; 3631 : $item->{text};
3095 3632
3096 for ($short) { 3633 for ($short) {
3097 s/^\s+//; 3634 s/^\s+//;
3098 s/\s+/ /g; 3635 s/\s+/ /g;
3099 } 3636 }
3100 3637
3101 new CFClient::UI::Label 3638 new CFPlus::UI::Label
3102 markup => $short, 3639 markup => $short,
3103 tooltip => $item->{tooltip}, 3640 tooltip => $item->{tooltip},
3104 tooltip_font => $::FONT_PROP, 3641 tooltip_font => $::FONT_PROP,
3105 tooltip_width => 0.67, 3642 tooltip_width => 0.67,
3106 fontsize => $item->{fontsize} || $self->{fontsize}, 3643 fontsize => $item->{fontsize} || $self->{fontsize},
3107 max_w => $::WIDTH * 0.44, 3644 max_w => $::WIDTH * 0.44,
3108 fg => $item->{fg}, 3645 fg => [@{ $item->{fg} }],
3109 can_events => 1, 3646 can_events => 1,
3110 can_hover => 1 3647 can_hover => 1
3111 }; 3648 };
3649
3650 if ((my $diff = $item->{timeout} - $NOW) < 2) {
3651 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
3652 $label->update;
3653 $label->set_max_size (undef, $label->{req_h} * $diff)
3654 if $diff < 1;
3655 $self->{timer}->interval (1/30);
3656 } else {
3657 $label->{fg}[3] = $item->{fg}[3] || 1;
3658 }
3659
3660 push @widgets, $label;
3112 } 3661 }
3113 3662
3114 $self->clear; 3663 $self->clear;
3115 $self->SUPER::add (reverse @widgets); 3664 $self->SUPER::add (reverse @widgets);
3116} 3665}
… …
3121 $text =~ s/^\s+//; 3670 $text =~ s/^\s+//;
3122 $text =~ s/\s+$//; 3671 $text =~ s/\s+$//;
3123 3672
3124 return unless $text; 3673 return unless $text;
3125 3674
3126 my $timeout = time + ((delete $arg{timeout}) || 60); 3675 my $timeout = (int time) + ((delete $arg{timeout}) || 60);
3127 3676
3128 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 3677 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
3129 3678
3130 if (my $item = $self->{item}{$group}) { 3679 if (my $item = $self->{item}{$group}) {
3131 if ($item->{text} eq $text) { 3680 if ($item->{text} eq $text) {
3132 $item->{count}++; 3681 $item->{count}++;
3133 } else { 3682 } else {
3134 $item->{count} = 1; 3683 $item->{count} = 1;
3135 $item->{text} = $item->{tooltip} = $text; 3684 $item->{text} = $item->{tooltip} = $text;
3136 } 3685 }
3137 $item->{id} = ++$self->{id}; 3686 $item->{id} += 0.2;#d#
3138 $item->{timeout} = $timeout; 3687 $item->{timeout} = $timeout;
3139 delete $item->{label}; 3688 delete $item->{label};
3140 } else { 3689 } else {
3141 $self->{item}{$group} = { 3690 $self->{item}{$group} = {
3142 id => ++$self->{id}, 3691 id => ++$self->{id},
… …
3148 count => 1, 3697 count => 1,
3149 %arg, 3698 %arg,
3150 }; 3699 };
3151 } 3700 }
3152 3701
3702 $ROOT->on_refresh (reorder => sub {
3153 $self->reorder; 3703 $self->reorder;
3704 });
3154} 3705}
3155 3706
3156sub reconfigure { 3707sub reconfigure {
3157 my ($self) = @_; 3708 my ($self) = @_;
3158 3709
… …
3161 3712
3162 $self->reorder; 3713 $self->reorder;
3163 $self->SUPER::reconfigure; 3714 $self->SUPER::reconfigure;
3164} 3715}
3165 3716
3717sub destroy {
3718 my ($self) = @_;
3719
3720 $self->{timer}->cancel;
3721
3722 $self->SUPER::destroy;
3723}
3724
3166############################################################################# 3725#############################################################################
3167 3726
3168package CFClient::UI::Inventory; 3727package CFPlus::UI::Inventory;
3169 3728
3170our @ISA = CFClient::UI::ScrolledWindow::; 3729our @ISA = CFPlus::UI::Table::;
3171 3730
3172sub new { 3731sub new {
3173 my $class = shift; 3732 my $class = shift;
3174 3733
3175 my $self = $class->SUPER::new ( 3734 my $self = $class->SUPER::new (
3176 scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]), 3735 col_expand => [0, 1, 0],
3736 items => [],
3177 @_, 3737 @_,
3178 ); 3738 );
3179 3739
3740 $self->set_sort_order (undef);
3741
3180 $self 3742 $self
3743}
3744
3745sub update_items {
3746 my ($self) = @_;
3747
3748 $self->clear;
3749
3750 my @item = $self->{sort}->(@{ $self->{items} });
3751
3752 my @adds;
3753 my $row = 0;
3754 for my $item ($self->{sort}->(@{ $self->{items} })) {
3755 CFPlus::Item::update_widgets $item;
3756
3757 push @adds, 0, $row, $item->{face_widget};
3758 push @adds, 1, $row, $item->{desc_widget};
3759 push @adds, 2, $row, $item->{weight_widget};
3760
3761 $row++;
3762 }
3763
3764 $self->add (@adds);
3765}
3766
3767sub set_sort_order {
3768 my ($self, $order) = @_;
3769
3770 $self->{sort} = $order ||= sub {
3771 sort {
3772 $a->{type} <=> $b->{type}
3773 or $a->{name} cmp $b->{name}
3774 } @_
3775 };
3776
3777 $self->update_items;
3181} 3778}
3182 3779
3183sub set_items { 3780sub set_items {
3184 my ($self, $items) = @_; 3781 my ($self, $items) = @_;
3185 3782
3186 $self->{scrolled}->clear; 3783 $self->{items} = [$items ? values %$items : ()];
3187 return unless $items; 3784 $self->update_items;
3188
3189 my @items = sort {
3190 ($a->{type} <=> $b->{type})
3191 or ($a->{name} cmp $b->{name})
3192 } @$items;
3193
3194 $self->{real_items} = \@items;
3195
3196 my $row = 0;
3197 for my $item (@items) {
3198 CFClient::Item::update_widgets $item;
3199
3200 $self->{scrolled}->add (0, $row, $item->{face_widget});
3201 $self->{scrolled}->add (1, $row, $item->{desc_widget});
3202 $self->{scrolled}->add (2, $row, $item->{weight_widget});
3203
3204 $row++;
3205 }
3206} 3785}
3207 3786
3208############################################################################# 3787#############################################################################
3209 3788
3210package CFClient::UI::BindEditor;
3211
3212our @ISA = CFClient::UI::FancyFrame::;
3213
3214sub new {
3215 my $class = shift;
3216
3217 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3218
3219 $self->add (my $vb = new CFClient::UI::VBox);
3220
3221
3222 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3223 text => "start recording",
3224 tooltip => "Start/Stops recording of actions."
3225 ."All subsequent actions after the recording started will be captured."
3226 ."The actions are displayed after the record was stopped."
3227 ."To bind the action you have to click on the 'Bind' button",
3228 on_activate => sub {
3229 unless ($self->{recording}) {
3230 $self->start;
3231 } else {
3232 $self->stop;
3233 }
3234 });
3235
3236 $vb->add (new CFClient::UI::Label text => "Actions:");
3237 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3238
3239 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3240 $vb->add (my $hb = new CFClient::UI::HBox);
3241 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3242 $hb->add (new CFClient::UI::Button
3243 text => "bind",
3244 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3245 on_activate => sub {
3246 $self->ask_for_bind;
3247 });
3248
3249 $vb->add (my $hb = new CFClient::UI::HBox);
3250 $hb->add (new CFClient::UI::Button
3251 text => "ok",
3252 expand => 1,
3253 tooltip => "This closes the binding editor and saves the binding",
3254 on_activate => sub {
3255 $self->hide;
3256 $self->commit;
3257 });
3258
3259 $hb->add (new CFClient::UI::Button
3260 text => "cancel",
3261 expand => 1,
3262 tooltip => "This closes the binding editor without saving",
3263 on_activate => sub {
3264 $self->hide;
3265 $self->{binding_cancel}->()
3266 if $self->{binding_cancel};
3267 });
3268
3269 $self->update_binding_widgets;
3270
3271 $self
3272}
3273
3274sub commit {
3275 my ($self) = @_;
3276 my ($mod, $sym, $cmds) = $self->get_binding;
3277 if ($sym != 0 && @$cmds > 0) {
3278 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3279 ."'. Don't forget 'Save Config'!");
3280 $self->{binding_change}->($mod, $sym, $cmds)
3281 if $self->{binding_change};
3282 } else {
3283 $::STATUSBOX->add ("No action bound, no key or action specified!");
3284 $self->{binding_cancel}->()
3285 if $self->{binding_cancel};
3286 }
3287}
3288
3289sub start {
3290 my ($self) = @_;
3291
3292 $self->{rec_btn}->set_text ("stop recording");
3293 $self->{recording} = 1;
3294 $self->clear_command_list;
3295 $::CONN->start_record if $::CONN;
3296}
3297
3298sub stop {
3299 my ($self) = @_;
3300
3301 $self->{rec_btn}->set_text ("start recording");
3302 $self->{recording} = 0;
3303
3304 my $rec;
3305 $rec = $::CONN->stop_record if $::CONN;
3306 return unless ref $rec eq 'ARRAY';
3307 $self->set_command_list ($rec);
3308}
3309
3310
3311sub ask_for_bind_and_commit {
3312 my ($self) = @_;
3313 $self->ask_for_bind (1);
3314}
3315
3316sub ask_for_bind {
3317 my ($self, $commit) = @_;
3318
3319 CFClient::Binder::open_binding_dialog (sub {
3320 my ($mod, $sym) = @_;
3321 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3322 $self->update_binding_widgets;
3323 $self->commit if $commit;
3324 });
3325}
3326
3327# $mod and $sym are the modifiers and key symbol
3328# $cmds is a array ref of strings (the commands)
3329# $cb is the callback that is executed on OK
3330# $ccb is the callback that is executed on CANCEL and
3331# when the binding was unsuccessful on OK
3332sub set_binding {
3333 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3334
3335 $self->clear_command_list;
3336 $self->{recording} = 0;
3337 $self->{rec_btn}->set_text ("start recording");
3338
3339 $self->{binding} = [$mod, $sym];
3340 $self->{commands} = $cmds;
3341
3342 $self->{binding_change} = $cb;
3343 $self->{binding_cancel} = $ccb;
3344
3345 $self->update_binding_widgets;
3346}
3347
3348# this is a shortcut method that asks for a binding
3349# and then just binds it.
3350sub do_quick_binding {
3351 my ($self, $cmds) = @_;
3352 $self->set_binding (undef, undef, $cmds, sub {
3353 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3354 });
3355 $self->ask_for_bind (1);
3356}
3357
3358sub update_binding_widgets {
3359 my ($self) = @_;
3360 my ($mod, $sym, $cmds) = $self->get_binding;
3361 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3362 $self->set_command_list ($cmds);
3363}
3364
3365sub get_binding {
3366 my ($self) = @_;
3367 return (
3368 $self->{binding}->[0],
3369 $self->{binding}->[1],
3370 [ grep { defined $_ } @{$self->{commands}} ]
3371 );
3372}
3373
3374sub clear_command_list {
3375 my ($self) = @_;
3376 $self->{cmdbox}->clear ();
3377}
3378
3379sub set_command_list {
3380 my ($self, $cmds) = @_;
3381
3382 $self->{cmdbox}->clear ();
3383 $self->{commands} = $cmds;
3384
3385 my $idx = 0;
3386
3387 for (@$cmds) {
3388 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3389
3390 my $i = $idx;
3391 $hb->add (new CFClient::UI::Label text => $_);
3392 $hb->add (new CFClient::UI::Button
3393 text => "delete",
3394 tooltip => "Deletes the action from the record",
3395 on_activate => sub {
3396 $self->{cmdbox}->remove ($hb);
3397 $cmds->[$i] = undef;
3398 });
3399
3400
3401 $idx++
3402 }
3403}
3404
3405#############################################################################
3406
3407package CFClient::UI::SpellList; 3789package CFPlus::UI::SpellList;
3408 3790
3409our @ISA = CFClient::UI::ScrolledWindow::; 3791our @ISA = CFPlus::UI::Table::;
3410 3792
3411sub new { 3793sub new {
3412 my $class = shift; 3794 my $class = shift;
3413 3795
3414 my $self = $class->SUPER::new ( 3796 my $self = $class->SUPER::new (
3415 binding => [], 3797 binding => [],
3416 commands => [], 3798 commands => [],
3417 scrolled => (new CFClient::UI::Table),
3418 @_, 3799 @_,
3419 ) 3800 )
3420} 3801}
3421 3802
3422# XXX: Do sorting? Argl... 3803my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3804
3805my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3806 "<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
3807my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3808 "<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3809my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3810 "<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3811my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3812 "<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3813my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3814 "<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3815
3816sub rebuild_spell_list {
3817 my ($self) = @_;
3818
3819 $CFPlus::UI::ROOT->on_refresh ($self => sub {
3820 $self->clear;
3821
3822 return unless $::CONN;
3823
3824 $self->add (1, 0, new CFPlus::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3825 $self->add (2, 0, new CFPlus::UI::Label text => "Skill", @TOOLTIP_SKILL);
3826 $self->add (3, 0, new CFPlus::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3827 $self->add (4, 0, new CFPlus::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3828 $self->add (5, 0, new CFPlus::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3829
3830 my $row = 0;
3831
3832 for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3833 my $spell = $self->{spell}{$_};
3834
3835 $row++;
3836
3837 my $spell_cb = sub {
3838 my ($widget, $ev) = @_;
3839
3840 if ($ev->{button} == 1) {
3841 $::CONN->user_send ("cast $spell->{name}");
3842 } elsif ($ev->{button} == 2) {
3843 $::CONN->user_send ("invoke $spell->{name}");
3844 } elsif ($ev->{button} == 3) {
3845 (new CFPlus::UI::Menu
3846 items => [
3847 ["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3848 ["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3849 ],
3850 )->popup ($ev);
3851 } else {
3852 return 0;
3853 }
3854
3855 1
3856 };
3857
3858 my $tooltip = (CFPlus::asxml $spell->{message}) . $TOOLTIP_ALL;
3859
3860 #TODO: add path info to tooltip
3861 #$self->add (6, $row, new CFPlus::UI::Label text => $spell->{path});
3862
3863 $self->add (0, $row, new CFPlus::UI::Face
3864 face => $spell->{face},
3865 can_hover => 1,
3866 can_events => 1,
3867 tooltip => $tooltip,
3868 on_button_down => $spell_cb,
3869 );
3870
3871 $self->add (1, $row, new CFPlus::UI::Label
3872 expand => 1,
3873 text => $spell->{name},
3874 can_hover => 1,
3875 can_events => 1,
3876 tooltip => $tooltip,
3877 on_button_down => $spell_cb,
3878 );
3879
3880 $self->add (2, $row, new CFPlus::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3881 $self->add (3, $row, new CFPlus::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3882 $self->add (4, $row, new CFPlus::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3883 $self->add (5, $row, new CFPlus::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3884 }
3885 });
3886}
3887
3423sub add_spell { 3888sub add_spell {
3424 my ($self, $spell) = @_; 3889 my ($self, $spell) = @_;
3890
3425 $self->{spells}->{$spell->{name}} = $spell; 3891 $self->{spell}->{$spell->{name}} = $spell;
3426 3892 $self->rebuild_spell_list;
3427 $self->{scrolled}->add (0, $self->{tbl_idx}, new CFClient::UI::Face
3428 face => $spell->{face},
3429 can_hover => 1,
3430 can_events => 1,
3431 tooltip => $spell->{message});
3432
3433 $self->{scrolled}->add (1, $self->{tbl_idx}, new CFClient::UI::Label
3434 text => $spell->{name},
3435 can_hover => 1,
3436 can_events => 1,
3437 tooltip => $spell->{message},
3438 expand => 1);
3439
3440 $self->{scrolled}->add (2, $self->{tbl_idx}, new CFClient::UI::Label
3441 text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
3442 $spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
3443 expand => 1);
3444
3445 $self->{scrolled}->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
3446 text => "bind to key",
3447 on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
3448}
3449
3450sub rebuild_spell_list {
3451 my ($self) = @_;
3452 $self->{tbl_idx} = 0;
3453 $self->add_spell ($_) for values %{$self->{spells}};
3454} 3893}
3455 3894
3456sub remove_spell { 3895sub remove_spell {
3457 my ($self, $spell) = @_; 3896 my ($self, $spell) = @_;
3897
3458 delete $self->{spells}->{$spell->{name}}; 3898 delete $self->{spell}->{$spell->{name}};
3459 $self->rebuild_spell_list; 3899 $self->rebuild_spell_list;
3460} 3900}
3461 3901
3902sub clear_spells {
3903 my ($self) = @_;
3904
3905 $self->{spell} = {};
3906 $self->rebuild_spell_list;
3907}
3908
3462############################################################################# 3909#############################################################################
3463 3910
3464package CFClient::UI::Root; 3911package CFPlus::UI::Root;
3465 3912
3466our @ISA = CFClient::UI::Container::; 3913our @ISA = CFPlus::UI::Container::;
3467 3914
3915use List::Util qw(min max);
3916
3468use CFClient::OpenGL; 3917use CFPlus::OpenGL;
3469 3918
3470sub new { 3919sub new {
3471 my $class = shift; 3920 my $class = shift;
3472 3921
3473 my $self = $class->SUPER::new ( 3922 my $self = $class->SUPER::new (
… …
3498 $coord = $max - $size if $coord > $max - $size; 3947 $coord = $max - $size if $coord > $max - $size;
3499 3948
3500 int $coord + 0.5 3949 int $coord + 0.5
3501} 3950}
3502 3951
3503sub size_allocate { 3952sub invoke_size_allocate {
3504 my ($self, $w, $h) = @_; 3953 my ($self, $w, $h) = @_;
3505 3954
3506 for my $child ($self->children) { 3955 for my $child ($self->children) {
3507 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3956 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3508 3957
… …
3512 $X = _to_pixel $X, $W, $self->{w}; 3961 $X = _to_pixel $X, $W, $self->{w};
3513 $Y = _to_pixel $Y, $H, $self->{h}; 3962 $Y = _to_pixel $Y, $H, $self->{h};
3514 3963
3515 $child->configure ($X, $Y, $W, $H); 3964 $child->configure ($X, $Y, $W, $H);
3516 } 3965 }
3966
3967 1
3517} 3968}
3518 3969
3519sub coord2local { 3970sub coord2local {
3520 my ($self, $x, $y) = @_; 3971 my ($self, $x, $y) = @_;
3521 3972
… …
3606 4057
3607 delete $queue{$widget+0}; 4058 delete $queue{$widget+0};
3608 4059
3609 my ($w, $h) = $widget->size_request; 4060 my ($w, $h) = $widget->size_request;
3610 4061
3611 $w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2; 4062 $w = max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3612 $h = List::Util::max $widget->{min_h}, $h + $widget->{padding_y} * 2; 4063 $h = max $widget->{min_h}, $h + $widget->{padding_y} * 2;
4064
4065 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
4066 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3613 4067
3614 $w = $widget->{force_w} if exists $widget->{force_w}; 4068 $w = $widget->{force_w} if exists $widget->{force_w};
3615 $h = $widget->{force_h} if exists $widget->{force_h}; 4069 $h = $widget->{force_h} if exists $widget->{force_h};
3616 4070
3617 if ($widget->{req_w} != $w || $widget->{req_h} != $h 4071 if ($widget->{req_w} != $w || $widget->{req_h} != $h
… …
3643 4097
3644 my ($w, $h) = @$widget{qw(alloc_w alloc_h)}; 4098 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3645 4099
3646 $w = 0 if $w < 0; 4100 $w = 0 if $w < 0;
3647 $h = 0 if $h < 0; 4101 $h = 0 if $h < 0;
4102
4103 $w = max $widget->{min_w}, $w;
4104 $h = max $widget->{min_h}, $h;
4105
4106# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
4107# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
4108
4109 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
4110 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3648 4111
3649 $w = int $w + 0.5; 4112 $w = int $w + 0.5;
3650 $h = int $h + 0.5; 4113 $h = int $h + 0.5;
3651 4114
3652 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) { 4115 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
… …
3676 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 4139 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3677 glMatrixMode GL_MODELVIEW; 4140 glMatrixMode GL_MODELVIEW;
3678 glLoadIdentity; 4141 glLoadIdentity;
3679 4142
3680 { 4143 {
3681 package CFClient::UI::Base; 4144 package CFPlus::UI::Base;
3682 4145
3683 ($draw_x, $draw_y, $draw_w, $draw_h) = 4146 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3684 (0, 0, $self->{w}, $self->{h}); 4147 (0, 0, $self->{w}, $self->{h});
3685 }
3686 4148
3687 $self->_draw; 4149 $self->_draw;
4150 }
3688} 4151}
3689 4152
3690############################################################################# 4153#############################################################################
3691 4154
3692package CFClient::UI; 4155package CFPlus::UI;
3693 4156
3694$ROOT = new CFClient::UI::Root; 4157$ROOT = new CFPlus::UI::Root;
3695$TOOLTIP = new CFClient::UI::Tooltip z => 900; 4158$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
3696 4159
36971 41601
3698 4161

Diff Legend

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