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

Diff Legend

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