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.252 by root, Sun May 28 23:21:28 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) {
27 $TOOLTIP->hide;
28
45 $TOOLTIP->{owner} = $widget; 29 $TOOLTIP->{owner} = $widget;
30
31 return if $ENV{CFPLUS_DEBUG} & 8;
46 32
47 my $tip = $widget->{tooltip}; 33 my $tip = $widget->{tooltip};
48 34
49 $tip = $tip->($widget) if CODE:: eq ref $tip; 35 $tip = $tip->($widget) if CODE:: eq ref $tip;
50 36
51 $TOOLTIP->set_tooltip_from ($widget); 37 $TOOLTIP->set_tooltip_from ($widget);
52
53 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
54
55 ($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0)
56 if $x + $TOOLTIP->{w} > $::WIDTH;
57
58 $TOOLTIP->move ($x, $y);
59 $TOOLTIP->show; 38 $TOOLTIP->show;
60 } 39 }
61 40
62 return; 41 return;
63 } 42 }
64 } 43 }
65 } 44 }
66 45
67 $TOOLTIP->hide; 46 $TOOLTIP->hide;
68 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;
69} 71}
70 72
71# class methods for events 73# class methods for events
72sub feed_sdl_key_down_event { 74sub feed_sdl_key_down_event {
73 $FOCUS->emit (key_down => $_[0]) 75 $FOCUS->emit (key_down => $_[0])
… …
87 my $widget = $ROOT->find_widget ($x, $y); 89 my $widget = $ROOT->find_widget ($x, $y);
88 90
89 $GRAB = $widget; 91 $GRAB = $widget;
90 $GRAB->update if $GRAB; 92 $GRAB->update if $GRAB;
91 93
92 check_tooltip; 94 $TOOLTIP_WATCHER->cb->();
93 } 95 }
94 96
95 $BUTTON_STATE |= 1 << ($ev->{button} - 1); 97 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
96 98
97 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y)) 99 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))
… …
112 if (!$BUTTON_STATE) { 114 if (!$BUTTON_STATE) {
113 my $grab = $GRAB; undef $GRAB; 115 my $grab = $GRAB; undef $GRAB;
114 $grab->update if $grab; 116 $grab->update if $grab;
115 $GRAB->update if $GRAB; 117 $GRAB->update if $GRAB;
116 118
117 check_tooltip; 119 $TOOLTIP_WATCHER->cb->();
118 } 120 }
119} 121}
120 122
121sub feed_sdl_motion_event { 123sub feed_sdl_motion_event {
122 my ($ev) = @_; 124 my ($ev) = @_;
… …
128 my $hover = $HOVER; $HOVER = $widget; 130 my $hover = $HOVER; $HOVER = $widget;
129 131
130 $hover->update if $hover && $hover->{can_hover}; 132 $hover->update if $hover && $hover->{can_hover};
131 $HOVER->update if $HOVER && $HOVER->{can_hover}; 133 $HOVER->update if $HOVER && $HOVER->{can_hover};
132 134
133 check_tooltip; 135 $TOOLTIP_WATCHER->start;
134 } 136 }
135 137
136 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y)) 138 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
137 if $HOVER; 139 if $HOVER;
138} 140}
… …
170sub rescale_widgets { 172sub rescale_widgets {
171 my ($sx, $sy) = @_; 173 my ($sx, $sy) = @_;
172 174
173 for my $widget (values %WIDGET) { 175 for my $widget (values %WIDGET) {
174 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
175 $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.]+$/;
176 $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};
177 $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};
178 $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.]+$/;
179 $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};
180 $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
181 } 190 }
182 } 191 }
183 192
184 reconfigure_widgets; 193 reconfigure_widgets;
185} 194}
… …
194 203
195sub new { 204sub new {
196 my $class = shift; 205 my $class = shift;
197 206
198 my $self = bless { 207 my $self = bless {
199 x => 0, 208 x => "center",
200 y => 0, 209 y => "center",
201 z => 0, 210 z => 0,
211 w => undef,
212 h => undef,
202 can_events => 1, 213 can_events => 1,
203 @_ 214 @_
204 }, $class; 215 }, $class;
216
217 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
205 218
206 for (keys %$self) { 219 for (keys %$self) {
207 if (/^on_(.*)$/) { 220 if (/^on_(.*)$/) {
208 $self->connect ($1 => delete $self->{$_}); 221 $self->connect ($1 => delete $self->{$_});
209 } 222 }
210 } 223 }
211 224
212 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
213
214 if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) { 225 if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {
215 $self->{req_x} = $layout->{x} * $::WIDTH; 226 $self->{x} = $layout->{x} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{x};
216 $self->{req_y} = $layout->{y} * $::HEIGHT; 227 $self->{y} = $layout->{y} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{y};
217 $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};
218 $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};
219 } 235 }
220 236
221 $self 237 $self
222} 238}
223 239
… …
234 return if $self->{parent}; 250 return if $self->{parent};
235 251
236 $CFClient::UI::ROOT->add ($self); 252 $CFClient::UI::ROOT->add ($self);
237} 253}
238 254
239sub center {
240 my ($self) = @_;
241
242 $CFClient::UI::ROOT->on_post_alloc (
243 "center_$self" => sub {
244 $self->move (($self->{parent}{w} - $self->{w}) * 0.5, ($self->{parent}{h} - $self->{h}) * 0.5);
245 },
246 );
247
248 $self->update;
249}
250
251sub set_visible { 255sub set_visible {
252 my ($self) = @_; 256 my ($self) = @_;
253 257
254 return if $self->{visible}; 258 return if $self->{visible};
255 259
… …
268 272
269 return unless $self->{visible}; 273 return unless $self->{visible};
270 274
271 $_->set_invisible for $self->children; 275 $_->set_invisible for $self->children;
272 276
277 delete $self->{visible};
273 delete $self->{root}; 278 delete $self->{root};
274 delete $self->{visible};
275 279
276 undef $GRAB if $GRAB == $self; 280 undef $GRAB if $GRAB == $self;
277 undef $HOVER if $HOVER == $self; 281 undef $HOVER if $HOVER == $self;
278 282
279 CFClient::UI::check_tooltip 283 $CFClient::UI::TOOLTIP_WATCHER->cb->()
280 if $TOOLTIP->{owner} == $self; 284 if $TOOLTIP->{owner} == $self;
281 285
282 $self->focus_out; 286 $self->focus_out;
283 287
284 $self->emit (visibility_change => 0); 288 $self->emit (visibility_change => 0);
… …
308 312
309 $self->{parent}->remove ($self) 313 $self->{parent}->remove ($self)
310 if $self->{parent}; 314 if $self->{parent};
311} 315}
312 316
313sub move { 317sub move_abs {
314 my ($self, $x, $y, $z) = @_; 318 my ($self, $x, $y, $z) = @_;
315 319
316 $self->{x} = int $x; 320 $self->{x} = List::Util::max 0, List::Util::min $self->{root}{w} - $self->{w}, int $x;
317 $self->{y} = int $y; 321 $self->{y} = List::Util::max 0, List::Util::min $self->{root}{h} - $self->{h}, int $y;
318 $self->{z} = $z if defined $z; 322 $self->{z} = $z if defined $z;
319 323
320 $self->update; 324 $self->update;
321} 325}
322 326
323sub set_size { 327sub set_size {
324 my ($self, $w, $h) = @_; 328 my ($self, $w, $h) = @_;
325 329
326 $self->{def_w} = $w; 330 $self->{force_w} = $w;
327 $self->{def_h} = $h; 331 $self->{force_h} = $h;
328 332
329 $self->realloc; 333 $self->realloc;
330} 334}
331 335
332sub size_request { 336sub size_request {
… …
336 340
337sub configure { 341sub configure {
338 my ($self, $x, $y, $w, $h) = @_; 342 my ($self, $x, $y, $w, $h) = @_;
339 343
340 if ($self->{aspect}) { 344 if ($self->{aspect}) {
345 my ($ow, $oh) = ($w, $h);
346
341 my $w2 = List::Util::min $w, int $h * $self->{aspect}; 347 $w = List::Util::min $w, int $h * $self->{aspect};
342 my $h2 = List::Util::min $h, int $w / $self->{aspect}; 348 $h = List::Util::min $h, int $w / $self->{aspect};
343 349
344 # use alignment to adjust x, y 350 # use alignment to adjust x, y
345 351
346 $x += int +($w - $w2) * 0.5; 352 $x += int 0.5 * ($ow - $w);
347 $y += int +($h - $h2) * 0.5; 353 $y += int 0.5 * ($oh - $h);
348
349 ($w, $h) = ($w2, $h2);
350 } 354 }
351 355
352 if ($self->{x} != $x || $self->{y} != $y) { 356 if ($self->{x} ne $x || $self->{y} ne $y) {
353 $self->{x} = $x; 357 $self->{x} = $x;
354 $self->{y} = $y; 358 $self->{y} = $y;
355 $self->update; 359 $self->update;
356 } 360 }
357 361
358 if ($self->{w} != $w || $self->{h} != $h) { 362 if ($self->{alloc_w} != $w || $self->{alloc_h} != $h) {
359 return unless $self->{visible}; 363 return unless $self->{visible};
360 364
365 $self->{alloc_w} = $w;
366 $self->{alloc_h} = $h;
367
361 $self->{root}->{size_alloc}{$self+0} = [$self, $w, $h]; 368 $self->{root}{size_alloc}{$self+0} = $self;
362 } 369 }
363} 370}
364 371
365sub size_allocate { 372sub size_allocate {
366 # nothing to be done 373 # nothing to be done
367} 374}
368 375
369sub children { 376sub children {
377 # nop
378}
379
380sub visible_children {
381 $_[0]->children
370} 382}
371 383
372sub set_max_size { 384sub set_max_size {
373 my ($self, $w, $h) = @_; 385 my ($self, $w, $h) = @_;
374 386
375 delete $self->{max_w}; $self->{max_w} = $w if $w; 387 $self->{max_w} = int $w if defined $w;
376 delete $self->{max_h}; $self->{max_h} = $h if $h; 388 $self->{max_h} = int $h if defined $h;
389
390 $self->realloc;
377} 391}
378 392
379sub set_tooltip { 393sub set_tooltip {
380 my ($self, $tooltip) = @_; 394 my ($self, $tooltip) = @_;
381 395
… …
386 400
387 $self->{tooltip} = $tooltip; 401 $self->{tooltip} = $tooltip;
388 402
389 if ($CFClient::UI::TOOLTIP->{owner} == $self) { 403 if ($CFClient::UI::TOOLTIP->{owner} == $self) {
390 delete $CFClient::UI::TOOLTIP->{owner}; 404 delete $CFClient::UI::TOOLTIP->{owner};
391 CFClient::UI::check_tooltip; 405 $CFClient::UI::TOOLTIP_WATCHER->cb->();
392 } 406 }
393} 407}
394 408
395# translate global coordinates to local coordinate system 409# translate global coordinates to local coordinate system
396sub coord2local { 410sub coord2local {
… …
433 447
434 $::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
435 unless $FOCUS; 449 unless $FOCUS;
436} 450}
437 451
438sub mouse_motion { } 452sub mouse_motion { 0 }
439sub button_up { } 453sub button_up { 0 }
440sub key_down { } 454sub key_down { 0 }
441sub key_up { } 455sub key_up { 0 }
442 456
443sub button_down { 457sub button_down {
444 my ($self, $ev, $x, $y) = @_; 458 my ($self, $ev, $x, $y) = @_;
445 459
446 $self->focus_in; 460 $self->focus_in;
447}
448 461
449sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} } 462 0
450sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } 463}
451sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} }
452sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} }
453sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} }
454 464
455sub find_widget { 465sub find_widget {
456 my ($self, $x, $y) = @_; 466 my ($self, $x, $y) = @_;
457 467
458 return () unless $self->{can_events}; 468 return () unless $self->{can_events};
… …
466 476
467sub set_parent { 477sub set_parent {
468 my ($self, $parent) = @_; 478 my ($self, $parent) = @_;
469 479
470 Scalar::Util::weaken ($self->{parent} = $parent); 480 Scalar::Util::weaken ($self->{parent} = $parent);
471
472 $self->set_visible if $parent->{visible}; 481 $self->set_visible if $parent->{visible};
473} 482}
474 483
475sub connect { 484sub connect {
476 my ($self, $signal, $cb) = @_; 485 my ($self, $signal, $cb) = @_;
… …
497 506
498sub realloc { 507sub realloc {
499 my ($self) = @_; 508 my ($self) = @_;
500 509
501 if ($self->{visible}) { 510 if ($self->{visible}) {
502 return if $self->{root}{realloc}{$self}; 511 return if $self->{root}{realloc}{$self+0};
503 512
504 $self->{root}{realloc}{$self} = $self; 513 $self->{root}{realloc}{$self+0} = $self;
505 $self->{root}->update; 514 $self->{root}->update;
506 } else { 515 } else {
507 delete $self->{req_w}; 516 delete $self->{req_w};
517 delete $self->{req_h};
508 } 518 }
509} 519}
510 520
511sub update { 521sub update {
512 my ($self) = @_; 522 my ($self) = @_;
513 523
514 $self->{parent}->update 524 $self->{parent}->update
515 if $self->{parent}; 525 if $self->{parent};
516} 526}
517 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
518sub draw { 539sub draw {
519 my ($self) = @_; 540 my ($self) = @_;
520 541
521 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);
522 553
523 glPushMatrix; 554 glPushMatrix;
524 glTranslate $self->{x}, $self->{y}, 0; 555 glTranslate $self->{x}, $self->{y}, 0;
525 $self->_draw;
526 glPopMatrix;
527 556
528 if ($self == $HOVER && $self->{can_hover}) { 557 if ($self == $HOVER && $self->{can_hover}) {
529 my ($x, $y) = @$self{qw(x y)};
530
531 glColor 1, 0.8, 0.5, 0.2; 558 glColor 1*0.2, 0.8*0.2, 0.5*0.2, 0.2;
532 glEnable GL_BLEND; 559 glEnable GL_BLEND;
533 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 560 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
534 glBegin GL_QUADS; 561 glBegin GL_QUADS;
535 glVertex $x , $y; 562 glVertex 0 , 0;
536 glVertex $x + $self->{w}, $y; 563 glVertex $self->{w}, 0;
537 glVertex $x + $self->{w}, $y + $self->{h}; 564 glVertex $self->{w}, $self->{h};
538 glVertex $x , $y + $self->{h}; 565 glVertex 0 , $self->{h};
539 glEnd; 566 glEnd;
540 glDisable GL_BLEND; 567 glDisable GL_BLEND;
541 } 568 }
542 569
543 if ($ENV{PCLIENT_DEBUG}) { 570 if ($ENV{CFPLUS_DEBUG} & 1) {
544 glPushMatrix; 571 glPushMatrix;
545 glColor 1, 1, 0, 1; 572 glColor 1, 1, 0, 1;
546 glTranslate $self->{x} + 0.375, $self->{y} + 0.375; 573 glTranslate 0.375, 0.375;
547 glBegin GL_LINE_LOOP; 574 glBegin GL_LINE_LOOP;
548 glVertex 0 , 0; 575 glVertex 0 , 0;
549 glVertex $self->{w} - 1, 0; 576 glVertex $self->{w} - 1, 0;
550 glVertex $self->{w} - 1, $self->{h} - 1; 577 glVertex $self->{w} - 1, $self->{h} - 1;
551 glVertex 0 , $self->{h} - 1; 578 glVertex 0 , $self->{h} - 1;
552 glEnd; 579 glEnd;
553 glPopMatrix; 580 glPopMatrix;
554 #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;
555 } 582 }
583
584 $self->_draw;
585 glPopMatrix;
556} 586}
557 587
558sub _draw { 588sub _draw {
559 my ($self) = @_; 589 my ($self) = @_;
560 590
… …
563 593
564sub DESTROY { 594sub DESTROY {
565 my ($self) = @_; 595 my ($self) = @_;
566 596
567 delete $WIDGET{$self+0}; 597 delete $WIDGET{$self+0};
568 #$self->deactivate; 598
599 eval { $self->destroy };
600 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
569} 601}
570 602
571############################################################################# 603#############################################################################
572 604
573package CFClient::UI::DrawBG; 605package CFClient::UI::DrawBG;
… …
598 630
599 if ($color && (@$color < 4 || $color->[3])) { 631 if ($color && (@$color < 4 || $color->[3])) {
600 my ($w, $h) = @$self{qw(w h)}; 632 my ($w, $h) = @$self{qw(w h)};
601 633
602 glEnable GL_BLEND; 634 glEnable GL_BLEND;
603 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 635 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
604 glColor @$color; 636 glColor_premultiply @$color;
605 637
606 glBegin GL_QUADS; 638 glBegin GL_QUADS;
607 glVertex 0 , 0; 639 glVertex 0 , 0;
608 glVertex 0 , $h; 640 glVertex 0 , $h;
609 glVertex $w, $h; 641 glVertex $w, $h;
… …
624 my ($class, %arg) = @_; 656 my ($class, %arg) = @_;
625 $class->SUPER::new (can_events => 0, %arg); 657 $class->SUPER::new (can_events => 0, %arg);
626} 658}
627 659
628sub size_request { 660sub size_request {
629 (0, 0) 661 my ($self) = @_;
662
663 ($self->{w} + 0, $self->{h} + 0)
630} 664}
631 665
632sub draw { } 666sub draw { }
633 667
634############################################################################# 668#############################################################################
… …
638our @ISA = CFClient::UI::Base::; 672our @ISA = CFClient::UI::Base::;
639 673
640sub new { 674sub new {
641 my ($class, %arg) = @_; 675 my ($class, %arg) = @_;
642 676
643 my $children = delete $arg{children} || []; 677 my $children = delete $arg{children};
644 678
645 my $self = $class->SUPER::new ( 679 my $self = $class->SUPER::new (
646 children => [], 680 children => [],
647 can_events => 0, 681 can_events => 0,
648 %arg, 682 %arg,
649 ); 683 );
684
650 $self->add ($_) for @$children; 685 $self->add (@$children)
686 if $children;
651 687
652 $self 688 $self
653} 689}
654 690
655sub add { 691sub add {
… …
703 $x -= $self->{x}; 739 $x -= $self->{x};
704 $y -= $self->{y}; 740 $y -= $self->{y};
705 741
706 my $res; 742 my $res;
707 743
708 for (reverse @{ $self->{children} }) { 744 for (reverse $self->visible_children) {
709 $res = $_->find_widget ($x, $y) 745 $res = $_->find_widget ($x, $y)
710 and return $res; 746 and return $res;
711 } 747 }
712 748
713 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y}) 749 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
… …
734} 770}
735 771
736sub add { 772sub add {
737 my ($self, $child) = @_; 773 my ($self, $child) = @_;
738 774
739 $self->{children} = []; 775 $self->SUPER::remove ($_) for @{ $self->{children} };
740
741 $self->SUPER::add ($child); 776 $self->SUPER::add ($child);
742} 777}
743 778
744sub remove { 779sub remove {
745 my ($self, $widget) = @_; 780 my ($self, $widget) = @_;
… …
755sub size_request { 790sub size_request {
756 $_[0]{children}[0]->size_request 791 $_[0]{children}[0]->size_request
757} 792}
758 793
759sub size_allocate { 794sub size_allocate {
760 my ($self, $w, $h, $changed) = @_; 795 my ($self, $w, $h) = @_;
761 796
762 $self->{children}[0]->configure (0, 0, $w, $h); 797 $self->{children}[0]->configure (0, 0, $w, $h);
763} 798}
764 799
765############################################################################# 800#############################################################################
801
802# back-buffered drawing area
766 803
767package CFClient::UI::Window; 804package CFClient::UI::Window;
768 805
769our @ISA = CFClient::UI::Bin::; 806our @ISA = CFClient::UI::Bin::;
770 807
… …
782 $ROOT->on_post_alloc ($self => sub { $self->render_child }); 819 $ROOT->on_post_alloc ($self => sub { $self->render_child });
783 $self->SUPER::update; 820 $self->SUPER::update;
784} 821}
785 822
786sub size_allocate { 823sub size_allocate {
787 my ($self, $w, $h, $changed) = @_; 824 my ($self, $w, $h) = @_;
788 825
789 $self->SUPER::size_allocate ($w, $h, $changed); 826 $self->SUPER::size_allocate ($w, $h);
790 $self->update 827 $self->update;
791 if $changed;
792} 828}
793 829
794sub _render { 830sub _render {
831 my ($self) = @_;
832
795 $_[0]{children}[0]->draw; 833 $self->{children}[0]->draw;
796} 834}
797 835
798sub render_child { 836sub render_child {
799 my ($self) = @_; 837 my ($self) = @_;
800 838
801 $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 {
802 glClearColor 0, 0, 0, 0; 840 glClearColor 0, 0, 0, 0;
803 glClear GL_COLOR_BUFFER_BIT; 841 glClear GL_COLOR_BUFFER_BIT;
804 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
805 $self->_render; 850 $self->_render;
806 }; 851 };
807} 852}
808 853
809sub _draw { 854sub _draw {
810 my ($self) = @_; 855 my ($self) = @_;
811 856
812 my ($w, $h) = ($self->w, $self->h); 857 my ($w, $h) = @$self{qw(w h)};
813 858
814 my $tex = $self->{texture} 859 my $tex = $self->{texture}
815 or return; 860 or return;
816 861
817 glEnable GL_TEXTURE_2D; 862 glEnable GL_TEXTURE_2D;
818 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 863 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
819 glColor 1, 1, 1, 1; 864 glColor 0, 0, 0, 1;
820 865
821 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 866 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
822 867
823 glDisable GL_TEXTURE_2D; 868 glDisable GL_TEXTURE_2D;
824} 869}
… …
840} 885}
841 886
842sub size_request { 887sub size_request {
843 my ($self) = @_; 888 my ($self) = @_;
844 889
845 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)};
846 891
847 $w = 10 if $self->{scroll_x}; 892 $w = 10 if $self->{scroll_x};
848 $h = 10 if $self->{scroll_y}; 893 $h = 10 if $self->{scroll_y};
849 894
850 ($w, $h) 895 ($w, $h)
851} 896}
852 897
853sub size_allocate { 898sub size_allocate {
854 my ($self, $w, $h, $changed) = @_; 899 my ($self, $w, $h) = @_;
855 900
901 my $child = $self->child;
902
856 $w = $self->{child_w} if $self->{scroll_x} && $self->{child_w}; 903 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
857 $h = $self->{child_h} if $self->{scroll_y} && $self->{child_h}; 904 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
858 905
859 $self->child->configure (0, 0, $w, $h); 906 $self->child->configure (0, 0, $w, $h);
860 $self->update; 907 $self->update;
861} 908}
862 909
… …
898} 945}
899 946
900sub _render { 947sub _render {
901 my ($self) = @_; 948 my ($self) = @_;
902 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
903 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 953 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
904 954
905 $self->SUPER::_render; 955 $self->SUPER::_render;
906} 956}
907 957
… …
910package CFClient::UI::ScrolledWindow; 960package CFClient::UI::ScrolledWindow;
911 961
912our @ISA = CFClient::UI::HBox::; 962our @ISA = CFClient::UI::HBox::;
913 963
914sub new { 964sub new {
915 my $class = shift; 965 my ($class, %arg) = @_;
966
967 my $child = delete $arg{child};
916 968
917 my $self; 969 my $self;
918 970
919 my $slider = new CFClient::UI::Slider 971 my $slider = new CFClient::UI::Slider
920 vertical => 1, 972 vertical => 1,
… …
925 ; 977 ;
926 978
927 $self = $class->SUPER::new ( 979 $self = $class->SUPER::new (
928 vp => (new CFClient::UI::ViewPort expand => 1), 980 vp => (new CFClient::UI::ViewPort expand => 1),
929 slider => $slider, 981 slider => $slider,
930 @_, 982 %arg,
931 ); 983 );
932 984
933 $self->{vp}->add ($self->{scrolled});
934 $self->add ($self->{vp});
935 $self->add ($self->{slider}); 985 $self->SUPER::add ($self->{vp}, $self->{slider});
986 $self->add ($child) if $child;
936 987
937 $self 988 $self
989}
990
991sub add {
992 my ($self, $widget) = @_;
993
994 $self->{vp}->add ($self->{child} = $widget);
938} 995}
939 996
940sub update { 997sub update {
941 my ($self) = @_; 998 my ($self) = @_;
942 999
… …
946 my $child = $self->{vp}->child; 1003 my $child = $self->{vp}->child;
947 $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]);
948} 1005}
949 1006
950sub size_allocate { 1007sub size_allocate {
951 my ($self, $w, $h, $changed) = @_; 1008 my ($self, $w, $h) = @_;
952 1009
953 $self->SUPER::size_allocate ($w, $h, $changed); 1010 $self->SUPER::size_allocate ($w, $h);
954 1011
955 my $child = $self->{vp}->child; 1012 my $child = $self->{vp}->child;
956 $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]);
957} 1014}
958 1015
… …
981 1038
982 if ($self->{bg}) { 1039 if ($self->{bg}) {
983 my ($w, $h) = @$self{qw(w h)}; 1040 my ($w, $h) = @$self{qw(w h)};
984 1041
985 glEnable GL_BLEND; 1042 glEnable GL_BLEND;
986 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1043 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
987 glColor @{ $self->{bg} }; 1044 glColor_premultiply @{ $self->{bg} };
988 1045
989 glBegin GL_QUADS; 1046 glBegin GL_QUADS;
990 glVertex 0 , 0; 1047 glVertex 0 , 0;
991 glVertex 0 , $h; 1048 glVertex 0 , $h;
992 glVertex $w, $h; 1049 glVertex $w, $h;
… …
1005 1062
1006our @ISA = CFClient::UI::Bin::; 1063our @ISA = CFClient::UI::Bin::;
1007 1064
1008use CFClient::OpenGL; 1065use CFClient::OpenGL;
1009 1066
1010my @tex = 1067my $bg =
1068 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
1069 mipmap => 1, wrap => 1;
1070
1071my @border =
1011 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1072 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1012 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);
1013 1074
1014sub new { 1075sub new {
1015 my $class = shift; 1076 my ($class, %arg) = @_;
1016 1077
1017 my $self = $class->SUPER::new ( 1078 my $self = $class->SUPER::new (
1018 bg => [1, 1, 1, 1], 1079 bg => [1, 1, 1, 1],
1019 border_bg => [1, 1, 1, 1], 1080 border_bg => [1, 1, 1, 1],
1020 border => 0.6, 1081 border => 0.6,
1021 is_toplevel => 1,
1022 can_events => 1, 1082 can_events => 1,
1023 @_ 1083 min_w => 16,
1084 min_h => 16,
1085 %arg,
1024 ); 1086 );
1025 1087
1026 $self->{title} &&= new CFClient::UI::Label 1088 $self->{title_widget} = new CFClient::UI::Label
1027 align => 0, 1089 align => 0,
1028 valign => 1, 1090 valign => 1,
1029 text => $self->{title}, 1091 text => $self->{title},
1030 fontsize => $self->{border}; 1092 fontsize => $self->{border},
1093 if exists $self->{title};
1031 1094
1032 $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};
1033} 1103}
1034 1104
1035sub border { 1105sub border {
1036 int $_[0]{border} * $::FONTSIZE 1106 int $_[0]{border} * $::FONTSIZE
1037} 1107}
1038 1108
1039sub size_request { 1109sub size_request {
1040 my ($self) = @_; 1110 my ($self) = @_;
1111
1112 $self->{title_widget}->size_request
1113 if $self->{title_widget};
1041 1114
1042 my ($w, $h) = $self->SUPER::size_request; 1115 my ($w, $h) = $self->SUPER::size_request;
1043 1116
1044 ( 1117 (
1045 $w + $self->border * 2, 1118 $w + $self->border * 2,
1046 $h + $self->border * 2, 1119 $h + $self->border * 2,
1047 ) 1120 )
1048} 1121}
1049 1122
1050sub size_allocate { 1123sub size_allocate {
1051 my ($self, $w, $h, $changed) = @_; 1124 my ($self, $w, $h) = @_;
1052 1125
1053 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 }
1054 1131
1132 my $border = $self->border;
1133
1055 $h -= List::Util::max 0, $self->border * 2; 1134 $h -= List::Util::max 0, $border * 2;
1056 $w -= List::Util::max 0, $self->border * 2; 1135 $w -= List::Util::max 0, $border * 2;
1057 1136
1058 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
1059 if $self->{title};
1060
1061 $self->child->configure ($self->border, $self->border, $w, $h); 1137 $self->child->configure ($border, $border, $w, $h);
1062} 1138}
1063 1139
1064sub button_down { 1140sub button_down {
1065 my ($self, $ev, $x, $y) = @_; 1141 my ($self, $ev, $x, $y) = @_;
1066 1142
… …
1082 my ($ev, $x, $y) = @_; 1158 my ($ev, $x, $y) = @_;
1083 1159
1084 my $dx = $ev->{x} - $ox; 1160 my $dx = $ev->{x} - $ox;
1085 my $dy = $ev->{y} - $oy; 1161 my $dy = $ev->{y} - $oy;
1086 1162
1087 $self->{user_x} = $wx + $dx * $mx;
1088 $self->{user_y} = $wy + $dy * $my;
1089 $self->{def_w} = $bw + $dx * ($mx ? -1 : 1); 1163 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
1090 $self->{def_h} = $bh + $dy * ($my ? -1 : 1); 1164 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1091 $self->move ($self->{user_x}, $self->{user_y}); 1165
1166 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1092 $self->realloc; 1167 $self->realloc;
1093 }; 1168 };
1094 1169
1095 } elsif ($lr ^ $td) { 1170 } elsif ($lr ^ $td) {
1096 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1171 my ($ox, $oy) = ($ev->{x}, $ev->{y});
… …
1099 $self->{motion} = sub { 1174 $self->{motion} = sub {
1100 my ($ev, $x, $y) = @_; 1175 my ($ev, $x, $y) = @_;
1101 1176
1102 ($x, $y) = ($ev->{x}, $ev->{y}); 1177 ($x, $y) = ($ev->{x}, $ev->{y});
1103 1178
1104 $self->{user_x} = $bx + $x - $ox; 1179 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1105 $self->{user_y} = $by + $y - $oy; 1180 # HACK: the next line is required to enforce placement
1106 1181 $self->{parent}->size_allocate ($self->{parent}{w}, $self->{parent}{h});
1107 $self->move ($self->{user_x}, $self->{user_y});
1108 $self->realloc;
1109 }; 1182 };
1183 } else {
1184 return 0;
1185 }
1186
1110 } 1187 1
1111} 1188}
1112 1189
1113sub button_up { 1190sub button_up {
1114 my ($self, $ev, $x, $y) = @_; 1191 my ($self, $ev, $x, $y) = @_;
1115 1192
1116 delete $self->{motion}; 1193 !!delete $self->{motion}
1117} 1194}
1118 1195
1119sub mouse_motion { 1196sub mouse_motion {
1120 my ($self, $ev, $x, $y) = @_; 1197 my ($self, $ev, $x, $y) = @_;
1121 1198
1122 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1199 $self->{motion}->($ev, $x, $y) if $self->{motion};
1200
1201 !!$self->{motion}
1123} 1202}
1124 1203
1125sub _draw { 1204sub _draw {
1126 my ($self) = @_; 1205 my ($self) = @_;
1127 1206
1207 my $child = $self->{children}[0];
1208
1128 my ($w, $h ) = ($self->{w}, $self->{h}); 1209 my ($w, $h ) = ($self->{w}, $self->{h});
1129 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1210 my ($cw, $ch) = ($child->{w}, $child->{h});
1130 1211
1131 glEnable GL_TEXTURE_2D; 1212 glEnable GL_TEXTURE_2D;
1132 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1213 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1133 1214
1134 my $border = $self->border; 1215 my $border = $self->border;
1135 1216
1136 glColor @{ $self->{border_bg} }; 1217 glColor @{ $self->{border_bg} };
1137 $tex[1]->draw_quad_alpha (0, 0, $w, $border); 1218 $border[0]->draw_quad_alpha (0, 0, $w, $border);
1138 $tex[3]->draw_quad_alpha (0, $border, $border, $ch); 1219 $border[1]->draw_quad_alpha (0, $border, $border, $ch);
1139 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1220 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1140 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border); 1221 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
1141 1222
1142 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1223 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1143 my $bg = $tex[0]; 1224 glColor @{ $self->{bg} };
1144 1225
1145 # TODO: repeat texture not scale 1226 # TODO: repeat texture not scale
1227 # solve this better(?)
1146 my $rep_x = $cw / $bg->{w}; 1228 $bg->{s} = $cw / $bg->{w};
1147 my $rep_y = $ch / $bg->{h}; 1229 $bg->{t} = $ch / $bg->{h};
1148
1149 glColor @{ $self->{bg} };
1150
1151 $bg->{s} = $rep_x;
1152 $bg->{t} = $rep_y;
1153 $bg->{wrap_mode} = 1;
1154 $bg->draw_quad_alpha ($border, $border, $cw, $ch); 1230 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1155 } 1231 }
1156 1232
1157 glDisable GL_TEXTURE_2D; 1233 glDisable GL_TEXTURE_2D;
1158 1234
1159 $self->{title}->draw if $self->{title};
1160
1161 $self->child->draw; 1235 $child->draw;
1236
1237 if ($self->{title_widget}) {
1238 glTranslate 0, $border - $self->{h};
1239 $self->{title_widget}->_draw;
1240 }
1162} 1241}
1163 1242
1164############################################################################# 1243#############################################################################
1165 1244
1166package CFClient::UI::Table; 1245package CFClient::UI::Table;
… …
1189 1268
1190 $child->set_parent ($self); 1269 $child->set_parent ($self);
1191 $self->{children}[$y][$x] = $child; 1270 $self->{children}[$y][$x] = $child;
1192 1271
1193 $self->realloc; 1272 $self->realloc;
1273}
1274
1275sub remove {
1276 my ($self, $child) = @_;
1277
1278 # TODO: not yet implemented
1194} 1279}
1195 1280
1196# 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?
1197sub clear { 1282sub clear {
1198 my ($self) = @_; 1283 my ($self) = @_;
… …
1240 (sum @$hs), 1325 (sum @$hs),
1241 ) 1326 )
1242} 1327}
1243 1328
1244sub size_allocate { 1329sub size_allocate {
1245 my ($self, $w, $h, $changed) = @_; 1330 my ($self, $w, $h) = @_;
1246 1331
1247 my ($ws, $hs) = $self->get_wh; 1332 my ($ws, $hs) = $self->get_wh;
1248 1333
1249 my $req_w = (sum @$ws) || 1; 1334 my $req_w = (sum @$ws) || 1;
1250 my $req_h = (sum @$hs) || 1; 1335 my $req_h = (sum @$hs) || 1;
… …
1328 (List::Util::max map $_->{req_h}, @{$self->{children}}), 1413 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1329 ) 1414 )
1330} 1415}
1331 1416
1332sub size_allocate { 1417sub size_allocate {
1333 my ($self, $w, $h, $changed) = @_; 1418 my ($self, $w, $h) = @_;
1334 1419
1335 my $space = $self->{vertical} ? $h : $w; 1420 my $space = $self->{vertical} ? $h : $w;
1336 my $children = $self->{children}; 1421 my $children = $self->{children};
1337 1422
1338 my @req; 1423 my @req;
… …
1421 ellipsise => 3, # end 1506 ellipsise => 3, # end
1422 layout => (new CFClient::Layout), 1507 layout => (new CFClient::Layout),
1423 fontsize => 1, 1508 fontsize => 1,
1424 align => -1, 1509 align => -1,
1425 valign => -1, 1510 valign => -1,
1426 padding => 2, 1511 padding_x => 2,
1512 padding_y => 2,
1427 can_events => 0, 1513 can_events => 0,
1428 %arg 1514 %arg
1429 ); 1515 );
1430 1516
1431 if (exists $self->{template}) { 1517 if (exists $self->{template}) {
… …
1458 1544
1459 delete $self->{texture}; 1545 delete $self->{texture};
1460 $self->SUPER::update; 1546 $self->SUPER::update;
1461} 1547}
1462 1548
1549sub realloc {
1550 my ($self) = @_;
1551
1552 delete $self->{ox};
1553 $self->SUPER::realloc;
1554}
1555
1463sub set_text { 1556sub set_text {
1464 my ($self, $text) = @_; 1557 my ($self, $text) = @_;
1465 1558
1466 return if $self->{text} eq "T$text"; 1559 return if $self->{text} eq "T$text";
1467 $self->{text} = "T$text"; 1560 $self->{text} = "T$text";
1468 1561
1469 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba; 1562 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1470 $self->{layout}->set_text ($text); 1563 $self->{layout}->set_text ($text);
1471 1564
1565 delete $self->{size_req};
1472 $self->realloc; 1566 $self->realloc;
1473 $self->update; 1567 $self->update;
1474} 1568}
1475 1569
1476sub set_markup { 1570sub set_markup {
… …
1482 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1576 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1483 1577
1484 $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;
1485 $self->{layout}->set_markup ($markup); 1579 $self->{layout}->set_markup ($markup);
1486 1580
1581 delete $self->{size_req};
1487 $self->realloc; 1582 $self->realloc;
1488 $self->update; 1583 $self->update;
1489} 1584}
1490 1585
1491sub size_request { 1586sub size_request {
1492 my ($self) = @_; 1587 my ($self) = @_;
1493 1588
1589 $self->{size_req} ||= do {
1494 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1590 $self->{layout}->set_font ($self->{font}) if $self->{font};
1495 $self->{layout}->set_width ($self->{max_w} || -1); 1591 $self->{layout}->set_width ($self->{max_w} || -1);
1496 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1592 $self->{layout}->set_ellipsise ($self->{ellipsise});
1497 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1593 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1498 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1594 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1499 1595
1500 my ($w, $h) = $self->{layout}->size; 1596 my ($w, $h) = $self->{layout}->size;
1501 1597
1502 if (exists $self->{template}) { 1598 if (exists $self->{template}) {
1503 $self->{template}->set_font ($self->{font}) if $self->{font}; 1599 $self->{template}->set_font ($self->{font}) if $self->{font};
1504 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1600 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1505 1601
1506 my ($w2, $h2) = $self->{template}->size; 1602 my ($w2, $h2) = $self->{template}->size;
1507 1603
1508 $w = List::Util::max $w, $w2; 1604 $w = List::Util::max $w, $w2;
1509 $h = List::Util::max $h, $h2; 1605 $h = List::Util::max $h, $h2;
1606 }
1607
1608 [$w, $h]
1510 } 1609 };
1511 1610
1512 ( 1611 @{ $self->{size_req} }
1513 $w + $self->{padding} * 2,
1514 $h + $self->{padding} * 2,
1515 )
1516} 1612}
1517 1613
1518sub size_allocate { 1614sub size_allocate {
1519 my ($self, $w, $h, $changed) = @_; 1615 my ($self, $w, $h) = @_;
1616
1617 delete $self->{ox};
1520 1618
1521 delete $self->{texture} 1619 delete $self->{texture}
1522 if $changed; 1620 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1523} 1621}
1524 1622
1525sub set_fontsize { 1623sub set_fontsize {
1526 my ($self, $fontsize) = @_; 1624 my ($self, $fontsize) = @_;
1527 1625
1528 $self->{fontsize} = $fontsize; 1626 $self->{fontsize} = $fontsize;
1529 delete $self->{texture}; 1627 delete $self->{texture};
1530 1628
1531 $self->realloc; 1629 $self->realloc;
1630}
1631
1632sub reconfigure {
1633 my ($self) = @_;
1634
1635 delete $self->{size_req};
1636
1637 $self->SUPER::reconfigure;
1532} 1638}
1533 1639
1534sub _draw { 1640sub _draw {
1535 my ($self) = @_; 1641 my ($self) = @_;
1536 1642
… …
1542 $self->{layout}->set_width ($self->{w}); 1648 $self->{layout}->set_width ($self->{w});
1543 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1649 $self->{layout}->set_ellipsise ($self->{ellipsise});
1544 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1650 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1545 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1651 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1546 1652
1547 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1653 new_from_layout CFClient::Texture $self->{layout}
1654 };
1548 1655
1656 unless (exists $self->{ox}) {
1549 $self->{ox} = int ($self->{align} < 0 ? $self->{padding} 1657 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1550 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} 1658 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1551 : ($self->{w} - $tex->{w}) * 0.5); 1659 : ($self->{w} - $tex->{w}) * 0.5);
1552 1660
1553 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding} 1661 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1554 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding} 1662 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1555 : ($self->{h} - $tex->{h}) * 0.5); 1663 : ($self->{h} - $tex->{h}) * 0.5);
1556
1557 $tex
1558 }; 1664 };
1559 1665
1560 glEnable GL_TEXTURE_2D; 1666 glEnable GL_TEXTURE_2D;
1561 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};
1562 1670
1563 if ($tex->{format} == GL_ALPHA) { 1671 if ($tex->{format} == GL_ALPHA) {
1672 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1564 glColor @{$self->{fg}}; 1673 glColor @{$self->{fg}};
1565 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}); 1674 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}, $w, $h);
1566 } else { 1675 } else {
1676 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1567 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}); 1677 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}, $w, $h);
1568 } 1678 }
1569 1679
1570 glDisable GL_TEXTURE_2D; 1680 glDisable GL_TEXTURE_2D;
1571} 1681}
1572 1682
… …
1589 can_hover => 1, 1699 can_hover => 1,
1590 can_focus => 1, 1700 can_focus => 1,
1591 valign => 0, 1701 valign => 0,
1592 can_events => 1, 1702 can_events => 1,
1593 #text => ... 1703 #text => ...
1704 #hidden => "*",
1594 @_ 1705 @_
1595 ) 1706 )
1596} 1707}
1597 1708
1598sub _set_text { 1709sub _set_text {
… …
1600 1711
1601 delete $self->{cur_h}; 1712 delete $self->{cur_h};
1602 1713
1603 return if $self->{text} eq $text; 1714 return if $self->{text} eq $text;
1604 1715
1605 delete $self->{texture};
1606
1607 $self->{last_activity} = $::NOW; 1716 $self->{last_activity} = $::NOW;
1608 $self->{text} = $text; 1717 $self->{text} = $text;
1609 1718
1610 $text =~ s/./*/g if $self->{hidden}; 1719 $text =~ s/./*/g if $self->{hidden};
1611 $self->{layout}->set_text ("$text "); 1720 $self->{layout}->set_text ("$text ");
1721 delete $self->{size_req};
1612 1722
1613 $self->_emit (changed => $self->{text}); 1723 $self->_emit (changed => $self->{text});
1724
1725 $self->realloc;
1726 $self->update;
1614} 1727}
1615 1728
1616sub set_text { 1729sub set_text {
1617 my ($self, $text) = @_; 1730 my ($self, $text) = @_;
1618 1731
1619 $self->{cursor} = length $text; 1732 $self->{cursor} = length $text;
1620 $self->_set_text ($text); 1733 $self->_set_text ($text);
1621
1622 $self->realloc;
1623} 1734}
1624 1735
1625sub get_text { 1736sub get_text {
1626 $_[0]{text} 1737 $_[0]{text}
1627} 1738}
… …
1657 $self->{cursor} = length $text; 1768 $self->{cursor} = length $text;
1658 } elsif ($uni == 27) { 1769 } elsif ($uni == 27) {
1659 $self->_emit ('escape'); 1770 $self->_emit ('escape');
1660 } elsif ($uni) { 1771 } elsif ($uni) {
1661 substr $text, $self->{cursor}++, 0, chr $uni; 1772 substr $text, $self->{cursor}++, 0, chr $uni;
1773 } else {
1774 return 0;
1662 } 1775 }
1663 1776
1664 $self->_set_text ($text); 1777 $self->_set_text ($text);
1665 1778
1666 $self->realloc; 1779 $self->realloc;
1780
1781 1
1667} 1782}
1668 1783
1669sub focus_in { 1784sub focus_in {
1670 my ($self) = @_; 1785 my ($self) = @_;
1671 1786
… …
1686 utf8::encode $text; 1801 utf8::encode $text;
1687 $self->{cursor} = length substr $text, 0, $idx; 1802 $self->{cursor} = length substr $text, 0, $idx;
1688 1803
1689 $self->_set_text ($self->{text}); 1804 $self->_set_text ($self->{text});
1690 $self->update; 1805 $self->update;
1806
1807 1
1691} 1808}
1692 1809
1693sub mouse_motion { 1810sub mouse_motion {
1694 my ($self, $ev, $x, $y) = @_; 1811 my ($self, $ev, $x, $y) = @_;
1695# 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
1696} 1815}
1697 1816
1698sub _draw { 1817sub _draw {
1699 my ($self) = @_; 1818 my ($self) = @_;
1700 1819
1701 local $self->{fg} = $self->{fg}; 1820 local $self->{fg} = $self->{fg};
1702 1821
1703 if ($FOCUS == $self) { 1822 if ($FOCUS == $self) {
1704 glColor @{$self->{active_bg}}; 1823 glColor_premultiply @{$self->{active_bg}};
1705 $self->{fg} = $self->{active_fg}; 1824 $self->{fg} = $self->{active_fg};
1706 } else { 1825 } else {
1707 glColor @{$self->{bg}}; 1826 glColor_premultiply @{$self->{bg}};
1708 } 1827 }
1709 1828
1710 glEnable GL_BLEND; 1829 glEnable GL_BLEND;
1711 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1830 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1712 glBegin GL_QUADS; 1831 glBegin GL_QUADS;
1713 glVertex 0 , 0; 1832 glVertex 0 , 0;
1714 glVertex 0 , $self->{h}; 1833 glVertex 0 , $self->{h};
1715 glVertex $self->{w}, $self->{h}; 1834 glVertex $self->{w}, $self->{h};
1716 glVertex $self->{w}, 0; 1835 glVertex $self->{w}, 0;
… …
1777 } else { 1896 } else {
1778 $self->set_text ($self->{history_saveback}); 1897 $self->set_text ($self->{history_saveback});
1779 } 1898 }
1780 1899
1781 } else { 1900 } else {
1782 $self->SUPER::key_down ($ev); 1901 return $self->SUPER::key_down ($ev)
1902 }
1903
1783 } 1904 1
1784
1785} 1905}
1786 1906
1787############################################################################# 1907#############################################################################
1788 1908
1789package CFClient::UI::Button; 1909package CFClient::UI::Button;
… …
1798 1918
1799sub new { 1919sub new {
1800 my $class = shift; 1920 my $class = shift;
1801 1921
1802 $class->SUPER::new ( 1922 $class->SUPER::new (
1803 padding => 4, 1923 padding_x => 4,
1924 padding_y => 4,
1804 fg => [1, 1, 1], 1925 fg => [1, 1, 1],
1805 active_fg => [0, 0, 1], 1926 active_fg => [0, 0, 1],
1806 can_hover => 1, 1927 can_hover => 1,
1807 align => 0, 1928 align => 0,
1808 valign => 0, 1929 valign => 0,
… …
1817 my ($self, $ev, $x, $y) = @_; 1938 my ($self, $ev, $x, $y) = @_;
1818 1939
1819 $self->emit ("activate") 1940 $self->emit ("activate")
1820 if $x >= 0 && $x < $self->{w} 1941 if $x >= 0 && $x < $self->{w}
1821 && $y >= 0 && $y < $self->{h}; 1942 && $y >= 0 && $y < $self->{h};
1943
1944 1
1822} 1945}
1823 1946
1824sub _draw { 1947sub _draw {
1825 my ($self) = @_; 1948 my ($self) = @_;
1826 1949
1827 local $self->{fg} = $self->{fg}; 1950 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1828
1829 if ($GRAB == $self) {
1830 $self->{fg} = $self->{active_fg};
1831 }
1832 1951
1833 glEnable GL_TEXTURE_2D; 1952 glEnable GL_TEXTURE_2D;
1834 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1953 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1835 glColor 0, 0, 0, 1; 1954 glColor 0, 0, 0, 1;
1836 1955
… …
1855 1974
1856sub new { 1975sub new {
1857 my $class = shift; 1976 my $class = shift;
1858 1977
1859 $class->SUPER::new ( 1978 $class->SUPER::new (
1860 padding => 2, 1979 padding_x => 2,
1980 padding_y => 2,
1861 fg => [1, 1, 1], 1981 fg => [1, 1, 1],
1862 active_fg => [1, 1, 0], 1982 active_fg => [1, 1, 0],
1863 bg => [0, 0, 0, 0.2], 1983 bg => [0, 0, 0, 0.2],
1864 active_bg => [1, 1, 1, 0.5], 1984 active_bg => [1, 1, 1, 0.5],
1865 state => 0, 1985 state => 0,
… …
1869} 1989}
1870 1990
1871sub size_request { 1991sub size_request {
1872 my ($self) = @_; 1992 my ($self) = @_;
1873 1993
1874 ($self->{padding} * 2 + 6) x 2 1994 (6) x 2
1875} 1995}
1876 1996
1877sub button_down { 1997sub button_down {
1878 my ($self, $ev, $x, $y) = @_; 1998 my ($self, $ev, $x, $y) = @_;
1879 1999
1880 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 2000 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1881 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 2001 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1882 $self->{state} = !$self->{state}; 2002 $self->{state} = !$self->{state};
1883 $self->_emit (changed => $self->{state}); 2003 $self->_emit (changed => $self->{state});
2004 } else {
2005 return 0
2006 }
2007
1884 } 2008 1
1885} 2009}
1886 2010
1887sub _draw { 2011sub _draw {
1888 my ($self) = @_; 2012 my ($self) = @_;
1889 2013
1890 $self->SUPER::_draw; 2014 $self->SUPER::_draw;
1891 2015
1892 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 2016 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1893 2017
1894 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;
1895 2021
1896 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 2022 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1897 2023
1898 my $tex = $self->{state} ? $tex[1] : $tex[0]; 2024 my $tex = $self->{state} ? $tex[1] : $tex[0];
1899 2025
… …
2054 2180
2055 my $h1 = $self->{h} * (1 - $ycut1); 2181 my $h1 = $self->{h} * (1 - $ycut1);
2056 my $h2 = $self->{h} * (1 - $ycut2); 2182 my $h2 = $self->{h} * (1 - $ycut2);
2057 2183
2058 glEnable GL_BLEND; 2184 glEnable GL_BLEND;
2059 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;
2060 glEnable GL_TEXTURE_2D; 2187 glEnable GL_TEXTURE_2D;
2061 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2188 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2062 2189
2063 glBindTexture GL_TEXTURE_2D, $t1->{name}; 2190 glBindTexture GL_TEXTURE_2D, $t1->{name};
2064 glBegin GL_QUADS; 2191 glBegin GL_QUADS;
… …
2164 fg => [1, 1, 1], 2291 fg => [1, 1, 1],
2165 active_fg => [0, 0, 0], 2292 active_fg => [0, 0, 0],
2166 bg => [0, 0, 0, 0.2], 2293 bg => [0, 0, 0, 0.2],
2167 active_bg => [1, 1, 1, 0.5], 2294 active_bg => [1, 1, 1, 0.5],
2168 range => [0, 0, 100, 10, 0], 2295 range => [0, 0, 100, 10, 0],
2169 req_w => $::WIDTH / 80, 2296 min_w => $::WIDTH / 80,
2170 req_h => $::WIDTH / 80, 2297 min_h => $::WIDTH / 80,
2171 vertical => 0, 2298 vertical => 0,
2172 can_hover => 1, 2299 can_hover => 1,
2173 inner_pad => 0.02, 2300 inner_pad => 0.02,
2174 @_ 2301 @_
2175 ); 2302 );
… …
2185sub set_range { 2312sub set_range {
2186 my ($self, $range) = @_; 2313 my ($self, $range) = @_;
2187 2314
2188 ($range, $self->{range}) = ($self->{range}, $range); 2315 ($range, $self->{range}) = ($self->{range}, $range);
2189 2316
2190 $self->update
2191 if "@$range" ne "@{$self->{range}}"; 2317 if ("@$range" ne "@{$self->{range}}") {
2318 $self->update;
2319 $self->set_value ($self->{range}[0]);
2320 }
2192} 2321}
2193 2322
2194sub set_value { 2323sub set_value {
2195 my ($self, $value) = @_; 2324 my ($self, $value) = @_;
2196 2325
… …
2215} 2344}
2216 2345
2217sub size_request { 2346sub size_request {
2218 my ($self) = @_; 2347 my ($self) = @_;
2219 2348
2220 my $w = $self->{req_w}; 2349 ($self->{req_w}, $self->{req_h})
2221 my $h = $self->{req_h};
2222
2223 $self->{vertical} ? ($h, $w) : ($w, $h)
2224} 2350}
2225 2351
2226sub button_down { 2352sub button_down {
2227 my ($self, $ev, $x, $y) = @_; 2353 my ($self, $ev, $x, $y) = @_;
2228 2354
2229 $self->SUPER::button_down ($ev, $x, $y); 2355 $self->SUPER::button_down ($ev, $x, $y);
2230 2356
2231 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2357 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2232 2358
2233 $self->mouse_motion ($ev, $x, $y); 2359 $self->mouse_motion ($ev, $x, $y)
2234} 2360}
2235 2361
2236sub mouse_motion { 2362sub mouse_motion {
2237 my ($self, $ev, $x, $y) = @_; 2363 my ($self, $ev, $x, $y) = @_;
2238 2364
… …
2242 my (undef, $lo, $hi, $page) = @{$self->{range}}; 2368 my (undef, $lo, $hi, $page) = @{$self->{range}};
2243 2369
2244 $x = ($x - $self->{click}[1]) / ($w * $self->{scale}); 2370 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2245 2371
2246 $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
2247 } 2377 1
2248} 2378}
2249 2379
2250sub update { 2380sub update {
2251 my ($self) = @_; 2381 my ($self) = @_;
2252 2382
2253 $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}) {
2254 $self->set_value ($self->{range}[0]); 2391 $self->set_value ($self->{range}[0]);
2255 2392
2256 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2393 my ($value, $lo, $hi, $page) = @{$self->{range}};
2257 my $range = ($hi - $page - $lo) || 1e-100; 2394 my $range = ($hi - $page - $lo) || 1e-100;
2258 2395
… …
2264 $value = ($value - $lo) / $range; 2401 $value = ($value - $lo) / $range;
2265 $value = $value * $self->{scale} + $self->{offset}; 2402 $value = $value * $self->{scale} + $self->{offset};
2266 2403
2267 $self->{knob_x} = $value - $knob_w * 0.5; 2404 $self->{knob_x} = $value - $knob_w * 0.5;
2268 $self->{knob_w} = $knob_w; 2405 $self->{knob_w} = $knob_w;
2269 }); 2406 }
2270
2271 $self->SUPER::update;
2272}
2273
2274sub _draw {
2275 my ($self) = @_;
2276 2407
2277 $self->SUPER::_draw (); 2408 $self->SUPER::_draw ();
2278 2409
2279 glScale $self->{w}, $self->{h}; 2410 glScale $self->{w}, $self->{h};
2280 2411
… …
2341sub set_range { shift->{slider}->set_range (@_) } 2472sub set_range { shift->{slider}->set_range (@_) }
2342sub set_value { shift->{slider}->set_value (@_) } 2473sub set_value { shift->{slider}->set_value (@_) }
2343 2474
2344############################################################################# 2475#############################################################################
2345 2476
2346package CFClient::UI::TextView; 2477package CFClient::UI::TextScroller;
2347 2478
2348our @ISA = CFClient::UI::HBox::; 2479our @ISA = CFClient::UI::HBox::;
2349 2480
2350use CFClient::OpenGL; 2481use CFClient::OpenGL;
2351 2482
… …
2353 my $class = shift; 2484 my $class = shift;
2354 2485
2355 my $self = $class->SUPER::new ( 2486 my $self = $class->SUPER::new (
2356 fontsize => 1, 2487 fontsize => 1,
2357 can_events => 0, 2488 can_events => 0,
2489 indent => 0,
2358 #font => default_font 2490 #font => default_font
2359 @_, 2491 @_,
2360 2492
2361 layout => (new CFClient::Layout 1), 2493 layout => (new CFClient::Layout 1),
2362 par => [], 2494 par => [],
… …
2378 $self->{fontsize} = $fontsize; 2510 $self->{fontsize} = $fontsize;
2379 $self->reflow; 2511 $self->reflow;
2380} 2512}
2381 2513
2382sub size_allocate { 2514sub size_allocate {
2383 my ($self, $w, $h, $changed) = @_; 2515 my ($self, $w, $h) = @_;
2384 2516
2385 $self->SUPER::size_allocate ($w, $h, $changed); 2517 $self->SUPER::size_allocate ($w, $h);
2386
2387 return unless $changed;
2388 2518
2389 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2519 $self->{layout}->set_font ($self->{font}) if $self->{font};
2390 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2520 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2391 $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});
2392 2523
2393 $self->reflow; 2524 $self->reflow;
2394} 2525}
2395 2526
2396sub text_size { 2527sub text_size {
… …
2398 2529
2399 my $layout = $self->{layout}; 2530 my $layout = $self->{layout};
2400 2531
2401 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2532 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2402 $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});
2403 $layout->set_markup ($text); 2535 $layout->set_markup ($text);
2404 2536
2405 $layout->size 2537 $layout->size
2406} 2538}
2407 2539
… …
2446 2578
2447 return unless $self->{h} > 0; 2579 return unless $self->{h} > 0;
2448 2580
2449 delete $self->{texture}; 2581 delete $self->{texture};
2450 2582
2451 $ROOT->on_post_alloc ($self, sub { 2583 $ROOT->on_post_alloc ($self => sub {
2452 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 2584 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2453 2585
2454 if (delete $self->{need_reflow}) { 2586 if (delete $self->{need_reflow}) {
2455 my $height = 0; 2587 my $height = 0;
2456 2588
… …
2459 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2591 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2460 2592
2461 for (@{$self->{par}}) { 2593 for (@{$self->{par}}) {
2462 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support 2594 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2463 $layout->set_width ($W - $_->[3]); 2595 $layout->set_width ($W - $_->[3]);
2596 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2464 $layout->set_markup ($_->[4]); 2597 $layout->set_markup ($_->[4]);
2465 my ($w, $h) = $layout->size; 2598 my ($w, $h) = $layout->size;
2466 $_->[0] = $w + $_->[3]; 2599 $_->[0] = $w + $_->[3];
2467 $_->[1] = $h; 2600 $_->[1] = $h;
2468 } 2601 }
… …
2471 } 2604 }
2472 2605
2473 $self->{height} = $height; 2606 $self->{height} = $height;
2474 2607
2475 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]); 2608 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2476 2609
2477 delete $self->{texture}; 2610 delete $self->{texture};
2478 } 2611 }
2479 2612
2480 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 2613 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2481 glClearColor 0.5, 0.5, 0.5, 0; 2614 glClearColor 0, 0, 0, 0;
2482 glClear GL_COLOR_BUFFER_BIT; 2615 glClear GL_COLOR_BUFFER_BIT;
2483 2616
2484 my $top = int $self->{children}[1]{range}[0]; 2617 my $top = int $self->{children}[1]{range}[0];
2485 2618
2486 my $y0 = $top; 2619 my $y0 = $top;
… …
2500 my $h = $par->[1]; 2633 my $h = $par->[1];
2501 2634
2502 if ($y0 < $y + $h && $y < $y1) { 2635 if ($y0 < $y + $h && $y < $y1) {
2503 $layout->set_foreground (@{ $par->[2] }); 2636 $layout->set_foreground (@{ $par->[2] });
2504 $layout->set_width ($W - $par->[3]); 2637 $layout->set_width ($W - $par->[3]);
2638 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2505 $layout->set_markup ($par->[4]); 2639 $layout->set_markup ($par->[4]);
2506 2640
2507 my ($w, $h, $data, $format, $internalformat) = $layout->render; 2641 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2508 2642
2509 glRasterPos $par->[3], $y - $y0; 2643 glRasterPos $par->[3], $y - $y0;
… …
2521sub _draw { 2655sub _draw {
2522 my ($self) = @_; 2656 my ($self) = @_;
2523 2657
2524 glEnable GL_TEXTURE_2D; 2658 glEnable GL_TEXTURE_2D;
2525 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2659 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2526 glColor 1, 1, 1, 1; 2660 glColor 0, 0, 0, 1;
2527 $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});
2528 glDisable GL_TEXTURE_2D; 2662 glDisable GL_TEXTURE_2D;
2529 2663
2530 $self->{children}[1]->draw; 2664 $self->{children}[1]->draw;
2531 2665
2532} 2666}
… …
2615} 2749}
2616 2750
2617sub set_tooltip_from { 2751sub set_tooltip_from {
2618 my ($self, $widget) = @_; 2752 my ($self, $widget) = @_;
2619 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
2620 $self->add (new CFClient::UI::Label 2766 $self->add (new CFClient::UI::Label
2621 markup => $widget->{tooltip}, 2767 markup => $tooltip,
2622 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2768 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2623 fontsize => 0.8, 2769 fontsize => 0.8,
2624 fg => [0, 0, 0, 1], 2770 fg => [0, 0, 0, 1],
2625 ellipsise => 0, 2771 ellipsise => 0,
2626 font => ($widget->{tooltip_font} || $::FONT_PROP), 2772 font => ($widget->{tooltip_font} || $::FONT_PROP),
… …
2634 2780
2635 ($w + 4, $h + 4) 2781 ($w + 4, $h + 4)
2636} 2782}
2637 2783
2638sub size_allocate { 2784sub size_allocate {
2639 my ($self, $w, $h, $changed) = @_; 2785 my ($self, $w, $h) = @_;
2640 2786
2641 return unless $changed;
2642
2643 $self->SUPER::size_allocate ($w - 4, $h - 4, $changed); 2787 $self->SUPER::size_allocate ($w - 4, $h - 4);
2788}
2789
2790sub visibility_change {
2791 my ($self, $visible) = @_;
2792
2793 return unless $visible;
2794
2795 $self->{root}->on_post_alloc ("move_$self" => sub {
2796 my $widget = $self->{owner}
2797 or return;
2798
2799 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2800
2801 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2802 if $x + $self->{w} > $self->{root}{w};
2803
2804 $self->move_abs ($x, $y);
2805 });
2644} 2806}
2645 2807
2646sub _draw { 2808sub _draw {
2647 my ($self) = @_; 2809 my ($self) = @_;
2648 2810
… …
2734 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 2896 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2735 2897
2736 if ($tex) { 2898 if ($tex) {
2737 glEnable GL_TEXTURE_2D; 2899 glEnable GL_TEXTURE_2D;
2738 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2900 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2739 glColor 1, 1, 1, 1; 2901 glColor 0, 0, 0, 1;
2740 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2902 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2741 glDisable GL_TEXTURE_2D; 2903 glDisable GL_TEXTURE_2D;
2742 } 2904 }
2743} 2905}
2744 2906
2745sub DESTROY { 2907sub destroy {
2746 my ($self) = @_; 2908 my ($self) = @_;
2747 2909
2748 $self->{timer}->cancel 2910 $self->{timer}->cancel
2749 if $self->{timer}; 2911 if $self->{timer};
2750 2912
2751 $self->SUPER::DESTROY; 2913 $self->SUPER::destroy;
2752} 2914}
2753 2915
2754############################################################################# 2916#############################################################################
2755 2917
2756package CFClient::UI::Inventory; 2918package CFClient::UI::Buttonbar;
2757 2919
2758our @ISA = CFClient::UI::ScrolledWindow::; 2920our @ISA = CFClient::UI::HBox::;
2759 2921
2760sub new { 2922# TODO: should actualyl wrap buttons and other goodies.
2761 my $class = shift;
2762
2763 my $self = $class->SUPER::new (
2764 scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2765 @_,
2766 );
2767
2768 $self
2769}
2770
2771sub set_items {
2772 my ($self, $items) = @_;
2773
2774 $self->{scrolled}->clear;
2775 return unless $items;
2776
2777 my @items = sort {
2778 ($a->{type} <=> $b->{type})
2779 or ($a->{name} cmp $b->{name})
2780 } @$items;
2781
2782 $self->{real_items} = \@items;
2783
2784 my $row = 0;
2785 for my $item (@items) {
2786 CFClient::Item::update_widgets $item;
2787
2788 $self->{scrolled}->add (0, $row, $item->{face_widget});
2789 $self->{scrolled}->add (1, $row, $item->{desc_widget});
2790 $self->{scrolled}->add (2, $row, $item->{weight_widget});
2791
2792 $row++;
2793 }
2794}
2795 2923
2796############################################################################# 2924#############################################################################
2797 2925
2798package CFClient::UI::Menu; 2926package CFClient::UI::Menu;
2799 2927
… …
2811 ); 2939 );
2812 2940
2813 $self->add ($self->{vbox} = new CFClient::UI::VBox); 2941 $self->add ($self->{vbox} = new CFClient::UI::VBox);
2814 2942
2815 for my $item (@{ $self->{items} }) { 2943 for my $item (@{ $self->{items} }) {
2816 my ($widget, $cb) = @$item; 2944 my ($widget, $cb, $tooltip) = @$item;
2817 2945
2818 # handle various types of items, only text for now 2946 # handle various types of items, only text for now
2819 if (!ref $widget) { 2947 if (!ref $widget) {
2820 $widget = new CFClient::UI::Label 2948 $widget = new CFClient::UI::Label
2821 can_hover => 1, 2949 can_hover => 1,
2822 can_events => 1, 2950 can_events => 1,
2823 text => $widget; 2951 markup => $widget,
2952 tooltip => $tooltip
2824 } 2953 }
2825 2954
2826 $self->{item}{$widget} = $item; 2955 $self->{item}{$widget} = $item;
2827 2956
2828 $self->{vbox}->add ($widget); 2957 $self->{vbox}->add ($widget);
… …
2840 # maybe save $GRAB? must be careful about events... 2969 # maybe save $GRAB? must be careful about events...
2841 $GRAB = $self; 2970 $GRAB = $self;
2842 $self->{button} = $ev->{button}; 2971 $self->{button} = $ev->{button};
2843 2972
2844 $self->show; 2973 $self->show;
2845 $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);
2846} 2975}
2847 2976
2848sub mouse_motion { 2977sub mouse_motion {
2849 my ($self, $ev, $x, $y) = @_; 2978 my ($self, $ev, $x, $y) = @_;
2850 2979
2851 # TODO: should use vbox->find_widget or so 2980 # TODO: should use vbox->find_widget or so
2852 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 2981 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2853 $self->{hover} = $self->{item}{$HOVER}; 2982 $self->{hover} = $self->{item}{$HOVER};
2983
2984 0
2854} 2985}
2855 2986
2856sub button_up { 2987sub button_up {
2857 my ($self, $ev, $x, $y) = @_; 2988 my ($self, $ev, $x, $y) = @_;
2858 2989
… …
2860 undef $GRAB; 2991 undef $GRAB;
2861 $self->hide; 2992 $self->hide;
2862 2993
2863 $self->_emit ("popdown"); 2994 $self->_emit ("popdown");
2864 $self->{hover}[1]->() if $self->{hover}; 2995 $self->{hover}[1]->() if $self->{hover};
2996 } else {
2997 return 0
2998 }
2999
2865 } 3000 1
2866} 3001}
2867 3002
2868############################################################################# 3003#############################################################################
2869 3004
2870package CFClient::UI::Statusbox; 3005package CFClient::UI::Multiplexer;
2871 3006
2872our @ISA = CFClient::UI::VBox::; 3007our @ISA = CFClient::UI::Container::;
2873 3008
2874sub new { 3009sub new {
2875 my $class = shift; 3010 my $class = shift;
2876 3011
2877 $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 (
2878 fontsize => 0.8, 3177 fontsize => 0.8,
2879 @_, 3178 @_,
2880 ) 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
2881} 3186}
2882 3187
2883sub reorder { 3188sub reorder {
2884 my ($self) = @_; 3189 my ($self) = @_;
2885 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} };
2886 3196
2887 while (my ($k, $v) = each %{ $self->{item} }) { 3197 while (my ($k, $v) = each %{ $self->{item} }) {
2888 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3198 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2889 } 3199 }
2890 3200
… …
2893 my @items = sort { 3203 my @items = sort {
2894 $a->{pri} <=> $b->{pri} 3204 $a->{pri} <=> $b->{pri}
2895 or $b->{id} <=> $a->{id} 3205 or $b->{id} <=> $a->{id}
2896 } values %{ $self->{item} }; 3206 } values %{ $self->{item} };
2897 3207
3208 $self->{timer}->interval (1);
3209
2898 my $count = 10 + 1; 3210 my $count = 10 + 1;
2899 for my $item (@items) { 3211 for my $item (@items) {
2900 last unless --$count; 3212 last unless --$count;
2901 3213
2902 push @widgets, $item->{label} ||= do { 3214 my $label = $item->{label} ||= do {
2903 # TODO: doesn't handle markup well (read as: at all) 3215 # TODO: doesn't handle markup well (read as: at all)
2904 my $short = $item->{count} > 1 3216 my $short = $item->{count} > 1
2905 ? "<b>$item->{count} ×</b> $item->{text}" 3217 ? "<b>$item->{count} ×</b> $item->{text}"
2906 : $item->{text}; 3218 : $item->{text};
2907 3219
… …
2915 tooltip => $item->{tooltip}, 3227 tooltip => $item->{tooltip},
2916 tooltip_font => $::FONT_PROP, 3228 tooltip_font => $::FONT_PROP,
2917 tooltip_width => 0.67, 3229 tooltip_width => 0.67,
2918 fontsize => $item->{fontsize} || $self->{fontsize}, 3230 fontsize => $item->{fontsize} || $self->{fontsize},
2919 max_w => $::WIDTH * 0.44, 3231 max_w => $::WIDTH * 0.44,
2920 fg => $item->{fg}, 3232 fg => [@{ $item->{fg} }],
2921 can_events => 1, 3233 can_events => 1,
2922 can_hover => 1 3234 can_hover => 1
2923 }; 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;
2924 } 3248 }
2925 3249
2926 $self->clear; 3250 $self->clear;
2927 $self->SUPER::add (reverse @widgets); 3251 $self->SUPER::add (reverse @widgets);
2928} 3252}
… …
2933 $text =~ s/^\s+//; 3257 $text =~ s/^\s+//;
2934 $text =~ s/\s+$//; 3258 $text =~ s/\s+$//;
2935 3259
2936 return unless $text; 3260 return unless $text;
2937 3261
2938 my $timeout = time + ((delete $arg{timeout}) || 60); 3262 my $timeout = (int time) + ((delete $arg{timeout}) || 60);
2939 3263
2940 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 3264 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2941 3265
2942 if (my $item = $self->{item}{$group}) { 3266 if (my $item = $self->{item}{$group}) {
2943 if ($item->{text} eq $text) { 3267 if ($item->{text} eq $text) {
2944 $item->{count}++; 3268 $item->{count}++;
2945 } else { 3269 } else {
2946 $item->{count} = 1; 3270 $item->{count} = 1;
2947 $item->{text} = $item->{tooltip} = $text; 3271 $item->{text} = $item->{tooltip} = $text;
2948 } 3272 }
2949 $item->{id} = ++$self->{id}; 3273 $item->{id} += 0.2;#d#
2950 $item->{timeout} = $timeout; 3274 $item->{timeout} = $timeout;
2951 delete $item->{label}; 3275 delete $item->{label};
2952 } else { 3276 } else {
2953 $self->{item}{$group} = { 3277 $self->{item}{$group} = {
2954 id => ++$self->{id}, 3278 id => ++$self->{id},
… …
2973 3297
2974 $self->reorder; 3298 $self->reorder;
2975 $self->SUPER::reconfigure; 3299 $self->SUPER::reconfigure;
2976} 3300}
2977 3301
3302sub destroy {
3303 my ($self) = @_;
3304
3305 $self->{timer}->cancel;
3306
3307 $self->SUPER::destroy;
3308}
3309
2978############################################################################# 3310#############################################################################
2979 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
2980package CFClient::UI::Root; 3673package CFClient::UI::Root;
2981 3674
2982our @ISA = CFClient::UI::Container::; 3675our @ISA = CFClient::UI::Container::;
3676
3677use List::Util qw(min max);
2983 3678
2984use CFClient::OpenGL; 3679use CFClient::OpenGL;
2985 3680
2986sub new { 3681sub new {
2987 my $class = shift; 3682 my $class = shift;
… …
2994 Scalar::Util::weaken ($self->{root} = $self); 3689 Scalar::Util::weaken ($self->{root} = $self);
2995 3690
2996 $self 3691 $self
2997} 3692}
2998 3693
2999sub configure {
3000 my ($self, $x, $y, $w, $h) = @_;
3001
3002 $self->{w} = $w;
3003 $self->{h} = $h;
3004}
3005
3006sub reconfigure {
3007 my ($self) = @_;
3008
3009 $self->SUPER::reconfigure;
3010
3011 $self->size_allocate ($self->{w}, $self->{h}, 1)
3012 if $self->{w};
3013}
3014
3015sub size_request { 3694sub size_request {
3016 my ($self) = @_; 3695 my ($self) = @_;
3017 3696
3018 ($self->{w}, $self->{h}) 3697 ($self->{w}, $self->{h})
3019} 3698}
3020 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
3021sub size_allocate { 3714sub size_allocate {
3022 my ($self, $w, $h, $changed) = @_; 3715 my ($self, $w, $h) = @_;
3023 3716
3024 for my $child ($self->children) { 3717 for my $child ($self->children) {
3025 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)};
3026 3719
3027 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1 3720 $X = $child->{force_x} if exists $child->{force_x};
3028 if exists $child->{req_x}; 3721 $Y = $child->{force_y} if exists $child->{force_y};
3029 3722
3030 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1 3723 $X = _to_pixel $X, $W, $self->{w};
3031 if exists $child->{req_y}; 3724 $Y = _to_pixel $Y, $H, $self->{h};
3032
3033 #delete @$child{qw(req_x req_y)};#d# def_x, def_y
3034
3035 $X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
3036 $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
3037 3725
3038 $child->configure ($X, $Y, $W, $H); 3726 $child->configure ($X, $Y, $W, $H);
3039 } 3727 }
3040} 3728}
3041 3729
… …
3058} 3746}
3059 3747
3060sub add { 3748sub add {
3061 my ($self, @children) = @_; 3749 my ($self, @children) = @_;
3062 3750
3063 for my $child (@children) {
3064 $child->{is_toplevel} = 1; 3751 $_->{is_toplevel} = 1
3065 3752 for @children;
3066 # integerise window positions
3067 $child->{x} = int $child->{x};
3068 $child->{y} = int $child->{y};
3069 }
3070 3753
3071 $self->SUPER::add (@children); 3754 $self->SUPER::add (@children);
3072} 3755}
3073 3756
3074sub remove { 3757sub remove {
3075 my ($self, @children) = @_; 3758 my ($self, @children) = @_;
3076 3759
3077 $self->SUPER::remove (@children); 3760 $self->SUPER::remove (@children);
3761
3762 delete $self->{is_toplevel}
3763 for @children;
3078 3764
3079 while (@children) { 3765 while (@children) {
3080 my $w = pop @children; 3766 my $w = pop @children;
3081 push @children, $w->children; 3767 push @children, $w->children;
3082 $w->set_invisible; 3768 $w->set_invisible;
… …
3102 $_->() 3788 $_->()
3103 for values %{delete $self->{refresh_hook}}; 3789 for values %{delete $self->{refresh_hook}};
3104 } 3790 }
3105 3791
3106 if ($self->{realloc}) { 3792 if ($self->{realloc}) {
3793 my %queue;
3107 my @queue; 3794 my @queue;
3795 my $widget;
3108 3796
3797 outer:
3109 while () { 3798 while () {
3110 if ($self->{realloc}) { 3799 if (my $realloc = delete $self->{realloc}) {
3111 #TODO use array-of-depth approach 3800 for $widget (values %$realloc) {
3801 $widget->{visible} or next; # do not resize invisible widgets
3112 3802
3113 @queue = sort { $a->{visible} <=> $b->{visible} } 3803 $queue{$widget+0}++ and next; # duplicates are common
3114 @queue, values %{delete $self->{realloc}}; 3804
3805 push @{ $queue[$widget->{visible}] }, $widget;
3806 }
3115 } 3807 }
3116 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 () {
3117 my $widget = pop @queue || last; 3856 my $widget = pop @queue || last;
3118 3857
3119 $widget->{visible} or last; # do not resize invisible widgets 3858 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3120
3121 my ($w, $h) = $widget->{def_w} && $widget->{def_h}
3122 ? @$widget{qw(def_w def_h)}
3123 : $widget->size_request;
3124
3125 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
3126
3127 $widget->{req_w} = $w;
3128 $widget->{req_h} = $h;
3129
3130 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h];
3131
3132 push @queue, $widget->{parent}
3133 if $widget->{parent};
3134 }
3135 }
3136
3137 while (my $size_alloc = delete $self->{size_alloc}) {
3138 my @queue = sort $b->[0]{visible} <=> $a->[0]{visible},
3139 values %$size_alloc;
3140
3141 while () {
3142 my ($widget, $w, $h) = @{ pop @queue or last };
3143 3859
3144 $w = 0 if $w < 0; 3860 $w = 0 if $w < 0;
3145 $h = 0 if $h < 0; 3861 $h = 0 if $h < 0;
3146 3862
3147 my $changed = $widget->{w} != $w || $widget->{h} != $h; 3863 $w = int $w + 0.5;
3864 $h = int $h + 0.5;
3148 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
3149 $widget->{w} = $w; 3870 $widget->{w} = $w;
3150 $widget->{h} = $h; 3871 $widget->{h} = $h;
3151 3872
3152 $widget->emit (size_allocate => $w, $h, $changed); 3873 $widget->emit (size_allocate => $w, $h);
3874 }
3153 } 3875 }
3154 } 3876 }
3155 3877
3156 while ($self->{post_alloc_hook}) { 3878 while ($self->{post_alloc_hook}) {
3157 $_->() 3879 $_->()
3158 for values %{delete $self->{post_alloc_hook}}; 3880 for values %{delete $self->{post_alloc_hook}};
3159 } 3881 }
3882
3160 3883
3161 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3884 glViewport 0, 0, $::WIDTH, $::HEIGHT;
3162 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3885 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3163 glClear GL_COLOR_BUFFER_BIT; 3886 glClear GL_COLOR_BUFFER_BIT;
3164 3887
… …
3166 glLoadIdentity; 3889 glLoadIdentity;
3167 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 3890 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3168 glMatrixMode GL_MODELVIEW; 3891 glMatrixMode GL_MODELVIEW;
3169 glLoadIdentity; 3892 glLoadIdentity;
3170 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
3171 $self->_draw; 3901 $self->_draw;
3172} 3902}
3173 3903
3174############################################################################# 3904#############################################################################
3175 3905

Diff Legend

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