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.253 by root, Sun May 28 23:28:12 2006 UTC vs.
Revision 1.302 by root, Mon Jun 12 13:26:14 2006 UTC

… …
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 CFClient;
10use CFClient::Texture; 11use CFClient::Texture;
11 12
12our ($FOCUS, $HOVER, $GRAB); # various widgets 13our ($FOCUS, $HOVER, $GRAB); # various widgets
… …
16our $TOOLTIP; 17our $TOOLTIP;
17our $BUTTON_STATE; 18our $BUTTON_STATE;
18 19
19our %WIDGET; # all widgets, weak-referenced 20our %WIDGET; # all widgets, weak-referenced
20 21
21sub get_layout { 22our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub {
22 for (grep { $_->{name} } values %WIDGET) {
23 $LAYOUT->{$_->{name}} = {
24 x => $_->{x} / $::WIDTH,
25 y => $_->{y} / $::HEIGHT,
26 w => $_->{w} / $::WIDTH,
27 h => $_->{h} / $::HEIGHT
28 };
29 }
30
31 return $LAYOUT;
32}
33
34sub set_layout {
35 my ($layout) = @_;
36 $LAYOUT = $layout;
37}
38
39sub check_tooltip {
40 if (!$GRAB) { 23 if (!$GRAB) {
41 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) { 24 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
42 if (length $widget->{tooltip}) { 25 if (length $widget->{tooltip}) {
43
44 if ($TOOLTIP->{owner} != $widget) { 26 if ($TOOLTIP->{owner} != $widget) {
45 $TOOLTIP->hide; 27 $TOOLTIP->hide;
46 28
47 $TOOLTIP->{owner} = $widget; 29 $TOOLTIP->{owner} = $widget;
30
31 return if $ENV{CFPLUS_DEBUG} & 8;
48 32
49 my $tip = $widget->{tooltip}; 33 my $tip = $widget->{tooltip};
50 34
51 $tip = $tip->($widget) if CODE:: eq ref $tip; 35 $tip = $tip->($widget) if CODE:: eq ref $tip;
52 36
… …
59 } 43 }
60 } 44 }
61 45
62 $TOOLTIP->hide; 46 $TOOLTIP->hide;
63 delete $TOOLTIP->{owner}; 47 delete $TOOLTIP->{owner};
48});
49
50sub get_layout {
51 my $layout;
52
53 for (grep { $_->{name} } values %WIDGET) {
54 my $win = $layout->{$_->{name}} = { };
55
56 $win->{x} = ($_->{x} + $_->{w} * 0.5) / $::WIDTH if $_->{x} =~ /^[0-9.]+$/;
57 $win->{y} = ($_->{y} + $_->{h} * 0.5) / $::HEIGHT if $_->{y} =~ /^[0-9.]+$/;
58 $win->{w} = $_->{w} / $::WIDTH if defined $_->{w};
59 $win->{h} = $_->{h} / $::HEIGHT if defined $_->{h};
60
61 $win->{show} = $_->{visible} && $_->{is_toplevel};
62 }
63
64 $layout
65}
66
67sub set_layout {
68 my ($layout) = @_;
69
70 $LAYOUT = $layout;
64} 71}
65 72
66# class methods for events 73# class methods for events
67sub feed_sdl_key_down_event { 74sub feed_sdl_key_down_event {
68 $FOCUS->emit (key_down => $_[0]) 75 $FOCUS->emit (key_down => $_[0])
… …
82 my $widget = $ROOT->find_widget ($x, $y); 89 my $widget = $ROOT->find_widget ($x, $y);
83 90
84 $GRAB = $widget; 91 $GRAB = $widget;
85 $GRAB->update if $GRAB; 92 $GRAB->update if $GRAB;
86 93
87 check_tooltip; 94 $TOOLTIP_WATCHER->cb->();
88 } 95 }
89 96
90 $BUTTON_STATE |= 1 << ($ev->{button} - 1); 97 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
91 98
92 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y)) 99 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))
… …
107 if (!$BUTTON_STATE) { 114 if (!$BUTTON_STATE) {
108 my $grab = $GRAB; undef $GRAB; 115 my $grab = $GRAB; undef $GRAB;
109 $grab->update if $grab; 116 $grab->update if $grab;
110 $GRAB->update if $GRAB; 117 $GRAB->update if $GRAB;
111 118
112 check_tooltip; 119 $TOOLTIP_WATCHER->cb->();
113 } 120 }
114} 121}
115 122
116sub feed_sdl_motion_event { 123sub feed_sdl_motion_event {
117 my ($ev) = @_; 124 my ($ev) = @_;
… …
123 my $hover = $HOVER; $HOVER = $widget; 130 my $hover = $HOVER; $HOVER = $widget;
124 131
125 $hover->update if $hover && $hover->{can_hover}; 132 $hover->update if $hover && $hover->{can_hover};
126 $HOVER->update if $HOVER && $HOVER->{can_hover}; 133 $HOVER->update if $HOVER && $HOVER->{can_hover};
127 134
128 check_tooltip; 135 $TOOLTIP_WATCHER->start;
129 } 136 }
130 137
131 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y)) 138 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
132 if $HOVER; 139 if $HOVER;
133} 140}
… …
165sub rescale_widgets { 172sub rescale_widgets {
166 my ($sx, $sy) = @_; 173 my ($sx, $sy) = @_;
167 174
168 for my $widget (values %WIDGET) { 175 for my $widget (values %WIDGET) {
169 if ($widget->{is_toplevel}) { 176 if ($widget->{is_toplevel}) {
177 $widget->{x} += int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
178 $widget->{y} += int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
179
170 $widget->{x} = int 0.5 + $widget->{x} * $sx if exists $widget->{x}; 180 $widget->{x} = int 0.5 + $widget->{x} * $sx if $widget->{x} =~ /^[0-9.]+$/;
171 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w}; 181 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};
172 $widget->{req_w} = int 0.5 + $widget->{req_w} * $sx if exists $widget->{req_w}; 182 $widget->{force_w} = int 0.5 + $widget->{force_w} * $sx if exists $widget->{force_w};
173 $widget->{y} = int 0.5 + $widget->{y} * $sy if exists $widget->{y}; 183 $widget->{y} = int 0.5 + $widget->{y} * $sy if $widget->{y} =~ /^[0-9.]+$/;
174 $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h}; 184 $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};
175 $widget->{req_h} = int 0.5 + $widget->{req_h} * $sy if exists $widget->{req_h}; 185 $widget->{force_h} = int 0.5 + $widget->{force_h} * $sy if exists $widget->{force_h};
186
187 $widget->{x} -= int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
188 $widget->{y} -= int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
189
176 } 190 }
177 } 191 }
178 192
179 reconfigure_widgets; 193 reconfigure_widgets;
180} 194}
… …
189 203
190sub new { 204sub new {
191 my $class = shift; 205 my $class = shift;
192 206
193 my $self = bless { 207 my $self = bless {
194 x => 0, 208 x => "center",
195 y => 0, 209 y => "center",
196 z => 0, 210 z => 0,
211 w => undef,
212 h => undef,
197 can_events => 1, 213 can_events => 1,
198 @_ 214 @_
199 }, $class; 215 }, $class;
216
217 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
200 218
201 for (keys %$self) { 219 for (keys %$self) {
202 if (/^on_(.*)$/) { 220 if (/^on_(.*)$/) {
203 $self->connect ($1 => delete $self->{$_}); 221 $self->connect ($1 => delete $self->{$_});
204 } 222 }
205 } 223 }
206 224
207 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
208
209 if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) { 225 if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {
210 $self->{req_x} = $layout->{x} * $::WIDTH; 226 $self->{x} = $layout->{x} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{x};
211 $self->{req_y} = $layout->{y} * $::HEIGHT; 227 $self->{y} = $layout->{y} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{y};
212 $self->{def_w} = ($layout->{w} != 0 ? $layout->{w} : 1) * $::WIDTH; 228 $self->{force_w} = $layout->{w} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{w};
213 $self->{def_h} = ($layout->{h} != 0 ? $layout->{h} : 1) * $::HEIGHT; 229 $self->{force_h} = $layout->{h} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{h};
230
231 $self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
232 $self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
233
234 $self->show if $layout->{show};
214 } 235 }
215 236
216 $self 237 $self
217} 238}
218 239
… …
229 return if $self->{parent}; 250 return if $self->{parent};
230 251
231 $CFClient::UI::ROOT->add ($self); 252 $CFClient::UI::ROOT->add ($self);
232} 253}
233 254
234sub center {
235 my ($self) = @_;
236
237 $CFClient::UI::ROOT->on_post_alloc (
238 "center_$self" => sub {
239 $self->move (($self->{parent}{w} - $self->{w}) * 0.5, ($self->{parent}{h} - $self->{h}) * 0.5);
240 },
241 );
242
243 $self->update;
244}
245
246sub set_visible { 255sub set_visible {
247 my ($self) = @_; 256 my ($self) = @_;
248 257
249 return if $self->{visible}; 258 return if $self->{visible};
250 259
… …
263 272
264 return unless $self->{visible}; 273 return unless $self->{visible};
265 274
266 $_->set_invisible for $self->children; 275 $_->set_invisible for $self->children;
267 276
277 delete $self->{visible};
268 delete $self->{root}; 278 delete $self->{root};
269 delete $self->{visible};
270 279
271 undef $GRAB if $GRAB == $self; 280 undef $GRAB if $GRAB == $self;
272 undef $HOVER if $HOVER == $self; 281 undef $HOVER if $HOVER == $self;
273 282
274 CFClient::UI::check_tooltip 283 $CFClient::UI::TOOLTIP_WATCHER->cb->()
275 if $TOOLTIP->{owner} == $self; 284 if $TOOLTIP->{owner} == $self;
276 285
277 $self->focus_out; 286 $self->focus_out;
278 287
279 $self->emit (visibility_change => 0); 288 $self->emit (visibility_change => 0);
… …
303 312
304 $self->{parent}->remove ($self) 313 $self->{parent}->remove ($self)
305 if $self->{parent}; 314 if $self->{parent};
306} 315}
307 316
308sub move { 317sub move_abs {
309 my ($self, $x, $y, $z) = @_; 318 my ($self, $x, $y, $z) = @_;
310 319
311 $self->{x} = int $x; 320 $self->{x} = List::Util::max 0, List::Util::min $self->{root}{w} - $self->{w}, int $x;
312 $self->{y} = int $y; 321 $self->{y} = List::Util::max 0, List::Util::min $self->{root}{h} - $self->{h}, int $y;
313 $self->{z} = $z if defined $z; 322 $self->{z} = $z if defined $z;
314 323
315 $self->update; 324 $self->update;
316} 325}
317 326
318sub set_size { 327sub set_size {
319 my ($self, $w, $h) = @_; 328 my ($self, $w, $h) = @_;
320 329
321 $self->{def_w} = $w; 330 $self->{force_w} = $w;
322 $self->{def_h} = $h; 331 $self->{force_h} = $h;
323 332
324 $self->realloc; 333 $self->realloc;
325} 334}
326 335
327sub size_request { 336sub size_request {
… …
331 340
332sub configure { 341sub configure {
333 my ($self, $x, $y, $w, $h) = @_; 342 my ($self, $x, $y, $w, $h) = @_;
334 343
335 if ($self->{aspect}) { 344 if ($self->{aspect}) {
345 my ($ow, $oh) = ($w, $h);
346
336 my $w2 = List::Util::min $w, int $h * $self->{aspect}; 347 $w = List::Util::min $w, int $h * $self->{aspect};
337 my $h2 = List::Util::min $h, int $w / $self->{aspect}; 348 $h = List::Util::min $h, int $w / $self->{aspect};
338 349
339 # use alignment to adjust x, y 350 # use alignment to adjust x, y
340 351
341 $x += int +($w - $w2) * 0.5; 352 $x += int 0.5 * ($ow - $w);
342 $y += int +($h - $h2) * 0.5; 353 $y += int 0.5 * ($oh - $h);
343
344 ($w, $h) = ($w2, $h2);
345 } 354 }
346 355
347 if ($self->{x} != $x || $self->{y} != $y) { 356 if ($self->{x} ne $x || $self->{y} ne $y) {
348 $self->{x} = $x; 357 $self->{x} = $x;
349 $self->{y} = $y; 358 $self->{y} = $y;
350 $self->update; 359 $self->update;
351 } 360 }
352 361
353 if ($self->{w} != $w || $self->{h} != $h) { 362 if ($self->{alloc_w} != $w || $self->{alloc_h} != $h) {
354 return unless $self->{visible}; 363 return unless $self->{visible};
355 364
365 $self->{alloc_w} = $w;
366 $self->{alloc_h} = $h;
367
356 $self->{root}->{size_alloc}{$self+0} = [$self, $w, $h]; 368 $self->{root}{size_alloc}{$self+0} = $self;
357 } 369 }
358} 370}
359 371
360sub size_allocate { 372sub size_allocate {
361 # nothing to be done 373 # nothing to be done
362} 374}
363 375
364sub children { 376sub children {
377 # nop
378}
379
380sub visible_children {
381 $_[0]->children
365} 382}
366 383
367sub set_max_size { 384sub set_max_size {
368 my ($self, $w, $h) = @_; 385 my ($self, $w, $h) = @_;
369 386
370 delete $self->{max_w}; $self->{max_w} = $w if $w; 387 $self->{max_w} = int $w if defined $w;
371 delete $self->{max_h}; $self->{max_h} = $h if $h; 388 $self->{max_h} = int $h if defined $h;
389
390 $self->realloc;
372} 391}
373 392
374sub set_tooltip { 393sub set_tooltip {
375 my ($self, $tooltip) = @_; 394 my ($self, $tooltip) = @_;
376 395
… …
381 400
382 $self->{tooltip} = $tooltip; 401 $self->{tooltip} = $tooltip;
383 402
384 if ($CFClient::UI::TOOLTIP->{owner} == $self) { 403 if ($CFClient::UI::TOOLTIP->{owner} == $self) {
385 delete $CFClient::UI::TOOLTIP->{owner}; 404 delete $CFClient::UI::TOOLTIP->{owner};
386 CFClient::UI::check_tooltip; 405 $CFClient::UI::TOOLTIP_WATCHER->cb->();
387 } 406 }
388} 407}
389 408
390# translate global coordinates to local coordinate system 409# translate global coordinates to local coordinate system
391sub coord2local { 410sub coord2local {
… …
428 447
429 $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus 448 $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus
430 unless $FOCUS; 449 unless $FOCUS;
431} 450}
432 451
433sub mouse_motion { } 452sub mouse_motion { 0 }
434sub button_up { } 453sub button_up { 0 }
435sub key_down { } 454sub key_down { 0 }
436sub key_up { } 455sub key_up { 0 }
437 456
438sub button_down { 457sub button_down {
439 my ($self, $ev, $x, $y) = @_; 458 my ($self, $ev, $x, $y) = @_;
440 459
441 $self->focus_in; 460 $self->focus_in;
442}
443 461
444sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} } 462 0
445sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } 463}
446sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} }
447sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} }
448sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} }
449 464
450sub find_widget { 465sub find_widget {
451 my ($self, $x, $y) = @_; 466 my ($self, $x, $y) = @_;
452 467
453 return () unless $self->{can_events}; 468 return () unless $self->{can_events};
… …
461 476
462sub set_parent { 477sub set_parent {
463 my ($self, $parent) = @_; 478 my ($self, $parent) = @_;
464 479
465 Scalar::Util::weaken ($self->{parent} = $parent); 480 Scalar::Util::weaken ($self->{parent} = $parent);
466
467 $self->set_visible if $parent->{visible}; 481 $self->set_visible if $parent->{visible};
468} 482}
469 483
470sub connect { 484sub connect {
471 my ($self, $signal, $cb) = @_; 485 my ($self, $signal, $cb) = @_;
… …
492 506
493sub realloc { 507sub realloc {
494 my ($self) = @_; 508 my ($self) = @_;
495 509
496 if ($self->{visible}) { 510 if ($self->{visible}) {
497 return if $self->{root}{realloc}{$self}; 511 return if $self->{root}{realloc}{$self+0};
498 512
499 $self->{root}{realloc}{$self} = $self; 513 $self->{root}{realloc}{$self+0} = $self;
500 $self->{root}->update; 514 $self->{root}->update;
501 } else { 515 } else {
502 delete $self->{req_w}; 516 delete $self->{req_w};
517 delete $self->{req_h};
503 } 518 }
504} 519}
505 520
506sub update { 521sub update {
507 my ($self) = @_; 522 my ($self) = @_;
508 523
509 $self->{parent}->update 524 $self->{parent}->update
510 if $self->{parent}; 525 if $self->{parent};
511} 526}
512 527
528sub reconfigure {
529 my ($self) = @_;
530
531 $self->realloc;
532 $self->update;
533}
534
535# using global variables seems a bit hacky, but passing through all drawing
536# functions seems pointless.
537our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn
538
513sub draw { 539sub draw {
514 my ($self) = @_; 540 my ($self) = @_;
515 541
516 return unless $self->{h} && $self->{w}; 542 return unless $self->{h} && $self->{w};
543
544 # update screen rectangle
545 local $draw_x = $draw_x + $self->{x};
546 local $draw_y = $draw_y + $self->{y};
547 local $draw_w = $draw_x + $self->{w};
548 local $draw_h = $draw_y + $self->{h};
549
550 # skip widgets that are entirely outside the drawing area
551 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
552 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
517 553
518 glPushMatrix; 554 glPushMatrix;
519 glTranslate $self->{x}, $self->{y}, 0; 555 glTranslate $self->{x}, $self->{y}, 0;
520 $self->_draw;
521 glPopMatrix;
522 556
523 if ($self == $HOVER && $self->{can_hover}) { 557 if ($self == $HOVER && $self->{can_hover}) {
524 my ($x, $y) = @$self{qw(x y)};
525
526 glColor 1, 0.8, 0.5, 0.2; 558 glColor 1*0.2, 0.8*0.2, 0.5*0.2, 0.2;
527 glEnable GL_BLEND; 559 glEnable GL_BLEND;
528 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 560 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
529 glBegin GL_QUADS; 561 glBegin GL_QUADS;
530 glVertex $x , $y; 562 glVertex 0 , 0;
531 glVertex $x + $self->{w}, $y; 563 glVertex $self->{w}, 0;
532 glVertex $x + $self->{w}, $y + $self->{h}; 564 glVertex $self->{w}, $self->{h};
533 glVertex $x , $y + $self->{h}; 565 glVertex 0 , $self->{h};
534 glEnd; 566 glEnd;
535 glDisable GL_BLEND; 567 glDisable GL_BLEND;
536 } 568 }
537 569
538 if ($ENV{PCLIENT_DEBUG}) { 570 if ($ENV{CFPLUS_DEBUG} & 1) {
539 glPushMatrix; 571 glPushMatrix;
540 glColor 1, 1, 0, 1; 572 glColor 1, 1, 0, 1;
541 glTranslate $self->{x} + 0.375, $self->{y} + 0.375; 573 glTranslate 0.375, 0.375;
542 glBegin GL_LINE_LOOP; 574 glBegin GL_LINE_LOOP;
543 glVertex 0 , 0; 575 glVertex 0 , 0;
544 glVertex $self->{w} - 1, 0; 576 glVertex $self->{w} - 1, 0;
545 glVertex $self->{w} - 1, $self->{h} - 1; 577 glVertex $self->{w} - 1, $self->{h} - 1;
546 glVertex 0 , $self->{h} - 1; 578 glVertex 0 , $self->{h} - 1;
547 glEnd; 579 glEnd;
548 glPopMatrix; 580 glPopMatrix;
549 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw; 581 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
550 } 582 }
583
584 $self->_draw;
585 glPopMatrix;
551} 586}
552 587
553sub _draw { 588sub _draw {
554 my ($self) = @_; 589 my ($self) = @_;
555 590
… …
558 593
559sub DESTROY { 594sub DESTROY {
560 my ($self) = @_; 595 my ($self) = @_;
561 596
562 delete $WIDGET{$self+0}; 597 delete $WIDGET{$self+0};
563 #$self->deactivate; 598
599 eval { $self->destroy };
600 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
564} 601}
565 602
566############################################################################# 603#############################################################################
567 604
568package CFClient::UI::DrawBG; 605package CFClient::UI::DrawBG;
… …
593 630
594 if ($color && (@$color < 4 || $color->[3])) { 631 if ($color && (@$color < 4 || $color->[3])) {
595 my ($w, $h) = @$self{qw(w h)}; 632 my ($w, $h) = @$self{qw(w h)};
596 633
597 glEnable GL_BLEND; 634 glEnable GL_BLEND;
598 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 635 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
599 glColor @$color; 636 glColor_premultiply @$color;
600 637
601 glBegin GL_QUADS; 638 glBegin GL_QUADS;
602 glVertex 0 , 0; 639 glVertex 0 , 0;
603 glVertex 0 , $h; 640 glVertex 0 , $h;
604 glVertex $w, $h; 641 glVertex $w, $h;
… …
619 my ($class, %arg) = @_; 656 my ($class, %arg) = @_;
620 $class->SUPER::new (can_events => 0, %arg); 657 $class->SUPER::new (can_events => 0, %arg);
621} 658}
622 659
623sub size_request { 660sub size_request {
624 (0, 0) 661 my ($self) = @_;
662
663 ($self->{w} + 0, $self->{h} + 0)
625} 664}
626 665
627sub draw { } 666sub draw { }
628 667
629############################################################################# 668#############################################################################
… …
633our @ISA = CFClient::UI::Base::; 672our @ISA = CFClient::UI::Base::;
634 673
635sub new { 674sub new {
636 my ($class, %arg) = @_; 675 my ($class, %arg) = @_;
637 676
638 my $children = delete $arg{children} || []; 677 my $children = delete $arg{children};
639 678
640 my $self = $class->SUPER::new ( 679 my $self = $class->SUPER::new (
641 children => [], 680 children => [],
642 can_events => 0, 681 can_events => 0,
643 %arg, 682 %arg,
644 ); 683 );
684
645 $self->add ($_) for @$children; 685 $self->add (@$children)
686 if $children;
646 687
647 $self 688 $self
648} 689}
649 690
650sub add { 691sub add {
… …
698 $x -= $self->{x}; 739 $x -= $self->{x};
699 $y -= $self->{y}; 740 $y -= $self->{y};
700 741
701 my $res; 742 my $res;
702 743
703 for (reverse @{ $self->{children} }) { 744 for (reverse $self->visible_children) {
704 $res = $_->find_widget ($x, $y) 745 $res = $_->find_widget ($x, $y)
705 and return $res; 746 and return $res;
706 } 747 }
707 748
708 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y}) 749 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
… …
729} 770}
730 771
731sub add { 772sub add {
732 my ($self, $child) = @_; 773 my ($self, $child) = @_;
733 774
734 $self->{children} = []; 775 $self->SUPER::remove ($_) for @{ $self->{children} };
735
736 $self->SUPER::add ($child); 776 $self->SUPER::add ($child);
737} 777}
738 778
739sub remove { 779sub remove {
740 my ($self, $widget) = @_; 780 my ($self, $widget) = @_;
… …
750sub size_request { 790sub size_request {
751 $_[0]{children}[0]->size_request 791 $_[0]{children}[0]->size_request
752} 792}
753 793
754sub size_allocate { 794sub size_allocate {
755 my ($self, $w, $h, $changed) = @_; 795 my ($self, $w, $h) = @_;
756 796
757 $self->{children}[0]->configure (0, 0, $w, $h); 797 $self->{children}[0]->configure (0, 0, $w, $h);
758} 798}
759 799
760############################################################################# 800#############################################################################
801
802# back-buffered drawing area
761 803
762package CFClient::UI::Window; 804package CFClient::UI::Window;
763 805
764our @ISA = CFClient::UI::Bin::; 806our @ISA = CFClient::UI::Bin::;
765 807
… …
777 $ROOT->on_post_alloc ($self => sub { $self->render_child }); 819 $ROOT->on_post_alloc ($self => sub { $self->render_child });
778 $self->SUPER::update; 820 $self->SUPER::update;
779} 821}
780 822
781sub size_allocate { 823sub size_allocate {
782 my ($self, $w, $h, $changed) = @_; 824 my ($self, $w, $h) = @_;
783 825
784 $self->SUPER::size_allocate ($w, $h, $changed); 826 $self->SUPER::size_allocate ($w, $h);
785 $self->update 827 $self->update;
786 if $changed;
787} 828}
788 829
789sub _render { 830sub _render {
831 my ($self) = @_;
832
790 $_[0]{children}[0]->draw; 833 $self->{children}[0]->draw;
791} 834}
792 835
793sub render_child { 836sub render_child {
794 my ($self) = @_; 837 my ($self) = @_;
795 838
796 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 839 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
797 glClearColor 0, 0, 0, 0; 840 glClearColor 0, 0, 0, 0;
798 glClear GL_COLOR_BUFFER_BIT; 841 glClear GL_COLOR_BUFFER_BIT;
799 842
843 {
844 package CFClient::UI::Base;
845
846 ($draw_x, $draw_y, $draw_w, $draw_h) =
847 (0, 0, $self->{w}, $self->{h});
848 }
849
800 $self->_render; 850 $self->_render;
801 }; 851 };
802} 852}
803 853
804sub _draw { 854sub _draw {
805 my ($self) = @_; 855 my ($self) = @_;
806 856
807 my ($w, $h) = ($self->w, $self->h); 857 my ($w, $h) = @$self{qw(w h)};
808 858
809 my $tex = $self->{texture} 859 my $tex = $self->{texture}
810 or return; 860 or return;
811 861
812 glEnable GL_TEXTURE_2D; 862 glEnable GL_TEXTURE_2D;
813 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 863 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
814 glColor 1, 1, 1, 1; 864 glColor 0, 0, 0, 1;
815 865
816 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 866 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
817 867
818 glDisable GL_TEXTURE_2D; 868 glDisable GL_TEXTURE_2D;
819} 869}
… …
835} 885}
836 886
837sub size_request { 887sub size_request {
838 my ($self) = @_; 888 my ($self) = @_;
839 889
840 my ($w, $h) = @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 890 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
841 891
842 $w = 10 if $self->{scroll_x}; 892 $w = 10 if $self->{scroll_x};
843 $h = 10 if $self->{scroll_y}; 893 $h = 10 if $self->{scroll_y};
844 894
845 ($w, $h) 895 ($w, $h)
846} 896}
847 897
848sub size_allocate { 898sub size_allocate {
849 my ($self, $w, $h, $changed) = @_; 899 my ($self, $w, $h) = @_;
850 900
901 my $child = $self->child;
902
851 $w = $self->{child_w} if $self->{scroll_x} && $self->{child_w}; 903 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
852 $h = $self->{child_h} if $self->{scroll_y} && $self->{child_h}; 904 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
853 905
854 $self->child->configure (0, 0, $w, $h); 906 $self->child->configure (0, 0, $w, $h);
855 $self->update; 907 $self->update;
856} 908}
857 909
… …
893} 945}
894 946
895sub _render { 947sub _render {
896 my ($self) = @_; 948 my ($self) = @_;
897 949
950 local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x};
951 local $CFClient::UI::Base::draw_y = $CFClient::UI::Base::draw_y - $self->{view_y};
952
898 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 953 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
899 954
900 $self->SUPER::_render; 955 $self->SUPER::_render;
901} 956}
902 957
… …
905package CFClient::UI::ScrolledWindow; 960package CFClient::UI::ScrolledWindow;
906 961
907our @ISA = CFClient::UI::HBox::; 962our @ISA = CFClient::UI::HBox::;
908 963
909sub new { 964sub new {
910 my $class = shift; 965 my ($class, %arg) = @_;
966
967 my $child = delete $arg{child};
911 968
912 my $self; 969 my $self;
913 970
914 my $slider = new CFClient::UI::Slider 971 my $slider = new CFClient::UI::Slider
915 vertical => 1, 972 vertical => 1,
… …
920 ; 977 ;
921 978
922 $self = $class->SUPER::new ( 979 $self = $class->SUPER::new (
923 vp => (new CFClient::UI::ViewPort expand => 1), 980 vp => (new CFClient::UI::ViewPort expand => 1),
924 slider => $slider, 981 slider => $slider,
925 @_, 982 %arg,
926 ); 983 );
927 984
928 $self->{vp}->add ($self->{scrolled});
929 $self->add ($self->{vp});
930 $self->add ($self->{slider}); 985 $self->SUPER::add ($self->{vp}, $self->{slider});
986 $self->add ($child) if $child;
931 987
932 $self 988 $self
989}
990
991sub add {
992 my ($self, $widget) = @_;
993
994 $self->{vp}->add ($self->{child} = $widget);
933} 995}
934 996
935sub update { 997sub update {
936 my ($self) = @_; 998 my ($self) = @_;
937 999
… …
941 my $child = $self->{vp}->child; 1003 my $child = $self->{vp}->child;
942 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]); 1004 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
943} 1005}
944 1006
945sub size_allocate { 1007sub size_allocate {
946 my ($self, $w, $h, $changed) = @_; 1008 my ($self, $w, $h) = @_;
947 1009
948 $self->SUPER::size_allocate ($w, $h, $changed); 1010 $self->SUPER::size_allocate ($w, $h);
949 1011
950 my $child = $self->{vp}->child; 1012 my $child = $self->{vp}->child;
951 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]); 1013 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
952} 1014}
953 1015
… …
976 1038
977 if ($self->{bg}) { 1039 if ($self->{bg}) {
978 my ($w, $h) = @$self{qw(w h)}; 1040 my ($w, $h) = @$self{qw(w h)};
979 1041
980 glEnable GL_BLEND; 1042 glEnable GL_BLEND;
981 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1043 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
982 glColor @{ $self->{bg} }; 1044 glColor_premultiply @{ $self->{bg} };
983 1045
984 glBegin GL_QUADS; 1046 glBegin GL_QUADS;
985 glVertex 0 , 0; 1047 glVertex 0 , 0;
986 glVertex 0 , $h; 1048 glVertex 0 , $h;
987 glVertex $w, $h; 1049 glVertex $w, $h;
… …
1000 1062
1001our @ISA = CFClient::UI::Bin::; 1063our @ISA = CFClient::UI::Bin::;
1002 1064
1003use CFClient::OpenGL; 1065use CFClient::OpenGL;
1004 1066
1005my @tex = 1067my $bg =
1068 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
1069 mipmap => 1, wrap => 1;
1070
1071my @border =
1006 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1072 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1007 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 1073 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1008 1074
1009sub new { 1075sub new {
1010 my $class = shift; 1076 my ($class, %arg) = @_;
1011 1077
1012 my $self = $class->SUPER::new ( 1078 my $self = $class->SUPER::new (
1013 bg => [1, 1, 1, 1], 1079 bg => [1, 1, 1, 1],
1014 border_bg => [1, 1, 1, 1], 1080 border_bg => [1, 1, 1, 1],
1015 border => 0.6, 1081 border => 0.6,
1016 is_toplevel => 1,
1017 can_events => 1, 1082 can_events => 1,
1018 @_ 1083 min_w => 16,
1084 min_h => 16,
1085 %arg,
1019 ); 1086 );
1020 1087
1021 $self->{title} &&= new CFClient::UI::Label 1088 $self->{title_widget} = new CFClient::UI::Label
1022 align => 0, 1089 align => 0,
1023 valign => 1, 1090 valign => 1,
1024 text => $self->{title}, 1091 text => $self->{title},
1025 fontsize => $self->{border}; 1092 fontsize => $self->{border},
1093 if exists $self->{title};
1026 1094
1027 $self 1095 $self
1096}
1097
1098sub add {
1099 my ($self, @widgets) = @_;
1100
1101 $self->SUPER::add (@widgets);
1102 $self->CFClient::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1028} 1103}
1029 1104
1030sub border { 1105sub border {
1031 int $_[0]{border} * $::FONTSIZE 1106 int $_[0]{border} * $::FONTSIZE
1032} 1107}
1033 1108
1034sub size_request { 1109sub size_request {
1035 my ($self) = @_; 1110 my ($self) = @_;
1111
1112 $self->{title_widget}->size_request
1113 if $self->{title_widget};
1036 1114
1037 my ($w, $h) = $self->SUPER::size_request; 1115 my ($w, $h) = $self->SUPER::size_request;
1038 1116
1039 ( 1117 (
1040 $w + $self->border * 2, 1118 $w + $self->border * 2,
1041 $h + $self->border * 2, 1119 $h + $self->border * 2,
1042 ) 1120 )
1043} 1121}
1044 1122
1045sub size_allocate { 1123sub size_allocate {
1046 my ($self, $w, $h, $changed) = @_; 1124 my ($self, $w, $h) = @_;
1047 1125
1048 return unless $changed; 1126 if ($self->{title_widget}) {
1127 $self->{title_widget}{w} = $w;
1128 $self->{title_widget}{h} = $h;
1129 $self->{title_widget}->size_allocate ($w, $h);
1130 }
1049 1131
1132 my $border = $self->border;
1133
1050 $h -= List::Util::max 0, $self->border * 2; 1134 $h -= List::Util::max 0, $border * 2;
1051 $w -= List::Util::max 0, $self->border * 2; 1135 $w -= List::Util::max 0, $border * 2;
1052 1136
1053 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
1054 if $self->{title};
1055
1056 $self->child->configure ($self->border, $self->border, $w, $h); 1137 $self->child->configure ($border, $border, $w, $h);
1057} 1138}
1058 1139
1059sub button_down { 1140sub button_down {
1060 my ($self, $ev, $x, $y) = @_; 1141 my ($self, $ev, $x, $y) = @_;
1061 1142
… …
1077 my ($ev, $x, $y) = @_; 1158 my ($ev, $x, $y) = @_;
1078 1159
1079 my $dx = $ev->{x} - $ox; 1160 my $dx = $ev->{x} - $ox;
1080 my $dy = $ev->{y} - $oy; 1161 my $dy = $ev->{y} - $oy;
1081 1162
1082 $self->{user_x} = $wx + $dx * $mx;
1083 $self->{user_y} = $wy + $dy * $my;
1084 $self->{def_w} = $bw + $dx * ($mx ? -1 : 1); 1163 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
1085 $self->{def_h} = $bh + $dy * ($my ? -1 : 1); 1164 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1086 $self->move ($self->{user_x}, $self->{user_y}); 1165
1166 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1087 $self->realloc; 1167 $self->realloc;
1088 }; 1168 };
1089 1169
1090 } elsif ($lr ^ $td) { 1170 } elsif ($lr ^ $td) {
1091 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1171 my ($ox, $oy) = ($ev->{x}, $ev->{y});
… …
1094 $self->{motion} = sub { 1174 $self->{motion} = sub {
1095 my ($ev, $x, $y) = @_; 1175 my ($ev, $x, $y) = @_;
1096 1176
1097 ($x, $y) = ($ev->{x}, $ev->{y}); 1177 ($x, $y) = ($ev->{x}, $ev->{y});
1098 1178
1099 $self->{user_x} = $bx + $x - $ox; 1179 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1100 $self->{user_y} = $by + $y - $oy; 1180 # HACK: the next line is required to enforce placement
1101 1181 $self->{parent}->size_allocate ($self->{parent}{w}, $self->{parent}{h});
1102 $self->move ($self->{user_x}, $self->{user_y});
1103 $self->realloc;
1104 }; 1182 };
1183 } else {
1184 return 0;
1185 }
1186
1105 } 1187 1
1106} 1188}
1107 1189
1108sub button_up { 1190sub button_up {
1109 my ($self, $ev, $x, $y) = @_; 1191 my ($self, $ev, $x, $y) = @_;
1110 1192
1111 delete $self->{motion}; 1193 !!delete $self->{motion}
1112} 1194}
1113 1195
1114sub mouse_motion { 1196sub mouse_motion {
1115 my ($self, $ev, $x, $y) = @_; 1197 my ($self, $ev, $x, $y) = @_;
1116 1198
1117 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1199 $self->{motion}->($ev, $x, $y) if $self->{motion};
1200
1201 !!$self->{motion}
1118} 1202}
1119 1203
1120sub _draw { 1204sub _draw {
1121 my ($self) = @_; 1205 my ($self) = @_;
1122 1206
1207 my $child = $self->{children}[0];
1208
1123 my ($w, $h ) = ($self->{w}, $self->{h}); 1209 my ($w, $h ) = ($self->{w}, $self->{h});
1124 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1210 my ($cw, $ch) = ($child->{w}, $child->{h});
1125 1211
1126 glEnable GL_TEXTURE_2D; 1212 glEnable GL_TEXTURE_2D;
1127 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1213 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1128 1214
1129 my $border = $self->border; 1215 my $border = $self->border;
1130 1216
1131 glColor @{ $self->{border_bg} }; 1217 glColor @{ $self->{border_bg} };
1132 $tex[1]->draw_quad_alpha (0, 0, $w, $border); 1218 $border[0]->draw_quad_alpha (0, 0, $w, $border);
1133 $tex[3]->draw_quad_alpha (0, $border, $border, $ch); 1219 $border[1]->draw_quad_alpha (0, $border, $border, $ch);
1134 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1220 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1135 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border); 1221 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
1136 1222
1137 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1223 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1138 my $bg = $tex[0]; 1224 glColor @{ $self->{bg} };
1139 1225
1140 # TODO: repeat texture not scale 1226 # TODO: repeat texture not scale
1227 # solve this better(?)
1141 my $rep_x = $cw / $bg->{w}; 1228 $bg->{s} = $cw / $bg->{w};
1142 my $rep_y = $ch / $bg->{h}; 1229 $bg->{t} = $ch / $bg->{h};
1143
1144 glColor @{ $self->{bg} };
1145
1146 $bg->{s} = $rep_x;
1147 $bg->{t} = $rep_y;
1148 $bg->{wrap_mode} = 1;
1149 $bg->draw_quad_alpha ($border, $border, $cw, $ch); 1230 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1150 } 1231 }
1151 1232
1152 glDisable GL_TEXTURE_2D; 1233 glDisable GL_TEXTURE_2D;
1153 1234
1154 $self->{title}->draw if $self->{title};
1155
1156 $self->child->draw; 1235 $child->draw;
1236
1237 if ($self->{title_widget}) {
1238 glTranslate 0, $border - $self->{h};
1239 $self->{title_widget}->_draw;
1240 }
1157} 1241}
1158 1242
1159############################################################################# 1243#############################################################################
1160 1244
1161package CFClient::UI::Table; 1245package CFClient::UI::Table;
… …
1184 1268
1185 $child->set_parent ($self); 1269 $child->set_parent ($self);
1186 $self->{children}[$y][$x] = $child; 1270 $self->{children}[$y][$x] = $child;
1187 1271
1188 $self->realloc; 1272 $self->realloc;
1273}
1274
1275sub remove {
1276 my ($self, $child) = @_;
1277
1278 # TODO: not yet implemented
1189} 1279}
1190 1280
1191# TODO: move to container class maybe? send children a signal on removal? 1281# TODO: move to container class maybe? send children a signal on removal?
1192sub clear { 1282sub clear {
1193 my ($self) = @_; 1283 my ($self) = @_;
… …
1235 (sum @$hs), 1325 (sum @$hs),
1236 ) 1326 )
1237} 1327}
1238 1328
1239sub size_allocate { 1329sub size_allocate {
1240 my ($self, $w, $h, $changed) = @_; 1330 my ($self, $w, $h) = @_;
1241 1331
1242 my ($ws, $hs) = $self->get_wh; 1332 my ($ws, $hs) = $self->get_wh;
1243 1333
1244 my $req_w = (sum @$ws) || 1; 1334 my $req_w = (sum @$ws) || 1;
1245 my $req_h = (sum @$hs) || 1; 1335 my $req_h = (sum @$hs) || 1;
… …
1323 (List::Util::max map $_->{req_h}, @{$self->{children}}), 1413 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1324 ) 1414 )
1325} 1415}
1326 1416
1327sub size_allocate { 1417sub size_allocate {
1328 my ($self, $w, $h, $changed) = @_; 1418 my ($self, $w, $h) = @_;
1329 1419
1330 my $space = $self->{vertical} ? $h : $w; 1420 my $space = $self->{vertical} ? $h : $w;
1331 my $children = $self->{children}; 1421 my $children = $self->{children};
1332 1422
1333 my @req; 1423 my @req;
… …
1416 ellipsise => 3, # end 1506 ellipsise => 3, # end
1417 layout => (new CFClient::Layout), 1507 layout => (new CFClient::Layout),
1418 fontsize => 1, 1508 fontsize => 1,
1419 align => -1, 1509 align => -1,
1420 valign => -1, 1510 valign => -1,
1421 padding => 2, 1511 padding_x => 2,
1512 padding_y => 2,
1422 can_events => 0, 1513 can_events => 0,
1423 %arg 1514 %arg
1424 ); 1515 );
1425 1516
1426 if (exists $self->{template}) { 1517 if (exists $self->{template}) {
… …
1453 1544
1454 delete $self->{texture}; 1545 delete $self->{texture};
1455 $self->SUPER::update; 1546 $self->SUPER::update;
1456} 1547}
1457 1548
1549sub realloc {
1550 my ($self) = @_;
1551
1552 delete $self->{ox};
1553 $self->SUPER::realloc;
1554}
1555
1458sub set_text { 1556sub set_text {
1459 my ($self, $text) = @_; 1557 my ($self, $text) = @_;
1460 1558
1461 return if $self->{text} eq "T$text"; 1559 return if $self->{text} eq "T$text";
1462 $self->{text} = "T$text"; 1560 $self->{text} = "T$text";
1463 1561
1464 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba; 1562 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1465 $self->{layout}->set_text ($text); 1563 $self->{layout}->set_text ($text);
1466 1564
1565 delete $self->{size_req};
1467 $self->realloc; 1566 $self->realloc;
1468 $self->update; 1567 $self->update;
1469} 1568}
1470 1569
1471sub set_markup { 1570sub set_markup {
… …
1477 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1576 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1478 1577
1479 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba; 1578 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1480 $self->{layout}->set_markup ($markup); 1579 $self->{layout}->set_markup ($markup);
1481 1580
1581 delete $self->{size_req};
1482 $self->realloc; 1582 $self->realloc;
1483 $self->update; 1583 $self->update;
1484} 1584}
1485 1585
1486sub size_request { 1586sub size_request {
1487 my ($self) = @_; 1587 my ($self) = @_;
1488 1588
1589 $self->{size_req} ||= do {
1489 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1590 $self->{layout}->set_font ($self->{font}) if $self->{font};
1490 $self->{layout}->set_width ($self->{max_w} || -1); 1591 $self->{layout}->set_width ($self->{max_w} || -1);
1491 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1592 $self->{layout}->set_ellipsise ($self->{ellipsise});
1492 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1593 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1493 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1594 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1494 1595
1495 my ($w, $h) = $self->{layout}->size; 1596 my ($w, $h) = $self->{layout}->size;
1496 1597
1497 if (exists $self->{template}) { 1598 if (exists $self->{template}) {
1498 $self->{template}->set_font ($self->{font}) if $self->{font}; 1599 $self->{template}->set_font ($self->{font}) if $self->{font};
1499 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1600 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1500 1601
1501 my ($w2, $h2) = $self->{template}->size; 1602 my ($w2, $h2) = $self->{template}->size;
1502 1603
1503 $w = List::Util::max $w, $w2; 1604 $w = List::Util::max $w, $w2;
1504 $h = List::Util::max $h, $h2; 1605 $h = List::Util::max $h, $h2;
1606 }
1607
1608 [$w, $h]
1505 } 1609 };
1506 1610
1507 ( 1611 @{ $self->{size_req} }
1508 $w + $self->{padding} * 2,
1509 $h + $self->{padding} * 2,
1510 )
1511} 1612}
1512 1613
1513sub size_allocate { 1614sub size_allocate {
1514 my ($self, $w, $h, $changed) = @_; 1615 my ($self, $w, $h) = @_;
1616
1617 delete $self->{ox};
1515 1618
1516 delete $self->{texture} 1619 delete $self->{texture}
1517 if $changed; 1620 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1518} 1621}
1519 1622
1520sub set_fontsize { 1623sub set_fontsize {
1521 my ($self, $fontsize) = @_; 1624 my ($self, $fontsize) = @_;
1522 1625
1523 $self->{fontsize} = $fontsize; 1626 $self->{fontsize} = $fontsize;
1524 delete $self->{texture}; 1627 delete $self->{texture};
1525 1628
1526 $self->realloc; 1629 $self->realloc;
1630}
1631
1632sub reconfigure {
1633 my ($self) = @_;
1634
1635 delete $self->{size_req};
1636
1637 $self->SUPER::reconfigure;
1527} 1638}
1528 1639
1529sub _draw { 1640sub _draw {
1530 my ($self) = @_; 1641 my ($self) = @_;
1531 1642
… …
1537 $self->{layout}->set_width ($self->{w}); 1648 $self->{layout}->set_width ($self->{w});
1538 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1649 $self->{layout}->set_ellipsise ($self->{ellipsise});
1539 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1650 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1540 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1651 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1541 1652
1542 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1653 new_from_layout CFClient::Texture $self->{layout}
1654 };
1543 1655
1656 unless (exists $self->{ox}) {
1544 $self->{ox} = int ($self->{align} < 0 ? $self->{padding} 1657 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1545 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} 1658 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1546 : ($self->{w} - $tex->{w}) * 0.5); 1659 : ($self->{w} - $tex->{w}) * 0.5);
1547 1660
1548 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding} 1661 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1549 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding} 1662 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1550 : ($self->{h} - $tex->{h}) * 0.5); 1663 : ($self->{h} - $tex->{h}) * 0.5);
1551
1552 $tex
1553 }; 1664 };
1554 1665
1555 glEnable GL_TEXTURE_2D; 1666 glEnable GL_TEXTURE_2D;
1556 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1667
1668 my $w = List::Util::min $self->{w} + 4, $tex->{w};
1669 my $h = List::Util::min $self->{h} + 2, $tex->{h};
1557 1670
1558 if ($tex->{format} == GL_ALPHA) { 1671 if ($tex->{format} == GL_ALPHA) {
1672 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1559 glColor @{$self->{fg}}; 1673 glColor @{$self->{fg}};
1560 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}); 1674 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}, $w, $h);
1561 } else { 1675 } else {
1676 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1562 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}); 1677 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}, $w, $h);
1563 } 1678 }
1564 1679
1565 glDisable GL_TEXTURE_2D; 1680 glDisable GL_TEXTURE_2D;
1566} 1681}
1567 1682
… …
1584 can_hover => 1, 1699 can_hover => 1,
1585 can_focus => 1, 1700 can_focus => 1,
1586 valign => 0, 1701 valign => 0,
1587 can_events => 1, 1702 can_events => 1,
1588 #text => ... 1703 #text => ...
1704 #hidden => "*",
1589 @_ 1705 @_
1590 ) 1706 )
1591} 1707}
1592 1708
1593sub _set_text { 1709sub _set_text {
… …
1595 1711
1596 delete $self->{cur_h}; 1712 delete $self->{cur_h};
1597 1713
1598 return if $self->{text} eq $text; 1714 return if $self->{text} eq $text;
1599 1715
1600 delete $self->{texture};
1601
1602 $self->{last_activity} = $::NOW; 1716 $self->{last_activity} = $::NOW;
1603 $self->{text} = $text; 1717 $self->{text} = $text;
1604 1718
1605 $text =~ s/./*/g if $self->{hidden}; 1719 $text =~ s/./*/g if $self->{hidden};
1606 $self->{layout}->set_text ("$text "); 1720 $self->{layout}->set_text ("$text ");
1721 delete $self->{size_req};
1607 1722
1608 $self->_emit (changed => $self->{text}); 1723 $self->_emit (changed => $self->{text});
1724
1725 $self->realloc;
1726 $self->update;
1609} 1727}
1610 1728
1611sub set_text { 1729sub set_text {
1612 my ($self, $text) = @_; 1730 my ($self, $text) = @_;
1613 1731
1614 $self->{cursor} = length $text; 1732 $self->{cursor} = length $text;
1615 $self->_set_text ($text); 1733 $self->_set_text ($text);
1616
1617 $self->realloc;
1618} 1734}
1619 1735
1620sub get_text { 1736sub get_text {
1621 $_[0]{text} 1737 $_[0]{text}
1622} 1738}
… …
1652 $self->{cursor} = length $text; 1768 $self->{cursor} = length $text;
1653 } elsif ($uni == 27) { 1769 } elsif ($uni == 27) {
1654 $self->_emit ('escape'); 1770 $self->_emit ('escape');
1655 } elsif ($uni) { 1771 } elsif ($uni) {
1656 substr $text, $self->{cursor}++, 0, chr $uni; 1772 substr $text, $self->{cursor}++, 0, chr $uni;
1773 } else {
1774 return 0;
1657 } 1775 }
1658 1776
1659 $self->_set_text ($text); 1777 $self->_set_text ($text);
1660 1778
1661 $self->realloc; 1779 $self->realloc;
1780
1781 1
1662} 1782}
1663 1783
1664sub focus_in { 1784sub focus_in {
1665 my ($self) = @_; 1785 my ($self) = @_;
1666 1786
… …
1681 utf8::encode $text; 1801 utf8::encode $text;
1682 $self->{cursor} = length substr $text, 0, $idx; 1802 $self->{cursor} = length substr $text, 0, $idx;
1683 1803
1684 $self->_set_text ($self->{text}); 1804 $self->_set_text ($self->{text});
1685 $self->update; 1805 $self->update;
1806
1807 1
1686} 1808}
1687 1809
1688sub mouse_motion { 1810sub mouse_motion {
1689 my ($self, $ev, $x, $y) = @_; 1811 my ($self, $ev, $x, $y) = @_;
1690# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 1812# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1813
1814 0
1691} 1815}
1692 1816
1693sub _draw { 1817sub _draw {
1694 my ($self) = @_; 1818 my ($self) = @_;
1695 1819
1696 local $self->{fg} = $self->{fg}; 1820 local $self->{fg} = $self->{fg};
1697 1821
1698 if ($FOCUS == $self) { 1822 if ($FOCUS == $self) {
1699 glColor @{$self->{active_bg}}; 1823 glColor_premultiply @{$self->{active_bg}};
1700 $self->{fg} = $self->{active_fg}; 1824 $self->{fg} = $self->{active_fg};
1701 } else { 1825 } else {
1702 glColor @{$self->{bg}}; 1826 glColor_premultiply @{$self->{bg}};
1703 } 1827 }
1704 1828
1705 glEnable GL_BLEND; 1829 glEnable GL_BLEND;
1706 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1830 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1707 glBegin GL_QUADS; 1831 glBegin GL_QUADS;
1708 glVertex 0 , 0; 1832 glVertex 0 , 0;
1709 glVertex 0 , $self->{h}; 1833 glVertex 0 , $self->{h};
1710 glVertex $self->{w}, $self->{h}; 1834 glVertex $self->{w}, $self->{h};
1711 glVertex $self->{w}, 0; 1835 glVertex $self->{w}, 0;
… …
1772 } else { 1896 } else {
1773 $self->set_text ($self->{history_saveback}); 1897 $self->set_text ($self->{history_saveback});
1774 } 1898 }
1775 1899
1776 } else { 1900 } else {
1777 $self->SUPER::key_down ($ev); 1901 return $self->SUPER::key_down ($ev)
1902 }
1903
1778 } 1904 1
1779
1780} 1905}
1781 1906
1782############################################################################# 1907#############################################################################
1783 1908
1784package CFClient::UI::Button; 1909package CFClient::UI::Button;
… …
1793 1918
1794sub new { 1919sub new {
1795 my $class = shift; 1920 my $class = shift;
1796 1921
1797 $class->SUPER::new ( 1922 $class->SUPER::new (
1798 padding => 4, 1923 padding_x => 4,
1924 padding_y => 4,
1799 fg => [1, 1, 1], 1925 fg => [1, 1, 1],
1800 active_fg => [0, 0, 1], 1926 active_fg => [0, 0, 1],
1801 can_hover => 1, 1927 can_hover => 1,
1802 align => 0, 1928 align => 0,
1803 valign => 0, 1929 valign => 0,
… …
1812 my ($self, $ev, $x, $y) = @_; 1938 my ($self, $ev, $x, $y) = @_;
1813 1939
1814 $self->emit ("activate") 1940 $self->emit ("activate")
1815 if $x >= 0 && $x < $self->{w} 1941 if $x >= 0 && $x < $self->{w}
1816 && $y >= 0 && $y < $self->{h}; 1942 && $y >= 0 && $y < $self->{h};
1943
1944 1
1817} 1945}
1818 1946
1819sub _draw { 1947sub _draw {
1820 my ($self) = @_; 1948 my ($self) = @_;
1821 1949
1822 local $self->{fg} = $self->{fg}; 1950 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1823
1824 if ($GRAB == $self) {
1825 $self->{fg} = $self->{active_fg};
1826 }
1827 1951
1828 glEnable GL_TEXTURE_2D; 1952 glEnable GL_TEXTURE_2D;
1829 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1953 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1830 glColor 0, 0, 0, 1; 1954 glColor 0, 0, 0, 1;
1831 1955
… …
1850 1974
1851sub new { 1975sub new {
1852 my $class = shift; 1976 my $class = shift;
1853 1977
1854 $class->SUPER::new ( 1978 $class->SUPER::new (
1855 padding => 2, 1979 padding_x => 2,
1980 padding_y => 2,
1856 fg => [1, 1, 1], 1981 fg => [1, 1, 1],
1857 active_fg => [1, 1, 0], 1982 active_fg => [1, 1, 0],
1858 bg => [0, 0, 0, 0.2], 1983 bg => [0, 0, 0, 0.2],
1859 active_bg => [1, 1, 1, 0.5], 1984 active_bg => [1, 1, 1, 0.5],
1860 state => 0, 1985 state => 0,
… …
1864} 1989}
1865 1990
1866sub size_request { 1991sub size_request {
1867 my ($self) = @_; 1992 my ($self) = @_;
1868 1993
1869 ($self->{padding} * 2 + 6) x 2 1994 (6) x 2
1870} 1995}
1871 1996
1872sub button_down { 1997sub button_down {
1873 my ($self, $ev, $x, $y) = @_; 1998 my ($self, $ev, $x, $y) = @_;
1874 1999
1875 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 2000 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1876 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 2001 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1877 $self->{state} = !$self->{state}; 2002 $self->{state} = !$self->{state};
1878 $self->_emit (changed => $self->{state}); 2003 $self->_emit (changed => $self->{state});
2004 } else {
2005 return 0
2006 }
2007
1879 } 2008 1
1880} 2009}
1881 2010
1882sub _draw { 2011sub _draw {
1883 my ($self) = @_; 2012 my ($self) = @_;
1884 2013
1885 $self->SUPER::_draw; 2014 $self->SUPER::_draw;
1886 2015
1887 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 2016 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1888 2017
1889 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; 2018 my ($w, $h) = @$self{qw(w h)};
2019
2020 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
1890 2021
1891 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 2022 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1892 2023
1893 my $tex = $self->{state} ? $tex[1] : $tex[0]; 2024 my $tex = $self->{state} ? $tex[1] : $tex[0];
1894 2025
… …
2049 2180
2050 my $h1 = $self->{h} * (1 - $ycut1); 2181 my $h1 = $self->{h} * (1 - $ycut1);
2051 my $h2 = $self->{h} * (1 - $ycut2); 2182 my $h2 = $self->{h} * (1 - $ycut2);
2052 2183
2053 glEnable GL_BLEND; 2184 glEnable GL_BLEND;
2054 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2185 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2186 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2055 glEnable GL_TEXTURE_2D; 2187 glEnable GL_TEXTURE_2D;
2056 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2188 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2057 2189
2058 glBindTexture GL_TEXTURE_2D, $t1->{name}; 2190 glBindTexture GL_TEXTURE_2D, $t1->{name};
2059 glBegin GL_QUADS; 2191 glBegin GL_QUADS;
… …
2159 fg => [1, 1, 1], 2291 fg => [1, 1, 1],
2160 active_fg => [0, 0, 0], 2292 active_fg => [0, 0, 0],
2161 bg => [0, 0, 0, 0.2], 2293 bg => [0, 0, 0, 0.2],
2162 active_bg => [1, 1, 1, 0.5], 2294 active_bg => [1, 1, 1, 0.5],
2163 range => [0, 0, 100, 10, 0], 2295 range => [0, 0, 100, 10, 0],
2164 req_w => $::WIDTH / 80, 2296 min_w => $::WIDTH / 80,
2165 req_h => $::WIDTH / 80, 2297 min_h => $::WIDTH / 80,
2166 vertical => 0, 2298 vertical => 0,
2167 can_hover => 1, 2299 can_hover => 1,
2168 inner_pad => 0.02, 2300 inner_pad => 0.02,
2169 @_ 2301 @_
2170 ); 2302 );
… …
2180sub set_range { 2312sub set_range {
2181 my ($self, $range) = @_; 2313 my ($self, $range) = @_;
2182 2314
2183 ($range, $self->{range}) = ($self->{range}, $range); 2315 ($range, $self->{range}) = ($self->{range}, $range);
2184 2316
2185 $self->update
2186 if "@$range" ne "@{$self->{range}}"; 2317 if ("@$range" ne "@{$self->{range}}") {
2318 $self->update;
2319 $self->set_value ($self->{range}[0]);
2320 }
2187} 2321}
2188 2322
2189sub set_value { 2323sub set_value {
2190 my ($self, $value) = @_; 2324 my ($self, $value) = @_;
2191 2325
… …
2210} 2344}
2211 2345
2212sub size_request { 2346sub size_request {
2213 my ($self) = @_; 2347 my ($self) = @_;
2214 2348
2215 my $w = $self->{req_w}; 2349 ($self->{req_w}, $self->{req_h})
2216 my $h = $self->{req_h};
2217
2218 $self->{vertical} ? ($h, $w) : ($w, $h)
2219} 2350}
2220 2351
2221sub button_down { 2352sub button_down {
2222 my ($self, $ev, $x, $y) = @_; 2353 my ($self, $ev, $x, $y) = @_;
2223 2354
2224 $self->SUPER::button_down ($ev, $x, $y); 2355 $self->SUPER::button_down ($ev, $x, $y);
2225 2356
2226 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2357 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2227 2358
2228 $self->mouse_motion ($ev, $x, $y); 2359 $self->mouse_motion ($ev, $x, $y)
2229} 2360}
2230 2361
2231sub mouse_motion { 2362sub mouse_motion {
2232 my ($self, $ev, $x, $y) = @_; 2363 my ($self, $ev, $x, $y) = @_;
2233 2364
… …
2237 my (undef, $lo, $hi, $page) = @{$self->{range}}; 2368 my (undef, $lo, $hi, $page) = @{$self->{range}};
2238 2369
2239 $x = ($x - $self->{click}[1]) / ($w * $self->{scale}); 2370 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2240 2371
2241 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo)); 2372 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2373 } else {
2374 return 0;
2375 }
2376
2242 } 2377 1
2243} 2378}
2244 2379
2245sub update { 2380sub update {
2246 my ($self) = @_; 2381 my ($self) = @_;
2247 2382
2248 $CFClient::UI::ROOT->on_post_alloc ($self => sub { 2383 delete $self->{knob_w};
2384 $self->SUPER::update;
2385}
2386
2387sub _draw {
2388 my ($self) = @_;
2389
2390 unless ($self->{knob_w}) {
2249 $self->set_value ($self->{range}[0]); 2391 $self->set_value ($self->{range}[0]);
2250 2392
2251 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2393 my ($value, $lo, $hi, $page) = @{$self->{range}};
2252 my $range = ($hi - $page - $lo) || 1e-100; 2394 my $range = ($hi - $page - $lo) || 1e-100;
2253 2395
… …
2259 $value = ($value - $lo) / $range; 2401 $value = ($value - $lo) / $range;
2260 $value = $value * $self->{scale} + $self->{offset}; 2402 $value = $value * $self->{scale} + $self->{offset};
2261 2403
2262 $self->{knob_x} = $value - $knob_w * 0.5; 2404 $self->{knob_x} = $value - $knob_w * 0.5;
2263 $self->{knob_w} = $knob_w; 2405 $self->{knob_w} = $knob_w;
2264 }); 2406 }
2265
2266 $self->SUPER::update;
2267}
2268
2269sub _draw {
2270 my ($self) = @_;
2271 2407
2272 $self->SUPER::_draw (); 2408 $self->SUPER::_draw ();
2273 2409
2274 glScale $self->{w}, $self->{h}; 2410 glScale $self->{w}, $self->{h};
2275 2411
… …
2336sub set_range { shift->{slider}->set_range (@_) } 2472sub set_range { shift->{slider}->set_range (@_) }
2337sub set_value { shift->{slider}->set_value (@_) } 2473sub set_value { shift->{slider}->set_value (@_) }
2338 2474
2339############################################################################# 2475#############################################################################
2340 2476
2341package CFClient::UI::TextView; 2477package CFClient::UI::TextScroller;
2342 2478
2343our @ISA = CFClient::UI::HBox::; 2479our @ISA = CFClient::UI::HBox::;
2344 2480
2345use CFClient::OpenGL; 2481use CFClient::OpenGL;
2346 2482
… …
2348 my $class = shift; 2484 my $class = shift;
2349 2485
2350 my $self = $class->SUPER::new ( 2486 my $self = $class->SUPER::new (
2351 fontsize => 1, 2487 fontsize => 1,
2352 can_events => 0, 2488 can_events => 0,
2489 indent => 0,
2353 #font => default_font 2490 #font => default_font
2354 @_, 2491 @_,
2355 2492
2356 layout => (new CFClient::Layout 1), 2493 layout => (new CFClient::Layout 1),
2357 par => [], 2494 par => [],
… …
2373 $self->{fontsize} = $fontsize; 2510 $self->{fontsize} = $fontsize;
2374 $self->reflow; 2511 $self->reflow;
2375} 2512}
2376 2513
2377sub size_allocate { 2514sub size_allocate {
2378 my ($self, $w, $h, $changed) = @_; 2515 my ($self, $w, $h) = @_;
2379 2516
2380 $self->SUPER::size_allocate ($w, $h, $changed); 2517 $self->SUPER::size_allocate ($w, $h);
2381
2382 return unless $changed;
2383 2518
2384 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2519 $self->{layout}->set_font ($self->{font}) if $self->{font};
2385 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2520 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2386 $self->{layout}->set_width ($self->{children}[0]{w}); 2521 $self->{layout}->set_width ($self->{children}[0]{w});
2522 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2387 2523
2388 $self->reflow; 2524 $self->reflow;
2389} 2525}
2390 2526
2391sub text_size { 2527sub text_size {
… …
2393 2529
2394 my $layout = $self->{layout}; 2530 my $layout = $self->{layout};
2395 2531
2396 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2532 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2397 $layout->set_width ($self->{children}[0]{w} - $indent); 2533 $layout->set_width ($self->{children}[0]{w} - $indent);
2534 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2398 $layout->set_markup ($text); 2535 $layout->set_markup ($text);
2399 2536
2400 $layout->size 2537 $layout->size
2401} 2538}
2402 2539
… …
2441 2578
2442 return unless $self->{h} > 0; 2579 return unless $self->{h} > 0;
2443 2580
2444 delete $self->{texture}; 2581 delete $self->{texture};
2445 2582
2446 $ROOT->on_post_alloc ($self, sub { 2583 $ROOT->on_post_alloc ($self => sub {
2447 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 2584 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2448 2585
2449 if (delete $self->{need_reflow}) { 2586 if (delete $self->{need_reflow}) {
2450 my $height = 0; 2587 my $height = 0;
2451 2588
… …
2454 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2591 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2455 2592
2456 for (@{$self->{par}}) { 2593 for (@{$self->{par}}) {
2457 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support 2594 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2458 $layout->set_width ($W - $_->[3]); 2595 $layout->set_width ($W - $_->[3]);
2596 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2459 $layout->set_markup ($_->[4]); 2597 $layout->set_markup ($_->[4]);
2460 my ($w, $h) = $layout->size; 2598 my ($w, $h) = $layout->size;
2461 $_->[0] = $w + $_->[3]; 2599 $_->[0] = $w + $_->[3];
2462 $_->[1] = $h; 2600 $_->[1] = $h;
2463 } 2601 }
… …
2466 } 2604 }
2467 2605
2468 $self->{height} = $height; 2606 $self->{height} = $height;
2469 2607
2470 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]); 2608 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2471 2609
2472 delete $self->{texture}; 2610 delete $self->{texture};
2473 } 2611 }
2474 2612
2475 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 2613 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2476 glClearColor 0.5, 0.5, 0.5, 0; 2614 glClearColor 0, 0, 0, 0;
2477 glClear GL_COLOR_BUFFER_BIT; 2615 glClear GL_COLOR_BUFFER_BIT;
2478 2616
2479 my $top = int $self->{children}[1]{range}[0]; 2617 my $top = int $self->{children}[1]{range}[0];
2480 2618
2481 my $y0 = $top; 2619 my $y0 = $top;
… …
2495 my $h = $par->[1]; 2633 my $h = $par->[1];
2496 2634
2497 if ($y0 < $y + $h && $y < $y1) { 2635 if ($y0 < $y + $h && $y < $y1) {
2498 $layout->set_foreground (@{ $par->[2] }); 2636 $layout->set_foreground (@{ $par->[2] });
2499 $layout->set_width ($W - $par->[3]); 2637 $layout->set_width ($W - $par->[3]);
2638 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2500 $layout->set_markup ($par->[4]); 2639 $layout->set_markup ($par->[4]);
2501 2640
2502 my ($w, $h, $data, $format, $internalformat) = $layout->render; 2641 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2503 2642
2504 glRasterPos $par->[3], $y - $y0; 2643 glRasterPos $par->[3], $y - $y0;
… …
2516sub _draw { 2655sub _draw {
2517 my ($self) = @_; 2656 my ($self) = @_;
2518 2657
2519 glEnable GL_TEXTURE_2D; 2658 glEnable GL_TEXTURE_2D;
2520 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2659 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2521 glColor 1, 1, 1, 1; 2660 glColor 0, 0, 0, 1;
2522 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2661 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2523 glDisable GL_TEXTURE_2D; 2662 glDisable GL_TEXTURE_2D;
2524 2663
2525 $self->{children}[1]->draw; 2664 $self->{children}[1]->draw;
2526 2665
2527} 2666}
… …
2610} 2749}
2611 2750
2612sub set_tooltip_from { 2751sub set_tooltip_from {
2613 my ($self, $widget) = @_; 2752 my ($self, $widget) = @_;
2614 2753
2754 my $tooltip = $widget->{tooltip};
2755
2756 if ($ENV{CFPLUS_DEBUG} & 2) {
2757 $tooltip .= "\n\n" . (ref $widget) . "\n"
2758 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2759 . "req $widget->{req_w} $widget->{req_h}\n"
2760 . "visible $widget->{visible}";
2761 }
2762
2763 $tooltip =~ s/^\n+//;
2764 $tooltip =~ s/\n+$//;
2765
2615 $self->add (new CFClient::UI::Label 2766 $self->add (new CFClient::UI::Label
2616 markup => $widget->{tooltip}, 2767 markup => $tooltip,
2617 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2768 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2618 fontsize => 0.8, 2769 fontsize => 0.8,
2619 fg => [0, 0, 0, 1], 2770 fg => [0, 0, 0, 1],
2620 ellipsise => 0, 2771 ellipsise => 0,
2621 font => ($widget->{tooltip_font} || $::FONT_PROP), 2772 font => ($widget->{tooltip_font} || $::FONT_PROP),
… …
2629 2780
2630 ($w + 4, $h + 4) 2781 ($w + 4, $h + 4)
2631} 2782}
2632 2783
2633sub size_allocate { 2784sub size_allocate {
2634 my ($self, $w, $h, $changed) = @_; 2785 my ($self, $w, $h) = @_;
2635 2786
2636 return unless $changed;
2637
2638 $self->SUPER::size_allocate ($w - 4, $h - 4, $changed); 2787 $self->SUPER::size_allocate ($w - 4, $h - 4);
2639} 2788}
2640 2789
2641sub visibility_change { 2790sub visibility_change {
2642 my ($self, $visible) = @_; 2791 my ($self, $visible) = @_;
2643 2792
2644 return unless $visible; 2793 return unless $visible;
2645 2794
2646 $self->{root}->on_post_alloc ("move_$self" => sub { 2795 $self->{root}->on_post_alloc ("move_$self" => sub {
2647 my $widget = $self->{owner}; 2796 my $widget = $self->{owner}
2797 or return;
2648 2798
2649 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 2799 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2650 2800
2651 ($x, $y) = $widget->coord2global (-$self->{w}, 0) 2801 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2652 if $x + $self->{w} > $::WIDTH; 2802 if $x + $self->{w} > $self->{root}{w};
2653 2803
2654 $self->move ($x, $y); 2804 $self->move_abs ($x, $y);
2655 }); 2805 });
2656} 2806}
2657 2807
2658sub _draw { 2808sub _draw {
2659 my ($self) = @_; 2809 my ($self) = @_;
… …
2746 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 2896 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2747 2897
2748 if ($tex) { 2898 if ($tex) {
2749 glEnable GL_TEXTURE_2D; 2899 glEnable GL_TEXTURE_2D;
2750 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2900 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2751 glColor 1, 1, 1, 1; 2901 glColor 0, 0, 0, 1;
2752 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2902 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2753 glDisable GL_TEXTURE_2D; 2903 glDisable GL_TEXTURE_2D;
2754 } 2904 }
2755} 2905}
2756 2906
2757sub DESTROY { 2907sub destroy {
2758 my ($self) = @_; 2908 my ($self) = @_;
2759 2909
2760 $self->{timer}->cancel 2910 $self->{timer}->cancel
2761 if $self->{timer}; 2911 if $self->{timer};
2762 2912
2763 $self->SUPER::DESTROY; 2913 $self->SUPER::destroy;
2764} 2914}
2765 2915
2766############################################################################# 2916#############################################################################
2767 2917
2768package CFClient::UI::Inventory; 2918package CFClient::UI::Buttonbar;
2769 2919
2770our @ISA = CFClient::UI::ScrolledWindow::; 2920our @ISA = CFClient::UI::HBox::;
2771 2921
2772sub new { 2922# TODO: should actualyl wrap buttons and other goodies.
2773 my $class = shift;
2774
2775 my $self = $class->SUPER::new (
2776 scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2777 @_,
2778 );
2779
2780 $self
2781}
2782
2783sub set_items {
2784 my ($self, $items) = @_;
2785
2786 $self->{scrolled}->clear;
2787 return unless $items;
2788
2789 my @items = sort {
2790 ($a->{type} <=> $b->{type})
2791 or ($a->{name} cmp $b->{name})
2792 } @$items;
2793
2794 $self->{real_items} = \@items;
2795
2796 my $row = 0;
2797 for my $item (@items) {
2798 CFClient::Item::update_widgets $item;
2799
2800 $self->{scrolled}->add (0, $row, $item->{face_widget});
2801 $self->{scrolled}->add (1, $row, $item->{desc_widget});
2802 $self->{scrolled}->add (2, $row, $item->{weight_widget});
2803
2804 $row++;
2805 }
2806}
2807 2923
2808############################################################################# 2924#############################################################################
2809 2925
2810package CFClient::UI::Menu; 2926package CFClient::UI::Menu;
2811 2927
… …
2823 ); 2939 );
2824 2940
2825 $self->add ($self->{vbox} = new CFClient::UI::VBox); 2941 $self->add ($self->{vbox} = new CFClient::UI::VBox);
2826 2942
2827 for my $item (@{ $self->{items} }) { 2943 for my $item (@{ $self->{items} }) {
2828 my ($widget, $cb) = @$item; 2944 my ($widget, $cb, $tooltip) = @$item;
2829 2945
2830 # handle various types of items, only text for now 2946 # handle various types of items, only text for now
2831 if (!ref $widget) { 2947 if (!ref $widget) {
2832 $widget = new CFClient::UI::Label 2948 $widget = new CFClient::UI::Label
2833 can_hover => 1, 2949 can_hover => 1,
2834 can_events => 1, 2950 can_events => 1,
2835 text => $widget; 2951 markup => $widget,
2952 tooltip => $tooltip
2836 } 2953 }
2837 2954
2838 $self->{item}{$widget} = $item; 2955 $self->{item}{$widget} = $item;
2839 2956
2840 $self->{vbox}->add ($widget); 2957 $self->{vbox}->add ($widget);
… …
2852 # maybe save $GRAB? must be careful about events... 2969 # maybe save $GRAB? must be careful about events...
2853 $GRAB = $self; 2970 $GRAB = $self;
2854 $self->{button} = $ev->{button}; 2971 $self->{button} = $ev->{button};
2855 2972
2856 $self->show; 2973 $self->show;
2857 $self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 2974 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2858} 2975}
2859 2976
2860sub mouse_motion { 2977sub mouse_motion {
2861 my ($self, $ev, $x, $y) = @_; 2978 my ($self, $ev, $x, $y) = @_;
2862 2979
2863 # TODO: should use vbox->find_widget or so 2980 # TODO: should use vbox->find_widget or so
2864 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 2981 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2865 $self->{hover} = $self->{item}{$HOVER}; 2982 $self->{hover} = $self->{item}{$HOVER};
2983
2984 0
2866} 2985}
2867 2986
2868sub button_up { 2987sub button_up {
2869 my ($self, $ev, $x, $y) = @_; 2988 my ($self, $ev, $x, $y) = @_;
2870 2989
… …
2872 undef $GRAB; 2991 undef $GRAB;
2873 $self->hide; 2992 $self->hide;
2874 2993
2875 $self->_emit ("popdown"); 2994 $self->_emit ("popdown");
2876 $self->{hover}[1]->() if $self->{hover}; 2995 $self->{hover}[1]->() if $self->{hover};
2996 } else {
2997 return 0
2998 }
2999
2877 } 3000 1
2878} 3001}
2879 3002
2880############################################################################# 3003#############################################################################
2881 3004
2882package CFClient::UI::Statusbox; 3005package CFClient::UI::Multiplexer;
2883 3006
2884our @ISA = CFClient::UI::VBox::; 3007our @ISA = CFClient::UI::Container::;
2885 3008
2886sub new { 3009sub new {
2887 my $class = shift; 3010 my $class = shift;
2888 3011
2889 $class->SUPER::new ( 3012 my $self = $class->SUPER::new (
3013 @_,
3014 );
3015
3016 $self->{current} = $self->{children}[0]
3017 if @{ $self->{children} };
3018
3019 $self
3020}
3021
3022sub add {
3023 my ($self, @widgets) = @_;
3024
3025 $self->SUPER::add (@widgets);
3026
3027 $self->{current} = $self->{children}[0]
3028 if @{ $self->{children} };
3029}
3030
3031sub set_current_page {
3032 my ($self, $page_or_widget) = @_;
3033
3034 my $widget = ref $page_or_widget
3035 ? $page_or_widget
3036 : $self->{children}[$page_or_widget];
3037
3038 $self->{current} = $widget;
3039 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
3040
3041 $self->_emit (page_changed => $self->{current});
3042
3043 $self->realloc;
3044}
3045
3046sub visible_children {
3047 $_[0]{current}
3048}
3049
3050sub size_request {
3051 my ($self) = @_;
3052
3053 $self->{current}->size_request
3054}
3055
3056sub size_allocate {
3057 my ($self, $w, $h) = @_;
3058
3059 $self->{current}->configure (0, 0, $w, $h);
3060}
3061
3062sub _draw {
3063 my ($self) = @_;
3064
3065 $self->{current}->draw;
3066}
3067
3068#############################################################################
3069
3070package CFClient::UI::Notebook;
3071
3072our @ISA = CFClient::UI::VBox::;
3073
3074sub new {
3075 my $class = shift;
3076
3077 my $self = $class->SUPER::new (
3078 buttonbar => (new CFClient::UI::Buttonbar),
3079 multiplexer => (new CFClient::UI::Multiplexer expand => 1),
3080 # filter => # will be put between multiplexer and $self
3081 @_,
3082 );
3083
3084 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3085 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3086
3087 $self
3088}
3089
3090sub add {
3091 my ($self, $title, $widget, $tooltip) = @_;
3092
3093 Scalar::Util::weaken $self;
3094
3095 $self->{buttonbar}->add (new CFClient::UI::Button
3096 markup => $title,
3097 tooltip => $tooltip,
3098 on_activate => sub { $self->set_current_page ($widget) },
3099 );
3100
3101 $self->{multiplexer}->add ($widget);
3102}
3103
3104sub set_current_page {
3105 my ($self, $page) = @_;
3106
3107 $self->{multiplexer}->set_current_page ($page);
3108 $self->_emit (page_changed => $self->{multiplexer}{current});
3109}
3110
3111#############################################################################
3112
3113package CFClient::UI::Combobox;
3114
3115use utf8;
3116
3117our @ISA = CFClient::UI::Button::;
3118
3119sub new {
3120 my $class = shift;
3121
3122 my $self = $class->SUPER::new (
3123 options => [], # [value, title, longdesc], ...
3124 value => undef,
3125 @_,
3126 );
3127
3128 $self->_set_value ($self->{value});
3129
3130 $self
3131}
3132
3133sub button_down {
3134 my ($self, $ev) = @_;
3135
3136 my @menu_items;
3137
3138 for (@{ $self->{options} }) {
3139 my ($value, $title, $tooltip) = @$_;
3140
3141 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3142 }
3143
3144 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
3145}
3146
3147sub _set_value {
3148 my ($self, $value) = @_;
3149
3150 my ($item) = grep $_->[0] eq $value, @{ $self->{options} }
3151 or return;
3152
3153 $self->{value} = $item->[0];
3154 $self->set_markup ("$item->[1] ⇓");
3155 $self->set_tooltip ($item->[2]);
3156}
3157
3158sub set_value {
3159 my ($self, $value) = @_;
3160
3161 return unless $self->{value} ne $value;
3162
3163 $self->_set_value ($value);
3164 $self->_emit (changed => $value);
3165}
3166
3167#############################################################################
3168
3169package CFClient::UI::Statusbox;
3170
3171our @ISA = CFClient::UI::VBox::;
3172
3173sub new {
3174 my $class = shift;
3175
3176 my $self = $class->SUPER::new (
2890 fontsize => 0.8, 3177 fontsize => 0.8,
2891 @_, 3178 @_,
2892 ) 3179 );
3180
3181 Scalar::Util::weaken (my $this = $self);
3182
3183 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3184
3185 $self
2893} 3186}
2894 3187
2895sub reorder { 3188sub reorder {
2896 my ($self) = @_; 3189 my ($self) = @_;
2897 my $NOW = time; 3190 my $NOW = Time::HiRes::time;
3191
3192 # freeze display when hovering over any label
3193 return if $CFClient::UI::TOOLTIP->{owner}
3194 && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},
3195 values %{ $self->{item} };
2898 3196
2899 while (my ($k, $v) = each %{ $self->{item} }) { 3197 while (my ($k, $v) = each %{ $self->{item} }) {
2900 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3198 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2901 } 3199 }
2902 3200
… …
2905 my @items = sort { 3203 my @items = sort {
2906 $a->{pri} <=> $b->{pri} 3204 $a->{pri} <=> $b->{pri}
2907 or $b->{id} <=> $a->{id} 3205 or $b->{id} <=> $a->{id}
2908 } values %{ $self->{item} }; 3206 } values %{ $self->{item} };
2909 3207
3208 $self->{timer}->interval (1);
3209
2910 my $count = 10 + 1; 3210 my $count = 10 + 1;
2911 for my $item (@items) { 3211 for my $item (@items) {
2912 last unless --$count; 3212 last unless --$count;
2913 3213
2914 push @widgets, $item->{label} ||= do { 3214 my $label = $item->{label} ||= do {
2915 # TODO: doesn't handle markup well (read as: at all) 3215 # TODO: doesn't handle markup well (read as: at all)
2916 my $short = $item->{count} > 1 3216 my $short = $item->{count} > 1
2917 ? "<b>$item->{count} ×</b> $item->{text}" 3217 ? "<b>$item->{count} ×</b> $item->{text}"
2918 : $item->{text}; 3218 : $item->{text};
2919 3219
… …
2927 tooltip => $item->{tooltip}, 3227 tooltip => $item->{tooltip},
2928 tooltip_font => $::FONT_PROP, 3228 tooltip_font => $::FONT_PROP,
2929 tooltip_width => 0.67, 3229 tooltip_width => 0.67,
2930 fontsize => $item->{fontsize} || $self->{fontsize}, 3230 fontsize => $item->{fontsize} || $self->{fontsize},
2931 max_w => $::WIDTH * 0.44, 3231 max_w => $::WIDTH * 0.44,
2932 fg => $item->{fg}, 3232 fg => [@{ $item->{fg} }],
2933 can_events => 1, 3233 can_events => 1,
2934 can_hover => 1 3234 can_hover => 1
2935 }; 3235 };
3236
3237 if ((my $diff = $item->{timeout} - $NOW) < 2) {
3238 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
3239 $label->update;
3240 $label->set_max_size (undef, $label->{req_h} * $diff)
3241 if $diff < 1;
3242 $self->{timer}->interval (1/30);
3243 } else {
3244 $label->{fg}[3] = $item->{fg}[3] || 1;
3245 }
3246
3247 push @widgets, $label;
2936 } 3248 }
2937 3249
2938 $self->clear; 3250 $self->clear;
2939 $self->SUPER::add (reverse @widgets); 3251 $self->SUPER::add (reverse @widgets);
2940} 3252}
… …
2945 $text =~ s/^\s+//; 3257 $text =~ s/^\s+//;
2946 $text =~ s/\s+$//; 3258 $text =~ s/\s+$//;
2947 3259
2948 return unless $text; 3260 return unless $text;
2949 3261
2950 my $timeout = time + ((delete $arg{timeout}) || 60); 3262 my $timeout = (int time) + ((delete $arg{timeout}) || 60);
2951 3263
2952 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 3264 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2953 3265
2954 if (my $item = $self->{item}{$group}) { 3266 if (my $item = $self->{item}{$group}) {
2955 if ($item->{text} eq $text) { 3267 if ($item->{text} eq $text) {
2956 $item->{count}++; 3268 $item->{count}++;
2957 } else { 3269 } else {
2958 $item->{count} = 1; 3270 $item->{count} = 1;
2959 $item->{text} = $item->{tooltip} = $text; 3271 $item->{text} = $item->{tooltip} = $text;
2960 } 3272 }
2961 $item->{id} = ++$self->{id}; 3273 $item->{id} += 0.2;#d#
2962 $item->{timeout} = $timeout; 3274 $item->{timeout} = $timeout;
2963 delete $item->{label}; 3275 delete $item->{label};
2964 } else { 3276 } else {
2965 $self->{item}{$group} = { 3277 $self->{item}{$group} = {
2966 id => ++$self->{id}, 3278 id => ++$self->{id},
… …
2985 3297
2986 $self->reorder; 3298 $self->reorder;
2987 $self->SUPER::reconfigure; 3299 $self->SUPER::reconfigure;
2988} 3300}
2989 3301
3302sub destroy {
3303 my ($self) = @_;
3304
3305 $self->{timer}->cancel;
3306
3307 $self->SUPER::destroy;
3308}
3309
2990############################################################################# 3310#############################################################################
2991 3311
3312package CFClient::UI::Inventory;
3313
3314our @ISA = CFClient::UI::ScrolledWindow::;
3315
3316sub new {
3317 my $class = shift;
3318
3319 my $self = $class->SUPER::new (
3320 child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
3321 @_,
3322 );
3323
3324 $self
3325}
3326
3327sub set_items {
3328 my ($self, $items) = @_;
3329
3330 $self->{child}->clear;
3331 return unless $items;
3332
3333 my @items = sort {
3334 ($a->{type} <=> $b->{type})
3335 or ($a->{name} cmp $b->{name})
3336 } @$items;
3337
3338 $self->{real_items} = \@items;
3339
3340 my $row = 0;
3341 for my $item (@items) {
3342 CFClient::Item::update_widgets $item;
3343
3344 $self->{child}->add (0, $row, $item->{face_widget});
3345 $self->{child}->add (1, $row, $item->{desc_widget});
3346 $self->{child}->add (2, $row, $item->{weight_widget});
3347
3348 $row++;
3349 }
3350}
3351
3352#############################################################################
3353
3354package CFClient::UI::BindEditor;
3355
3356our @ISA = CFClient::UI::FancyFrame::;
3357
3358sub new {
3359 my $class = shift;
3360
3361 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3362
3363 $self->add (my $vb = new CFClient::UI::VBox);
3364
3365
3366 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3367 text => "start recording",
3368 tooltip => "Start/Stops recording of actions."
3369 ."All subsequent actions after the recording started will be captured."
3370 ."The actions are displayed after the record was stopped."
3371 ."To bind the action you have to click on the 'Bind' button",
3372 on_activate => sub {
3373 unless ($self->{recording}) {
3374 $self->start;
3375 } else {
3376 $self->stop;
3377 }
3378 });
3379
3380 $vb->add (new CFClient::UI::Label text => "Actions:");
3381 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3382
3383 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3384 $vb->add (my $hb = new CFClient::UI::HBox);
3385 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3386 $hb->add (new CFClient::UI::Button
3387 text => "bind",
3388 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3389 on_activate => sub {
3390 $self->ask_for_bind;
3391 });
3392
3393 $vb->add (my $hb = new CFClient::UI::HBox);
3394 $hb->add (new CFClient::UI::Button
3395 text => "ok",
3396 expand => 1,
3397 tooltip => "This closes the binding editor and saves the binding",
3398 on_activate => sub {
3399 $self->hide;
3400 $self->commit;
3401 });
3402
3403 $hb->add (new CFClient::UI::Button
3404 text => "cancel",
3405 expand => 1,
3406 tooltip => "This closes the binding editor without saving",
3407 on_activate => sub {
3408 $self->hide;
3409 $self->{binding_cancel}->()
3410 if $self->{binding_cancel};
3411 });
3412
3413 $self->update_binding_widgets;
3414
3415 $self
3416}
3417
3418sub commit {
3419 my ($self) = @_;
3420 my ($mod, $sym, $cmds) = $self->get_binding;
3421 if ($sym != 0 && @$cmds > 0) {
3422 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3423 ."'. Don't forget 'Save Config'!");
3424 $self->{binding_change}->($mod, $sym, $cmds)
3425 if $self->{binding_change};
3426 } else {
3427 $::STATUSBOX->add ("No action bound, no key or action specified!");
3428 $self->{binding_cancel}->()
3429 if $self->{binding_cancel};
3430 }
3431}
3432
3433sub start {
3434 my ($self) = @_;
3435
3436 $self->{rec_btn}->set_text ("stop recording");
3437 $self->{recording} = 1;
3438 $self->clear_command_list;
3439 $::CONN->start_record if $::CONN;
3440}
3441
3442sub stop {
3443 my ($self) = @_;
3444
3445 $self->{rec_btn}->set_text ("start recording");
3446 $self->{recording} = 0;
3447
3448 my $rec;
3449 $rec = $::CONN->stop_record if $::CONN;
3450 return unless ref $rec eq 'ARRAY';
3451 $self->set_command_list ($rec);
3452}
3453
3454
3455sub ask_for_bind_and_commit {
3456 my ($self) = @_;
3457 $self->ask_for_bind (1);
3458}
3459
3460sub ask_for_bind {
3461 my ($self, $commit) = @_;
3462
3463 CFClient::Binder::open_binding_dialog (sub {
3464 my ($mod, $sym) = @_;
3465 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3466 $self->update_binding_widgets;
3467 $self->commit if $commit;
3468 });
3469}
3470
3471# $mod and $sym are the modifiers and key symbol
3472# $cmds is a array ref of strings (the commands)
3473# $cb is the callback that is executed on OK
3474# $ccb is the callback that is executed on CANCEL and
3475# when the binding was unsuccessful on OK
3476sub set_binding {
3477 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3478
3479 $self->clear_command_list;
3480 $self->{recording} = 0;
3481 $self->{rec_btn}->set_text ("start recording");
3482
3483 $self->{binding} = [$mod, $sym];
3484 $self->{commands} = $cmds;
3485
3486 $self->{binding_change} = $cb;
3487 $self->{binding_cancel} = $ccb;
3488
3489 $self->update_binding_widgets;
3490}
3491
3492# this is a shortcut method that asks for a binding
3493# and then just binds it.
3494sub do_quick_binding {
3495 my ($self, $cmds) = @_;
3496 $self->set_binding (undef, undef, $cmds, sub {
3497 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3498 });
3499 $self->ask_for_bind (1);
3500}
3501
3502sub update_binding_widgets {
3503 my ($self) = @_;
3504 my ($mod, $sym, $cmds) = $self->get_binding;
3505 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3506 $self->set_command_list ($cmds);
3507}
3508
3509sub get_binding {
3510 my ($self) = @_;
3511 return (
3512 $self->{binding}->[0],
3513 $self->{binding}->[1],
3514 [ grep { defined $_ } @{$self->{commands}} ]
3515 );
3516}
3517
3518sub clear_command_list {
3519 my ($self) = @_;
3520 $self->{cmdbox}->clear ();
3521}
3522
3523sub set_command_list {
3524 my ($self, $cmds) = @_;
3525
3526 $self->{cmdbox}->clear ();
3527 $self->{commands} = $cmds;
3528
3529 my $idx = 0;
3530
3531 for (@$cmds) {
3532 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3533
3534 my $i = $idx;
3535 $hb->add (new CFClient::UI::Label text => $_);
3536 $hb->add (new CFClient::UI::Button
3537 text => "delete",
3538 tooltip => "Deletes the action from the record",
3539 on_activate => sub {
3540 $self->{cmdbox}->remove ($hb);
3541 $cmds->[$i] = undef;
3542 });
3543
3544
3545 $idx++
3546 }
3547}
3548
3549#############################################################################
3550
3551package CFClient::UI::SpellList;
3552
3553our @ISA = CFClient::UI::Table::;
3554
3555sub new {
3556 my $class = shift;
3557
3558 my $self = $class->SUPER::new (
3559 binding => [],
3560 commands => [],
3561 @_,
3562 )
3563}
3564
3565my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3566
3567my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3568 "<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
3569my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3570 "<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3571my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3572 "<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3573my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3574 "<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3575my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3576 "<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3577
3578sub rebuild_spell_list {
3579 my ($self) = @_;
3580
3581 $CFClient::UI::ROOT->on_refresh ($self => sub {
3582 $self->clear;
3583
3584 return unless $::CONN;
3585
3586 $self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3587 $self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL);
3588 $self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3589 $self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3590 $self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3591
3592 my $row = 0;
3593
3594 for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3595 my $spell = $self->{spell}{$_};
3596
3597 $row++;
3598
3599 my $spell_cb = sub {
3600 my ($widget, $ev) = @_;
3601
3602 if ($ev->{button} == 1) {
3603 $::CONN->user_send ("cast $spell->{name}");
3604 } elsif ($ev->{button} == 2) {
3605 $::CONN->user_send ("invoke $spell->{name}");
3606 } elsif ($ev->{button} == 3) {
3607 (new CFClient::UI::Menu
3608 items => [
3609 ["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3610 ["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3611 ],
3612 )->popup ($ev);
3613 } else {
3614 return 0;
3615 }
3616
3617 1
3618 };
3619
3620 my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3621
3622 #TODO: add path info to tooltip
3623 #$self->add (6, $row, new CFClient::UI::Label text => $spell->{path});
3624
3625 $self->add (0, $row, new CFClient::UI::Face
3626 face => $spell->{face},
3627 can_hover => 1,
3628 can_events => 1,
3629 tooltip => $tooltip,
3630 on_button_down => $spell_cb,
3631 );
3632
3633 $self->add (1, $row, new CFClient::UI::Label
3634 expand => 1,
3635 text => $spell->{name},
3636 can_hover => 1,
3637 can_events => 1,
3638 tooltip => $tooltip,
3639 on_button_down => $spell_cb,
3640 );
3641
3642 $self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3643 $self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3644 $self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3645 $self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3646 }
3647 });
3648}
3649
3650sub add_spell {
3651 my ($self, $spell) = @_;
3652
3653 $self->{spell}->{$spell->{name}} = $spell;
3654 $self->rebuild_spell_list;
3655}
3656
3657sub remove_spell {
3658 my ($self, $spell) = @_;
3659
3660 delete $self->{spell}->{$spell->{name}};
3661 $self->rebuild_spell_list;
3662}
3663
3664sub clear_spells {
3665 my ($self) = @_;
3666
3667 $self->{spell} = {};
3668 $self->rebuild_spell_list;
3669}
3670
3671#############################################################################
3672
2992package CFClient::UI::Root; 3673package CFClient::UI::Root;
2993 3674
2994our @ISA = CFClient::UI::Container::; 3675our @ISA = CFClient::UI::Container::;
3676
3677use List::Util qw(min max);
2995 3678
2996use CFClient::OpenGL; 3679use CFClient::OpenGL;
2997 3680
2998sub new { 3681sub new {
2999 my $class = shift; 3682 my $class = shift;
… …
3006 Scalar::Util::weaken ($self->{root} = $self); 3689 Scalar::Util::weaken ($self->{root} = $self);
3007 3690
3008 $self 3691 $self
3009} 3692}
3010 3693
3011sub configure {
3012 my ($self, $x, $y, $w, $h) = @_;
3013
3014 $self->{w} = $w;
3015 $self->{h} = $h;
3016}
3017
3018sub reconfigure {
3019 my ($self) = @_;
3020
3021 $self->SUPER::reconfigure;
3022
3023 $self->size_allocate ($self->{w}, $self->{h}, 1)
3024 if $self->{w};
3025}
3026
3027sub size_request { 3694sub size_request {
3028 my ($self) = @_; 3695 my ($self) = @_;
3029 3696
3030 ($self->{w}, $self->{h}) 3697 ($self->{w}, $self->{h})
3031} 3698}
3032 3699
3700sub _to_pixel {
3701 my ($coord, $size, $max) = @_;
3702
3703 $coord =
3704 $coord eq "center" ? ($max - $size) * 0.5
3705 : $coord eq "max" ? $max
3706 : $coord;
3707
3708 $coord = 0 if $coord < 0;
3709 $coord = $max - $size if $coord > $max - $size;
3710
3711 int $coord + 0.5
3712}
3713
3033sub size_allocate { 3714sub size_allocate {
3034 my ($self, $w, $h, $changed) = @_; 3715 my ($self, $w, $h) = @_;
3035 3716
3036 for my $child ($self->children) { 3717 for my $child ($self->children) {
3037 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3718 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3038 3719
3039 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1 3720 $X = $child->{force_x} if exists $child->{force_x};
3040 if exists $child->{req_x}; 3721 $Y = $child->{force_y} if exists $child->{force_y};
3041 3722
3042 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1 3723 $X = _to_pixel $X, $W, $self->{w};
3043 if exists $child->{req_y}; 3724 $Y = _to_pixel $Y, $H, $self->{h};
3044
3045 #delete @$child{qw(req_x req_y)};#d# def_x, def_y
3046
3047 $X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
3048 $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
3049 3725
3050 $child->configure ($X, $Y, $W, $H); 3726 $child->configure ($X, $Y, $W, $H);
3051 } 3727 }
3052} 3728}
3053 3729
… …
3070} 3746}
3071 3747
3072sub add { 3748sub add {
3073 my ($self, @children) = @_; 3749 my ($self, @children) = @_;
3074 3750
3075 for my $child (@children) {
3076 $child->{is_toplevel} = 1; 3751 $_->{is_toplevel} = 1
3077 3752 for @children;
3078 # integerise window positions
3079 $child->{x} = int $child->{x};
3080 $child->{y} = int $child->{y};
3081 }
3082 3753
3083 $self->SUPER::add (@children); 3754 $self->SUPER::add (@children);
3084} 3755}
3085 3756
3086sub remove { 3757sub remove {
3087 my ($self, @children) = @_; 3758 my ($self, @children) = @_;
3088 3759
3089 $self->SUPER::remove (@children); 3760 $self->SUPER::remove (@children);
3761
3762 delete $self->{is_toplevel}
3763 for @children;
3090 3764
3091 while (@children) { 3765 while (@children) {
3092 my $w = pop @children; 3766 my $w = pop @children;
3093 push @children, $w->children; 3767 push @children, $w->children;
3094 $w->set_invisible; 3768 $w->set_invisible;
… …
3114 $_->() 3788 $_->()
3115 for values %{delete $self->{refresh_hook}}; 3789 for values %{delete $self->{refresh_hook}};
3116 } 3790 }
3117 3791
3118 if ($self->{realloc}) { 3792 if ($self->{realloc}) {
3793 my %queue;
3119 my @queue; 3794 my @queue;
3795 my $widget;
3120 3796
3797 outer:
3121 while () { 3798 while () {
3122 if ($self->{realloc}) { 3799 if (my $realloc = delete $self->{realloc}) {
3123 #TODO use array-of-depth approach 3800 for $widget (values %$realloc) {
3801 $widget->{visible} or next; # do not resize invisible widgets
3124 3802
3125 @queue = sort { $a->{visible} <=> $b->{visible} } 3803 $queue{$widget+0}++ and next; # duplicates are common
3126 @queue, values %{delete $self->{realloc}}; 3804
3805 push @{ $queue[$widget->{visible}] }, $widget;
3806 }
3127 } 3807 }
3128 3808
3809 while () {
3810 @queue or last outer;
3811
3812 $widget = pop @{ $queue[-1] || [] }
3813 and last;
3814
3815 pop @queue;
3816 }
3817
3818 delete $queue{$widget+0};
3819
3820 my ($w, $h) = $widget->size_request;
3821
3822 $w = max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3823 $h = max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3824
3825 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3826 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3827
3828 $w = $widget->{force_w} if exists $widget->{force_w};
3829 $h = $widget->{force_h} if exists $widget->{force_h};
3830
3831 if ($widget->{req_w} != $w || $widget->{req_h} != $h
3832 || delete $widget->{force_realloc}) {
3833 $widget->{req_w} = $w;
3834 $widget->{req_h} = $h;
3835
3836 $self->{size_alloc}{$widget+0} = $widget;
3837
3838 if (my $parent = $widget->{parent}) {
3839 $self->{realloc}{$parent+0} = $parent
3840 unless $queue{$parent+0};
3841
3842 $parent->{force_size_alloc} = 1;
3843 $self->{size_alloc}{$parent+0} = $parent;
3844 }
3845 }
3846
3847 delete $self->{realloc}{$widget+0};
3848 }
3849 }
3850
3851 while (my $size_alloc = delete $self->{size_alloc}) {
3852 my @queue = sort { $b->{visible} <=> $a->{visible} }
3853 values %$size_alloc;
3854
3855 while () {
3129 my $widget = pop @queue || last; 3856 my $widget = pop @queue || last;
3130 3857
3131 $widget->{visible} or last; # do not resize invisible widgets 3858 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3132
3133 my ($w, $h) = $widget->{def_w} && $widget->{def_h}
3134 ? @$widget{qw(def_w def_h)}
3135 : $widget->size_request;
3136
3137 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
3138
3139 $widget->{req_w} = $w;
3140 $widget->{req_h} = $h;
3141
3142 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h];
3143
3144 push @queue, $widget->{parent}
3145 if $widget->{parent};
3146 }
3147 }
3148
3149 while (my $size_alloc = delete $self->{size_alloc}) {
3150 my @queue = sort $b->[0]{visible} <=> $a->[0]{visible},
3151 values %$size_alloc;
3152
3153 while () {
3154 my ($widget, $w, $h) = @{ pop @queue or last };
3155 3859
3156 $w = 0 if $w < 0; 3860 $w = 0 if $w < 0;
3157 $h = 0 if $h < 0; 3861 $h = 0 if $h < 0;
3158 3862
3159 my $changed = $widget->{w} != $w || $widget->{h} != $h; 3863 $w = int $w + 0.5;
3864 $h = int $h + 0.5;
3160 3865
3866 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3867 $widget->{old_w} = $widget->{w};
3868 $widget->{old_h} = $widget->{h};
3869
3161 $widget->{w} = $w; 3870 $widget->{w} = $w;
3162 $widget->{h} = $h; 3871 $widget->{h} = $h;
3163 3872
3164 $widget->emit (size_allocate => $w, $h, $changed); 3873 $widget->emit (size_allocate => $w, $h);
3874 }
3165 } 3875 }
3166 } 3876 }
3167 3877
3168 while ($self->{post_alloc_hook}) { 3878 while ($self->{post_alloc_hook}) {
3169 $_->() 3879 $_->()
3170 for values %{delete $self->{post_alloc_hook}}; 3880 for values %{delete $self->{post_alloc_hook}};
3171 } 3881 }
3882
3172 3883
3173 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3884 glViewport 0, 0, $::WIDTH, $::HEIGHT;
3174 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3885 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3175 glClear GL_COLOR_BUFFER_BIT; 3886 glClear GL_COLOR_BUFFER_BIT;
3176 3887
… …
3178 glLoadIdentity; 3889 glLoadIdentity;
3179 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 3890 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3180 glMatrixMode GL_MODELVIEW; 3891 glMatrixMode GL_MODELVIEW;
3181 glLoadIdentity; 3892 glLoadIdentity;
3182 3893
3894 {
3895 package CFClient::UI::Base;
3896
3897 ($draw_x, $draw_y, $draw_w, $draw_h) =
3898 (0, 0, $self->{w}, $self->{h});
3899 }
3900
3183 $self->_draw; 3901 $self->_draw;
3184} 3902}
3185 3903
3186############################################################################# 3904#############################################################################
3187 3905

Diff Legend

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