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

Diff Legend

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