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

Diff Legend

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