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.151 by root, Sun Apr 23 00:57:39 2006 UTC vs.
Revision 1.268 by root, Thu Jun 1 05:04:41 2006 UTC

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

Diff Legend

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