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.140 by root, Thu Apr 20 04:20:52 2006 UTC vs.
Revision 1.273 by root, Sat Jun 3 02:32:35 2006 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines