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.191 by root, Tue May 9 22:27:53 2006 UTC vs.
Revision 1.325 by root, Thu Jul 13 01:29:17 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 ();
8use Event;
7 9
8use CFClient; 10use CFClient;
11use CFClient::Texture;
9 12
10our ($FOCUS, $HOVER, $GRAB); # various widgets 13our ($FOCUS, $HOVER, $GRAB); # various widgets
11 14
15our $LAYOUT;
12our $ROOT; 16our $ROOT;
13our $TOOLTIP; 17our $TOOLTIP;
14our $BUTTON_STATE; 18our $BUTTON_STATE;
15 19
16sub check_tooltip { 20our %WIDGET; # all widgets, weak-referenced
21
22our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub {
17 if (!$GRAB) { 23 if (!$GRAB) {
18 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) { 24 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
19 if (length $widget->{tooltip}) { 25 if (length $widget->{tooltip}) {
20
21 if ($TOOLTIP->{owner} != $widget) { 26 if ($TOOLTIP->{owner} != $widget) {
27 $TOOLTIP->hide;
28
22 $TOOLTIP->{owner} = $widget; 29 $TOOLTIP->{owner} = $widget;
30
31 return if $ENV{CFPLUS_DEBUG} & 8;
23 32
24 my $tip = $widget->{tooltip}; 33 my $tip = $widget->{tooltip};
25 34
26 $tip = $tip->($widget) if CODE:: eq ref $tip; 35 $tip = $tip->($widget) if CODE:: eq ref $tip;
27 36
28 $TOOLTIP->set_markup ($widget->{tooltip}); 37 $TOOLTIP->set_tooltip_from ($widget);
29
30 $TOOLTIP->show; 38 $TOOLTIP->show;
31
32 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
33
34 if ($x + $TOOLTIP->{w} > $::WIDTH) {
35 ($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0);
36 }
37
38 $TOOLTIP->move ($x, $y);
39 } 39 }
40 40
41 return; 41 return;
42 } 42 }
43 } 43 }
44 } 44 }
45 45
46 $TOOLTIP->hide; 46 $TOOLTIP->hide;
47 delete $TOOLTIP->{owner}; 47 delete $TOOLTIP->{owner};
48});
49
50sub get_layout {
51 my $layout;
52
53 for (grep { $_->{name} } values %WIDGET) {
54 my $win = $layout->{$_->{name}} = { };
55
56 $win->{x} = ($_->{x} + $_->{w} * 0.5) / $::WIDTH if $_->{x} =~ /^[0-9.]+$/;
57 $win->{y} = ($_->{y} + $_->{h} * 0.5) / $::HEIGHT if $_->{y} =~ /^[0-9.]+$/;
58 $win->{w} = $_->{w} / $::WIDTH if defined $_->{w};
59 $win->{h} = $_->{h} / $::HEIGHT if defined $_->{h};
60
61 $win->{show} = $_->{visible} && $_->{is_toplevel};
62 }
63
64 $layout
65}
66
67sub set_layout {
68 my ($layout) = @_;
69
70 $LAYOUT = $layout;
48} 71}
49 72
50# class methods for events 73# class methods for events
51sub feed_sdl_key_down_event { 74sub feed_sdl_key_down_event {
52 $FOCUS->emit (key_down => $_[0]) || $FOCUS->key_down ($_[0]) 75 $FOCUS->emit (key_down => $_[0])
53 if $FOCUS; 76 if $FOCUS;
54} 77}
55 78
56sub feed_sdl_key_up_event { 79sub feed_sdl_key_up_event {
57 $FOCUS->emit (key_up => $_[0]) || $FOCUS->key_up ($_[0]) 80 $FOCUS->emit (key_up => $_[0])
58 if $FOCUS; 81 if $FOCUS;
59} 82}
60 83
61sub feed_sdl_button_down_event { 84sub feed_sdl_button_down_event {
62 my ($ev) = @_; 85 my ($ev) = @_;
… …
66 my $widget = $ROOT->find_widget ($x, $y); 89 my $widget = $ROOT->find_widget ($x, $y);
67 90
68 $GRAB = $widget; 91 $GRAB = $widget;
69 $GRAB->update if $GRAB; 92 $GRAB->update if $GRAB;
70 93
71 check_tooltip; 94 $TOOLTIP_WATCHER->cb->();
72 } 95 }
73 96
74 $BUTTON_STATE |= 1 << ($ev->{button} - 1); 97 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
75 98
76 if ($GRAB) { 99 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))
77 ($x, $y) = $GRAB->coord2local ($x, $y); 100 if $GRAB;
78 $GRAB->emit (button_down => $ev, $x, $y) || $GRAB->button_down ($ev, $x, $y);
79 }
80} 101}
81 102
82sub feed_sdl_button_up_event { 103sub feed_sdl_button_up_event {
83 my ($ev) = @_; 104 my ($ev) = @_;
84 my ($x, $y) = ($ev->{x}, $ev->{y}); 105 my ($x, $y) = ($ev->{x}, $ev->{y});
85 106
86 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 107 my $widget = $GRAB || $ROOT->find_widget ($x, $y);
87 108
88 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1)); 109 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
89 110
90 if ($GRAB) { 111 $GRAB->emit (button_up => $ev, $GRAB->coord2local ($x, $y))
91 ($x, $y) = $GRAB->coord2local ($x, $y); 112 if $GRAB;
92 $GRAB->emit (button_up => $ev, $x, $y) || $GRAB->button_up ($ev, $x, $y);
93 }
94 113
95 if (!$BUTTON_STATE) { 114 if (!$BUTTON_STATE) {
96 my $grab = $GRAB; undef $GRAB; 115 my $grab = $GRAB; undef $GRAB;
97 $grab->update if $grab; 116 $grab->update if $grab;
98 $GRAB->update if $GRAB; 117 $GRAB->update if $GRAB;
99 118
100 check_tooltip; 119 $TOOLTIP_WATCHER->cb->();
101 } 120 }
102} 121}
103 122
104sub feed_sdl_motion_event { 123sub feed_sdl_motion_event {
105 my ($ev) = @_; 124 my ($ev) = @_;
… …
111 my $hover = $HOVER; $HOVER = $widget; 130 my $hover = $HOVER; $HOVER = $widget;
112 131
113 $hover->update if $hover && $hover->{can_hover}; 132 $hover->update if $hover && $hover->{can_hover};
114 $HOVER->update if $HOVER && $HOVER->{can_hover}; 133 $HOVER->update if $HOVER && $HOVER->{can_hover};
115 134
116 check_tooltip; 135 $TOOLTIP_WATCHER->start;
117 } 136 }
118 137
119 if ($HOVER) {
120 ($x, $y) = $HOVER->coord2local ($x, $y);
121 $HOVER->emit (mouse_motion => $ev, $x, $y) || $HOVER->mouse_motion ($ev, $x, $y); 138 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
122 } 139 if $HOVER;
123} 140}
124 141
125# convert position array to integers 142# convert position array to integers
126sub harmonize { 143sub harmonize {
127 my ($vals) = @_; 144 my ($vals) = @_;
… …
133 $rem += $_ - $i; 150 $rem += $_ - $i;
134 $_ = $i; 151 $_ = $i;
135 } 152 }
136} 153}
137 154
155sub full_refresh {
156 # make a copy, otherwise for complains about freed values.
157 my @widgets = values %WIDGET;
158
159 $_->update
160 for @widgets;
161}
162
163sub reconfigure_widgets {
164 # make a copy, otherwise C<for> complains about freed values.
165 my @widgets = values %WIDGET;
166
167 $_->reconfigure
168 for @widgets;
169}
170
171# call when resolution changes etc.
172sub rescale_widgets {
173 my ($sx, $sy) = @_;
174
175 for my $widget (values %WIDGET) {
176 if ($widget->{is_toplevel}) {
177 $widget->{x} += int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
178 $widget->{y} += int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
179
180 $widget->{x} = int 0.5 + $widget->{x} * $sx if $widget->{x} =~ /^[0-9.]+$/;
181 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};
182 $widget->{force_w} = int 0.5 + $widget->{force_w} * $sx if exists $widget->{force_w};
183 $widget->{y} = int 0.5 + $widget->{y} * $sy if $widget->{y} =~ /^[0-9.]+$/;
184 $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};
185 $widget->{force_h} = int 0.5 + $widget->{force_h} * $sy if exists $widget->{force_h};
186
187 $widget->{x} -= int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
188 $widget->{y} -= int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
189
190 }
191 }
192
193 reconfigure_widgets;
194}
195
138############################################################################# 196#############################################################################
139 197
140package CFClient::UI::Base; 198package CFClient::UI::Base;
141 199
142use strict; 200use strict;
… …
145 203
146sub new { 204sub new {
147 my $class = shift; 205 my $class = shift;
148 206
149 my $self = bless { 207 my $self = bless {
150 x => 0, 208 x => "center",
151 y => 0, 209 y => "center",
152 z => 0, 210 z => 0,
211 w => undef,
212 h => undef,
153 can_events => 1, 213 can_events => 1,
154 @_ 214 @_
155 }, $class; 215 }, $class;
156 216
217 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
218
157 for (keys %$self) { 219 for (keys %$self) {
158 if (/^connect_(.*)$/) { 220 if (/^on_(.*)$/) {
159 $self->connect ($1 => delete $self->{$_}); 221 $self->connect ($1 => delete $self->{$_});
160 } 222 }
161 } 223 }
162 224
225 if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {
226 $self->{x} = $layout->{x} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{x};
227 $self->{y} = $layout->{y} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{y};
228 $self->{force_w} = $layout->{w} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{w};
229 $self->{force_h} = $layout->{h} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{h};
230
231 $self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
232 $self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
233
234 $self->show if $layout->{show};
235 }
236
163 $self 237 $self
164} 238}
165 239
166sub destroy { 240sub destroy {
167 my ($self) = @_; 241 my ($self) = @_;
… …
176 return if $self->{parent}; 250 return if $self->{parent};
177 251
178 $CFClient::UI::ROOT->add ($self); 252 $CFClient::UI::ROOT->add ($self);
179} 253}
180 254
181sub hide { 255sub set_visible {
182 my ($self) = @_; 256 my ($self) = @_;
257
258 return if $self->{visible};
259
260 $self->{root} = $self->{parent}{root};
261 $self->{visible} = $self->{parent}{visible} + 1;
262
263 $self->emit (visibility_change => 1);
264
265 $self->realloc if !exists $self->{req_w};
266
267 $_->set_visible for $self->children;
268}
269
270sub set_invisible {
271 my ($self) = @_;
272
273 return unless $self->{visible};
274
275 $_->set_invisible for $self->children;
276
277 delete $self->{visible};
278 delete $self->{root};
183 279
184 undef $GRAB if $GRAB == $self; 280 undef $GRAB if $GRAB == $self;
185 undef $HOVER if $HOVER == $self; 281 undef $HOVER if $HOVER == $self;
186 282
283 $CFClient::UI::TOOLTIP_WATCHER->cb->()
284 if $TOOLTIP->{owner} == $self;
285
286 $self->emit ("focus_out");
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
307sub hide {
308 my ($self) = @_;
309
310 $self->set_invisible;
311
187 $self->{parent}->remove ($self) 312 $self->{parent}->remove ($self)
188 if $self->{parent}; 313 if $self->{parent};
189} 314}
190 315
191sub move { 316sub move_abs {
192 my ($self, $x, $y, $z) = @_; 317 my ($self, $x, $y, $z) = @_;
193 318
194 $self->{x} = int $x; 319 $self->{x} = List::Util::max 0, List::Util::min $self->{root}{w} - $self->{w}, int $x;
195 $self->{y} = int $y; 320 $self->{y} = List::Util::max 0, List::Util::min $self->{root}{h} - $self->{h}, int $y;
196 $self->{z} = $z if defined $z; 321 $self->{z} = $z if defined $z;
197 322
198 $self->update; 323 $self->update;
199} 324}
200 325
201sub set_size { 326sub set_size {
202 my ($self, $w, $h) = @_; 327 my ($self, $w, $h) = @_;
203 328
204 $self->{user_w} = $w; 329 $self->{force_w} = $w;
205 $self->{user_h} = $h; 330 $self->{force_h} = $h;
206 331
207 $self->check_size; 332 $self->realloc;
208} 333}
209 334
210sub size_request { 335sub size_request {
211 require Carp; 336 require Carp;
212 Carp::confess "size_request is abstract"; 337 Carp::confess "size_request is abstract";
213} 338}
214 339
340sub baseline_shift {
341 0
342}
343
215sub configure { 344sub configure {
216 my ($self, $x, $y, $w, $h) = @_; 345 my ($self, $x, $y, $w, $h) = @_;
217 346
218 if ($self->{aspect}) { 347 if ($self->{aspect}) {
348 my ($ow, $oh) = ($w, $h);
349
219 my $w2 = List::Util::min $w, int $h * $self->{aspect}; 350 $w = List::Util::min $w, int $h * $self->{aspect};
220 my $h2 = List::Util::min $h, int $w / $self->{aspect}; 351 $h = List::Util::min $h, int $w / $self->{aspect};
221 352
222 # use alignment to adjust x, y 353 # use alignment to adjust x, y
223 354
224 $x += int +($w - $w2) * 0.5; 355 $x += int 0.5 * ($ow - $w);
225 $y += int +($h - $h2) * 0.5; 356 $y += int 0.5 * ($oh - $h);
226
227 ($w, $h) = ($w2, $h2);
228 } 357 }
229 358
230 if ($self->{x} != $x || $self->{y} != $y) { 359 if ($self->{x} ne $x || $self->{y} ne $y) {
231 $self->{x} = $x; 360 $self->{x} = $x;
232 $self->{y} = $y; 361 $self->{y} = $y;
233 $self->update; 362 $self->update;
234 } 363 }
235 364
236 if ($self->{w} != $w || $self->{h} != $h) { 365 if ($self->{alloc_w} != $w || $self->{alloc_h} != $h) {
237 $CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $w, $h]; 366 return unless $self->{visible};
238 }
239}
240 367
241sub size_allocate { 368 $self->{alloc_w} = $w;
242 # nothing to be done 369 $self->{alloc_h} = $h;
370
371 $self->{root}{size_alloc}{$self+0} = $self;
372 }
243} 373}
244 374
245sub children { 375sub children {
376 # nop
246} 377}
247 378
248# call when resolution changes etc. 379sub visible_children {
249sub reconfigure { 380 $_[0]->children
250 my ($self) = @_;
251
252 $_->reconfigure
253 for $self->children;
254
255 $self->check_size;
256 $self->size_allocate ($self->{w}, $self->{h});
257 $self->update;
258} 381}
259 382
260sub set_max_size { 383sub set_max_size {
261 my ($self, $w, $h) = @_; 384 my ($self, $w, $h) = @_;
262 385
263 delete $self->{max_w}; $self->{max_w} = $w if $w; 386 $self->{max_w} = int $w if defined $w;
264 delete $self->{max_h}; $self->{max_h} = $h if $h; 387 $self->{max_h} = int $h if defined $h;
388
389 $self->realloc;
390}
391
392sub set_tooltip {
393 my ($self, $tooltip) = @_;
394
395 $tooltip =~ s/^\s+//;
396 $tooltip =~ s/\s+$//;
397
398 return if $self->{tooltip} eq $tooltip;
399
400 $self->{tooltip} = $tooltip;
401
402 if ($CFClient::UI::TOOLTIP->{owner} == $self) {
403 delete $CFClient::UI::TOOLTIP->{owner};
404 $CFClient::UI::TOOLTIP_WATCHER->cb->();
405 }
265} 406}
266 407
267# translate global coordinates to local coordinate system 408# translate global coordinates to local coordinate system
268sub coord2local { 409sub coord2local {
269 my ($self, $x, $y) = @_; 410 my ($self, $x, $y) = @_;
… …
276 my ($self, $x, $y) = @_; 417 my ($self, $x, $y) = @_;
277 418
278 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y}) 419 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
279} 420}
280 421
281sub focus_in { 422sub invoke_focus_in {
282 my ($self) = @_; 423 my ($self) = @_;
283 424
284 return if $FOCUS == $self; 425 return if $FOCUS == $self;
285 return unless $self->{can_focus}; 426 return unless $self->{can_focus};
286 427
287 my $focus = $FOCUS; $FOCUS = $self; 428 $FOCUS = $self;
288 429
289 $self->emit (focus_in => $focus); 430 $self->update;
290 431
291 $focus->update if $focus; 432 0
292 $FOCUS->update;
293} 433}
294 434
295sub focus_out { 435sub invoke_focus_out {
296 my ($self) = @_; 436 my ($self) = @_;
297 437
298 return unless $FOCUS == $self; 438 return unless $FOCUS == $self;
299 439
300 my $focus = $FOCUS; undef $FOCUS; 440 undef $FOCUS;
301 441
302 $self->emit (focus_out => $focus); 442 $self->update;
303 443
304 $focus->update if $focus; #? 444 $::MAPWIDGET->grab_focus #d# focus mapwidget if no other widget has focus
305} 445 unless $FOCUS;
306 446
447 0
448}
449
450sub grab_focus {
451 my ($self) = @_;
452
453 $FOCUS->emit ("focus_out") if $FOCUS;
454 $self->emit ("focus_in");
455}
456
307sub mouse_motion { } 457sub invoke_mouse_motion { 1 }
308sub button_up { } 458sub invoke_button_up { 1 }
309sub key_down { } 459sub invoke_key_down { 1 }
310sub key_up { } 460sub invoke_key_up { 1 }
311 461
312sub button_down { 462sub invoke_button_down {
313 my ($self, $ev, $x, $y) = @_; 463 my ($self, $ev, $x, $y) = @_;
314 464
315 $self->focus_in; 465 $self->grab_focus;
316}
317 466
318sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} } 467 1
319sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } 468}
320sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} } 469
321sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} } 470sub connect {
322sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} } 471 my ($self, $signal, $cb) = @_;
472
473 push @{ $self->{signal_cb}{$signal} }, $cb;
474}
475
476sub emit {
477 my ($self, $signal, @args) = @_;
478
479 #d##TODO# stop propagating at first true, do not use sum
480 (List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}) # before
481 || ($self->can ("invoke_$signal") || sub { 1 })->($self, @args) # closure
482 || ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent
483}
484
485sub find_widget {
486 my ($self, $x, $y) = @_;
487
488 return () unless $self->{can_events};
489
490 return $self
491 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
492 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
493
494 ()
495}
496
497sub set_parent {
498 my ($self, $parent) = @_;
499
500 Scalar::Util::weaken ($self->{parent} = $parent);
501 $self->set_visible if $parent->{visible};
502}
503
504sub realloc {
505 my ($self) = @_;
506
507 if ($self->{visible}) {
508 return if $self->{root}{realloc}{$self+0};
509
510 $self->{root}{realloc}{$self+0} = $self;
511 $self->{root}->update;
512 } else {
513 delete $self->{req_w};
514 delete $self->{req_h};
515 }
516}
517
518sub update {
519 my ($self) = @_;
520
521 $self->{parent}->update
522 if $self->{parent};
523}
524
525sub reconfigure {
526 my ($self) = @_;
527
528 $self->realloc;
529 $self->update;
530}
531
532# using global variables seems a bit hacky, but passing through all drawing
533# functions seems pointless.
534our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn
323 535
324sub draw { 536sub draw {
325 my ($self) = @_; 537 my ($self) = @_;
326 538
327 return unless $self->{h} && $self->{w}; 539 return unless $self->{h} && $self->{w};
540
541 # update screen rectangle
542 local $draw_x = $draw_x + $self->{x};
543 local $draw_y = $draw_y + $self->{y};
544
545 # skip widgets that are entirely outside the drawing area
546 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
547 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
328 548
329 glPushMatrix; 549 glPushMatrix;
330 glTranslate $self->{x}, $self->{y}, 0; 550 glTranslate $self->{x}, $self->{y}, 0;
331 $self->_draw;
332 glPopMatrix;
333 551
334 if ($self == $HOVER && $self->{can_hover}) { 552 if ($self == $HOVER && $self->{can_hover}) {
335 my ($x, $y) = @$self{qw(x y)};
336
337 glColor 1, 0.8, 0.5, 0.2; 553 glColor 1*0.2, 0.8*0.2, 0.5*0.2, 0.2;
338 glEnable GL_BLEND; 554 glEnable GL_BLEND;
339 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 555 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
340 glBegin GL_QUADS; 556 glBegin GL_QUADS;
341 glVertex $x , $y;
342 glVertex $x + $self->{w}, $y;
343 glVertex $x + $self->{w}, $y + $self->{h};
344 glVertex $x , $y + $self->{h};
345 glEnd;
346 glDisable GL_BLEND;
347 }
348
349 if ($ENV{PCLIENT_DEBUG}) {
350 glPushMatrix;
351 glColor 1, 1, 0, 1;
352 glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
353 glBegin GL_LINE_LOOP;
354 glVertex 0 , 0; 557 glVertex 0 , 0;
355 glVertex $self->{w}, 0; 558 glVertex $self->{w}, 0;
356 glVertex $self->{w}, $self->{h}; 559 glVertex $self->{w}, $self->{h};
357 glVertex 0 , $self->{h}; 560 glVertex 0 , $self->{h};
358 glEnd; 561 glEnd;
562 glDisable GL_BLEND;
563 }
564
565 if ($ENV{CFPLUS_DEBUG} & 1) {
566 glPushMatrix;
567 glColor 1, 1, 0, 1;
568 glTranslate 0.375, 0.375;
569 glBegin GL_LINE_LOOP;
570 glVertex 0 , 0;
571 glVertex $self->{w} - 1, 0;
572 glVertex $self->{w} - 1, $self->{h} - 1;
573 glVertex 0 , $self->{h} - 1;
574 glEnd;
359 glPopMatrix; 575 glPopMatrix;
360 CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw; 576 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
361 } 577 }
578
579 $self->_draw;
580 glPopMatrix;
362} 581}
363 582
364sub _draw { 583sub _draw {
365 my ($self) = @_; 584 my ($self) = @_;
366 585
367 warn "no draw defined for $self\n"; 586 warn "no draw defined for $self\n";
368} 587}
369 588
370sub find_widget {
371 my ($self, $x, $y) = @_;
372
373 return () unless $self->{can_events};
374
375 return $self
376 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
377 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
378
379 ()
380}
381
382sub set_parent {
383 my ($self, $parent) = @_;
384
385 $self->{_tree_depth} = $parent->{_tree_depth} + 1;
386 Scalar::Util::weaken ($self->{parent} = $parent);
387}
388
389sub check_size {
390 my ($self) = @_;
391
392 $CFClient::UI::ROOT->{check_size}{$self} = $self;
393}
394
395sub update {
396 my ($self) = @_;
397
398 $self->{parent}->update
399 if $self->{parent};
400}
401
402sub connect {
403 my ($self, $signal, $cb) = @_;
404
405 push @{ $self->{signal_cb}{$signal} }, $cb;
406}
407
408sub emit {
409 my ($self, $signal, @args) = @_;
410
411 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
412}
413
414sub DESTROY { 589sub DESTROY {
415 my ($self) = @_; 590 my ($self) = @_;
416 591
417 #$self->deactivate; 592 return if CFClient::in_destruct;
593
594 delete $WIDGET{$self+0};
595
596 eval { $self->destroy };
597 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
418} 598}
419 599
420############################################################################# 600#############################################################################
421 601
422package CFClient::UI::DrawBG; 602package CFClient::UI::DrawBG;
… …
430 my $class = shift; 610 my $class = shift;
431 611
432 # range [value, low, high, page] 612 # range [value, low, high, page]
433 613
434 $class->SUPER::new ( 614 $class->SUPER::new (
435 bg => [0, 0, 0, 0.2], 615 #bg => [0, 0, 0, 0.2],
436 active_bg => [1, 1, 1, 0.5], 616 #active_bg => [1, 1, 1, 0.5],
437 @_ 617 @_
438 ) 618 )
439} 619}
440 620
441sub _draw { 621sub _draw {
442 my ($self) = @_; 622 my ($self) = @_;
443 623
624 my $color = $FOCUS == $self && $self->{active_bg}
625 ? $self->{active_bg}
626 : $self->{bg};
627
628 if ($color && (@$color < 4 || $color->[3])) {
444 my ($w, $h) = @$self{qw(w h)}; 629 my ($w, $h) = @$self{qw(w h)};
445 630
446 glEnable GL_BLEND; 631 glEnable GL_BLEND;
447 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 632 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
448 glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} }; 633 glColor_premultiply @$color;
449 634
450 glBegin GL_QUADS; 635 glBegin GL_QUADS;
451 glVertex 0 , 0; 636 glVertex 0 , 0;
452 glVertex 0 , $h; 637 glVertex 0 , $h;
453 glVertex $w, $h; 638 glVertex $w, $h;
454 glVertex $w, 0; 639 glVertex $w, 0;
455 glEnd; 640 glEnd;
456 641
457 glDisable GL_BLEND; 642 glDisable GL_BLEND;
643 }
458} 644}
459 645
460############################################################################# 646#############################################################################
461 647
462package CFClient::UI::Empty; 648package CFClient::UI::Empty;
… …
467 my ($class, %arg) = @_; 653 my ($class, %arg) = @_;
468 $class->SUPER::new (can_events => 0, %arg); 654 $class->SUPER::new (can_events => 0, %arg);
469} 655}
470 656
471sub size_request { 657sub size_request {
472 (0, 0) 658 my ($self) = @_;
659
660 ($self->{w} + 0, $self->{h} + 0)
473} 661}
474 662
475sub draw { } 663sub draw { }
476 664
477############################################################################# 665#############################################################################
… …
481our @ISA = CFClient::UI::Base::; 669our @ISA = CFClient::UI::Base::;
482 670
483sub new { 671sub new {
484 my ($class, %arg) = @_; 672 my ($class, %arg) = @_;
485 673
486 my $children = delete $arg{children} || []; 674 my $children = delete $arg{children};
487 675
488 my $self = $class->SUPER::new ( 676 my $self = $class->SUPER::new (
489 children => [], 677 children => [],
490 can_events => 0, 678 can_events => 0,
491 %arg, 679 %arg,
492 ); 680 );
681
493 $self->add ($_) for @$children; 682 $self->add (@$children)
683 if $children;
494 684
495 $self 685 $self
496} 686}
497 687
498sub add { 688sub add {
… …
506 $self->{children} = [ 696 $self->{children} = [
507 sort { $a->{z} <=> $b->{z} } 697 sort { $a->{z} <=> $b->{z} }
508 @{$self->{children}}, @widgets 698 @{$self->{children}}, @widgets
509 ]; 699 ];
510 700
511 $_->check_size 701 $self->realloc;
512 for @widgets;
513
514 $self->update;
515} 702}
516 703
517sub children { 704sub children {
518 @{ $_[0]{children} } 705 @{ $_[0]{children} }
519} 706}
… …
524 delete $child->{parent}; 711 delete $child->{parent};
525 $child->hide; 712 $child->hide;
526 713
527 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 714 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
528 715
529 $self->check_size; 716 $self->realloc;
530 $self->update;
531} 717}
532 718
533sub clear { 719sub clear {
534 my ($self) = @_; 720 my ($self) = @_;
535 721
… …
539 for (@$children) { 725 for (@$children) {
540 delete $_->{parent}; 726 delete $_->{parent};
541 $_->hide; 727 $_->hide;
542 } 728 }
543 729
544 $self->check_size; 730 $self->realloc;
545 $self->update;
546} 731}
547 732
548sub find_widget { 733sub find_widget {
549 my ($self, $x, $y) = @_; 734 my ($self, $x, $y) = @_;
550 735
551 $x -= $self->{x}; 736 $x -= $self->{x};
552 $y -= $self->{y}; 737 $y -= $self->{y};
553 738
554 my $res; 739 my $res;
555 740
556 for (reverse @{ $self->{children} }) { 741 for (reverse $self->visible_children) {
557 $res = $_->find_widget ($x, $y) 742 $res = $_->find_widget ($x, $y)
558 and return $res; 743 and return $res;
559 } 744 }
560 745
561 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y}) 746 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
… …
582} 767}
583 768
584sub add { 769sub add {
585 my ($self, $child) = @_; 770 my ($self, $child) = @_;
586 771
587 $self->{children} = []; 772 $self->SUPER::remove ($_) for @{ $self->{children} };
588
589 $self->SUPER::add ($child); 773 $self->SUPER::add ($child);
590} 774}
591 775
592sub remove { 776sub remove {
593 my ($self, $widget) = @_; 777 my ($self, $widget) = @_;
… …
602 786
603sub size_request { 787sub size_request {
604 $_[0]{children}[0]->size_request 788 $_[0]{children}[0]->size_request
605} 789}
606 790
607sub size_allocate { 791sub invoke_size_allocate {
608 my ($self, $w, $h) = @_; 792 my ($self, $w, $h) = @_;
609 793
610 $self->{children}[0]->configure (0, 0, $w, $h); 794 $self->{children}[0]->configure (0, 0, $w, $h);
795
796 1
611} 797}
612 798
613############################################################################# 799#############################################################################
800
801# back-buffered drawing area
614 802
615package CFClient::UI::Window; 803package CFClient::UI::Window;
616 804
617our @ISA = CFClient::UI::Bin::; 805our @ISA = CFClient::UI::Bin::;
618 806
… …
625} 813}
626 814
627sub update { 815sub update {
628 my ($self) = @_; 816 my ($self) = @_;
629 817
630 $ROOT->on_refresh ($self => sub { $self->render_child }); 818 $ROOT->on_post_alloc ($self => sub { $self->render_child });
631 $self->SUPER::update; 819 $self->SUPER::update;
632} 820}
633 821
634sub size_allocate { 822sub invoke_size_allocate {
635 my ($self, $w, $h) = @_; 823 my ($self, $w, $h) = @_;
636 824
637 $self->SUPER::size_allocate ($w, $h);
638 $self->update; 825 $self->update;
826
827 $self->SUPER::invoke_size_allocate ($w, $h)
639} 828}
640 829
641sub _render { 830sub _render {
831 my ($self) = @_;
832
642 $_[0]{children}[0]->draw; 833 $self->{children}[0]->draw;
643} 834}
644 835
645sub render_child { 836sub render_child {
646 my ($self) = @_; 837 my ($self) = @_;
647 838
648 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 839 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
649 glClearColor 0, 0, 0, 0; 840 glClearColor 0, 0, 0, 0;
650 glClear GL_COLOR_BUFFER_BIT; 841 glClear GL_COLOR_BUFFER_BIT;
651 842
843 {
844 package CFClient::UI::Base;
845
846 ($draw_x, $draw_y, $draw_w, $draw_h) =
847 (0, 0, $self->{w}, $self->{h});
848 }
849
652 $self->_render; 850 $self->_render;
653# glColorMask 1, 1, 1, 0;
654# glEnable GL_BLEND;
655# glBlendFunc GL_SRC_ALPHA, GL_ZERO;
656# glRasterPos 0, 0;
657# glCopyPixels 0, 0, $self->{w}, $self->{h};
658# glDisable GL_BLEND;
659# glColorMask 1, 1, 1, 1;
660 }; 851 };
661} 852}
662 853
663sub _draw { 854sub _draw {
664 my ($self) = @_; 855 my ($self) = @_;
665 856
666 my ($w, $h) = ($self->w, $self->h); 857 my ($w, $h) = @$self{qw(w h)};
667 858
668 my $tex = $self->{texture} 859 my $tex = $self->{texture}
669 or return; 860 or return;
670 861
671 glEnable GL_BLEND;
672 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
673 glEnable GL_TEXTURE_2D; 862 glEnable GL_TEXTURE_2D;
674 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 863 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
675 glColor 0, 0, 0, 1; 864 glColor 0, 0, 0, 1;
676 865
677 $tex->draw_quad (0, 0, $w, $h); 866 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
678 867
679 glDisable GL_BLEND;
680 glDisable GL_TEXTURE_2D; 868 glDisable GL_TEXTURE_2D;
681} 869}
682 870
683############################################################################# 871#############################################################################
684 872
685package CFClient::UI::ViewPort; 873package CFClient::UI::ViewPort;
686 874
687our @ISA = CFClient::UI::Window::; 875our @ISA = CFClient::UI::Window::;
688 876
877sub new {
878 my $class = shift;
879
880 $class->SUPER::new (
881 scroll_x => 0,
882 scroll_y => 1,
883 @_,
884 )
885}
886
689sub size_request { 887sub size_request {
690 my ($self) = @_; 888 my ($self) = @_;
691 889
692 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 890 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
693 $self->child->configure (0, 0, @$self{qw(child_w child_h)});
694 891
695 @$self{qw(child_w child_h)} 892 $w = 10 if $self->{scroll_x};
696} 893 $h = 10 if $self->{scroll_y};
697 894
895 ($w, $h)
896}
897
698sub size_allocate { 898sub invoke_size_allocate {
699 my ($self, $w, $h) = @_; 899 my ($self, $w, $h) = @_;
700 900
901 my $child = $self->child;
902
903 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
904 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
905
906 $self->child->configure (0, 0, $w, $h);
701 $self->update; 907 $self->update;
908
909 1
702} 910}
703 911
704sub set_offset { 912sub set_offset {
705 my ($self, $x, $y) = @_; 913 my ($self, $x, $y) = @_;
706 914
… …
739} 947}
740 948
741sub _render { 949sub _render {
742 my ($self) = @_; 950 my ($self) = @_;
743 951
952 local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x};
953 local $CFClient::UI::Base::draw_y = $CFClient::UI::Base::draw_y - $self->{view_y};
954
744 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 955 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
745 956
746 $self->SUPER::_render; 957 $self->SUPER::_render;
747} 958}
748 959
749############################################################################# 960#############################################################################
750 961
751package CFClient::UI::ScrolledWindow; 962package CFClient::UI::ScrolledWindow;
752 963
753our @ISA = CFClient::UI::HBox::; 964our @ISA = CFClient::UI::HBox::;
965
966sub new {
967 my ($class, %arg) = @_;
968
969 my $child = delete $arg{child};
970
971 my $self;
972
973 my $slider = new CFClient::UI::Slider
974 vertical => 1,
975 range => [0, 0, 1, 0.01], # HACK fix
976 on_changed => sub {
977 $self->{vp}->set_offset (0, $_[1]);
978 },
979 ;
980
981 $self = $class->SUPER::new (
982 vp => (new CFClient::UI::ViewPort expand => 1),
983 slider => $slider,
984 %arg,
985 );
986
987 $self->SUPER::add ($self->{vp}, $self->{slider});
988 $self->add ($child) if $child;
989
990 $self
991}
992
993#TODO# update range on size_allocate depending on child
994
995sub add {
996 my ($self, $widget) = @_;
997
998 $self->{vp}->add ($self->{child} = $widget);
999}
1000
1001sub update_slider {
1002 my ($self) = @_;
1003
1004 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $self->{vp}->child->{h}, $self->{vp}{h}, 1]);
1005}
1006
1007sub update {
1008 my ($self) = @_;
1009
1010 $self->SUPER::update;
1011
1012 $self->update_slider;
1013}
1014
1015sub invoke_size_allocate {
1016 my ($self, $w, $h) = @_;
1017
1018 $self->update_slider;
1019
1020 $self->SUPER::invoke_size_allocate ($w, $h)
1021}
1022
1023#############################################################################
1024
1025package CFClient::UI::Frame;
1026
1027our @ISA = CFClient::UI::Bin::;
1028
1029use CFClient::OpenGL;
754 1030
755sub new { 1031sub new {
756 my $class = shift; 1032 my $class = shift;
757 1033
758 my $self;
759
760 my $slider = new CFClient::UI::Slider
761 vertical => 1,
762 range => [0, 0, 1, 0.01], # HACK fix
763 connect_changed => sub {
764 $self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h}));
765 },
766 ;
767
768 $self = $class->SUPER::new ( 1034 $class->SUPER::new (
769 vp => (new CFClient::UI::ViewPort), 1035 bg => undef,
770 slider => $slider,
771 @_, 1036 @_,
1037 )
1038}
1039
1040sub _draw {
1041 my ($self) = @_;
1042
1043 if ($self->{bg}) {
1044 my ($w, $h) = @$self{qw(w h)};
1045
1046 glEnable GL_BLEND;
1047 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1048 glColor_premultiply @{ $self->{bg} };
1049
1050 glBegin GL_QUADS;
1051 glVertex 0 , 0;
1052 glVertex 0 , $h;
1053 glVertex $w, $h;
1054 glVertex $w, 0;
1055 glEnd;
1056
1057 glDisable GL_BLEND;
1058 }
1059
1060 $self->SUPER::_draw;
1061}
1062
1063#############################################################################
1064
1065package CFClient::UI::FancyFrame;
1066
1067our @ISA = CFClient::UI::Bin::;
1068
1069use CFClient::OpenGL;
1070
1071my $bg =
1072 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
1073 mipmap => 1, wrap => 1;
1074
1075my @border =
1076 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1077 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1078
1079sub new {
1080 my ($class, %arg) = @_;
1081
1082 my $self = $class->SUPER::new (
1083 bg => [1, 1, 1, 1],
1084 border_bg => [1, 1, 1, 1],
1085 border => 0.6,
1086 can_events => 1,
1087 min_w => 16,
1088 min_h => 16,
1089 %arg,
772 ); 1090 );
773 1091
774 $self->{vp}->add ($self->{scrolled});
775 $self->add ($self->{vp});
776 $self->add ($self->{slider});
777
778 $self
779}
780
781#TODO# update range on size_allocate depeneing on child
782# update viewport offset on scroll
783
784#############################################################################
785
786package CFClient::UI::Frame;
787
788our @ISA = CFClient::UI::Bin::;
789
790use CFClient::OpenGL;
791
792sub new {
793 my $class = shift;
794
795 my $self = $class->SUPER::new (
796 bg => [1, 1, 1, 1],
797 border_bg => [1, 1, 1, 1],
798 border => 0.8,
799 @_
800 );
801
802 $self
803}
804
805sub _draw {
806 my ($self) = @_;
807
808 my ($w, $h) = ($self->{w}, $self->{h});
809
810 glEnable GL_BLEND;
811 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
812 glEnable GL_TEXTURE_2D;
813 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
814
815# glBegin GL_QUADS;
816# glColor 0, 0, 0, 0;
817# glVertex 0 , 0;
818# glVertex 0 , $h;
819# glVertex $w, $h;
820# glVertex $w, 0;
821# glEnd;
822
823
824 $self->child->draw;
825 glDisable GL_BLEND;
826 glDisable GL_TEXTURE_2D;
827}
828
829#############################################################################
830
831package CFClient::UI::FancyFrame;
832
833our @ISA = CFClient::UI::Bin::;
834
835use CFClient::OpenGL;
836
837my @tex =
838 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
839 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
840
841sub new {
842 my $class = shift;
843
844 # TODO: user_x, user_y, overwrite moveto?
845
846 my $self = $class->SUPER::new (
847 bg => [1, 1, 1, 1],
848 border_bg => [1, 1, 1, 1],
849 border => 0.6,
850 can_events => 1,
851 @_
852 );
853
854 $self->{title} &&= new CFClient::UI::Label 1092 $self->{title_widget} = new CFClient::UI::Label
855 align => 0, 1093 align => 0,
856 valign => 1, 1094 valign => 1,
857 text => $self->{title}, 1095 text => $self->{title},
858 fontsize => $self->{border}; 1096 fontsize => $self->{border},
1097 if exists $self->{title};
1098
1099 if ($self->{has_close_button}) {
1100 $self->{close_button} =
1101 new CFClient::UI::ImageButton
1102 path => 'x1_close.png',
1103 on_activate => sub { $self->emit ("delete") };
1104
1105 $self->CFClient::UI::Container::add ($self->{close_button});
1106 }
859 1107
860 $self 1108 $self
1109}
1110
1111sub add {
1112 my ($self, @widgets) = @_;
1113
1114 $self->SUPER::add (@widgets);
1115 $self->CFClient::UI::Container::add ($self->{close_button}) if $self->{close_button};
1116 $self->CFClient::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
861} 1117}
862 1118
863sub border { 1119sub border {
864 int $_[0]{border} * $::FONTSIZE 1120 int $_[0]{border} * $::FONTSIZE
865} 1121}
866 1122
867sub size_request { 1123sub size_request {
868 my ($self) = @_; 1124 my ($self) = @_;
1125
1126 $self->{title_widget}->size_request
1127 if $self->{title_widget};
1128
1129 $self->{close_button}->size_request
1130 if $self->{close_button};
869 1131
870 my ($w, $h) = $self->SUPER::size_request; 1132 my ($w, $h) = $self->SUPER::size_request;
871 1133
872 ( 1134 (
873 $w + $self->border * 2, 1135 $w + $self->border * 2,
874 $h + $self->border * 2, 1136 $h + $self->border * 2,
875 ) 1137 )
876} 1138}
877 1139
878sub size_allocate { 1140sub invoke_size_allocate {
879 my ($self, $w, $h) = @_; 1141 my ($self, $w, $h) = @_;
880 1142
1143 if ($self->{title_widget}) {
1144 $self->{title_widget}{w} = $w;
1145 $self->{title_widget}{h} = $h;
1146 $self->{title_widget}->invoke_size_allocate ($w, $h);
1147 }
1148
1149 my $border = $self->border;
1150
881 $h -= List::Util::max 0, $self->border * 2; 1151 $h -= List::Util::max 0, $border * 2;
882 $w -= List::Util::max 0, $self->border * 2; 1152 $w -= List::Util::max 0, $border * 2;
883 1153
884 $self->{title}->configure ($self->border, $self->border - $::FONTSIZE * 2, $w, $::FONTSIZE * 2)
885 if $self->{title};
886
887 $self->child->configure ($self->border, $self->border, $w, $h); 1154 $self->child->configure ($border, $border, $w, $h);
888}
889 1155
1156 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
1157 if $self->{close_button};
1158
1159 1
1160}
1161
1162sub invoke_delete {
1163 my ($self) = @_;
1164
1165 $self->hide;
1166
1167 1
1168}
1169
890sub button_down { 1170sub invoke_button_down {
891 my ($self, $ev, $x, $y) = @_; 1171 my ($self, $ev, $x, $y) = @_;
892 1172
893 my ($w, $h) = @$self{qw(w h)}; 1173 my ($w, $h) = @$self{qw(w h)};
894 my $border = $self->border; 1174 my $border = $self->border;
895 1175
… …
908 my ($ev, $x, $y) = @_; 1188 my ($ev, $x, $y) = @_;
909 1189
910 my $dx = $ev->{x} - $ox; 1190 my $dx = $ev->{x} - $ox;
911 my $dy = $ev->{y} - $oy; 1191 my $dy = $ev->{y} - $oy;
912 1192
913 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1); 1193 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
914 $self->{user_h} = $bh + $dy * ($my ? -1 : 1); 1194 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1195
915 $self->move ($wx + $dx * $mx, $wy + $dy * $my); 1196 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
916 $self->check_size; 1197 $self->realloc;
917 }; 1198 };
918 1199
919 } elsif ($lr ^ $td) { 1200 } elsif ($lr ^ $td) {
920 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1201 my ($ox, $oy) = ($ev->{x}, $ev->{y});
921 my ($bx, $by) = ($self->{x}, $self->{y}); 1202 my ($bx, $by) = ($self->{x}, $self->{y});
… …
923 $self->{motion} = sub { 1204 $self->{motion} = sub {
924 my ($ev, $x, $y) = @_; 1205 my ($ev, $x, $y) = @_;
925 1206
926 ($x, $y) = ($ev->{x}, $ev->{y}); 1207 ($x, $y) = ($ev->{x}, $ev->{y});
927 1208
928 $self->move ($bx + $x - $ox, $by + $y - $oy); 1209 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
929 $self->update; 1210 # HACK: the next line is required to enforce placement
1211 $self->{parent}->invoke_size_allocate ($self->{parent}{w}, $self->{parent}{h});
930 }; 1212 };
1213 } else {
1214 return 0;
1215 }
1216
931 } 1217 1
932} 1218}
933 1219
934sub button_up { 1220sub invoke_button_up {
935 my ($self, $ev, $x, $y) = @_; 1221 my ($self, $ev, $x, $y) = @_;
936 1222
937 delete $self->{motion}; 1223 ! ! delete $self->{motion}
938} 1224}
939 1225
940sub mouse_motion { 1226sub invoke_mouse_motion {
941 my ($self, $ev, $x, $y) = @_; 1227 my ($self, $ev, $x, $y) = @_;
942 1228
943 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1229 $self->{motion}->($ev, $x, $y) if $self->{motion};
1230
1231 ! ! $self->{motion}
944} 1232}
945 1233
946sub _draw { 1234sub _draw {
947 my ($self) = @_; 1235 my ($self) = @_;
948 1236
1237 my $child = $self->{children}[0];
1238
949 my ($w, $h ) = ($self->{w}, $self->{h}); 1239 my ($w, $h ) = ($self->{w}, $self->{h});
950 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1240 my ($cw, $ch) = ($child->{w}, $child->{h});
951 1241
952 glEnable GL_BLEND;
953 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
954 glEnable GL_TEXTURE_2D; 1242 glEnable GL_TEXTURE_2D;
955 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1243 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
956 1244
957 my $border = $self->border; 1245 my $border = $self->border;
958 1246
959 glColor @{ $self->{border_bg} }; 1247 glColor @{ $self->{border_bg} };
960 $tex[1]->draw_quad (0, 0, $w, $border); 1248 $border[0]->draw_quad_alpha (0, 0, $w, $border);
961 $tex[3]->draw_quad (0, $border, $border, $ch); 1249 $border[1]->draw_quad_alpha (0, $border, $border, $ch);
962 $tex[2]->draw_quad ($w - $border, $border, $border, $ch); 1250 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
963 $tex[4]->draw_quad (0, $h - $border, $w, $border); 1251 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
964 1252
965 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1253 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
966 my $bg = $tex[0]; 1254 glColor @{ $self->{bg} };
967 1255
968 # TODO: repeat texture not scale 1256 # TODO: repeat texture not scale
1257 # solve this better(?)
969 my $rep_x = $cw / $bg->{w}; 1258 $bg->{s} = $cw / $bg->{w};
970 my $rep_y = $ch / $bg->{h}; 1259 $bg->{t} = $ch / $bg->{h};
971
972 glColor @{ $self->{bg} };
973
974 $bg->{s} = $rep_x;
975 $bg->{t} = $rep_y;
976 $bg->{wrap_mode} = 1;
977 $bg->draw_quad ($border, $border, $cw, $ch); 1260 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1261 }
978 1262
979 glDisable GL_TEXTURE_2D; 1263 glDisable GL_TEXTURE_2D;
980 glDisable GL_BLEND;
981 }
982 1264
983 $self->{title}->draw if $self->{title};
984
985 $self->child->draw; 1265 $child->draw;
1266
1267 if ($self->{title_widget}) {
1268 glTranslate 0, $border - $self->{h};
1269 $self->{title_widget}->_draw;
1270
1271 glTranslate 0, - ($border - $self->{h});
1272 }
1273
1274 $self->{close_button}->draw
1275 if $self->{close_button};
986} 1276}
987 1277
988############################################################################# 1278#############################################################################
989 1279
990package CFClient::UI::Table; 1280package CFClient::UI::Table;
… …
998sub new { 1288sub new {
999 my $class = shift; 1289 my $class = shift;
1000 1290
1001 $class->SUPER::new ( 1291 $class->SUPER::new (
1002 col_expand => [], 1292 col_expand => [],
1003 @_ 1293 @_,
1004 ) 1294 )
1295}
1296
1297sub children {
1298 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1005} 1299}
1006 1300
1007sub add { 1301sub add {
1008 my ($self, $x, $y, $child) = @_; 1302 my ($self, $x, $y, $child) = @_;
1009 1303
1010 $child->set_parent ($self); 1304 $child->set_parent ($self);
1011 $self->{children}[$y][$x] = $child; 1305 $self->{children}[$y][$x] = $child;
1012 1306
1013 $child->check_size; 1307 $self->realloc;
1014} 1308}
1015 1309
1016sub children { 1310sub remove {
1017 grep $_, map @$_, grep $_, @{ $_[0]{children} } 1311 my ($self, $child) = @_;
1018}
1019 1312
1313 # TODO: not yet implemented
1314}
1315
1020# TODO: move to container class maybe? send childs a signal on removal? 1316# TODO: move to container class maybe? send children a signal on removal?
1021sub clear { 1317sub clear {
1022 my ($self) = @_; 1318 my ($self) = @_;
1023 1319
1024 my @children = $self->children; 1320 my @children = $self->children;
1025 delete $self->{children}; 1321 delete $self->{children};
… …
1027 for (@children) { 1323 for (@children) {
1028 delete $_->{parent}; 1324 delete $_->{parent};
1029 $_->hide; 1325 $_->hide;
1030 } 1326 }
1031 1327
1032 $self->update; 1328 $self->realloc;
1033} 1329}
1034 1330
1035sub get_wh { 1331sub get_wh {
1036 my ($self) = @_; 1332 my ($self) = @_;
1037 1333
… …
1063 (sum @$ws), 1359 (sum @$ws),
1064 (sum @$hs), 1360 (sum @$hs),
1065 ) 1361 )
1066} 1362}
1067 1363
1068sub size_allocate { 1364sub invoke_size_allocate {
1069 my ($self, $w, $h) = @_; 1365 my ($self, $w, $h) = @_;
1070 1366
1071 my ($ws, $hs) = $self->get_wh; 1367 my ($ws, $hs) = $self->get_wh;
1072 1368
1073 my $req_w = sum @$ws; 1369 my $req_w = (sum @$ws) || 1;
1074 my $req_h = sum @$hs; 1370 my $req_h = (sum @$hs) || 1;
1075 1371
1076 # TODO: nicer code && do row_expand 1372 # TODO: nicer code && do row_expand
1077 my @col_expand = @{$self->{col_expand}}; 1373 my @col_expand = @{$self->{col_expand}};
1078 @col_expand = (1) x @$ws unless @col_expand; 1374 @col_expand = (1) x @$ws unless @col_expand;
1079 my $col_expand = (sum @col_expand) || 1; 1375 my $col_expand = (sum @col_expand) || 1;
… …
1105 } 1401 }
1106 1402
1107 $y += $row_h; 1403 $y += $row_h;
1108 } 1404 }
1109 1405
1406 1
1110} 1407}
1111 1408
1112sub find_widget { 1409sub find_widget {
1113 my ($self, $x, $y) = @_; 1410 my ($self, $x, $y) = @_;
1114 1411
… …
1133 } 1430 }
1134} 1431}
1135 1432
1136############################################################################# 1433#############################################################################
1137 1434
1435package CFClient::UI::Box;
1436
1437our @ISA = CFClient::UI::Container::;
1438
1439sub size_request {
1440 my ($self) = @_;
1441
1442 $self->{vertical}
1443 ? (
1444 (List::Util::max map $_->{req_w}, @{$self->{children}}),
1445 (List::Util::sum map $_->{req_h}, @{$self->{children}}),
1446 )
1447 : (
1448 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1449 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1450 )
1451}
1452
1453sub invoke_size_allocate {
1454 my ($self, $w, $h) = @_;
1455
1456 my $space = $self->{vertical} ? $h : $w;
1457 my @children = $self->visible_children;
1458
1459 my @req;
1460
1461 if ($self->{homogeneous}) {
1462 @req = ($space / (@children || 1)) x @children;
1463 } else {
1464 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @children;
1465 my $req = List::Util::sum @req;
1466
1467 if ($req > $space) {
1468 # ah well, not enough space
1469 $_ *= $space / $req for @req;
1470 } else {
1471 my $expand = (List::Util::sum map $_->{expand}, @children) || 1;
1472
1473 $space = ($space - $req) / $expand; # remaining space to give away
1474
1475 $req[$_] += $space * $children[$_]{expand}
1476 for 0 .. $#children;
1477 }
1478 }
1479
1480 CFClient::UI::harmonize \@req;
1481
1482 my $pos = 0;
1483 for (0 .. $#children) {
1484 my $alloc = $req[$_];
1485 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1486
1487 $pos += $alloc;
1488 }
1489
1490 1
1491}
1492
1493#############################################################################
1494
1138package CFClient::UI::HBox; 1495package CFClient::UI::HBox;
1139 1496
1140# TODO: wrap into common Box base class
1141
1142our @ISA = CFClient::UI::Container::; 1497our @ISA = CFClient::UI::Box::;
1143 1498
1144sub size_request { 1499sub new {
1145 my ($self) = @_; 1500 my $class = shift;
1146 1501
1147 my @alloc = map [$_->size_request], @{$self->{children}}; 1502 $class->SUPER::new (
1148 1503 vertical => 0,
1149 ( 1504 @_,
1150 (List::Util::sum map $_->[0], @alloc),
1151 (List::Util::max map $_->[1], @alloc),
1152 ) 1505 )
1153} 1506}
1154 1507
1155sub size_allocate {
1156 my ($self, $w, $h) = @_;
1157
1158 ($h, $w) = ($w, $h);
1159
1160 my $children = $self->{children};
1161
1162 my @h = map $_->{req_w}, @$children;
1163
1164 my $req_h = List::Util::sum @h;
1165
1166 if ($req_h > $h) {
1167 # ah well, not enough space
1168 $_ *= $h / $req_h for @h;
1169 } else {
1170 my $exp = List::Util::sum map $_->{expand}, @$children;
1171 $exp ||= 1;
1172
1173 for (0 .. $#$children) {
1174 my $child = $children->[$_];
1175
1176 my $alloc_h = $h[$_];
1177 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
1178 $h[$_] = $alloc_h;
1179 }
1180 }
1181
1182 CFClient::UI::harmonize \@h;
1183
1184 my $y = 0;
1185 for (0 .. $#$children) {
1186 my $child = $children->[$_];
1187 my $h = $h[$_];
1188 $child->configure ($y, 0, $h, $w);
1189
1190 $y += $h;
1191 }
1192
1193 1
1194}
1195
1196############################################################################# 1508#############################################################################
1197 1509
1198package CFClient::UI::VBox; 1510package CFClient::UI::VBox;
1199 1511
1200# TODO: wrap into common Box base class
1201
1202our @ISA = CFClient::UI::Container::; 1512our @ISA = CFClient::UI::Box::;
1203 1513
1204sub size_request { 1514sub new {
1205 my ($self) = @_; 1515 my $class = shift;
1206 1516
1207 my @alloc = map [$_->size_request], @{$self->{children}}; 1517 $class->SUPER::new (
1208 1518 vertical => 1,
1209 ( 1519 @_,
1210 (List::Util::max map $_->[0], @alloc),
1211 (List::Util::sum map $_->[1], @alloc),
1212 ) 1520 )
1213} 1521}
1214 1522
1215sub size_allocate {
1216 my ($self, $w, $h) = @_;
1217
1218 my $children = $self->{children};
1219
1220 my @h = map $_->{req_h}, @$children;
1221
1222 my $req_h = List::Util::sum @h;
1223
1224 if ($req_h > $h) {
1225 # ah well, not enough space
1226 $_ *= $h / $req_h for @h;
1227 } else {
1228 my $exp = List::Util::sum map $_->{expand}, @$children;
1229 $exp ||= 1;
1230
1231 for (0 .. $#$children) {
1232 my $child = $children->[$_];
1233
1234 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1235 }
1236 }
1237
1238 CFClient::UI::harmonize \@h;
1239
1240 my $y = 0;
1241 for (0 .. $#$children) {
1242 my $child = $children->[$_];
1243 my $h = $h[$_];
1244 $child->configure (0, $y, $w, $h);
1245
1246 $y += $h;
1247 }
1248
1249 1
1250}
1251
1252############################################################################# 1523#############################################################################
1253 1524
1254package CFClient::UI::Label; 1525package CFClient::UI::Label;
1255 1526
1256our @ISA = CFClient::UI::Base::; 1527our @ISA = CFClient::UI::DrawBG::;
1257 1528
1258use CFClient::OpenGL; 1529use CFClient::OpenGL;
1259 1530
1260sub new { 1531sub new {
1261 my ($class, %arg) = @_; 1532 my ($class, %arg) = @_;
1262 1533
1263 my $self = $class->SUPER::new ( 1534 my $self = $class->SUPER::new (
1264 fg => [1, 1, 1], 1535 fg => [1, 1, 1],
1536 #bg => none
1537 #active_bg => none
1265 #font => default_font 1538 #font => default_font
1539 #text => initial text
1540 #markup => initial narkup
1541 #max_w => maximum pixel width
1542 ellipsise => 3, # end
1543 layout => (new CFClient::Layout),
1266 fontsize => 1, 1544 fontsize => 1,
1267 text => "",
1268 align => -1, 1545 align => -1,
1269 valign => -1, 1546 valign => -1,
1270 padding => 2, 1547 padding_x => 2,
1271 layout => new CFClient::Layout, 1548 padding_y => 2,
1272 can_events => 0, 1549 can_events => 0,
1273 %arg 1550 %arg
1274 ); 1551 );
1275 1552
1276 if (exists $self->{template}) { 1553 if (exists $self->{template}) {
1277 my $layout = new CFClient::Layout; 1554 my $layout = new CFClient::Layout;
1278 $layout->set_text (delete $self->{template}); 1555 $layout->set_text (delete $self->{template});
1279 $self->{template} = $layout; 1556 $self->{template} = $layout;
1280 } 1557 }
1281 1558
1282 $self->set_text (delete $self->{text}) if exists $self->{text}; 1559 if (exists $self->{markup}) {
1283 $self->set_markup (delete $self->{markup}) if exists $self->{markup}; 1560 $self->set_markup (delete $self->{markup});
1561 } else {
1562 $self->set_text (delete $self->{text});
1563 }
1284 1564
1285 $self 1565 $self
1286} 1566}
1287 1567
1288sub escape { 1568sub escape($) {
1289 local $_ = $_[1]; 1569 local $_ = $_[0];
1290 1570
1291 s/&/&amp;/g; 1571 s/&/&amp;/g;
1292 s/>/&gt;/g; 1572 s/>/&gt;/g;
1293 s/</&lt;/g; 1573 s/</&lt;/g;
1294 1574
1295 $_[1] 1575 $_
1296} 1576}
1297 1577
1298sub update { 1578sub update {
1299 my ($self) = @_; 1579 my ($self) = @_;
1300 1580
1301 delete $self->{texture}; 1581 delete $self->{texture};
1302 $self->SUPER::update; 1582 $self->SUPER::update;
1303} 1583}
1304 1584
1585sub realloc {
1586 my ($self) = @_;
1587
1588 delete $self->{ox};
1589 $self->SUPER::realloc;
1590}
1591
1305sub set_text { 1592sub set_text {
1306 my ($self, $text) = @_; 1593 my ($self, $text) = @_;
1307 1594
1308 return if $self->{text} eq "T$text"; 1595 return if $self->{text} eq "T$text";
1309 $self->{text} = "T$text"; 1596 $self->{text} = "T$text";
1310 1597
1311 $self->{layout}->set_text ($text); 1598 $self->{layout}->set_text ($text);
1312 1599
1600 delete $self->{size_req};
1601 $self->realloc;
1313 $self->update; 1602 $self->update;
1314 $self->check_size;
1315} 1603}
1316 1604
1317sub set_markup { 1605sub set_markup {
1318 my ($self, $markup) = @_; 1606 my ($self, $markup) = @_;
1319 1607
1320 return if $self->{text} eq "M$markup"; 1608 return if $self->{text} eq "M$markup";
1321 $self->{text} = "M$markup"; 1609 $self->{text} = "M$markup";
1322 1610
1611 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1612
1323 $self->{layout}->set_markup ($markup); 1613 $self->{layout}->set_markup ($markup);
1324 1614
1615 delete $self->{size_req};
1616 $self->realloc;
1325 $self->update; 1617 $self->update;
1326 $self->check_size;
1327} 1618}
1328 1619
1329sub size_request { 1620sub size_request {
1330 my ($self) = @_; 1621 my ($self) = @_;
1331 1622
1623 $self->{size_req} ||= do {
1332 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1624 $self->{layout}->set_font ($self->{font}) if $self->{font};
1333 $self->{layout}->set_width ($self->{max_w} || -1); 1625 $self->{layout}->set_width ($self->{max_w} || -1);
1626 $self->{layout}->set_ellipsise ($self->{ellipsise});
1627 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1334 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1628 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1335 1629
1336 my ($w, $h) = $self->{layout}->size; 1630 my ($w, $h) = $self->{layout}->size;
1337 1631
1338 if (exists $self->{template}) { 1632 if (exists $self->{template}) {
1339 $self->{template}->set_font ($self->{font}) if $self->{font}; 1633 $self->{template}->set_font ($self->{font}) if $self->{font};
1634 $self->{template}->set_width ($self->{max_w} || -1);
1340 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1635 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1341 1636
1342 my ($w2, $h2) = $self->{template}->size; 1637 my ($w2, $h2) = $self->{template}->size;
1343 1638
1344 $w = List::Util::max $w, $w2; 1639 $w = List::Util::max $w, $w2;
1345 $h = List::Util::max $h, $h2; 1640 $h = List::Util::max $h, $h2;
1641 }
1642
1643 [$w, $h]
1346 } 1644 };
1347 1645
1348 ( 1646 @{ $self->{size_req} }
1349 $w + $self->{padding} * 2,
1350 $h + $self->{padding} * 2,
1351 )
1352} 1647}
1353 1648
1649sub baseline_shift {
1650 $_[0]{layout}->descent
1651}
1652
1354sub size_allocate { 1653sub invoke_size_allocate {
1355 my ($self, $w, $h) = @_; 1654 my ($self, $w, $h) = @_;
1356 1655
1656 delete $self->{ox};
1657
1357 delete $self->{texture}; 1658 delete $self->{texture}
1659 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1660
1661 1
1358} 1662}
1359 1663
1360sub set_fontsize { 1664sub set_fontsize {
1361 my ($self, $fontsize) = @_; 1665 my ($self, $fontsize) = @_;
1362 1666
1363 $self->{fontsize} = $fontsize; 1667 $self->{fontsize} = $fontsize;
1668 delete $self->{size_req};
1364 delete $self->{texture}; 1669 delete $self->{texture};
1365 1670
1366 $self->update; 1671 $self->realloc;
1367 $self->check_size; 1672}
1673
1674sub reconfigure {
1675 my ($self) = @_;
1676
1677 delete $self->{size_req};
1678 delete $self->{texture};
1679
1680 $self->SUPER::reconfigure;
1368} 1681}
1369 1682
1370sub _draw { 1683sub _draw {
1371 my ($self) = @_; 1684 my ($self) = @_;
1372 1685
1686 $self->SUPER::_draw; # draw background, if applicable
1687
1373 my $tex = $self->{texture} ||= do { 1688 my $size = $self->{texture} ||= do {
1689 $self->{layout}->set_foreground (@{$self->{fg}});
1374 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1690 $self->{layout}->set_font ($self->{font}) if $self->{font};
1375 $self->{layout}->set_width ($self->{w}); 1691 $self->{layout}->set_width ($self->{w});
1692 $self->{layout}->set_ellipsise ($self->{ellipsise});
1693 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1376 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE); 1694 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1377 new_from_layout CFClient::Texture $self->{layout} 1695
1696 [$self->{layout}->size]
1378 }; 1697 };
1379 1698
1380 glEnable GL_BLEND; 1699 unless (exists $self->{ox}) {
1381 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1382 glEnable GL_TEXTURE_2D;
1383 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1384
1385 glColor @{$self->{fg}};
1386
1387 $self->{ox} = int (
1388 $self->{align} < 0 ? $self->{padding} 1700 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1389 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} 1701 : $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
1390 : ($self->{w} - $tex->{w}) * 0.5 1702 : ($self->{w} - $size->[0]) * 0.5);
1391 );
1392 1703
1393 $self->{oy} = int (
1394 $self->{valign} < 0 ? $self->{padding} 1704 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1395 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding} 1705 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1396 : ($self->{h} - $tex->{h}) * 0.5 1706 : ($self->{h} - $size->[1]) * 0.5);
1397 ); 1707 };
1398 1708
1399 $tex->draw_quad ($self->{ox}, $self->{oy}); 1709 my $w = List::Util::min $self->{w} + 4, $size->[0];
1710 my $h = List::Util::min $self->{h} + 2, $size->[1];
1400 1711
1401 glDisable GL_TEXTURE_2D; 1712 $self->{layout}->render ($self->{ox}, $self->{oy});
1402 glDisable GL_BLEND;
1403} 1713}
1404 1714
1405############################################################################# 1715#############################################################################
1406 1716
1407package CFClient::UI::EntryBase; 1717package CFClient::UI::EntryBase;
… …
1420 active_fg => [0, 0, 0], 1730 active_fg => [0, 0, 0],
1421 can_hover => 1, 1731 can_hover => 1,
1422 can_focus => 1, 1732 can_focus => 1,
1423 valign => 0, 1733 valign => 0,
1424 can_events => 1, 1734 can_events => 1,
1735 #text => ...
1736 #hidden => "*",
1425 @_ 1737 @_
1426 ) 1738 )
1427} 1739}
1428 1740
1429sub _set_text { 1741sub _set_text {
… …
1431 1743
1432 delete $self->{cur_h}; 1744 delete $self->{cur_h};
1433 1745
1434 return if $self->{text} eq $text; 1746 return if $self->{text} eq $text;
1435 1747
1436 delete $self->{texture};
1437
1438 $self->{last_activity} = $::NOW; 1748 $self->{last_activity} = $::NOW;
1439 $self->{text} = $text; 1749 $self->{text} = $text;
1440 1750
1441 $text =~ s/./*/g if $self->{hidden}; 1751 $text =~ s/./*/g if $self->{hidden};
1442 $self->{layout}->set_text ("$text "); 1752 $self->{layout}->set_text ("$text ");
1753 delete $self->{size_req};
1443 1754
1444 $self->emit (changed => $self->{text}); 1755 $self->emit (changed => $self->{text});
1756
1757 $self->realloc;
1758 $self->update;
1759}
1760
1761sub set_text {
1762 my ($self, $text) = @_;
1763
1764 $self->{cursor} = length $text;
1765 $self->_set_text ($text);
1445} 1766}
1446 1767
1447sub get_text { 1768sub get_text {
1448 $_[0]{text} 1769 $_[0]{text}
1449} 1770}
… …
1454 my ($w, $h) = $self->SUPER::size_request; 1775 my ($w, $h) = $self->SUPER::size_request;
1455 1776
1456 ($w + 1, $h) # add 1 for cursor 1777 ($w + 1, $h) # add 1 for cursor
1457} 1778}
1458 1779
1459sub size_allocate {
1460 my ($self, $w, $h) = @_;
1461
1462 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1463}
1464
1465sub set_text {
1466 my ($self, $text) = @_;
1467
1468 $self->{cursor} = length $text;
1469 $self->_set_text ($text);
1470 $self->update;
1471}
1472
1473sub key_down { 1780sub invoke_key_down {
1474 my ($self, $ev) = @_; 1781 my ($self, $ev) = @_;
1475 1782
1476 my $mod = $ev->{mod}; 1783 my $mod = $ev->{mod};
1477 my $sym = $ev->{sym}; 1784 my $sym = $ev->{sym};
1478 my $uni = $ev->{unicode}; 1785 my $uni = $ev->{unicode};
1479 1786
1480 my $text = $self->get_text; 1787 my $text = $self->get_text;
1481 1788
1482 if ($sym == 8) { 1789 if ($uni == 8) {
1483 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 1790 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1484 } elsif ($sym == 127) { 1791 } elsif ($uni == 127) {
1485 substr $text, $self->{cursor}, 1, ""; 1792 substr $text, $self->{cursor}, 1, "";
1486 } elsif ($sym == CFClient::SDLK_LEFT) { 1793 } elsif ($sym == CFClient::SDLK_LEFT) {
1487 --$self->{cursor} if $self->{cursor}; 1794 --$self->{cursor} if $self->{cursor};
1488 } elsif ($sym == CFClient::SDLK_RIGHT) { 1795 } elsif ($sym == CFClient::SDLK_RIGHT) {
1489 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1796 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1490 } elsif ($sym == CFClient::SDLK_HOME) { 1797 } elsif ($sym == CFClient::SDLK_HOME) {
1491 $self->{cursor} = 0; 1798 $self->{cursor} = 0;
1492 } elsif ($sym == CFClient::SDLK_END) { 1799 } elsif ($sym == CFClient::SDLK_END) {
1493 $self->{cursor} = length $text; 1800 $self->{cursor} = length $text;
1494 } elsif ($sym == 27) { 1801 } elsif ($uni == 27) {
1495 $self->emit ('escape'); 1802 $self->emit ('escape');
1496 } elsif ($uni) { 1803 } elsif ($uni) {
1497 substr $text, $self->{cursor}++, 0, chr $uni; 1804 substr $text, $self->{cursor}++, 0, chr $uni;
1805 } else {
1806 return 0;
1498 } 1807 }
1499 1808
1500 $self->_set_text ($text); 1809 $self->_set_text ($text);
1501 $self->update;
1502}
1503 1810
1811 $self->realloc;
1812
1813 1
1814}
1815
1504sub focus_in { 1816sub invoke_focus_in {
1505 my ($self) = @_; 1817 my ($self) = @_;
1506 1818
1507 $self->{last_activity} = $::NOW; 1819 $self->{last_activity} = $::NOW;
1508 1820
1509 $self->SUPER::focus_in; 1821 $self->SUPER::invoke_focus_in
1510} 1822}
1511 1823
1512sub button_down { 1824sub invoke_button_down {
1513 my ($self, $ev, $x, $y) = @_; 1825 my ($self, $ev, $x, $y) = @_;
1514 1826
1515 $self->SUPER::button_down ($ev, $x, $y); 1827 $self->SUPER::invoke_button_down ($ev, $x, $y);
1516 1828
1517 my $idx = $self->{layout}->xy_to_index ($x, $y); 1829 my $idx = $self->{layout}->xy_to_index ($x, $y);
1518 1830
1519 # byte-index to char-index 1831 # byte-index to char-index
1520 my $text = $self->{text}; 1832 my $text = $self->{text};
1521 utf8::encode $text; 1833 utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1522 $self->{cursor} = length substr $text, 0, $idx; 1834 $self->{cursor} = length $text;
1523 1835
1524 $self->_set_text ($self->{text}); 1836 $self->_set_text ($self->{text});
1525 $self->update; 1837 $self->update;
1838
1839 1
1526} 1840}
1527 1841
1528sub mouse_motion { 1842sub invoke_mouse_motion {
1529 my ($self, $ev, $x, $y) = @_; 1843 my ($self, $ev, $x, $y) = @_;
1530# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 1844# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1845
1846 1
1531} 1847}
1532 1848
1533sub _draw { 1849sub _draw {
1534 my ($self) = @_; 1850 my ($self) = @_;
1535 1851
1536 local $self->{fg} = $self->{fg}; 1852 local $self->{fg} = $self->{fg};
1537 1853
1538 if ($FOCUS == $self) { 1854 if ($FOCUS == $self) {
1539 glColor @{$self->{active_bg}}; 1855 glColor_premultiply @{$self->{active_bg}};
1540 $self->{fg} = $self->{active_fg}; 1856 $self->{fg} = $self->{active_fg};
1541 } else { 1857 } else {
1542 glColor @{$self->{bg}}; 1858 glColor_premultiply @{$self->{bg}};
1543 } 1859 }
1544 1860
1545 glEnable GL_BLEND; 1861 glEnable GL_BLEND;
1546 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1862 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1547 glBegin GL_QUADS; 1863 glBegin GL_QUADS;
1548 glVertex 0 , 0; 1864 glVertex 0 , 0;
1549 glVertex 0 , $self->{h}; 1865 glVertex 0 , $self->{h};
1550 glVertex $self->{w}, $self->{h}; 1866 glVertex $self->{w}, $self->{h};
1551 glVertex $self->{w}, 0; 1867 glVertex $self->{w}, 0;
… …
1576 1892
1577our @ISA = CFClient::UI::EntryBase::; 1893our @ISA = CFClient::UI::EntryBase::;
1578 1894
1579use CFClient::OpenGL; 1895use CFClient::OpenGL;
1580 1896
1581sub key_down { 1897sub invoke_key_down {
1582 my ($self, $ev) = @_; 1898 my ($self, $ev) = @_;
1583 1899
1584 my $sym = $ev->{sym}; 1900 my $sym = $ev->{sym};
1585 1901
1586 if ($sym == 13) { 1902 if ($sym == 13) {
1587 unshift @{$self->{history}}, 1903 unshift @{$self->{history}},
1588 my $txt = $self->get_text; 1904 my $txt = $self->get_text;
1905
1589 $self->{history_pointer} = -1; 1906 $self->{history_pointer} = -1;
1590 $self->{history_saveback} = ''; 1907 $self->{history_saveback} = '';
1591 $self->emit (activate => $txt); 1908 $self->emit (activate => $txt);
1592 $self->update; 1909 $self->update;
1593 1910
… …
1612 } else { 1929 } else {
1613 $self->set_text ($self->{history_saveback}); 1930 $self->set_text ($self->{history_saveback});
1614 } 1931 }
1615 1932
1616 } else { 1933 } else {
1617 $self->SUPER::key_down ($ev); 1934 return $self->SUPER::invoke_key_down ($ev)
1935 }
1936
1618 } 1937 1
1619
1620} 1938}
1621 1939
1622############################################################################# 1940#############################################################################
1623 1941
1624package CFClient::UI::Button; 1942package CFClient::UI::Button;
… …
1633 1951
1634sub new { 1952sub new {
1635 my $class = shift; 1953 my $class = shift;
1636 1954
1637 $class->SUPER::new ( 1955 $class->SUPER::new (
1638 padding => 4, 1956 padding_x => 4,
1957 padding_y => 4,
1639 fg => [1, 1, 1], 1958 fg => [1, 1, 1],
1640 bg => [1, 1, 1, 0.2],
1641 active_fg => [0, 0, 1], 1959 active_fg => [0, 0, 1],
1642 can_hover => 1, 1960 can_hover => 1,
1643 align => 0, 1961 align => 0,
1644 valign => 0, 1962 valign => 0,
1645 can_events => 1, 1963 can_events => 1,
1646 @_ 1964 @_
1647 ) 1965 )
1648} 1966}
1649 1967
1650sub button_up { 1968sub invoke_button_up {
1651 my ($self, $ev, $x, $y) = @_; 1969 my ($self, $ev, $x, $y) = @_;
1652 1970
1971 $self->emit ("activate")
1653 if ($x >= 0 && $x < $self->{w} 1972 if $x >= 0 && $x < $self->{w}
1654 && $y >= 0 && $y < $self->{h}) { 1973 && $y >= 0 && $y < $self->{h};
1655 $self->emit ("activate"); 1974
1656 } 1975 1
1657} 1976}
1658 1977
1659sub _draw { 1978sub _draw {
1660 my ($self) = @_; 1979 my ($self) = @_;
1661 1980
1662 local $self->{fg} = $self->{fg}; 1981 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1663 1982
1664 if ($GRAB == $self) {
1665 $self->{fg} = $self->{active_fg};
1666 }
1667
1668 glEnable GL_BLEND;
1669 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1670 glEnable GL_TEXTURE_2D; 1983 glEnable GL_TEXTURE_2D;
1671 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1984 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1672 glColor 0, 0, 0, 1; 1985 glColor 0, 0, 0, 1;
1673 1986
1674 $tex[0]->draw_quad (0, 0, $self->{w}, $self->{h}); 1987 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1675 1988
1676 glDisable GL_TEXTURE_2D; 1989 glDisable GL_TEXTURE_2D;
1677 glDisable GL_BLEND;
1678 1990
1679 $self->SUPER::_draw; 1991 $self->SUPER::_draw;
1992}
1993
1994#############################################################################
1995
1996package CFClient::UI::ImageButton;
1997
1998our @ISA = CFClient::UI::Image::;
1999
2000use CFClient::OpenGL;
2001
2002my %textures;
2003
2004sub new {
2005 my $class = shift;
2006
2007 my $self = $class->SUPER::new (
2008 padding_x => 4,
2009 padding_y => 4,
2010 fg => [1, 1, 1],
2011 active_fg => [0, 0, 1],
2012 can_hover => 1,
2013 align => 0,
2014 valign => 0,
2015 can_events => 1,
2016 @_
2017 );
2018}
2019
2020sub invoke_button_up {
2021 my ($self, $ev, $x, $y) = @_;
2022
2023 $self->emit ("activate")
2024 if $x >= 0 && $x < $self->{w}
2025 && $y >= 0 && $y < $self->{h};
2026
2027 1
1680} 2028}
1681 2029
1682############################################################################# 2030#############################################################################
1683 2031
1684package CFClient::UI::CheckBox; 2032package CFClient::UI::CheckBox;
… …
1693 2041
1694sub new { 2042sub new {
1695 my $class = shift; 2043 my $class = shift;
1696 2044
1697 $class->SUPER::new ( 2045 $class->SUPER::new (
1698 padding => 2, 2046 padding_x => 2,
2047 padding_y => 2,
1699 fg => [1, 1, 1], 2048 fg => [1, 1, 1],
1700 active_fg => [1, 1, 0], 2049 active_fg => [1, 1, 0],
2050 bg => [0, 0, 0, 0.2],
2051 active_bg => [1, 1, 1, 0.5],
1701 state => 0, 2052 state => 0,
1702 can_hover => 1, 2053 can_hover => 1,
1703 @_ 2054 @_
1704 ) 2055 )
1705} 2056}
1706 2057
1707sub size_request { 2058sub size_request {
1708 my ($self) = @_; 2059 my ($self) = @_;
1709 2060
1710 ($self->{padding} * 2 + 6) x 2 2061 (6) x 2
1711} 2062}
1712 2063
2064sub toggle {
2065 my ($self) = @_;
2066
2067 $self->{state} = !$self->{state};
2068 $self->emit (changed => $self->{state});
2069 $self->update;
2070}
2071
1713sub button_down { 2072sub invoke_button_down {
1714 my ($self, $ev, $x, $y) = @_; 2073 my ($self, $ev, $x, $y) = @_;
1715 2074
1716 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 2075 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1717 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 2076 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1718 $self->{state} = !$self->{state}; 2077 $self->toggle;
1719 $self->emit (changed => $self->{state}); 2078 } else {
2079 return 0
2080 }
2081
1720 } 2082 1
1721} 2083}
1722 2084
1723sub _draw { 2085sub _draw {
1724 my ($self) = @_; 2086 my ($self) = @_;
1725 2087
1726 $self->SUPER::_draw; 2088 $self->SUPER::_draw;
1727 2089
1728 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 2090 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1729 2091
1730 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; 2092 my ($w, $h) = @$self{qw(w h)};
2093
2094 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
1731 2095
1732 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 2096 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1733 2097
1734 glEnable GL_BLEND; 2098 my $tex = $self->{state} ? $tex[1] : $tex[0];
2099
1735 glEnable GL_TEXTURE_2D; 2100 glEnable GL_TEXTURE_2D;
1736 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1737
1738 my $tex = $self->{state} ? $tex[1] : $tex[0];
1739
1740 $tex->draw_quad (0, 0, $s, $s); 2101 $tex->draw_quad_alpha (0, 0, $s, $s);
1741
1742 glDisable GL_TEXTURE_2D; 2102 glDisable GL_TEXTURE_2D;
1743 glDisable GL_BLEND;
1744} 2103}
1745 2104
1746############################################################################# 2105#############################################################################
1747 2106
1748package CFClient::UI::Image; 2107package CFClient::UI::Image;
1749 2108
1750our @ISA = CFClient::UI::Base::; 2109our @ISA = CFClient::UI::Base::;
1751 2110
1752use CFClient::OpenGL; 2111use CFClient::OpenGL;
1753use Carp qw/confess/;
1754 2112
1755our %loaded_images; 2113our %texture_cache;
1756 2114
1757sub new { 2115sub new {
1758 my $class = shift; 2116 my $class = shift;
1759 2117
1760 my $self = $class->SUPER::new (can_events => 0, @_); 2118 my $self = $class->SUPER::new (
2119 can_events => 0,
2120 @_,
2121 );
1761 2122
1762 $self->{image} or confess "Image has 'image' not set. This is a fatal error!"; 2123 $self->{path}
2124 or Carp::croak "required attribute 'path' not set";
1763 2125
1764 $loaded_images{$self->{image}} ||= 2126 $self->{tex} = $texture_cache{$self->{path}} ||=
1765 new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1; 2127 new_from_file CFClient::Texture CFClient::find_rcfile $self->{path}, mipmap => 1;
1766 2128
1767 my $tex = $self->{tex} = $loaded_images{$self->{image}}; 2129 Scalar::Util::weaken $texture_cache{$self->{path}};
1768 2130
1769 Scalar::Util::weaken $loaded_images{$self->{image}}; 2131 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
1770
1771 $self->{aspect} = $tex->{w} / $tex->{h};
1772 2132
1773 $self 2133 $self
1774} 2134}
1775 2135
1776sub size_request { 2136sub size_request {
1777 my ($self) = @_; 2137 my ($self) = @_;
1778 2138
1779 ($self->{tex}->{w}, $self->{tex}->{h}) 2139 ($self->{tex}{w}, $self->{tex}{h})
1780} 2140}
1781 2141
1782sub _draw { 2142sub _draw {
1783 my ($self) = @_; 2143 my ($self) = @_;
1784 2144
… …
1791 glTranslate 0, -$self->{w}, 0; 2151 glTranslate 0, -$self->{w}, 0;
1792 2152
1793 ($w, $h) = ($h, $w); 2153 ($w, $h) = ($h, $w);
1794 } 2154 }
1795 2155
1796 glEnable GL_BLEND;
1797 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1798 glEnable GL_TEXTURE_2D; 2156 glEnable GL_TEXTURE_2D;
1799 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2157 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1800 2158
1801 $tex->draw_quad (0, 0, $w, $h); 2159 $tex->draw_quad_alpha (0, 0, $w, $h);
1802 2160
1803 glDisable GL_BLEND;
1804 glDisable GL_TEXTURE_2D; 2161 glDisable GL_TEXTURE_2D;
1805} 2162}
1806 2163
1807############################################################################# 2164#############################################################################
1808 2165
… …
1896 my $ycut1 = max 0, min 1, $ycut; 2253 my $ycut1 = max 0, min 1, $ycut;
1897 my $ycut2 = max 0, min 1, $ycut - 1; 2254 my $ycut2 = max 0, min 1, $ycut - 1;
1898 2255
1899 my $h1 = $self->{h} * (1 - $ycut1); 2256 my $h1 = $self->{h} * (1 - $ycut1);
1900 my $h2 = $self->{h} * (1 - $ycut2); 2257 my $h2 = $self->{h} * (1 - $ycut2);
2258 my $h3 = $self->{h};
2259
2260 $_ = $_ * (284-4)/288 + 4/288 for ($h1, $h2, $h3);
1901 2261
1902 glEnable GL_BLEND; 2262 glEnable GL_BLEND;
1903 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2263 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2264 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1904 glEnable GL_TEXTURE_2D; 2265 glEnable GL_TEXTURE_2D;
1905 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2266 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1906 2267
1907 glBindTexture GL_TEXTURE_2D, $t1->{name}; 2268 glBindTexture GL_TEXTURE_2D, $t1->{name};
1908 glBegin GL_QUADS; 2269 glBegin GL_QUADS;
… …
1923 2284
1924 if ($t3) { 2285 if ($t3) {
1925 glBindTexture GL_TEXTURE_2D, $t3->{name}; 2286 glBindTexture GL_TEXTURE_2D, $t3->{name};
1926 glBegin GL_QUADS; 2287 glBegin GL_QUADS;
1927 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2; 2288 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
1928 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h}; 2289 glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
1929 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h}; 2290 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
1930 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2; 2291 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
1931 glEnd; 2292 glEnd;
1932 } 2293 }
1933 2294
1934 glDisable GL_BLEND; 2295 glDisable GL_BLEND;
… …
1997 qw(s1_slider.png s1_slider_bg.png); 2358 qw(s1_slider.png s1_slider_bg.png);
1998 2359
1999sub new { 2360sub new {
2000 my $class = shift; 2361 my $class = shift;
2001 2362
2002 # range [value, low, high, page] 2363 # range [value, low, high, page, unit]
2003 2364
2004 # TODO: 0-width page 2365 # TODO: 0-width page
2005 # TODO: req_w/h are wrong with vertical 2366 # TODO: req_w/h are wrong with vertical
2006 # TODO: calculations are off 2367 # TODO: calculations are off
2007 my $self = $class->SUPER::new ( 2368 my $self = $class->SUPER::new (
2008 fg => [1, 1, 1], 2369 fg => [1, 1, 1],
2009 active_fg => [0, 0, 0], 2370 active_fg => [0, 0, 0],
2371 bg => [0, 0, 0, 0.2],
2372 active_bg => [1, 1, 1, 0.5],
2010 range => [0, 0, 100, 10], 2373 range => [0, 0, 100, 10, 0],
2011 req_w => $::WIDTH / 80, 2374 min_w => $::WIDTH / 80,
2012 req_h => $::WIDTH / 80, 2375 min_h => $::WIDTH / 80,
2013 vertical => 0, 2376 vertical => 0,
2014 can_hover => 1, 2377 can_hover => 1,
2015 inner_pad => 5, 2378 inner_pad => 0.02,
2016 @_ 2379 @_
2017 ); 2380 );
2018 2381
2382 $self->set_value ($self->{range}[0]);
2383 $self->update;
2384
2019 $self 2385 $self
2020} 2386}
2021 2387
2388sub set_range {
2389 my ($self, $range) = @_;
2390
2391 ($range, $self->{range}) = ($self->{range}, $range);
2392
2393 if ("@$range" ne "@{$self->{range}}") {
2394 $self->update;
2395 $self->set_value ($self->{range}[0]);
2396 }
2397}
2398
2399sub set_value {
2400 my ($self, $value) = @_;
2401
2402 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
2403
2404 $hi = $lo + 1 if $hi <= $lo;
2405
2406 $page = $hi - $lo if $page > $hi - $lo;
2407
2408 $value = $lo if $value < $lo;
2409 $value = $hi - $page if $value > $hi - $page;
2410
2411 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
2412 if $unit;
2413
2414 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2415
2416 if ($value != $old_value) {
2417 $self->emit (changed => $value);
2418 $self->update;
2419 }
2420}
2421
2022sub size_request { 2422sub size_request {
2023 my ($self) = @_; 2423 my ($self) = @_;
2024 2424
2025 my $w = $self->{req_w}; 2425 ($self->{req_w}, $self->{req_h})
2026 my $h = $self->{req_h};
2027
2028 $self->{vertical} ? ($h, $w) : ($w, $h)
2029} 2426}
2030 2427
2031sub button_down { 2428sub invoke_button_down {
2032 my ($self, $ev, $x, $y) = @_; 2429 my ($self, $ev, $x, $y) = @_;
2033 2430
2034 $self->SUPER::button_down ($ev, $x, $y); 2431 $self->SUPER::invoke_button_down ($ev, $x, $y);
2432
2433 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2434
2035 $self->mouse_motion ($ev, $x, $y); 2435 $self->invoke_mouse_motion ($ev, $x, $y)
2036} 2436}
2037 2437
2038sub mouse_motion { 2438sub invoke_mouse_motion {
2039 my ($self, $ev, $x, $y) = @_; 2439 my ($self, $ev, $x, $y) = @_;
2040 2440
2041 if ($GRAB == $self) { 2441 if ($GRAB == $self) {
2442 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2443
2444 my (undef, $lo, $hi, $page) = @{$self->{range}};
2445
2446 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2447
2448 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2449 } else {
2450 return 0;
2451 }
2452
2453 1
2454}
2455
2456sub update {
2457 my ($self) = @_;
2458
2459 delete $self->{knob_w};
2460 $self->SUPER::update;
2461}
2462
2463sub _draw {
2464 my ($self) = @_;
2465
2466 unless ($self->{knob_w}) {
2467 $self->set_value ($self->{range}[0]);
2468
2042 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2469 my ($value, $lo, $hi, $page) = @{$self->{range}};
2470 my $range = ($hi - $page - $lo) || 1e-100;
2043 2471
2044 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2472 my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
2045 2473
2046 my $inner_pad_px = $self->_calc_inner_pad_px ($w); 2474 $self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
2047 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right 2475 $self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
2048 2476
2049 $x -= $inner_pad_px; # substract the padding 2477 $value = ($value - $lo) / $range;
2050 $x = $x * ($hi - $lo) / $inner_w + $lo; 2478 $value = $value * $self->{scale} + $self->{offset};
2051 $x = $lo if $x < $lo;
2052 $x = $hi - $page if $x > $hi - $page;
2053 $self->{range}[0] = $x;
2054 2479
2055 $self->emit (changed => $x); 2480 $self->{knob_x} = $value - $knob_w * 0.5;
2056 $self->update; 2481 $self->{knob_w} = $knob_w;
2057 } 2482 }
2058}
2059
2060# the inner_* stuff is for generating a padding for the slider handle,
2061# so that the handle doesn't leave the texture. This calculation isn't 100%
2062# correct propably, but it does the job for now
2063sub _calc_inner_pad_px {
2064 my ($self, $w) = @_;
2065 ($w / 100) * $self->{inner_pad} # % to pixels
2066}
2067
2068sub _draw {
2069 my ($self) = @_;
2070 2483
2071 $self->SUPER::_draw (); 2484 $self->SUPER::_draw ();
2072 2485
2073 my ($w, $h) = @$self{qw(w h)}; 2486 glScale $self->{w}, $self->{h};
2074 2487
2075 if ($self->{vertical}) { 2488 if ($self->{vertical}) {
2076 # draw a vertical slider like a rotated horizontal slider 2489 # draw a vertical slider like a rotated horizontal slider
2077 2490
2491 glTranslate 1, 0, 0;
2078 glRotate 90, 0, 0, 1; 2492 glRotate 90, 0, 0, 1;
2079 glTranslate 0, -$self->{w}, 0;
2080
2081 ($w, $h) = ($h, $w);
2082 } 2493 }
2083 2494
2084 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg}; 2495 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
2085 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg}; 2496 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
2086 2497
2087 my ($value, $lo, $hi, $page) = @{$self->{range}};
2088
2089 $hi = $value + 1 if $lo == $hi;
2090
2091 my $inner_pad_px = $self->_calc_inner_pad_px ($w);
2092 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
2093
2094 $page = int $page * $inner_w / ($hi - $lo);
2095 $value = int +($value - $lo) * $inner_w / ($hi - $lo);
2096
2097 $w -= $page;
2098 $page &= ~1;
2099 glTranslate $page * 0.5, 0, 0;
2100 $page ||= 2;
2101
2102 my $knob_a = $inner_pad_px + ($value - $page * 0.5);
2103 my $knob_b = $inner_pad_px + ($value + $page * 0.5);
2104
2105 glEnable GL_BLEND;
2106 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2107 glEnable GL_TEXTURE_2D; 2498 glEnable GL_TEXTURE_2D;
2108 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2499 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2109 2500
2110 # draw background 2501 # draw background
2111 $tex[1]->draw_quad (0, 0, $w, $h); 2502 $tex[1]->draw_quad_alpha (0, 0, 1, 1);
2112 2503
2113 # draw handle 2504 # draw handle
2114 $tex[0]->draw_quad ($knob_a, 0, $knob_b - $knob_a, $h); 2505 $tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1);
2115 2506
2116 glDisable GL_BLEND;
2117 glDisable GL_TEXTURE_2D; 2507 glDisable GL_TEXTURE_2D;
2118} 2508}
2119 2509
2120############################################################################# 2510#############################################################################
2121 2511
2512package CFClient::UI::ValSlider;
2513
2514our @ISA = CFClient::UI::HBox::;
2515
2516sub new {
2517 my ($class, %arg) = @_;
2518
2519 my $range = delete $arg{range};
2520
2521 my $self = $class->SUPER::new (
2522 slider => (new CFClient::UI::Slider expand => 1, range => $range),
2523 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),
2524 to_value => sub { shift },
2525 from_value => sub { shift },
2526 %arg,
2527 );
2528
2529 $self->{slider}->connect (changed => sub {
2530 my ($self, $value) = @_;
2531 $self->{parent}{entry}->set_text ($self->{parent}{to_value}->($value));
2532 $self->{parent}->emit (changed => $value);
2533 });
2534
2535# $self->{entry}->connect (changed => sub {
2536# my ($self, $value) = @_;
2537# $self->{parent}{slider}->set_value ($self->{parent}{from_value}->($value));
2538# $self->{parent}->emit (changed => $value);
2539# });
2540
2541 $self->add ($self->{slider}, $self->{entry});
2542
2543 $self->{slider}->emit (changed => $self->{slider}{range}[0]);
2544
2545 $self
2546}
2547
2548sub set_range { shift->{slider}->set_range (@_) }
2549sub set_value { shift->{slider}->set_value (@_) }
2550
2551#############################################################################
2552
2122package CFClient::UI::TextView; 2553package CFClient::UI::TextScroller;
2123 2554
2124our @ISA = CFClient::UI::HBox::; 2555our @ISA = CFClient::UI::HBox::;
2125 2556
2126use CFClient::OpenGL; 2557use CFClient::OpenGL;
2127 2558
… …
2129 my $class = shift; 2560 my $class = shift;
2130 2561
2131 my $self = $class->SUPER::new ( 2562 my $self = $class->SUPER::new (
2132 fontsize => 1, 2563 fontsize => 1,
2133 can_events => 0, 2564 can_events => 0,
2565 indent => 0,
2134 #font => default_font 2566 #font => default_font
2135 @_, 2567 @_,
2136 2568
2137 layout => (new CFClient::Layout), 2569 layout => (new CFClient::Layout),
2138 par => [], 2570 par => [],
… …
2153 2585
2154 $self->{fontsize} = $fontsize; 2586 $self->{fontsize} = $fontsize;
2155 $self->reflow; 2587 $self->reflow;
2156} 2588}
2157 2589
2158sub text_height { 2590sub size_request {
2591 my ($self) = @_;
2592
2593 my ($empty, $slider) = @{ $self->{children} };
2594
2595 local $self->{children} = [$empty, $slider];
2596 $self->SUPER::size_request
2597}
2598
2599sub invoke_size_allocate {
2600 my ($self, $w, $h) = @_;
2601
2602 my ($empty, $slider, @other) = @{ $self->{children} };
2603 $_->configure (@$_{qw(x y req_w req_h)}) for @other;
2604
2605 $self->{layout}->set_font ($self->{font}) if $self->{font};
2606 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2607 $self->{layout}->set_width ($empty->{w});
2608 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2609
2610 $self->reflow;
2611
2612 local $self->{children} = [$empty, $slider];
2613 $self->SUPER::invoke_size_allocate ($w, $h)
2614}
2615
2616sub get_layout {
2159 my ($self, $text) = @_; 2617 my ($self, $para) = @_;
2160 2618
2161 my $layout = $self->{layout}; 2619 my $layout = $self->{layout};
2162 2620
2621 $layout->set_font ($self->{font}) if $self->{font};
2622 $layout->set_foreground (@{$para->{fg}});
2163 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2623 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2164 $layout->set_width ($self->{children}[0]{w}); 2624 $layout->set_width ($self->{children}[0]{w} - $para->{indent});
2165 $layout->set_text ($text); 2625 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2626 $layout->set_markup ($para->{markup});
2627
2628 $layout->set_shapes (
2629 map
2630 +(0, $_->baseline_shift +$_->{padding_y} - $_->{h}, $_->{w}, $_->{h}),
2631 @{$para->{widget}}
2166 2632 );
2167 ($layout->size)[1] 2633
2634 $layout
2168} 2635}
2169 2636
2170sub reflow { 2637sub reflow {
2171 my ($self) = @_; 2638 my ($self) = @_;
2172 2639
2173 $self->{need_reflow}++; 2640 $self->{need_reflow}++;
2174 $self->update; 2641 $self->update;
2175} 2642}
2176 2643
2177sub size_allocate { 2644sub set_offset {
2645 my ($self, $offset) = @_;
2646
2647 # todo: base offset on lines or so, not on pixels
2648 $self->{children}[1]->set_value ($offset);
2649}
2650
2651sub clear {
2178 my ($self, $w, $h) = @_; 2652 my ($self) = @_;
2179 2653
2180 $self->SUPER::size_allocate ($w, $h); 2654 my (undef, undef, @other) = @{ $self->{children} };
2655 $self->remove ($_) for @other;
2181 2656
2182 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2657 $self->{par} = [];
2183 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2658 $self->{height} = 0;
2184 $self->{layout}->set_width ($self->{children}[0]{w}); 2659 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2185
2186 $self->reflow;
2187} 2660}
2188 2661
2189sub add_paragraph { 2662sub add_paragraph {
2190 my ($self, $color, $text) = @_; 2663 my ($self, $color, $para, $indent) = @_;
2191 2664
2192 #TODO: intelligently "reformat" paragraph 2665 my ($text, @w) = ref $para ? @$para : $para;
2193 2666
2194 my $height = $self->text_height ($text); 2667 $para = {
2668 w => 1e10,
2669 wrapped => 1,
2670 fg => $color,
2671 indent => $indent,
2672 markup => $text,
2673 widget => \@w,
2674 };
2195 2675
2196 $self->{height} += $height; 2676 $self->add (@w) if @w;
2677 push @{$self->{par}}, $para;
2197 2678
2198 push @{$self->{par}}, [$height, $color, $text]; 2679 $self->{need_reflow}++;
2680 $self->update;
2681}
2199 2682
2200 $self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}]; 2683sub scroll_to_bottom {
2201 $self->{children}[1]->update; 2684 my ($self) = @_;
2685
2686 $self->{scroll_to_bottom} = 1;
2687 $self->update;
2202} 2688}
2203 2689
2204sub update { 2690sub update {
2205 my ($self) = @_; 2691 my ($self) = @_;
2206 2692
… …
2208 2694
2209 return unless $self->{h} > 0; 2695 return unless $self->{h} > 0;
2210 2696
2211 delete $self->{texture}; 2697 delete $self->{texture};
2212 2698
2213 $ROOT->on_refresh ($self, sub { 2699 $ROOT->on_post_alloc ($self => sub {
2700 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2701
2214 if (delete $self->{need_reflow}) { 2702 if (delete $self->{need_reflow}) {
2215 my $height = 0; 2703 my $height = 0;
2216 2704
2217 $height += $_->[0] = $self->text_height ($_->[2])
2218 for @{$self->{par}}; 2705 for my $para (@{$self->{par}}) {
2706 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2707 my $layout = $self->get_layout ($para);
2708 my ($w, $h) = $layout->size;
2709
2710 $para->{w} = $w + $para->{indent};
2711 $para->{h} = $h;
2712 $para->{wrapped} = $layout->has_wrapped;
2713 }
2714
2715 $height += $para->{h};
2716 }
2219 2717
2220 $self->{height} = $height; 2718 $self->{height} = $height;
2221 2719
2222 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2720 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2223 2721
2224 delete $self->{texture}; 2722 delete $self->{texture};
2225 } 2723 }
2226 2724
2725 if (delete $self->{scroll_to_bottom}) {
2726 $self->{children}[1]->set_value (1e10);
2727 }
2728
2227 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub { 2729 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2228 glClearColor 0, 0, 0, 0; 2730 glClearColor 0, 0, 0, 0;
2229 glClear GL_COLOR_BUFFER_BIT; 2731 glClear GL_COLOR_BUFFER_BIT;
2230 2732
2231 glEnable GL_BLEND;
2232 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2233 glEnable GL_TEXTURE_2D;
2234 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2235
2236 my $top = int $self->{children}[1]{range}[0]; 2733 my $top = int $self->{children}[1]{range}[0];
2237 2734
2238 my $y0 = $top; 2735 my $y0 = $top;
2239 my $y1 = $top + $self->{h}; 2736 my $y1 = $top + $H;
2240 2737
2241 my $y = 0; 2738 my $y = 0;
2242 2739
2243 my $layout = $self->{layout};
2244
2245 $layout->set_font ($self->{font}) if $self->{font};
2246
2247 for my $par (@{$self->{par}}) { 2740 for my $para (@{$self->{par}}) {
2248 my $h = $par->[0]; 2741 my $h = $para->{h};
2249 2742
2250 if ($y0 < $y + $h && $y < $y1) { 2743 if ($y0 < $y + $h && $y < $y1) {
2251 $layout->set_text ($par->[2]);
2252 2744
2253 glColor @{ $par->[1] }; 2745 my $layout = $self->get_layout ($para);
2254 my ($W, $H) = $layout->size; 2746
2255 CFClient::Texture->new_from_layout ($layout)->draw_quad (0, $y - $y0); 2747 $layout->render ($para->{indent}, $y - $y0);
2748
2749 if (my @w = @{ $para->{widget} }) {
2750 my @s = $layout->get_shapes;
2751
2752 for (@w) {
2753 my ($dx, $dy) = splice @s, 0, 2, ();
2754
2755 $_->{x} = $dx + $para->{indent};
2756 $_->{y} = $dy + $y - $y0;
2757
2758 $_->draw;
2759 }
2760 }
2256 } 2761 }
2257 2762
2258 $y += $h; 2763 $y += $h;
2259 } 2764 }
2260
2261 glDisable GL_TEXTURE_2D;
2262 glDisable GL_BLEND;
2263 }; 2765 };
2264 }); 2766 });
2265} 2767}
2266 2768
2769sub reconfigure {
2770 my ($self) = @_;
2771
2772 $self->SUPER::reconfigure;
2773
2774 $_->{w} = 1e10 for @{ $self->{par} };
2775 $self->reflow;
2776}
2777
2267sub _draw { 2778sub _draw {
2268 my ($self) = @_; 2779 my ($self) = @_;
2269 2780
2270 glEnable GL_BLEND;
2271 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2272 glEnable GL_TEXTURE_2D; 2781 glEnable GL_TEXTURE_2D;
2273 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2782 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2274 glColor 1, 1, 1, 1; 2783 glColor 0, 0, 0, 1;
2275 $self->{texture}->draw_quad (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2784 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2276 glDisable GL_TEXTURE_2D; 2785 glDisable GL_TEXTURE_2D;
2277 glDisable GL_BLEND;
2278 2786
2279 $self->{children}[1]->draw; 2787 $self->{children}[1]->draw;
2280
2281} 2788}
2282 2789
2283############################################################################# 2790#############################################################################
2284 2791
2285package CFClient::UI::Animator; 2792package CFClient::UI::Animator;
… …
2330 2837
2331sub new { 2838sub new {
2332 my $class = shift; 2839 my $class = shift;
2333 2840
2334 my $self = $class->SUPER::new ( 2841 my $self = $class->SUPER::new (
2335 state => 0, 2842 state => 0,
2336 connect_activate => \&toggle_flopper, 2843 on_activate => \&toggle_flopper,
2337 @_ 2844 @_
2338 ); 2845 );
2339 2846
2340 if ($self->{state}) {
2341 $self->{state} = 0;
2342 $self->toggle_flopper;
2343 }
2344
2345 $self 2847 $self
2346} 2848}
2347 2849
2348sub toggle_flopper { 2850sub toggle_flopper {
2349 my ($self) = @_; 2851 my ($self) = @_;
2350 2852
2351 # TODO: use animation 2853 $self->{other}->toggle_visibility;
2352 if ($self->{state} = !$self->{state}) {
2353 $CFClient::UI::ROOT->add ($self->{other});
2354 $self->{other}->move ($self->coord2global (0, $self->{h}));
2355 $self->emit ("open");
2356 } else {
2357 $CFClient::UI::ROOT->remove ($self->{other});
2358 $self->emit ("close");
2359 }
2360
2361 $self->emit (changed => $self->{state});
2362} 2854}
2363 2855
2364############################################################################# 2856#############################################################################
2365 2857
2366package CFClient::UI::Tooltip; 2858package CFClient::UI::Tooltip;
… …
2376 @_, 2868 @_,
2377 can_events => 0, 2869 can_events => 0,
2378 ) 2870 )
2379} 2871}
2380 2872
2381sub set_markup { 2873sub set_tooltip_from {
2382 my ($self, $text) = @_; 2874 my ($self, $widget) = @_;
2383 2875
2384 $self->{label} ||= new CFClient::UI::Label fontsize => 0.8, fg => [0, 0, 0]; 2876 my $tooltip = $widget->{tooltip};
2385 $self->{label}->set_markup ($text); 2877
2386 $self->add ($self->{label}); 2878 if ($ENV{CFPLUS_DEBUG} & 2) {
2879 $tooltip .= "\n\n" . (ref $widget) . "\n"
2880 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2881 . "req $widget->{req_w} $widget->{req_h}\n"
2882 . "visible $widget->{visible}";
2883 }
2884
2885 $tooltip =~ s/^\n+//;
2886 $tooltip =~ s/\n+$//;
2887
2888 $self->add (new CFClient::UI::Label
2889 markup => $tooltip,
2890 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2891 fontsize => 0.8,
2892 fg => [0, 0, 0, 1],
2893 ellipsise => 0,
2894 font => ($widget->{tooltip_font} || $::FONT_PROP),
2895 );
2387} 2896}
2388 2897
2389sub size_request { 2898sub size_request {
2390 my ($self) = @_; 2899 my ($self) = @_;
2391 2900
2392 $self->child->set_max_size ($::WIDTH * 0.3);
2393
2394 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2901 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2395 2902
2396 ($w + 4, $h + 4) 2903 ($w + 4, $h + 4)
2397} 2904}
2398 2905
2399sub size_allocate { 2906sub invoke_size_allocate {
2400 my ($self, $w, $h) = @_; 2907 my ($self, $w, $h) = @_;
2401 2908
2402 $self->SUPER::size_allocate ($w - 4, $h - 4); 2909 $self->SUPER::invoke_size_allocate ($w - 4, $h - 4)
2910}
2911
2912sub invoke_visibility_change {
2913 my ($self, $visible) = @_;
2914
2915 return unless $visible;
2916
2917 $self->{root}->on_post_alloc ("move_$self" => sub {
2918 my $widget = $self->{owner}
2919 or return;
2920
2921 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2922
2923 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2924 if $x + $self->{w} > $self->{root}{w};
2925
2926 $self->move_abs ($x, $y);
2927 });
2403} 2928}
2404 2929
2405sub _draw { 2930sub _draw {
2406 my ($self) = @_; 2931 my ($self) = @_;
2407 2932
2408 glPushMatrix;
2409 glTranslate 0.375, 0.375; 2933 glTranslate 0.375, 0.375;
2410 2934
2411 my ($w, $h) = @$self{qw(w h)}; 2935 my ($w, $h) = @$self{qw(w h)};
2412 2936
2413 glColor 1, 0.8, 0.4; 2937 glColor 1, 0.8, 0.4;
… …
2424 glVertex 0 , $h; 2948 glVertex 0 , $h;
2425 glVertex $w, $h; 2949 glVertex $w, $h;
2426 glVertex $w, 0; 2950 glVertex $w, 0;
2427 glEnd; 2951 glEnd;
2428 2952
2429 glPopMatrix; 2953 glTranslate 2 - 0.375, 2 - 0.375;
2430 2954
2431 glTranslate 2, 2;
2432 $self->SUPER::_draw; 2955 $self->SUPER::_draw;
2433} 2956}
2434 2957
2435############################################################################# 2958#############################################################################
2436 2959
… …
2441use CFClient::OpenGL; 2964use CFClient::OpenGL;
2442 2965
2443sub new { 2966sub new {
2444 my $class = shift; 2967 my $class = shift;
2445 2968
2446 $class->SUPER::new ( 2969 my $self = $class->SUPER::new (
2447 aspect => 1, 2970 aspect => 1,
2971 can_events => 0,
2448 @_, 2972 @_,
2449 ) 2973 );
2974
2975 if ($self->{anim} && $self->{animspeed}) {
2976 Scalar::Util::weaken (my $widget = $self);
2977
2978 $self->{timer} = Event->timer (
2979 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2980 hard => 1,
2981 interval => $self->{animspeed},
2982 cb => sub {
2983 ++$widget->{frame};
2984 $widget->update;
2985 },
2986 );
2987 }
2988
2989 $self
2450} 2990}
2451 2991
2452sub size_request { 2992sub size_request {
2453 (32, 8) 2993 (32, 8)
2454} 2994}
2455 2995
2996sub update {
2997 my ($self) = @_;
2998
2999 return unless $self->{visible};
3000
3001 $self->SUPER::update;
3002}
3003
2456sub _draw { 3004sub _draw {
2457 my ($self) = @_; 3005 my ($self) = @_;
2458 3006
2459 return unless $::CONN;#d# manage and cache textures differently 3007 return unless $::CONN;
3008
3009 my $face;
3010
3011 if ($self->{frame}) {
3012 my $anim = $::CONN->{anim}[$self->{anim}];
3013
3014 $face = $anim->[ $self->{frame} % @$anim ]
3015 if $anim && @$anim;
3016 }
3017
2460 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]]; 3018 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2461 3019
2462 # TODO animation
2463 if ($tex) { 3020 if ($tex) {
2464 glEnable GL_BLEND;
2465 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2466 glEnable GL_TEXTURE_2D; 3021 glEnable GL_TEXTURE_2D;
2467 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3022 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2468 glColor 1, 1, 1, 1; 3023 glColor 0, 0, 0, 1;
2469 $tex->draw_quad (0, 0, $self->{w}, $self->{h}); 3024 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2470 glDisable GL_TEXTURE_2D; 3025 glDisable GL_TEXTURE_2D;
2471 glDisable GL_BLEND;
2472 } 3026 }
3027}
3028
3029sub destroy {
3030 my ($self) = @_;
3031
3032 $self->{timer}->cancel
3033 if $self->{timer};
3034
3035 $self->SUPER::destroy;
2473} 3036}
2474 3037
2475############################################################################# 3038#############################################################################
2476 3039
2477package CFClient::UI::InventoryItem; 3040package CFClient::UI::Buttonbar;
2478 3041
2479our @ISA = CFClient::UI::HBox::; 3042our @ISA = CFClient::UI::HBox::;
2480 3043
2481sub new { 3044# TODO: should actualyl wrap buttons and other goodies.
2482 my $class = shift;
2483
2484 my %args = @_;
2485
2486 my $item = $args{item};
2487
2488 my $desc = $item->{nrof} < 2
2489 ? $item->{name}
2490 : "$item->{nrof} $item->{name_pl}";
2491
2492
2493 my $self = $class->SUPER::new (
2494 can_hover => 1,
2495 can_events => 1,
2496 tooltip => (CFClient::UI::Label->escape ($desc)
2497 . "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),
2498 connect_button_down => sub {
2499 my ($self, $ev, $x, $y) = @_;
2500
2501 # todo: maybe put examine on 1? but should just be a tooltip :(
2502 if ($ev->{button} == 1) {
2503 $::CONN->send ("move $::CONN->{player}{tag} $item->{tag} 0");
2504 } elsif ($ev->{button} == 2) {
2505 $::CONN->send ("apply $item->{tag}");
2506 } elsif ($ev->{button} == 3) {
2507 CFClient::UI::Menu->new (
2508 items => [
2509 ["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2510 [
2511 $item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock",
2512 sub { $::CONN->send ("lock $item->{tag}") },
2513 ],
2514 ["mark", sub { $::CONN->send ("mark $item->{tag}") }],
2515 ["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2516 ["drop", sub { $::CONN->send ("move 0 $item->{tag} 0") }],
2517 ],
2518 )->popup ($ev);
2519 }
2520
2521 1
2522 },
2523 %args
2524 );
2525 $self->add(new CFClient::UI::Face
2526 can_events => 0,
2527 face => $item->{face},
2528 anim => $item->{anim},
2529 animspeed => $item->{animspeed});
2530 $self->add(new CFClient::UI::Label
2531 can_events => 0,
2532 text => $desc);
2533
2534 $self
2535}
2536
2537#############################################################################
2538
2539package CFClient::UI::Inventory;
2540
2541our @ISA = CFClient::UI::ScrolledWindow::;
2542
2543sub new {
2544 my $class = shift;
2545
2546 my $self = $class->SUPER::new (
2547 scrolled => (new CFClient::UI::VBox),
2548 @_,
2549 );
2550
2551 $self
2552}
2553
2554sub set_items {
2555 my ($self, $items) = @_;
2556
2557 $self->{scrolled}->clear;
2558 return unless $items;
2559
2560 my @items = sort { $a->{type} <=> $b->{type} } @$items;
2561
2562 $self->{real_items} = \@items;
2563
2564 for my $item (@items) {
2565 my $desc = $item->{nrof} < 2
2566 ? $item->{name}
2567 : "$item->{nrof} $item->{name_pl}";
2568
2569 $self->{scrolled}->add (new CFClient::UI::InventoryItem item => $item);
2570 }
2571
2572# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2573}
2574
2575sub size_request {
2576 my ($self) = @_;
2577 ($self->{req_w}, $self->{req_h});
2578}
2579 3045
2580############################################################################# 3046#############################################################################
2581 3047
2582package CFClient::UI::Menu; 3048package CFClient::UI::Menu;
2583 3049
… …
2595 ); 3061 );
2596 3062
2597 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3063 $self->add ($self->{vbox} = new CFClient::UI::VBox);
2598 3064
2599 for my $item (@{ $self->{items} }) { 3065 for my $item (@{ $self->{items} }) {
2600 my ($widget, $cb) = @$item; 3066 my ($widget, $cb, $tooltip) = @$item;
2601 3067
2602 # handle various types of items, only text for now 3068 # handle various types of items, only text for now
2603 if (!ref $widget) { 3069 if (!ref $widget) {
3070 if ($widget =~ /\t/) {
3071 my ($left, $right) = split /\t/, $widget, 2;
3072
3073 $widget = new CFClient::UI::HBox
3074 can_hover => 1,
3075 can_events => 1,
3076 tooltip => $tooltip,
3077 children => [
3078 (new CFClient::UI::Label markup => $left, expand => 1),
3079 (new CFClient::UI::Label markup => $right, align => +1),
3080 ],
3081 ;
3082
3083 } else {
2604 $widget = new CFClient::UI::Label 3084 $widget = new CFClient::UI::Label
2605 can_hover => 1, 3085 can_hover => 1,
2606 can_events => 1, 3086 can_events => 1,
2607 text => $widget; 3087 markup => $widget,
3088 tooltip => $tooltip;
3089 }
2608 } 3090 }
2609 3091
2610 $self->{item}{$widget} = $item; 3092 $self->{item}{$widget} = $item;
2611 3093
2612 $self->{vbox}->add ($widget); 3094 $self->{vbox}->add ($widget);
… …
2624 # maybe save $GRAB? must be careful about events... 3106 # maybe save $GRAB? must be careful about events...
2625 $GRAB = $self; 3107 $GRAB = $self;
2626 $self->{button} = $ev->{button}; 3108 $self->{button} = $ev->{button};
2627 3109
2628 $self->show; 3110 $self->show;
2629 $self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 3111 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2630} 3112}
2631 3113
2632sub mouse_motion { 3114sub invoke_mouse_motion {
2633 my ($self, $ev, $x, $y) = @_; 3115 my ($self, $ev, $x, $y) = @_;
2634 3116
2635 # TODO: should use vbox->find_widget or so 3117 # TODO: should use vbox->find_widget or so
2636 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 3118 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2637 $self->{hover} = $self->{item}{$HOVER}; 3119 $self->{hover} = $self->{item}{$HOVER};
2638}
2639 3120
3121 0
3122}
3123
2640sub button_up { 3124sub invoke_button_up {
2641 my ($self, $ev, $x, $y) = @_; 3125 my ($self, $ev, $x, $y) = @_;
2642 3126
2643 if ($ev->{button} == $self->{button}) { 3127 if ($ev->{button} == $self->{button}) {
2644 undef $GRAB; 3128 undef $GRAB;
2645 $self->hide; 3129 $self->hide;
2646 3130
2647 $self->emit ("popdown"); 3131 $self->emit ("popdown");
2648 $self->{hover}[1]->() if $self->{hover}; 3132 $self->{hover}[1]->() if $self->{hover};
3133 } else {
3134 return 0
3135 }
3136
2649 } 3137 1
2650} 3138}
2651 3139
2652############################################################################# 3140#############################################################################
2653 3141
2654package CFClient::UI::Root; 3142package CFClient::UI::Multiplexer;
2655 3143
2656our @ISA = CFClient::UI::Container::; 3144our @ISA = CFClient::UI::Container::;
2657
2658use CFClient::OpenGL;
2659 3145
2660sub new { 3146sub new {
2661 my $class = shift; 3147 my $class = shift;
2662 3148
2663 $class->SUPER::new ( 3149 my $self = $class->SUPER::new (
3150 @_,
3151 );
3152
3153 $self->{current} = $self->{children}[0]
3154 if @{ $self->{children} };
3155
3156 $self
3157}
3158
3159sub add {
3160 my ($self, @widgets) = @_;
3161
3162 $self->SUPER::add (@widgets);
3163
3164 $self->{current} = $self->{children}[0]
3165 if @{ $self->{children} };
3166}
3167
3168sub get_current_page {
3169 my ($self) = @_;
3170
3171 $self->{current}
3172}
3173
3174sub set_current_page {
3175 my ($self, $page_or_widget) = @_;
3176
3177 my $widget = ref $page_or_widget
3178 ? $page_or_widget
3179 : $self->{children}[$page_or_widget];
3180
3181 $self->{current} = $widget;
3182 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
3183
3184 $self->emit (page_changed => $self->{current});
3185
3186 $self->realloc;
3187}
3188
3189sub visible_children {
3190 $_[0]{current}
3191}
3192
3193sub size_request {
3194 my ($self) = @_;
3195
3196 $self->{current}->size_request
3197}
3198
3199sub invoke_size_allocate {
3200 my ($self, $w, $h) = @_;
3201
3202 $self->{current}->configure (0, 0, $w, $h);
3203
3204 1
3205}
3206
3207sub _draw {
3208 my ($self) = @_;
3209
3210 $self->{current}->draw;
3211}
3212
3213#############################################################################
3214
3215package CFClient::UI::Notebook;
3216
3217our @ISA = CFClient::UI::VBox::;
3218
3219sub new {
3220 my $class = shift;
3221
3222 my $self = $class->SUPER::new (
3223 buttonbar => (new CFClient::UI::Buttonbar),
3224 multiplexer => (new CFClient::UI::Multiplexer expand => 1),
3225 # filter => # will be put between multiplexer and $self
3226 @_,
3227 );
3228
3229 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3230 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3231
3232 $self
3233}
3234
3235sub add {
3236 my ($self, $title, $widget, $tooltip) = @_;
3237
3238 Scalar::Util::weaken $self;
3239
3240 $self->{buttonbar}->add (new CFClient::UI::Button
3241 markup => $title,
3242 tooltip => $tooltip,
3243 on_activate => sub { $self->set_current_page ($widget) },
3244 );
3245
3246 $self->{multiplexer}->add ($widget);
3247}
3248
3249sub get_current_page {
3250 my ($self) = @_;
3251
3252 $self->{multiplexer}->get_current_page
3253}
3254
3255sub set_current_page {
3256 my ($self, $page) = @_;
3257
3258 $self->{multiplexer}->set_current_page ($page);
3259 $self->emit (page_changed => $self->{multiplexer}{current});
3260}
3261
3262#############################################################################
3263
3264package CFClient::UI::Combobox;
3265
3266use utf8;
3267
3268our @ISA = CFClient::UI::Button::;
3269
3270sub new {
3271 my $class = shift;
3272
3273 my $self = $class->SUPER::new (
3274 options => [], # [value, title, longdesc], ...
3275 value => undef,
3276 @_,
3277 );
3278
3279 $self->_set_value ($self->{value});
3280
3281 $self
3282}
3283
3284sub invoke_button_down {
3285 my ($self, $ev) = @_;
3286
3287 my @menu_items;
3288
3289 for (@{ $self->{options} }) {
3290 my ($value, $title, $tooltip) = @$_;
3291
3292 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3293 }
3294
3295 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
3296}
3297
3298sub _set_value {
3299 my ($self, $value) = @_;
3300
3301 my ($item) = grep $_->[0] eq $value, @{ $self->{options} }
3302 or return;
3303
3304 $self->{value} = $item->[0];
3305 $self->set_markup ("$item->[1] ⇓");
3306 $self->set_tooltip ($item->[2]);
3307}
3308
3309sub set_value {
3310 my ($self, $value) = @_;
3311
3312 return unless $self->{value} ne $value;
3313
3314 $self->_set_value ($value);
3315 $self->emit (changed => $value);
3316}
3317
3318#############################################################################
3319
3320package CFClient::UI::Statusbox;
3321
3322our @ISA = CFClient::UI::VBox::;
3323
3324sub new {
3325 my $class = shift;
3326
3327 my $self = $class->SUPER::new (
3328 fontsize => 0.8,
3329 @_,
3330 );
3331
3332 Scalar::Util::weaken (my $this = $self);
3333
3334 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3335
3336 $self
3337}
3338
3339sub reorder {
3340 my ($self) = @_;
3341 my $NOW = Time::HiRes::time;
3342
3343 # freeze display when hovering over any label
3344 return if $CFClient::UI::TOOLTIP->{owner}
3345 && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},
3346 values %{ $self->{item} };
3347
3348 while (my ($k, $v) = each %{ $self->{item} }) {
3349 delete $self->{item}{$k} if $v->{timeout} < $NOW;
3350 }
3351
3352 my @widgets;
3353
3354 my @items = sort {
3355 $a->{pri} <=> $b->{pri}
3356 or $b->{id} <=> $a->{id}
3357 } values %{ $self->{item} };
3358
3359 $self->{timer}->interval (1);
3360
3361 my $count = 10 + 1;
3362 for my $item (@items) {
3363 last unless --$count;
3364
3365 my $label = $item->{label} ||= do {
3366 # TODO: doesn't handle markup well (read as: at all)
3367 my $short = $item->{count} > 1
3368 ? "<b>$item->{count} ×</b> $item->{text}"
3369 : $item->{text};
3370
3371 for ($short) {
3372 s/^\s+//;
3373 s/\s+/ /g;
3374 }
3375
3376 new CFClient::UI::Label
3377 markup => $short,
3378 tooltip => $item->{tooltip},
3379 tooltip_font => $::FONT_PROP,
3380 tooltip_width => 0.67,
3381 fontsize => $item->{fontsize} || $self->{fontsize},
3382 max_w => $::WIDTH * 0.44,
3383 fg => [@{ $item->{fg} }],
3384 can_events => 1,
3385 can_hover => 1
3386 };
3387
3388 if ((my $diff = $item->{timeout} - $NOW) < 2) {
3389 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
3390 $label->update;
3391 $label->set_max_size (undef, $label->{req_h} * $diff)
3392 if $diff < 1;
3393 $self->{timer}->interval (1/30);
3394 } else {
3395 $label->{fg}[3] = $item->{fg}[3] || 1;
3396 }
3397
3398 push @widgets, $label;
3399 }
3400
3401 $self->clear;
3402 $self->SUPER::add (reverse @widgets);
3403}
3404
3405sub add {
3406 my ($self, $text, %arg) = @_;
3407
3408 $text =~ s/^\s+//;
3409 $text =~ s/\s+$//;
3410
3411 return unless $text;
3412
3413 my $timeout = (int time) + ((delete $arg{timeout}) || 60);
3414
3415 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
3416
3417 if (my $item = $self->{item}{$group}) {
3418 if ($item->{text} eq $text) {
3419 $item->{count}++;
3420 } else {
3421 $item->{count} = 1;
3422 $item->{text} = $item->{tooltip} = $text;
3423 }
3424 $item->{id} += 0.2;#d#
3425 $item->{timeout} = $timeout;
3426 delete $item->{label};
3427 } else {
3428 $self->{item}{$group} = {
3429 id => ++$self->{id},
3430 text => $text,
3431 timeout => $timeout,
3432 tooltip => $text,
3433 fg => [0.8, 0.8, 0.8, 0.8],
3434 pri => 0,
3435 count => 1,
3436 %arg,
3437 };
3438 }
3439
3440 $ROOT->on_refresh (reorder => sub {
3441 $self->reorder;
3442 });
3443}
3444
3445sub reconfigure {
3446 my ($self) = @_;
3447
3448 delete $_->{label}
3449 for values %{ $self->{item} || {} };
3450
3451 $self->reorder;
3452 $self->SUPER::reconfigure;
3453}
3454
3455sub destroy {
3456 my ($self) = @_;
3457
3458 $self->{timer}->cancel;
3459
3460 $self->SUPER::destroy;
3461}
3462
3463#############################################################################
3464
3465package CFClient::UI::Inventory;
3466
3467our @ISA = CFClient::UI::Table::;
3468
3469sub new {
3470 my $class = shift;
3471
3472 my $self = $class->SUPER::new (
3473 col_expand => [0, 1, 0],
3474 @_,
3475 );
3476
3477 $self
3478}
3479
3480sub set_items {
3481 my ($self, $items) = @_;
3482
3483 $self->clear;
3484 return unless $items;
3485
3486 my @items = sort {
3487 ($a->{type} <=> $b->{type})
3488 or ($a->{name} cmp $b->{name})
3489 } values %$items;
3490
3491 $self->{real_items} = \@items;
3492
3493 my $row = 0;
3494 for my $item (@items) {
3495 CFClient::Item::update_widgets $item;
3496
3497 $self->add (0, $row, $item->{face_widget});
3498 $self->add (1, $row, $item->{desc_widget});
3499 $self->add (2, $row, $item->{weight_widget});
3500
3501 $row++;
3502 }
3503}
3504
3505#############################################################################
3506
3507package CFClient::UI::SpellList;
3508
3509our @ISA = CFClient::UI::Table::;
3510
3511sub new {
3512 my $class = shift;
3513
3514 my $self = $class->SUPER::new (
3515 binding => [],
3516 commands => [],
2664 @_, 3517 @_,
2665 ) 3518 )
2666} 3519}
2667 3520
2668sub configure { 3521my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
2669 my ($self, $x, $y, $w, $h) = @_;
2670 3522
2671 $self->{w} = $w; 3523my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
2672 $self->{h} = $h; 3524 "<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
2673} 3525my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3526 "<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3527my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3528 "<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3529my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3530 "<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3531my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3532 "<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
2674 3533
2675sub check_size { 3534sub rebuild_spell_list {
3535 my ($self) = @_;
3536
3537 $CFClient::UI::ROOT->on_refresh ($self => sub {
3538 $self->clear;
3539
3540 return unless $::CONN;
3541
3542 $self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3543 $self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL);
3544 $self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3545 $self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3546 $self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3547
3548 my $row = 0;
3549
3550 for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3551 my $spell = $self->{spell}{$_};
3552
3553 $row++;
3554
3555 my $spell_cb = sub {
3556 my ($widget, $ev) = @_;
3557
3558 if ($ev->{button} == 1) {
3559 $::CONN->user_send ("cast $spell->{name}");
3560 } elsif ($ev->{button} == 2) {
3561 $::CONN->user_send ("invoke $spell->{name}");
3562 } elsif ($ev->{button} == 3) {
3563 (new CFClient::UI::Menu
3564 items => [
3565 ["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3566 ["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3567 ],
3568 )->popup ($ev);
3569 } else {
3570 return 0;
3571 }
3572
3573 1
3574 };
3575
3576 my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3577
3578 #TODO: add path info to tooltip
3579 #$self->add (6, $row, new CFClient::UI::Label text => $spell->{path});
3580
3581 $self->add (0, $row, new CFClient::UI::Face
3582 face => $spell->{face},
3583 can_hover => 1,
3584 can_events => 1,
3585 tooltip => $tooltip,
3586 on_button_down => $spell_cb,
3587 );
3588
3589 $self->add (1, $row, new CFClient::UI::Label
3590 expand => 1,
3591 text => $spell->{name},
3592 can_hover => 1,
3593 can_events => 1,
3594 tooltip => $tooltip,
3595 on_button_down => $spell_cb,
3596 );
3597
3598 $self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3599 $self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3600 $self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3601 $self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3602 }
3603 });
3604}
3605
3606sub add_spell {
2676 my ($self) = @_; 3607 my ($self, $spell) = @_;
2677 3608
2678 $self->size_allocate ($self->{w}, $self->{h}) 3609 $self->{spell}->{$spell->{name}} = $spell;
2679 if $self->{w}; 3610 $self->rebuild_spell_list;
3611}
3612
3613sub remove_spell {
3614 my ($self, $spell) = @_;
3615
3616 delete $self->{spell}->{$spell->{name}};
3617 $self->rebuild_spell_list;
3618}
3619
3620sub clear_spells {
3621 my ($self) = @_;
3622
3623 $self->{spell} = {};
3624 $self->rebuild_spell_list;
3625}
3626
3627#############################################################################
3628
3629package CFClient::UI::Root;
3630
3631our @ISA = CFClient::UI::Container::;
3632
3633use List::Util qw(min max);
3634
3635use CFClient::OpenGL;
3636
3637sub new {
3638 my $class = shift;
3639
3640 my $self = $class->SUPER::new (
3641 visible => 1,
3642 @_,
3643 );
3644
3645 Scalar::Util::weaken ($self->{root} = $self);
3646
3647 $self
2680} 3648}
2681 3649
2682sub size_request { 3650sub size_request {
2683 my ($self) = @_; 3651 my ($self) = @_;
2684 3652
2685 ($self->{w}, $self->{h}) 3653 ($self->{w}, $self->{h})
2686} 3654}
2687 3655
3656sub _to_pixel {
3657 my ($coord, $size, $max) = @_;
3658
3659 $coord =
3660 $coord eq "center" ? ($max - $size) * 0.5
3661 : $coord eq "max" ? $max
3662 : $coord;
3663
3664 $coord = 0 if $coord < 0;
3665 $coord = $max - $size if $coord > $max - $size;
3666
3667 int $coord + 0.5
3668}
3669
2688sub size_allocate { 3670sub invoke_size_allocate {
2689 my ($self, $w, $h) = @_; 3671 my ($self, $w, $h) = @_;
2690
2691 my $old_w = $self->{old_w};
2692 my $old_h = $self->{old_h};
2693
2694 if ($old_w && $old_h) {
2695 for my $child ($self->children) {
2696 $child->{x} = int 0.5 + $child->{x} * $w / $old_w;
2697 $child->{w} = int 0.5 + $child->{w} * $w / $old_w;
2698 $child->{req_w} = int 0.5 + $child->{req_w} * $w / $old_w if exists $child->{req_w};
2699 $child->{user_w} = int 0.5 + $child->{user_w} * $w / $old_w if exists $child->{user_w};
2700 $child->{y} = int 0.5 + $child->{y} * $h / $old_h;
2701 $child->{h} = int 0.5 + $child->{h} * $h / $old_h;
2702 $child->{req_h} = int 0.5 + $child->{req_h} * $h / $old_h if exists $child->{req_h};
2703 $child->{user_h} = int 0.5 + $child->{user_h} * $h / $old_h if exists $child->{user_h};
2704 }
2705 }
2706 3672
2707 for my $child ($self->children) { 3673 for my $child ($self->children) {
2708 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3674 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2709 3675
2710 $X = List::Util::max 0, List::Util::min $w - $W, $X; 3676 $X = $child->{force_x} if exists $child->{force_x};
2711 $Y = List::Util::max 0, List::Util::min $h - $H, $Y; 3677 $Y = $child->{force_y} if exists $child->{force_y};
3678
3679 $X = _to_pixel $X, $W, $self->{w};
3680 $Y = _to_pixel $Y, $H, $self->{h};
3681
2712 $child->configure ($X, $Y, $W, $H); 3682 $child->configure ($X, $Y, $W, $H);
2713 } 3683 }
2714 3684
2715 $self->{old_w} = $w; 3685 1
2716 $self->{old_h} = $h;
2717} 3686}
2718 3687
2719sub coord2local { 3688sub coord2local {
2720 my ($self, $x, $y) = @_; 3689 my ($self, $x, $y) = @_;
2721 3690
… …
2729} 3698}
2730 3699
2731sub update { 3700sub update {
2732 my ($self) = @_; 3701 my ($self) = @_;
2733 3702
2734 $self->check_size;
2735 $::WANT_REFRESH++; 3703 $::WANT_REFRESH++;
2736} 3704}
2737 3705
2738sub add { 3706sub add {
2739 my ($self, $child) = @_; 3707 my ($self, @children) = @_;
2740 3708
2741 # integerise window positions 3709 $_->{is_toplevel} = 1
2742 $child->{x} = int $child->{x}; 3710 for @children;
2743 $child->{y} = int $child->{y};
2744 3711
2745 $self->SUPER::add ($child); 3712 $self->SUPER::add (@children);
3713}
3714
3715sub remove {
3716 my ($self, @children) = @_;
3717
3718 $self->SUPER::remove (@children);
3719
3720 delete $self->{is_toplevel}
3721 for @children;
3722
3723 while (@children) {
3724 my $w = pop @children;
3725 push @children, $w->children;
3726 $w->set_invisible;
3727 }
2746} 3728}
2747 3729
2748sub on_refresh { 3730sub on_refresh {
2749 my ($self, $id, $cb) = @_; 3731 my ($self, $id, $cb) = @_;
2750 3732
2751 $self->{refresh_hook}{$id} = $cb; 3733 $self->{refresh_hook}{$id} = $cb;
2752} 3734}
2753 3735
3736sub on_post_alloc {
3737 my ($self, $id, $cb) = @_;
3738
3739 $self->{post_alloc_hook}{$id} = $cb;
3740}
3741
2754sub draw { 3742sub draw {
2755 my ($self) = @_; 3743 my ($self) = @_;
2756
2757 if ($self->{check_size}) {
2758 my @queue = ([], []);
2759
2760 for (;;) {
2761 if ($self->{check_size}) {
2762 # heuristic: check containers last
2763 push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_
2764 for values %{delete $self->{check_size}}
2765 }
2766
2767 my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last;
2768
2769 my ($w, $h) = $widget->{user_w} && $widget->{user_h}
2770 ? @$widget{qw(user_w user_h)}
2771 : $widget->size_request;
2772
2773 if ($w != $widget->{req_w} || $h != $widget->{req_h}) {
2774 $widget->{req_w} = $w;
2775 $widget->{req_h} = $h;
2776
2777 $self->{size_alloc}{$widget} = [$widget, $widget->{w}, $widget->{h}];
2778
2779 $widget->{parent}->check_size
2780 if $widget->{parent};
2781 }
2782 }
2783 }
2784
2785 while ($self->{size_alloc}) {
2786 for (values %{delete $self->{size_alloc}}) {
2787 my ($widget, $w, $h) = @$_;
2788
2789 $widget->{w} = $w;
2790 $widget->{h} = $h;
2791 $widget->size_allocate ($w, $h);
2792 $widget->emit (size_allocate => $w, $h);
2793 }
2794 }
2795 3744
2796 while ($self->{refresh_hook}) { 3745 while ($self->{refresh_hook}) {
2797 $_->() 3746 $_->()
2798 for values %{delete $self->{refresh_hook}}; 3747 for values %{delete $self->{refresh_hook}};
2799 } 3748 }
2800 3749
3750 if ($self->{realloc}) {
3751 my %queue;
3752 my @queue;
3753 my $widget;
3754
3755 outer:
3756 while () {
3757 if (my $realloc = delete $self->{realloc}) {
3758 for $widget (values %$realloc) {
3759 $widget->{visible} or next; # do not resize invisible widgets
3760
3761 $queue{$widget+0}++ and next; # duplicates are common
3762
3763 push @{ $queue[$widget->{visible}] }, $widget;
3764 }
3765 }
3766
3767 while () {
3768 @queue or last outer;
3769
3770 $widget = pop @{ $queue[-1] || [] }
3771 and last;
3772
3773 pop @queue;
3774 }
3775
3776 delete $queue{$widget+0};
3777
3778 my ($w, $h) = $widget->size_request;
3779
3780 $w = max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3781 $h = max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3782
3783 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3784 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3785
3786 $w = $widget->{force_w} if exists $widget->{force_w};
3787 $h = $widget->{force_h} if exists $widget->{force_h};
3788
3789 if ($widget->{req_w} != $w || $widget->{req_h} != $h
3790 || delete $widget->{force_realloc}) {
3791 $widget->{req_w} = $w;
3792 $widget->{req_h} = $h;
3793
3794 $self->{size_alloc}{$widget+0} = $widget;
3795
3796 if (my $parent = $widget->{parent}) {
3797 $self->{realloc}{$parent+0} = $parent
3798 unless $queue{$parent+0};
3799
3800 $parent->{force_size_alloc} = 1;
3801 $self->{size_alloc}{$parent+0} = $parent;
3802 }
3803 }
3804
3805 delete $self->{realloc}{$widget+0};
3806 }
3807 }
3808
3809 while (my $size_alloc = delete $self->{size_alloc}) {
3810 my @queue = sort { $b->{visible} <=> $a->{visible} }
3811 values %$size_alloc;
3812
3813 while () {
3814 my $widget = pop @queue || last;
3815
3816 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3817
3818 $w = 0 if $w < 0;
3819 $h = 0 if $h < 0;
3820
3821 $w = int $w + 0.5;
3822 $h = int $h + 0.5;
3823
3824 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3825 $widget->{old_w} = $widget->{w};
3826 $widget->{old_h} = $widget->{h};
3827
3828 $widget->{w} = $w;
3829 $widget->{h} = $h;
3830
3831 $widget->emit (size_allocate => $w, $h);
3832 }
3833 }
3834 }
3835
3836 while ($self->{post_alloc_hook}) {
3837 $_->()
3838 for values %{delete $self->{post_alloc_hook}};
3839 }
3840
3841
2801 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3842 glViewport 0, 0, $::WIDTH, $::HEIGHT;
2802 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3843 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2803 glClear GL_COLOR_BUFFER_BIT; 3844 glClear GL_COLOR_BUFFER_BIT;
2804 3845
2805 glMatrixMode GL_PROJECTION; 3846 glMatrixMode GL_PROJECTION;
2806 glLoadIdentity; 3847 glLoadIdentity;
2807 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000; 3848 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
2808 glMatrixMode GL_MODELVIEW; 3849 glMatrixMode GL_MODELVIEW;
2809 glLoadIdentity; 3850 glLoadIdentity;
2810 3851
3852 {
3853 package CFClient::UI::Base;
3854
3855 ($draw_x, $draw_y, $draw_w, $draw_h) =
3856 (0, 0, $self->{w}, $self->{h});
3857 }
3858
2811 $self->_draw; 3859 $self->_draw;
2812} 3860}
2813 3861
2814############################################################################# 3862#############################################################################
2815 3863
2816package CFClient::UI; 3864package CFClient::UI;
2817 3865
2818$ROOT = new CFClient::UI::Root; 3866$ROOT = new CFClient::UI::Root;
2819$TOOLTIP = new CFClient::UI::Tooltip; 3867$TOOLTIP = new CFClient::UI::Tooltip z => 900;
2820 3868
28211 38691
2822 3870

Diff Legend

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