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

Diff Legend

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