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.255 by root, Mon May 29 02:01:56 2006 UTC vs.
Revision 1.303 by elmex, Tue Jun 13 10:28:38 2006 UTC

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

Diff Legend

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