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

Diff Legend

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