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

Diff Legend

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