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.148 by elmex, Sat Apr 22 12:14:45 2006 UTC vs.
Revision 1.268 by root, Thu Jun 1 05:04:41 2006 UTC

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

Diff Legend

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