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.147 by root, Sat Apr 22 03:50:25 2006 UTC vs.
Revision 1.269 by root, Fri Jun 2 06:22:55 2006 UTC

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

Diff Legend

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