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.153 by root, Sun Apr 23 02:14:33 2006 UTC vs.
Revision 1.267 by root, Thu Jun 1 04:10:29 2006 UTC

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

Diff Legend

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