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.312 by root, Fri Jun 23 23:54:30 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 my $focus = $FOCUS; $FOCUS = $self;
288 429
289 $self->emit (focus_in => $focus);
290
291 $focus->update if $focus; 430 $focus->update if $focus;
292 $FOCUS->update; 431 $FOCUS->update;
293}
294 432
433 0
434}
435
295sub focus_out { 436sub invoke_focus_out {
296 my ($self) = @_; 437 my ($self) = @_;
297 438
298 return unless $FOCUS == $self; 439 return unless $FOCUS == $self;
299 440
300 my $focus = $FOCUS; undef $FOCUS; 441 my $focus = $FOCUS; undef $FOCUS;
301 442
302 $self->emit (focus_out => $focus);
303
304 $focus->update if $focus; #? 443 $focus->update if $focus; #?
305}
306 444
445 $::MAPWIDGET->grab_focus #d# focus mapwidget if no other widget has focus
446 unless $FOCUS;
447
448 0
449}
450
451sub grab_focus {
452 my ($self) = @_;
453
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 delete $WIDGET{$self+0};
593
594 eval { $self->destroy };
595 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
418} 596}
419 597
420############################################################################# 598#############################################################################
421 599
422package CFClient::UI::DrawBG; 600package CFClient::UI::DrawBG;
… …
430 my $class = shift; 608 my $class = shift;
431 609
432 # range [value, low, high, page] 610 # range [value, low, high, page]
433 611
434 $class->SUPER::new ( 612 $class->SUPER::new (
435 bg => [0, 0, 0, 0.2], 613 #bg => [0, 0, 0, 0.2],
436 active_bg => [1, 1, 1, 0.5], 614 #active_bg => [1, 1, 1, 0.5],
437 @_ 615 @_
438 ) 616 )
439} 617}
440 618
441sub _draw { 619sub _draw {
442 my ($self) = @_; 620 my ($self) = @_;
443 621
622 my $color = $FOCUS == $self && $self->{active_bg}
623 ? $self->{active_bg}
624 : $self->{bg};
625
626 if ($color && (@$color < 4 || $color->[3])) {
444 my ($w, $h) = @$self{qw(w h)}; 627 my ($w, $h) = @$self{qw(w h)};
445 628
446 glEnable GL_BLEND; 629 glEnable GL_BLEND;
447 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 630 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
448 glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} }; 631 glColor_premultiply @$color;
449 632
450 glBegin GL_QUADS; 633 glBegin GL_QUADS;
451 glVertex 0 , 0; 634 glVertex 0 , 0;
452 glVertex 0 , $h; 635 glVertex 0 , $h;
453 glVertex $w, $h; 636 glVertex $w, $h;
454 glVertex $w, 0; 637 glVertex $w, 0;
455 glEnd; 638 glEnd;
456 639
457 glDisable GL_BLEND; 640 glDisable GL_BLEND;
641 }
458} 642}
459 643
460############################################################################# 644#############################################################################
461 645
462package CFClient::UI::Empty; 646package CFClient::UI::Empty;
… …
467 my ($class, %arg) = @_; 651 my ($class, %arg) = @_;
468 $class->SUPER::new (can_events => 0, %arg); 652 $class->SUPER::new (can_events => 0, %arg);
469} 653}
470 654
471sub size_request { 655sub size_request {
472 (0, 0) 656 my ($self) = @_;
657
658 ($self->{w} + 0, $self->{h} + 0)
473} 659}
474 660
475sub draw { } 661sub draw { }
476 662
477############################################################################# 663#############################################################################
… …
481our @ISA = CFClient::UI::Base::; 667our @ISA = CFClient::UI::Base::;
482 668
483sub new { 669sub new {
484 my ($class, %arg) = @_; 670 my ($class, %arg) = @_;
485 671
486 my $children = delete $arg{children} || []; 672 my $children = delete $arg{children};
487 673
488 my $self = $class->SUPER::new ( 674 my $self = $class->SUPER::new (
489 children => [], 675 children => [],
490 can_events => 0, 676 can_events => 0,
491 %arg, 677 %arg,
492 ); 678 );
679
493 $self->add ($_) for @$children; 680 $self->add (@$children)
681 if $children;
494 682
495 $self 683 $self
496} 684}
497 685
498sub add { 686sub add {
… …
506 $self->{children} = [ 694 $self->{children} = [
507 sort { $a->{z} <=> $b->{z} } 695 sort { $a->{z} <=> $b->{z} }
508 @{$self->{children}}, @widgets 696 @{$self->{children}}, @widgets
509 ]; 697 ];
510 698
511 $_->check_size 699 $self->realloc;
512 for @widgets;
513
514 $self->update;
515} 700}
516 701
517sub children { 702sub children {
518 @{ $_[0]{children} } 703 @{ $_[0]{children} }
519} 704}
… …
524 delete $child->{parent}; 709 delete $child->{parent};
525 $child->hide; 710 $child->hide;
526 711
527 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 712 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
528 713
529 $self->check_size; 714 $self->realloc;
530 $self->update;
531} 715}
532 716
533sub clear { 717sub clear {
534 my ($self) = @_; 718 my ($self) = @_;
535 719
… …
539 for (@$children) { 723 for (@$children) {
540 delete $_->{parent}; 724 delete $_->{parent};
541 $_->hide; 725 $_->hide;
542 } 726 }
543 727
544 $self->check_size; 728 $self->realloc;
545 $self->update;
546} 729}
547 730
548sub find_widget { 731sub find_widget {
549 my ($self, $x, $y) = @_; 732 my ($self, $x, $y) = @_;
550 733
551 $x -= $self->{x}; 734 $x -= $self->{x};
552 $y -= $self->{y}; 735 $y -= $self->{y};
553 736
554 my $res; 737 my $res;
555 738
556 for (reverse @{ $self->{children} }) { 739 for (reverse $self->visible_children) {
557 $res = $_->find_widget ($x, $y) 740 $res = $_->find_widget ($x, $y)
558 and return $res; 741 and return $res;
559 } 742 }
560 743
561 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y}) 744 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
… …
582} 765}
583 766
584sub add { 767sub add {
585 my ($self, $child) = @_; 768 my ($self, $child) = @_;
586 769
587 $self->{children} = []; 770 $self->SUPER::remove ($_) for @{ $self->{children} };
588
589 $self->SUPER::add ($child); 771 $self->SUPER::add ($child);
590} 772}
591 773
592sub remove { 774sub remove {
593 my ($self, $widget) = @_; 775 my ($self, $widget) = @_;
… …
602 784
603sub size_request { 785sub size_request {
604 $_[0]{children}[0]->size_request 786 $_[0]{children}[0]->size_request
605} 787}
606 788
607sub size_allocate { 789sub invoke_size_allocate {
608 my ($self, $w, $h) = @_; 790 my ($self, $w, $h) = @_;
609 791
610 $self->{children}[0]->configure (0, 0, $w, $h); 792 $self->{children}[0]->configure (0, 0, $w, $h);
793
794 1
611} 795}
612 796
613############################################################################# 797#############################################################################
798
799# back-buffered drawing area
614 800
615package CFClient::UI::Window; 801package CFClient::UI::Window;
616 802
617our @ISA = CFClient::UI::Bin::; 803our @ISA = CFClient::UI::Bin::;
618 804
… …
625} 811}
626 812
627sub update { 813sub update {
628 my ($self) = @_; 814 my ($self) = @_;
629 815
630 $ROOT->on_refresh ($self => sub { $self->render_child }); 816 $ROOT->on_post_alloc ($self => sub { $self->render_child });
631 $self->SUPER::update; 817 $self->SUPER::update;
632} 818}
633 819
634sub size_allocate { 820sub invoke_size_allocate {
635 my ($self, $w, $h) = @_; 821 my ($self, $w, $h) = @_;
636 822
637 $self->SUPER::size_allocate ($w, $h);
638 $self->update; 823 $self->update;
824
825 $self->SUPER::invoke_size_allocate ($w, $h)
639} 826}
640 827
641sub _render { 828sub _render {
829 my ($self) = @_;
830
642 $_[0]{children}[0]->draw; 831 $self->{children}[0]->draw;
643} 832}
644 833
645sub render_child { 834sub render_child {
646 my ($self) = @_; 835 my ($self) = @_;
647 836
648 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 837 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
649 glClearColor 0, 0, 0, 0; 838 glClearColor 0, 0, 0, 0;
650 glClear GL_COLOR_BUFFER_BIT; 839 glClear GL_COLOR_BUFFER_BIT;
651 840
841 {
842 package CFClient::UI::Base;
843
844 ($draw_x, $draw_y, $draw_w, $draw_h) =
845 (0, 0, $self->{w}, $self->{h});
846 }
847
652 $self->_render; 848 $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 }; 849 };
661} 850}
662 851
663sub _draw { 852sub _draw {
664 my ($self) = @_; 853 my ($self) = @_;
665 854
666 my ($w, $h) = ($self->w, $self->h); 855 my ($w, $h) = @$self{qw(w h)};
667 856
668 my $tex = $self->{texture} 857 my $tex = $self->{texture}
669 or return; 858 or return;
670 859
671 glEnable GL_BLEND;
672 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
673 glEnable GL_TEXTURE_2D; 860 glEnable GL_TEXTURE_2D;
674 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 861 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
675 glColor 0, 0, 0, 1; 862 glColor 0, 0, 0, 1;
676 863
677 $tex->draw_quad (0, 0, $w, $h); 864 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
678 865
679 glDisable GL_BLEND;
680 glDisable GL_TEXTURE_2D; 866 glDisable GL_TEXTURE_2D;
681} 867}
682 868
683############################################################################# 869#############################################################################
684 870
685package CFClient::UI::ViewPort; 871package CFClient::UI::ViewPort;
686 872
687our @ISA = CFClient::UI::Window::; 873our @ISA = CFClient::UI::Window::;
688 874
875sub new {
876 my $class = shift;
877
878 $class->SUPER::new (
879 scroll_x => 0,
880 scroll_y => 1,
881 @_,
882 )
883}
884
689sub size_request { 885sub size_request {
690 my ($self) = @_; 886 my ($self) = @_;
691 887
692 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 888 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
693 $self->child->configure (0, 0, @$self{qw(child_w child_h)});
694 889
695 @$self{qw(child_w child_h)} 890 $w = 10 if $self->{scroll_x};
696} 891 $h = 10 if $self->{scroll_y};
697 892
893 ($w, $h)
894}
895
698sub size_allocate { 896sub invoke_size_allocate {
699 my ($self, $w, $h) = @_; 897 my ($self, $w, $h) = @_;
700 898
899 my $child = $self->child;
900
901 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
902 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
903
904 $self->child->configure (0, 0, $w, $h);
701 $self->update; 905 $self->update;
906
907 1
702} 908}
703 909
704sub set_offset { 910sub set_offset {
705 my ($self, $x, $y) = @_; 911 my ($self, $x, $y) = @_;
706 912
… …
739} 945}
740 946
741sub _render { 947sub _render {
742 my ($self) = @_; 948 my ($self) = @_;
743 949
950 local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x};
951 local $CFClient::UI::Base::draw_y = $CFClient::UI::Base::draw_y - $self->{view_y};
952
744 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 953 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
745 954
746 $self->SUPER::_render; 955 $self->SUPER::_render;
747} 956}
748 957
749############################################################################# 958#############################################################################
750 959
751package CFClient::UI::ScrolledWindow; 960package CFClient::UI::ScrolledWindow;
752 961
753our @ISA = CFClient::UI::HBox::; 962our @ISA = CFClient::UI::HBox::;
963
964sub new {
965 my ($class, %arg) = @_;
966
967 my $child = delete $arg{child};
968
969 my $self;
970
971 my $slider = new CFClient::UI::Slider
972 vertical => 1,
973 range => [0, 0, 1, 0.01], # HACK fix
974 on_changed => sub {
975 $self->{vp}->set_offset (0, $_[1]);
976 },
977 ;
978
979 $self = $class->SUPER::new (
980 vp => (new CFClient::UI::ViewPort expand => 1),
981 slider => $slider,
982 %arg,
983 );
984
985 $self->SUPER::add ($self->{vp}, $self->{slider});
986 $self->add ($child) if $child;
987
988 $self
989}
990
991sub add {
992 my ($self, $widget) = @_;
993
994 $self->{vp}->add ($self->{child} = $widget);
995}
996
997sub update {
998 my ($self) = @_;
999
1000 $self->SUPER::update;
1001
1002 # todo: overwrite size_allocate of child
1003 my $child = $self->{vp}->child;
1004 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
1005}
1006
1007sub invoke_size_allocate {
1008 my ($self, $w, $h) = @_;
1009
1010 my $child = $self->{vp}->child;
1011 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
1012
1013 $self->SUPER::invoke_size_allocate ($w, $h)
1014}
1015
1016#TODO# update range on size_allocate depending on child
1017# update viewport offset on scroll
1018
1019#############################################################################
1020
1021package CFClient::UI::Frame;
1022
1023our @ISA = CFClient::UI::Bin::;
1024
1025use CFClient::OpenGL;
754 1026
755sub new { 1027sub new {
756 my $class = shift; 1028 my $class = shift;
757 1029
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 ( 1030 $class->SUPER::new (
769 vp => (new CFClient::UI::ViewPort), 1031 bg => undef,
770 slider => $slider,
771 @_, 1032 @_,
1033 )
1034}
1035
1036sub _draw {
1037 my ($self) = @_;
1038
1039 if ($self->{bg}) {
1040 my ($w, $h) = @$self{qw(w h)};
1041
1042 glEnable GL_BLEND;
1043 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1044 glColor_premultiply @{ $self->{bg} };
1045
1046 glBegin GL_QUADS;
1047 glVertex 0 , 0;
1048 glVertex 0 , $h;
1049 glVertex $w, $h;
1050 glVertex $w, 0;
1051 glEnd;
1052
1053 glDisable GL_BLEND;
1054 }
1055
1056 $self->SUPER::_draw;
1057}
1058
1059#############################################################################
1060
1061package CFClient::UI::FancyFrame;
1062
1063our @ISA = CFClient::UI::Bin::;
1064
1065use CFClient::OpenGL;
1066
1067my $bg =
1068 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
1069 mipmap => 1, wrap => 1;
1070
1071my @border =
1072 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1073 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1074
1075sub new {
1076 my ($class, %arg) = @_;
1077
1078 my $self = $class->SUPER::new (
1079 bg => [1, 1, 1, 1],
1080 border_bg => [1, 1, 1, 1],
1081 border => 0.6,
1082 can_events => 1,
1083 min_w => 16,
1084 min_h => 16,
1085 %arg,
772 ); 1086 );
773 1087
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 1088 $self->{title_widget} = new CFClient::UI::Label
855 align => 0, 1089 align => 0,
856 valign => 1, 1090 valign => 1,
857 text => $self->{title}, 1091 text => $self->{title},
858 fontsize => $self->{border}; 1092 fontsize => $self->{border},
1093 if exists $self->{title};
1094
1095 if ($self->{has_close_button}) {
1096 $self->{close_button} =
1097 new CFClient::UI::ImageButton
1098 path => 'x1_close.png',
1099 on_activate => sub { $self->hide };
1100
1101 $self->CFClient::UI::Container::add ($self->{close_button});
1102 }
859 1103
860 $self 1104 $self
1105}
1106
1107sub add {
1108 my ($self, @widgets) = @_;
1109
1110 $self->SUPER::add (@widgets);
1111 $self->CFClient::UI::Container::add ($self->{close_button}) if $self->{close_button};
1112 $self->CFClient::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
861} 1113}
862 1114
863sub border { 1115sub border {
864 int $_[0]{border} * $::FONTSIZE 1116 int $_[0]{border} * $::FONTSIZE
865} 1117}
866 1118
867sub size_request { 1119sub size_request {
868 my ($self) = @_; 1120 my ($self) = @_;
1121
1122 $self->{title_widget}->size_request
1123 if $self->{title_widget};
1124
1125 $self->{close_button}->size_request
1126 if $self->{close_button};
869 1127
870 my ($w, $h) = $self->SUPER::size_request; 1128 my ($w, $h) = $self->SUPER::size_request;
871 1129
872 ( 1130 (
873 $w + $self->border * 2, 1131 $w + $self->border * 2,
874 $h + $self->border * 2, 1132 $h + $self->border * 2,
875 ) 1133 )
876} 1134}
877 1135
878sub size_allocate { 1136sub invoke_size_allocate {
879 my ($self, $w, $h) = @_; 1137 my ($self, $w, $h) = @_;
880 1138
1139 if ($self->{title_widget}) {
1140 $self->{title_widget}{w} = $w;
1141 $self->{title_widget}{h} = $h;
1142 $self->{title_widget}->invoke_size_allocate ($w, $h);
1143 }
1144
1145 my $border = $self->border;
1146
881 $h -= List::Util::max 0, $self->border * 2; 1147 $h -= List::Util::max 0, $border * 2;
882 $w -= List::Util::max 0, $self->border * 2; 1148 $w -= List::Util::max 0, $border * 2;
883 1149
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); 1150 $self->child->configure ($border, $border, $w, $h);
888}
889 1151
1152 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
1153 if $self->{close_button};
1154
1155 1
1156}
1157
890sub button_down { 1158sub invoke_button_down {
891 my ($self, $ev, $x, $y) = @_; 1159 my ($self, $ev, $x, $y) = @_;
892 1160
893 my ($w, $h) = @$self{qw(w h)}; 1161 my ($w, $h) = @$self{qw(w h)};
894 my $border = $self->border; 1162 my $border = $self->border;
895 1163
… …
908 my ($ev, $x, $y) = @_; 1176 my ($ev, $x, $y) = @_;
909 1177
910 my $dx = $ev->{x} - $ox; 1178 my $dx = $ev->{x} - $ox;
911 my $dy = $ev->{y} - $oy; 1179 my $dy = $ev->{y} - $oy;
912 1180
913 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1); 1181 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
914 $self->{user_h} = $bh + $dy * ($my ? -1 : 1); 1182 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1183
915 $self->move ($wx + $dx * $mx, $wy + $dy * $my); 1184 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
916 $self->check_size; 1185 $self->realloc;
917 }; 1186 };
918 1187
919 } elsif ($lr ^ $td) { 1188 } elsif ($lr ^ $td) {
920 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1189 my ($ox, $oy) = ($ev->{x}, $ev->{y});
921 my ($bx, $by) = ($self->{x}, $self->{y}); 1190 my ($bx, $by) = ($self->{x}, $self->{y});
… …
923 $self->{motion} = sub { 1192 $self->{motion} = sub {
924 my ($ev, $x, $y) = @_; 1193 my ($ev, $x, $y) = @_;
925 1194
926 ($x, $y) = ($ev->{x}, $ev->{y}); 1195 ($x, $y) = ($ev->{x}, $ev->{y});
927 1196
928 $self->move ($bx + $x - $ox, $by + $y - $oy); 1197 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
929 $self->update; 1198 # HACK: the next line is required to enforce placement
1199 $self->{parent}->invoke_size_allocate ($self->{parent}{w}, $self->{parent}{h});
930 }; 1200 };
1201 } else {
1202 return 0;
1203 }
1204
931 } 1205 1
932} 1206}
933 1207
934sub button_up { 1208sub invoke_button_up {
935 my ($self, $ev, $x, $y) = @_; 1209 my ($self, $ev, $x, $y) = @_;
936 1210
937 delete $self->{motion}; 1211 ! ! delete $self->{motion}
938} 1212}
939 1213
940sub mouse_motion { 1214sub invoke_mouse_motion {
941 my ($self, $ev, $x, $y) = @_; 1215 my ($self, $ev, $x, $y) = @_;
942 1216
943 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1217 $self->{motion}->($ev, $x, $y) if $self->{motion};
1218
1219 ! ! $self->{motion}
944} 1220}
945 1221
946sub _draw { 1222sub _draw {
947 my ($self) = @_; 1223 my ($self) = @_;
948 1224
1225 my $child = $self->{children}[0];
1226
949 my ($w, $h ) = ($self->{w}, $self->{h}); 1227 my ($w, $h ) = ($self->{w}, $self->{h});
950 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1228 my ($cw, $ch) = ($child->{w}, $child->{h});
951 1229
952 glEnable GL_BLEND;
953 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
954 glEnable GL_TEXTURE_2D; 1230 glEnable GL_TEXTURE_2D;
955 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1231 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
956 1232
957 my $border = $self->border; 1233 my $border = $self->border;
958 1234
959 glColor @{ $self->{border_bg} }; 1235 glColor @{ $self->{border_bg} };
960 $tex[1]->draw_quad (0, 0, $w, $border); 1236 $border[0]->draw_quad_alpha (0, 0, $w, $border);
961 $tex[3]->draw_quad (0, $border, $border, $ch); 1237 $border[1]->draw_quad_alpha (0, $border, $border, $ch);
962 $tex[2]->draw_quad ($w - $border, $border, $border, $ch); 1238 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
963 $tex[4]->draw_quad (0, $h - $border, $w, $border); 1239 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
964 1240
965 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1241 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
966 my $bg = $tex[0]; 1242 glColor @{ $self->{bg} };
967 1243
968 # TODO: repeat texture not scale 1244 # TODO: repeat texture not scale
1245 # solve this better(?)
969 my $rep_x = $cw / $bg->{w}; 1246 $bg->{s} = $cw / $bg->{w};
970 my $rep_y = $ch / $bg->{h}; 1247 $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); 1248 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1249 }
978 1250
979 glDisable GL_TEXTURE_2D; 1251 glDisable GL_TEXTURE_2D;
980 glDisable GL_BLEND;
981 }
982 1252
983 $self->{title}->draw if $self->{title};
984
985 $self->child->draw; 1253 $child->draw;
1254
1255 if ($self->{title_widget}) {
1256 glTranslate 0, $border - $self->{h};
1257 $self->{title_widget}->_draw;
1258
1259 glTranslate 0, - ($border - $self->{h});
1260 }
1261
1262 $self->{close_button}->draw
1263 if $self->{close_button};
986} 1264}
987 1265
988############################################################################# 1266#############################################################################
989 1267
990package CFClient::UI::Table; 1268package CFClient::UI::Table;
… …
998sub new { 1276sub new {
999 my $class = shift; 1277 my $class = shift;
1000 1278
1001 $class->SUPER::new ( 1279 $class->SUPER::new (
1002 col_expand => [], 1280 col_expand => [],
1003 @_ 1281 @_,
1004 ) 1282 )
1283}
1284
1285sub children {
1286 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1005} 1287}
1006 1288
1007sub add { 1289sub add {
1008 my ($self, $x, $y, $child) = @_; 1290 my ($self, $x, $y, $child) = @_;
1009 1291
1010 $child->set_parent ($self); 1292 $child->set_parent ($self);
1011 $self->{children}[$y][$x] = $child; 1293 $self->{children}[$y][$x] = $child;
1012 1294
1013 $child->check_size; 1295 $self->realloc;
1014} 1296}
1015 1297
1016sub children { 1298sub remove {
1017 grep $_, map @$_, grep $_, @{ $_[0]{children} } 1299 my ($self, $child) = @_;
1018}
1019 1300
1301 # TODO: not yet implemented
1302}
1303
1020# TODO: move to container class maybe? send childs a signal on removal? 1304# TODO: move to container class maybe? send children a signal on removal?
1021sub clear { 1305sub clear {
1022 my ($self) = @_; 1306 my ($self) = @_;
1023 1307
1024 my @children = $self->children; 1308 my @children = $self->children;
1025 delete $self->{children}; 1309 delete $self->{children};
… …
1027 for (@children) { 1311 for (@children) {
1028 delete $_->{parent}; 1312 delete $_->{parent};
1029 $_->hide; 1313 $_->hide;
1030 } 1314 }
1031 1315
1032 $self->update; 1316 $self->realloc;
1033} 1317}
1034 1318
1035sub get_wh { 1319sub get_wh {
1036 my ($self) = @_; 1320 my ($self) = @_;
1037 1321
… …
1063 (sum @$ws), 1347 (sum @$ws),
1064 (sum @$hs), 1348 (sum @$hs),
1065 ) 1349 )
1066} 1350}
1067 1351
1068sub size_allocate { 1352sub invoke_size_allocate {
1069 my ($self, $w, $h) = @_; 1353 my ($self, $w, $h) = @_;
1070 1354
1071 my ($ws, $hs) = $self->get_wh; 1355 my ($ws, $hs) = $self->get_wh;
1072 1356
1073 my $req_w = sum @$ws; 1357 my $req_w = (sum @$ws) || 1;
1074 my $req_h = sum @$hs; 1358 my $req_h = (sum @$hs) || 1;
1075 1359
1076 # TODO: nicer code && do row_expand 1360 # TODO: nicer code && do row_expand
1077 my @col_expand = @{$self->{col_expand}}; 1361 my @col_expand = @{$self->{col_expand}};
1078 @col_expand = (1) x @$ws unless @col_expand; 1362 @col_expand = (1) x @$ws unless @col_expand;
1079 my $col_expand = (sum @col_expand) || 1; 1363 my $col_expand = (sum @col_expand) || 1;
… …
1105 } 1389 }
1106 1390
1107 $y += $row_h; 1391 $y += $row_h;
1108 } 1392 }
1109 1393
1394 1
1110} 1395}
1111 1396
1112sub find_widget { 1397sub find_widget {
1113 my ($self, $x, $y) = @_; 1398 my ($self, $x, $y) = @_;
1114 1399
… …
1133 } 1418 }
1134} 1419}
1135 1420
1136############################################################################# 1421#############################################################################
1137 1422
1423package CFClient::UI::Box;
1424
1425our @ISA = CFClient::UI::Container::;
1426
1427sub size_request {
1428 my ($self) = @_;
1429
1430 $self->{vertical}
1431 ? (
1432 (List::Util::max map $_->{req_w}, @{$self->{children}}),
1433 (List::Util::sum map $_->{req_h}, @{$self->{children}}),
1434 )
1435 : (
1436 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1437 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1438 )
1439}
1440
1441sub invoke_size_allocate {
1442 my ($self, $w, $h) = @_;
1443
1444 my $space = $self->{vertical} ? $h : $w;
1445 my @children = $self->visible_children;
1446
1447 my @req;
1448
1449 if ($self->{homogeneous}) {
1450 @req = ($space / (@children || 1)) x @children;
1451 } else {
1452 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @children;
1453 my $req = List::Util::sum @req;
1454
1455 if ($req > $space) {
1456 # ah well, not enough space
1457 $_ *= $space / $req for @req;
1458 } else {
1459 my $expand = (List::Util::sum map $_->{expand}, @children) || 1;
1460
1461 $space = ($space - $req) / $expand; # remaining space to give away
1462
1463 $req[$_] += $space * $children[$_]{expand}
1464 for 0 .. $#children;
1465 }
1466 }
1467
1468 CFClient::UI::harmonize \@req;
1469
1470 my $pos = 0;
1471 for (0 .. $#children) {
1472 my $alloc = $req[$_];
1473 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1474
1475 $pos += $alloc;
1476 }
1477
1478 1
1479}
1480
1481#############################################################################
1482
1138package CFClient::UI::HBox; 1483package CFClient::UI::HBox;
1139 1484
1140# TODO: wrap into common Box base class
1141
1142our @ISA = CFClient::UI::Container::; 1485our @ISA = CFClient::UI::Box::;
1143 1486
1144sub size_request { 1487sub new {
1145 my ($self) = @_; 1488 my $class = shift;
1146 1489
1147 my @alloc = map [$_->size_request], @{$self->{children}}; 1490 $class->SUPER::new (
1148 1491 vertical => 0,
1149 ( 1492 @_,
1150 (List::Util::sum map $_->[0], @alloc),
1151 (List::Util::max map $_->[1], @alloc),
1152 ) 1493 )
1153} 1494}
1154 1495
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############################################################################# 1496#############################################################################
1197 1497
1198package CFClient::UI::VBox; 1498package CFClient::UI::VBox;
1199 1499
1200# TODO: wrap into common Box base class
1201
1202our @ISA = CFClient::UI::Container::; 1500our @ISA = CFClient::UI::Box::;
1203 1501
1204sub size_request { 1502sub new {
1205 my ($self) = @_; 1503 my $class = shift;
1206 1504
1207 my @alloc = map [$_->size_request], @{$self->{children}}; 1505 $class->SUPER::new (
1208 1506 vertical => 1,
1209 ( 1507 @_,
1210 (List::Util::max map $_->[0], @alloc),
1211 (List::Util::sum map $_->[1], @alloc),
1212 ) 1508 )
1213} 1509}
1214 1510
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############################################################################# 1511#############################################################################
1253 1512
1254package CFClient::UI::Label; 1513package CFClient::UI::Label;
1255 1514
1256our @ISA = CFClient::UI::Base::; 1515our @ISA = CFClient::UI::DrawBG::;
1257 1516
1258use CFClient::OpenGL; 1517use CFClient::OpenGL;
1259 1518
1260sub new { 1519sub new {
1261 my ($class, %arg) = @_; 1520 my ($class, %arg) = @_;
1262 1521
1263 my $self = $class->SUPER::new ( 1522 my $self = $class->SUPER::new (
1264 fg => [1, 1, 1], 1523 fg => [1, 1, 1],
1524 #bg => none
1525 #active_bg => none
1265 #font => default_font 1526 #font => default_font
1527 #text => initial text
1528 #markup => initial narkup
1529 #max_w => maximum pixel width
1530 ellipsise => 3, # end
1531 layout => (new CFClient::Layout),
1266 fontsize => 1, 1532 fontsize => 1,
1267 text => "",
1268 align => -1, 1533 align => -1,
1269 valign => -1, 1534 valign => -1,
1270 padding => 2, 1535 padding_x => 2,
1271 layout => new CFClient::Layout, 1536 padding_y => 2,
1272 can_events => 0, 1537 can_events => 0,
1273 %arg 1538 %arg
1274 ); 1539 );
1275 1540
1276 if (exists $self->{template}) { 1541 if (exists $self->{template}) {
1277 my $layout = new CFClient::Layout; 1542 my $layout = new CFClient::Layout;
1278 $layout->set_text (delete $self->{template}); 1543 $layout->set_text (delete $self->{template});
1279 $self->{template} = $layout; 1544 $self->{template} = $layout;
1280 } 1545 }
1281 1546
1282 $self->set_text (delete $self->{text}) if exists $self->{text}; 1547 if (exists $self->{markup}) {
1283 $self->set_markup (delete $self->{markup}) if exists $self->{markup}; 1548 $self->set_markup (delete $self->{markup});
1549 } else {
1550 $self->set_text (delete $self->{text});
1551 }
1284 1552
1285 $self 1553 $self
1286} 1554}
1287 1555
1288sub escape { 1556sub escape($) {
1289 local $_ = $_[1]; 1557 local $_ = $_[0];
1290 1558
1291 s/&/&amp;/g; 1559 s/&/&amp;/g;
1292 s/>/&gt;/g; 1560 s/>/&gt;/g;
1293 s/</&lt;/g; 1561 s/</&lt;/g;
1294 1562
1295 $_[1] 1563 $_
1296} 1564}
1297 1565
1298sub update { 1566sub update {
1299 my ($self) = @_; 1567 my ($self) = @_;
1300 1568
1301 delete $self->{texture}; 1569 delete $self->{texture};
1302 $self->SUPER::update; 1570 $self->SUPER::update;
1303} 1571}
1304 1572
1573sub realloc {
1574 my ($self) = @_;
1575
1576 delete $self->{ox};
1577 $self->SUPER::realloc;
1578}
1579
1305sub set_text { 1580sub set_text {
1306 my ($self, $text) = @_; 1581 my ($self, $text) = @_;
1307 1582
1308 return if $self->{text} eq "T$text"; 1583 return if $self->{text} eq "T$text";
1309 $self->{text} = "T$text"; 1584 $self->{text} = "T$text";
1310 1585
1586 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1311 $self->{layout}->set_text ($text); 1587 $self->{layout}->set_text ($text);
1312 1588
1589 delete $self->{size_req};
1590 $self->realloc;
1313 $self->update; 1591 $self->update;
1314 $self->check_size;
1315} 1592}
1316 1593
1317sub set_markup { 1594sub set_markup {
1318 my ($self, $markup) = @_; 1595 my ($self, $markup) = @_;
1319 1596
1320 return if $self->{text} eq "M$markup"; 1597 return if $self->{text} eq "M$markup";
1321 $self->{text} = "M$markup"; 1598 $self->{text} = "M$markup";
1322 1599
1600 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1601
1602 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1323 $self->{layout}->set_markup ($markup); 1603 $self->{layout}->set_markup ($markup);
1324 1604
1605 delete $self->{size_req};
1606 $self->realloc;
1325 $self->update; 1607 $self->update;
1326 $self->check_size;
1327} 1608}
1328 1609
1329sub size_request { 1610sub size_request {
1330 my ($self) = @_; 1611 my ($self) = @_;
1331 1612
1613 $self->{size_req} ||= do {
1332 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1614 $self->{layout}->set_font ($self->{font}) if $self->{font};
1333 $self->{layout}->set_width ($self->{max_w} || -1); 1615 $self->{layout}->set_width ($self->{max_w} || -1);
1616 $self->{layout}->set_ellipsise ($self->{ellipsise});
1617 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1334 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1618 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1335 1619
1336 my ($w, $h) = $self->{layout}->size; 1620 my ($w, $h) = $self->{layout}->size;
1337 1621
1338 if (exists $self->{template}) { 1622 if (exists $self->{template}) {
1339 $self->{template}->set_font ($self->{font}) if $self->{font}; 1623 $self->{template}->set_font ($self->{font}) if $self->{font};
1340 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1624 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1341 1625
1342 my ($w2, $h2) = $self->{template}->size; 1626 my ($w2, $h2) = $self->{template}->size;
1343 1627
1344 $w = List::Util::max $w, $w2; 1628 $w = List::Util::max $w, $w2;
1345 $h = List::Util::max $h, $h2; 1629 $h = List::Util::max $h, $h2;
1630 }
1631
1632 [$w, $h]
1346 } 1633 };
1347 1634
1348 ( 1635 @{ $self->{size_req} }
1349 $w + $self->{padding} * 2,
1350 $h + $self->{padding} * 2,
1351 )
1352} 1636}
1353 1637
1638sub baseline_shift {
1639 $_[0]{layout}->descent
1640}
1641
1354sub size_allocate { 1642sub invoke_size_allocate {
1355 my ($self, $w, $h) = @_; 1643 my ($self, $w, $h) = @_;
1356 1644
1645 delete $self->{ox};
1646
1357 delete $self->{texture}; 1647 delete $self->{texture}
1648 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1649
1650 1
1358} 1651}
1359 1652
1360sub set_fontsize { 1653sub set_fontsize {
1361 my ($self, $fontsize) = @_; 1654 my ($self, $fontsize) = @_;
1362 1655
1363 $self->{fontsize} = $fontsize; 1656 $self->{fontsize} = $fontsize;
1364 delete $self->{texture}; 1657 delete $self->{texture};
1365 1658
1366 $self->update; 1659 $self->realloc;
1367 $self->check_size; 1660}
1661
1662sub reconfigure {
1663 my ($self) = @_;
1664
1665 delete $self->{size_req};
1666
1667 $self->SUPER::reconfigure;
1368} 1668}
1369 1669
1370sub _draw { 1670sub _draw {
1371 my ($self) = @_; 1671 my ($self) = @_;
1372 1672
1673 $self->SUPER::_draw; # draw background, if applicable
1674
1373 my $tex = $self->{texture} ||= do { 1675 my $tex = $self->{texture} ||= do {
1676 $self->{layout}->set_foreground (@{$self->{fg}});
1374 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1677 $self->{layout}->set_font ($self->{font}) if $self->{font};
1375 $self->{layout}->set_width ($self->{w}); 1678 $self->{layout}->set_width ($self->{w});
1679 $self->{layout}->set_ellipsise ($self->{ellipsise});
1680 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1376 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE); 1681 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1682
1377 new_from_layout CFClient::Texture $self->{layout} 1683 new_from_layout CFClient::Texture $self->{layout}
1378 }; 1684 };
1379 1685
1380 glEnable GL_BLEND; 1686 unless (exists $self->{ox}) {
1381 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1687 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1688 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1689 : ($self->{w} - $tex->{w}) * 0.5);
1690
1691 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1692 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1693 : ($self->{h} - $tex->{h}) * 0.5);
1694 };
1695
1382 glEnable GL_TEXTURE_2D; 1696 glEnable GL_TEXTURE_2D;
1697
1698 my $w = List::Util::min $self->{w} + 4, $tex->{w};
1699 my $h = List::Util::min $self->{h} + 2, $tex->{h};
1700
1701 if ($tex->{format} == GL_ALPHA) {
1702 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1703 glColor @{$self->{fg}};
1704 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}, $w, $h);
1705 } else {
1383 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1706 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1384 1707 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}, $w, $h);
1385 glColor @{$self->{fg}}; 1708 }
1386
1387 $self->{ox} = int (
1388 $self->{align} < 0 ? $self->{padding}
1389 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1390 : ($self->{w} - $tex->{w}) * 0.5
1391 );
1392
1393 $self->{oy} = int (
1394 $self->{valign} < 0 ? $self->{padding}
1395 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1396 : ($self->{h} - $tex->{h}) * 0.5
1397 );
1398
1399 $tex->draw_quad ($self->{ox}, $self->{oy});
1400 1709
1401 glDisable GL_TEXTURE_2D; 1710 glDisable GL_TEXTURE_2D;
1402 glDisable GL_BLEND;
1403} 1711}
1404 1712
1405############################################################################# 1713#############################################################################
1406 1714
1407package CFClient::UI::EntryBase; 1715package CFClient::UI::EntryBase;
… …
1420 active_fg => [0, 0, 0], 1728 active_fg => [0, 0, 0],
1421 can_hover => 1, 1729 can_hover => 1,
1422 can_focus => 1, 1730 can_focus => 1,
1423 valign => 0, 1731 valign => 0,
1424 can_events => 1, 1732 can_events => 1,
1733 #text => ...
1734 #hidden => "*",
1425 @_ 1735 @_
1426 ) 1736 )
1427} 1737}
1428 1738
1429sub _set_text { 1739sub _set_text {
… …
1431 1741
1432 delete $self->{cur_h}; 1742 delete $self->{cur_h};
1433 1743
1434 return if $self->{text} eq $text; 1744 return if $self->{text} eq $text;
1435 1745
1436 delete $self->{texture};
1437
1438 $self->{last_activity} = $::NOW; 1746 $self->{last_activity} = $::NOW;
1439 $self->{text} = $text; 1747 $self->{text} = $text;
1440 1748
1441 $text =~ s/./*/g if $self->{hidden}; 1749 $text =~ s/./*/g if $self->{hidden};
1442 $self->{layout}->set_text ("$text "); 1750 $self->{layout}->set_text ("$text ");
1751 delete $self->{size_req};
1443 1752
1444 $self->emit (changed => $self->{text}); 1753 $self->emit (changed => $self->{text});
1754
1755 $self->realloc;
1756 $self->update;
1757}
1758
1759sub set_text {
1760 my ($self, $text) = @_;
1761
1762 $self->{cursor} = length $text;
1763 $self->_set_text ($text);
1445} 1764}
1446 1765
1447sub get_text { 1766sub get_text {
1448 $_[0]{text} 1767 $_[0]{text}
1449} 1768}
… …
1454 my ($w, $h) = $self->SUPER::size_request; 1773 my ($w, $h) = $self->SUPER::size_request;
1455 1774
1456 ($w + 1, $h) # add 1 for cursor 1775 ($w + 1, $h) # add 1 for cursor
1457} 1776}
1458 1777
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 { 1778sub invoke_key_down {
1474 my ($self, $ev) = @_; 1779 my ($self, $ev) = @_;
1475 1780
1476 my $mod = $ev->{mod}; 1781 my $mod = $ev->{mod};
1477 my $sym = $ev->{sym}; 1782 my $sym = $ev->{sym};
1478 my $uni = $ev->{unicode}; 1783 my $uni = $ev->{unicode};
1479 1784
1480 my $text = $self->get_text; 1785 my $text = $self->get_text;
1481 1786
1482 if ($sym == 8) { 1787 if ($uni == 8) {
1483 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 1788 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1484 } elsif ($sym == 127) { 1789 } elsif ($uni == 127) {
1485 substr $text, $self->{cursor}, 1, ""; 1790 substr $text, $self->{cursor}, 1, "";
1486 } elsif ($sym == CFClient::SDLK_LEFT) { 1791 } elsif ($sym == CFClient::SDLK_LEFT) {
1487 --$self->{cursor} if $self->{cursor}; 1792 --$self->{cursor} if $self->{cursor};
1488 } elsif ($sym == CFClient::SDLK_RIGHT) { 1793 } elsif ($sym == CFClient::SDLK_RIGHT) {
1489 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1794 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1490 } elsif ($sym == CFClient::SDLK_HOME) { 1795 } elsif ($sym == CFClient::SDLK_HOME) {
1491 $self->{cursor} = 0; 1796 $self->{cursor} = 0;
1492 } elsif ($sym == CFClient::SDLK_END) { 1797 } elsif ($sym == CFClient::SDLK_END) {
1493 $self->{cursor} = length $text; 1798 $self->{cursor} = length $text;
1494 } elsif ($sym == 27) { 1799 } elsif ($uni == 27) {
1495 $self->emit ('escape'); 1800 $self->emit ('escape');
1496 } elsif ($uni) { 1801 } elsif ($uni) {
1497 substr $text, $self->{cursor}++, 0, chr $uni; 1802 substr $text, $self->{cursor}++, 0, chr $uni;
1803 } else {
1804 return 0;
1498 } 1805 }
1499 1806
1500 $self->_set_text ($text); 1807 $self->_set_text ($text);
1501 $self->update;
1502}
1503 1808
1809 $self->realloc;
1810
1811 1
1812}
1813
1504sub focus_in { 1814sub invoke_focus_in {
1505 my ($self) = @_; 1815 my ($self) = @_;
1506 1816
1507 $self->{last_activity} = $::NOW; 1817 $self->{last_activity} = $::NOW;
1508 1818
1509 $self->SUPER::focus_in; 1819 $self->SUPER::invoke_focus_in
1510} 1820}
1511 1821
1512sub button_down { 1822sub invoke_button_down {
1513 my ($self, $ev, $x, $y) = @_; 1823 my ($self, $ev, $x, $y) = @_;
1514 1824
1515 $self->SUPER::button_down ($ev, $x, $y); 1825 $self->SUPER::invoke_button_down ($ev, $x, $y);
1516 1826
1517 my $idx = $self->{layout}->xy_to_index ($x, $y); 1827 my $idx = $self->{layout}->xy_to_index ($x, $y);
1518 1828
1519 # byte-index to char-index 1829 # byte-index to char-index
1520 my $text = $self->{text}; 1830 my $text = $self->{text};
1521 utf8::encode $text; 1831 utf8::encode $text;
1522 $self->{cursor} = length substr $text, 0, $idx; 1832 $self->{cursor} = length substr $text, 0, $idx;
1523 1833
1524 $self->_set_text ($self->{text}); 1834 $self->_set_text ($self->{text});
1525 $self->update; 1835 $self->update;
1836
1837 1
1526} 1838}
1527 1839
1528sub mouse_motion { 1840sub invoke_mouse_motion {
1529 my ($self, $ev, $x, $y) = @_; 1841 my ($self, $ev, $x, $y) = @_;
1530# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 1842# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1843
1844 1
1531} 1845}
1532 1846
1533sub _draw { 1847sub _draw {
1534 my ($self) = @_; 1848 my ($self) = @_;
1535 1849
1536 local $self->{fg} = $self->{fg}; 1850 local $self->{fg} = $self->{fg};
1537 1851
1538 if ($FOCUS == $self) { 1852 if ($FOCUS == $self) {
1539 glColor @{$self->{active_bg}}; 1853 glColor_premultiply @{$self->{active_bg}};
1540 $self->{fg} = $self->{active_fg}; 1854 $self->{fg} = $self->{active_fg};
1541 } else { 1855 } else {
1542 glColor @{$self->{bg}}; 1856 glColor_premultiply @{$self->{bg}};
1543 } 1857 }
1544 1858
1545 glEnable GL_BLEND; 1859 glEnable GL_BLEND;
1546 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1860 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1547 glBegin GL_QUADS; 1861 glBegin GL_QUADS;
1548 glVertex 0 , 0; 1862 glVertex 0 , 0;
1549 glVertex 0 , $self->{h}; 1863 glVertex 0 , $self->{h};
1550 glVertex $self->{w}, $self->{h}; 1864 glVertex $self->{w}, $self->{h};
1551 glVertex $self->{w}, 0; 1865 glVertex $self->{w}, 0;
… …
1576 1890
1577our @ISA = CFClient::UI::EntryBase::; 1891our @ISA = CFClient::UI::EntryBase::;
1578 1892
1579use CFClient::OpenGL; 1893use CFClient::OpenGL;
1580 1894
1581sub key_down { 1895sub invoke_key_down {
1582 my ($self, $ev) = @_; 1896 my ($self, $ev) = @_;
1583 1897
1584 my $sym = $ev->{sym}; 1898 my $sym = $ev->{sym};
1585 1899
1586 if ($sym == 13) { 1900 if ($sym == 13) {
1587 unshift @{$self->{history}}, 1901 unshift @{$self->{history}},
1588 my $txt = $self->get_text; 1902 my $txt = $self->get_text;
1903
1589 $self->{history_pointer} = -1; 1904 $self->{history_pointer} = -1;
1590 $self->{history_saveback} = ''; 1905 $self->{history_saveback} = '';
1591 $self->emit (activate => $txt); 1906 $self->emit (activate => $txt);
1592 $self->update; 1907 $self->update;
1593 1908
… …
1612 } else { 1927 } else {
1613 $self->set_text ($self->{history_saveback}); 1928 $self->set_text ($self->{history_saveback});
1614 } 1929 }
1615 1930
1616 } else { 1931 } else {
1617 $self->SUPER::key_down ($ev); 1932 return $self->SUPER::invoke_key_down ($ev)
1933 }
1934
1618 } 1935 1
1619
1620} 1936}
1621 1937
1622############################################################################# 1938#############################################################################
1623 1939
1624package CFClient::UI::Button; 1940package CFClient::UI::Button;
… …
1633 1949
1634sub new { 1950sub new {
1635 my $class = shift; 1951 my $class = shift;
1636 1952
1637 $class->SUPER::new ( 1953 $class->SUPER::new (
1638 padding => 4, 1954 padding_x => 4,
1955 padding_y => 4,
1639 fg => [1, 1, 1], 1956 fg => [1, 1, 1],
1640 bg => [1, 1, 1, 0.2],
1641 active_fg => [0, 0, 1], 1957 active_fg => [0, 0, 1],
1642 can_hover => 1, 1958 can_hover => 1,
1643 align => 0, 1959 align => 0,
1644 valign => 0, 1960 valign => 0,
1645 can_events => 1, 1961 can_events => 1,
1646 @_ 1962 @_
1647 ) 1963 )
1648} 1964}
1649 1965
1650sub button_up { 1966sub invoke_button_up {
1651 my ($self, $ev, $x, $y) = @_; 1967 my ($self, $ev, $x, $y) = @_;
1652 1968
1969 $self->emit ("activate")
1653 if ($x >= 0 && $x < $self->{w} 1970 if $x >= 0 && $x < $self->{w}
1654 && $y >= 0 && $y < $self->{h}) { 1971 && $y >= 0 && $y < $self->{h};
1655 $self->emit ("activate"); 1972
1656 } 1973 1
1657} 1974}
1658 1975
1659sub _draw { 1976sub _draw {
1660 my ($self) = @_; 1977 my ($self) = @_;
1661 1978
1662 local $self->{fg} = $self->{fg}; 1979 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1663 1980
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; 1981 glEnable GL_TEXTURE_2D;
1671 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1982 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1672 glColor 0, 0, 0, 1; 1983 glColor 0, 0, 0, 1;
1673 1984
1674 $tex[0]->draw_quad (0, 0, $self->{w}, $self->{h}); 1985 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1675 1986
1676 glDisable GL_TEXTURE_2D; 1987 glDisable GL_TEXTURE_2D;
1677 glDisable GL_BLEND;
1678 1988
1679 $self->SUPER::_draw; 1989 $self->SUPER::_draw;
1990}
1991
1992#############################################################################
1993
1994package CFClient::UI::ImageButton;
1995
1996our @ISA = CFClient::UI::Image::;
1997
1998use CFClient::OpenGL;
1999
2000my %textures;
2001
2002sub new {
2003 my $class = shift;
2004
2005 my $self = $class->SUPER::new (
2006 padding_x => 4,
2007 padding_y => 4,
2008 fg => [1, 1, 1],
2009 active_fg => [0, 0, 1],
2010 can_hover => 1,
2011 align => 0,
2012 valign => 0,
2013 can_events => 1,
2014 @_
2015 );
2016}
2017
2018sub invoke_button_up {
2019 my ($self, $ev, $x, $y) = @_;
2020
2021 $self->emit ("activate")
2022 if $x >= 0 && $x < $self->{w}
2023 && $y >= 0 && $y < $self->{h};
2024
2025 1
1680} 2026}
1681 2027
1682############################################################################# 2028#############################################################################
1683 2029
1684package CFClient::UI::CheckBox; 2030package CFClient::UI::CheckBox;
… …
1693 2039
1694sub new { 2040sub new {
1695 my $class = shift; 2041 my $class = shift;
1696 2042
1697 $class->SUPER::new ( 2043 $class->SUPER::new (
1698 padding => 2, 2044 padding_x => 2,
2045 padding_y => 2,
1699 fg => [1, 1, 1], 2046 fg => [1, 1, 1],
1700 active_fg => [1, 1, 0], 2047 active_fg => [1, 1, 0],
2048 bg => [0, 0, 0, 0.2],
2049 active_bg => [1, 1, 1, 0.5],
1701 state => 0, 2050 state => 0,
1702 can_hover => 1, 2051 can_hover => 1,
1703 @_ 2052 @_
1704 ) 2053 )
1705} 2054}
1706 2055
1707sub size_request { 2056sub size_request {
1708 my ($self) = @_; 2057 my ($self) = @_;
1709 2058
1710 ($self->{padding} * 2 + 6) x 2 2059 (6) x 2
1711} 2060}
1712 2061
1713sub button_down { 2062sub invoke_button_down {
1714 my ($self, $ev, $x, $y) = @_; 2063 my ($self, $ev, $x, $y) = @_;
1715 2064
1716 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 2065 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1717 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 2066 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1718 $self->{state} = !$self->{state}; 2067 $self->{state} = !$self->{state};
1719 $self->emit (changed => $self->{state}); 2068 $self->emit (changed => $self->{state});
2069 } else {
2070 return 0
2071 }
2072
1720 } 2073 1
1721} 2074}
1722 2075
1723sub _draw { 2076sub _draw {
1724 my ($self) = @_; 2077 my ($self) = @_;
1725 2078
1726 $self->SUPER::_draw; 2079 $self->SUPER::_draw;
1727 2080
1728 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 2081 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1729 2082
1730 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; 2083 my ($w, $h) = @$self{qw(w h)};
2084
2085 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
1731 2086
1732 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 2087 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1733 2088
1734 glEnable GL_BLEND; 2089 my $tex = $self->{state} ? $tex[1] : $tex[0];
2090
1735 glEnable GL_TEXTURE_2D; 2091 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); 2092 $tex->draw_quad_alpha (0, 0, $s, $s);
1741
1742 glDisable GL_TEXTURE_2D; 2093 glDisable GL_TEXTURE_2D;
1743 glDisable GL_BLEND;
1744} 2094}
1745 2095
1746############################################################################# 2096#############################################################################
1747 2097
1748package CFClient::UI::Image; 2098package CFClient::UI::Image;
1749 2099
1750our @ISA = CFClient::UI::Base::; 2100our @ISA = CFClient::UI::Base::;
1751 2101
1752use CFClient::OpenGL; 2102use CFClient::OpenGL;
1753use Carp qw/confess/;
1754 2103
1755our %loaded_images; 2104our %texture_cache;
1756 2105
1757sub new { 2106sub new {
1758 my $class = shift; 2107 my $class = shift;
1759 2108
1760 my $self = $class->SUPER::new (can_events => 0, @_); 2109 my $self = $class->SUPER::new (
2110 can_events => 0,
2111 @_,
2112 );
1761 2113
1762 $self->{image} or confess "Image has 'image' not set. This is a fatal error!"; 2114 $self->{path}
2115 or Carp::croak "required attribute 'path' not set";
1763 2116
1764 $loaded_images{$self->{image}} ||= 2117 $self->{tex} = $texture_cache{$self->{path}} ||=
1765 new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1; 2118 new_from_file CFClient::Texture CFClient::find_rcfile $self->{path}, mipmap => 1;
1766 2119
1767 my $tex = $self->{tex} = $loaded_images{$self->{image}}; 2120 Scalar::Util::weaken $texture_cache{$self->{path}};
1768 2121
1769 Scalar::Util::weaken $loaded_images{$self->{image}}; 2122 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
1770
1771 $self->{aspect} = $tex->{w} / $tex->{h};
1772 2123
1773 $self 2124 $self
1774} 2125}
1775 2126
1776sub size_request { 2127sub size_request {
1777 my ($self) = @_; 2128 my ($self) = @_;
1778 2129
1779 ($self->{tex}->{w}, $self->{tex}->{h}) 2130 ($self->{tex}{w}, $self->{tex}{h})
1780} 2131}
1781 2132
1782sub _draw { 2133sub _draw {
1783 my ($self) = @_; 2134 my ($self) = @_;
1784 2135
… …
1791 glTranslate 0, -$self->{w}, 0; 2142 glTranslate 0, -$self->{w}, 0;
1792 2143
1793 ($w, $h) = ($h, $w); 2144 ($w, $h) = ($h, $w);
1794 } 2145 }
1795 2146
1796 glEnable GL_BLEND;
1797 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1798 glEnable GL_TEXTURE_2D; 2147 glEnable GL_TEXTURE_2D;
1799 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2148 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1800 2149
1801 $tex->draw_quad (0, 0, $w, $h); 2150 $tex->draw_quad_alpha (0, 0, $w, $h);
1802 2151
1803 glDisable GL_BLEND;
1804 glDisable GL_TEXTURE_2D; 2152 glDisable GL_TEXTURE_2D;
1805} 2153}
1806 2154
1807############################################################################# 2155#############################################################################
1808 2156
… …
1898 2246
1899 my $h1 = $self->{h} * (1 - $ycut1); 2247 my $h1 = $self->{h} * (1 - $ycut1);
1900 my $h2 = $self->{h} * (1 - $ycut2); 2248 my $h2 = $self->{h} * (1 - $ycut2);
1901 2249
1902 glEnable GL_BLEND; 2250 glEnable GL_BLEND;
1903 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2251 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2252 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1904 glEnable GL_TEXTURE_2D; 2253 glEnable GL_TEXTURE_2D;
1905 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2254 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1906 2255
1907 glBindTexture GL_TEXTURE_2D, $t1->{name}; 2256 glBindTexture GL_TEXTURE_2D, $t1->{name};
1908 glBegin GL_QUADS; 2257 glBegin GL_QUADS;
… …
1997 qw(s1_slider.png s1_slider_bg.png); 2346 qw(s1_slider.png s1_slider_bg.png);
1998 2347
1999sub new { 2348sub new {
2000 my $class = shift; 2349 my $class = shift;
2001 2350
2002 # range [value, low, high, page] 2351 # range [value, low, high, page, unit]
2003 2352
2004 # TODO: 0-width page 2353 # TODO: 0-width page
2005 # TODO: req_w/h are wrong with vertical 2354 # TODO: req_w/h are wrong with vertical
2006 # TODO: calculations are off 2355 # TODO: calculations are off
2007 my $self = $class->SUPER::new ( 2356 my $self = $class->SUPER::new (
2008 fg => [1, 1, 1], 2357 fg => [1, 1, 1],
2009 active_fg => [0, 0, 0], 2358 active_fg => [0, 0, 0],
2359 bg => [0, 0, 0, 0.2],
2360 active_bg => [1, 1, 1, 0.5],
2010 range => [0, 0, 100, 10], 2361 range => [0, 0, 100, 10, 0],
2011 req_w => $::WIDTH / 80, 2362 min_w => $::WIDTH / 80,
2012 req_h => $::WIDTH / 80, 2363 min_h => $::WIDTH / 80,
2013 vertical => 0, 2364 vertical => 0,
2014 can_hover => 1, 2365 can_hover => 1,
2015 inner_pad => 5, 2366 inner_pad => 0.02,
2016 @_ 2367 @_
2017 ); 2368 );
2018 2369
2370 $self->set_value ($self->{range}[0]);
2371 $self->update;
2372
2019 $self 2373 $self
2020} 2374}
2021 2375
2376sub set_range {
2377 my ($self, $range) = @_;
2378
2379 ($range, $self->{range}) = ($self->{range}, $range);
2380
2381 if ("@$range" ne "@{$self->{range}}") {
2382 $self->update;
2383 $self->set_value ($self->{range}[0]);
2384 }
2385}
2386
2387sub set_value {
2388 my ($self, $value) = @_;
2389
2390 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
2391
2392 $hi = $lo + 1 if $hi <= $lo;
2393
2394 $page = $hi - $lo if $page > $hi - $lo;
2395
2396 $value = $lo if $value < $lo;
2397 $value = $hi - $page if $value > $hi - $page;
2398
2399 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
2400 if $unit;
2401
2402 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2403
2404 if ($value != $old_value) {
2405 $self->emit (changed => $value);
2406 $self->update;
2407 }
2408}
2409
2022sub size_request { 2410sub size_request {
2023 my ($self) = @_; 2411 my ($self) = @_;
2024 2412
2025 my $w = $self->{req_w}; 2413 ($self->{req_w}, $self->{req_h})
2026 my $h = $self->{req_h};
2027
2028 $self->{vertical} ? ($h, $w) : ($w, $h)
2029} 2414}
2030 2415
2031sub button_down { 2416sub invoke_button_down {
2032 my ($self, $ev, $x, $y) = @_; 2417 my ($self, $ev, $x, $y) = @_;
2033 2418
2034 $self->SUPER::button_down ($ev, $x, $y); 2419 $self->SUPER::invoke_button_down ($ev, $x, $y);
2420
2421 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2422
2035 $self->mouse_motion ($ev, $x, $y); 2423 $self->invoke_mouse_motion ($ev, $x, $y)
2036} 2424}
2037 2425
2038sub mouse_motion { 2426sub invoke_mouse_motion {
2039 my ($self, $ev, $x, $y) = @_; 2427 my ($self, $ev, $x, $y) = @_;
2040 2428
2041 if ($GRAB == $self) { 2429 if ($GRAB == $self) {
2430 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2431
2432 my (undef, $lo, $hi, $page) = @{$self->{range}};
2433
2434 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2435
2436 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2437 } else {
2438 return 0;
2439 }
2440
2441 1
2442}
2443
2444sub update {
2445 my ($self) = @_;
2446
2447 delete $self->{knob_w};
2448 $self->SUPER::update;
2449}
2450
2451sub _draw {
2452 my ($self) = @_;
2453
2454 unless ($self->{knob_w}) {
2455 $self->set_value ($self->{range}[0]);
2456
2042 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2457 my ($value, $lo, $hi, $page) = @{$self->{range}};
2458 my $range = ($hi - $page - $lo) || 1e-100;
2043 2459
2044 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2460 my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
2045 2461
2046 my $inner_pad_px = $self->_calc_inner_pad_px ($w); 2462 $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 2463 $self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
2048 2464
2049 $x -= $inner_pad_px; # substract the padding 2465 $value = ($value - $lo) / $range;
2050 $x = $x * ($hi - $lo) / $inner_w + $lo; 2466 $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 2467
2055 $self->emit (changed => $x); 2468 $self->{knob_x} = $value - $knob_w * 0.5;
2056 $self->update; 2469 $self->{knob_w} = $knob_w;
2057 } 2470 }
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 2471
2071 $self->SUPER::_draw (); 2472 $self->SUPER::_draw ();
2072 2473
2073 my ($w, $h) = @$self{qw(w h)}; 2474 glScale $self->{w}, $self->{h};
2074 2475
2075 if ($self->{vertical}) { 2476 if ($self->{vertical}) {
2076 # draw a vertical slider like a rotated horizontal slider 2477 # draw a vertical slider like a rotated horizontal slider
2077 2478
2479 glTranslate 1, 0, 0;
2078 glRotate 90, 0, 0, 1; 2480 glRotate 90, 0, 0, 1;
2079 glTranslate 0, -$self->{w}, 0;
2080
2081 ($w, $h) = ($h, $w);
2082 } 2481 }
2083 2482
2084 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg}; 2483 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
2085 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg}; 2484 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
2086 2485
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; 2486 glEnable GL_TEXTURE_2D;
2108 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2487 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2109 2488
2110 # draw background 2489 # draw background
2111 $tex[1]->draw_quad (0, 0, $w, $h); 2490 $tex[1]->draw_quad_alpha (0, 0, 1, 1);
2112 2491
2113 # draw handle 2492 # draw handle
2114 $tex[0]->draw_quad ($knob_a, 0, $knob_b - $knob_a, $h); 2493 $tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1);
2115 2494
2116 glDisable GL_BLEND;
2117 glDisable GL_TEXTURE_2D; 2495 glDisable GL_TEXTURE_2D;
2118} 2496}
2119 2497
2120############################################################################# 2498#############################################################################
2121 2499
2500package CFClient::UI::ValSlider;
2501
2502our @ISA = CFClient::UI::HBox::;
2503
2504sub new {
2505 my ($class, %arg) = @_;
2506
2507 my $range = delete $arg{range};
2508
2509 my $self = $class->SUPER::new (
2510 slider => (new CFClient::UI::Slider expand => 1, range => $range),
2511 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),
2512 to_value => sub { shift },
2513 from_value => sub { shift },
2514 %arg,
2515 );
2516
2517 $self->{slider}->connect (changed => sub {
2518 my ($self, $value) = @_;
2519 $self->{parent}{entry}->set_text ($self->{parent}{to_value}->($value));
2520 $self->{parent}->emit (changed => $value);
2521 });
2522
2523# $self->{entry}->connect (changed => sub {
2524# my ($self, $value) = @_;
2525# $self->{parent}{slider}->set_value ($self->{parent}{from_value}->($value));
2526# $self->{parent}->emit (changed => $value);
2527# });
2528
2529 $self->add ($self->{slider}, $self->{entry});
2530
2531 $self->{slider}->emit (changed => $self->{slider}{range}[0]);
2532
2533 $self
2534}
2535
2536sub set_range { shift->{slider}->set_range (@_) }
2537sub set_value { shift->{slider}->set_value (@_) }
2538
2539#############################################################################
2540
2122package CFClient::UI::TextView; 2541package CFClient::UI::TextScroller;
2123 2542
2124our @ISA = CFClient::UI::HBox::; 2543our @ISA = CFClient::UI::HBox::;
2125 2544
2126use CFClient::OpenGL; 2545use CFClient::OpenGL;
2127 2546
… …
2129 my $class = shift; 2548 my $class = shift;
2130 2549
2131 my $self = $class->SUPER::new ( 2550 my $self = $class->SUPER::new (
2132 fontsize => 1, 2551 fontsize => 1,
2133 can_events => 0, 2552 can_events => 0,
2553 indent => 0,
2134 #font => default_font 2554 #font => default_font
2135 @_, 2555 @_,
2136 2556
2137 layout => (new CFClient::Layout), 2557 layout => (new CFClient::Layout 1),
2138 par => [], 2558 par => [],
2139 height => 0, 2559 height => 0,
2140 children => [ 2560 children => [
2141 (new CFClient::UI::Empty expand => 1), 2561 (new CFClient::UI::Empty expand => 1),
2142 (new CFClient::UI::Slider vertical => 1), 2562 (new CFClient::UI::Slider vertical => 1),
… …
2153 2573
2154 $self->{fontsize} = $fontsize; 2574 $self->{fontsize} = $fontsize;
2155 $self->reflow; 2575 $self->reflow;
2156} 2576}
2157 2577
2158sub text_height { 2578sub size_request {
2579 my ($self) = @_;
2580
2581 my ($empty, $slider) = @{ $self->{children} };
2582
2583 local $self->{children} = [$empty, $slider];
2584 $self->SUPER::size_request
2585}
2586
2587sub invoke_size_allocate {
2588 my ($self, $w, $h) = @_;
2589
2590 my ($empty, $slider, @other) = @{ $self->{children} };
2591 $_->configure (@$_{qw(x y req_w req_h)}) for @other;
2592
2593 $self->{layout}->set_font ($self->{font}) if $self->{font};
2594 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2595 $self->{layout}->set_width ($empty->{w});
2596 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2597
2598 $self->reflow;
2599
2600 local $self->{children} = [$empty, $slider];
2601 $self->SUPER::invoke_size_allocate ($w, $h)
2602}
2603
2604sub get_layout {
2159 my ($self, $text) = @_; 2605 my ($self, $para) = @_;
2160 2606
2161 my $layout = $self->{layout}; 2607 my $layout = $self->{layout};
2162 2608
2609 $layout->set_font ($self->{font}) if $self->{font};
2610 $layout->set_foreground (@{$para->{fg}});
2163 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2611 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2164 $layout->set_width ($self->{children}[0]{w}); 2612 $layout->set_width ($self->{children}[0]{w} - $para->{indent});
2165 $layout->set_text ($text); 2613 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2614 $layout->set_markup ($para->{markup});
2615
2616 $layout->set_shapes (
2617 map
2618 +(0, $_->baseline_shift +$_->{padding_y} - $_->{h}, $_->{w}, $_->{h}),
2619 @{$para->{widget}}
2166 2620 );
2167 ($layout->size)[1] 2621
2622 $layout
2168} 2623}
2169 2624
2170sub reflow { 2625sub reflow {
2171 my ($self) = @_; 2626 my ($self) = @_;
2172 2627
2173 $self->{need_reflow}++; 2628 $self->{need_reflow}++;
2174 $self->update; 2629 $self->update;
2175} 2630}
2176 2631
2177sub size_allocate { 2632sub set_offset {
2633 my ($self, $offset) = @_;
2634
2635 # todo: base offset on lines or so, not on pixels
2636 $self->{children}[1]->set_value ($offset);
2637}
2638
2639sub clear {
2178 my ($self, $w, $h) = @_; 2640 my ($self) = @_;
2179 2641
2180 $self->SUPER::size_allocate ($w, $h); 2642 my (undef, undef, @other) = @{ $self->{children} };
2643 $self->remove ($_) for @other;
2181 2644
2182 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2645 $self->{par} = [];
2183 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2646 $self->{height} = 0;
2184 $self->{layout}->set_width ($self->{children}[0]{w}); 2647 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2185
2186 $self->reflow;
2187} 2648}
2188 2649
2189sub add_paragraph { 2650sub add_paragraph {
2190 my ($self, $color, $text) = @_; 2651 my ($self, $color, $para, $indent) = @_;
2191 2652
2192 #TODO: intelligently "reformat" paragraph 2653 my ($text, @w) = ref $para ? @$para : $para;
2193 2654
2194 my $height = $self->text_height ($text); 2655 $para = {
2656 w => 1e10,
2657 wrapped => 1,
2658 fg => $color,
2659 indent => $indent,
2660 markup => $text,
2661 widget => \@w,
2662 };
2195 2663
2196 $self->{height} += $height; 2664 $self->add (@w) if @w;
2665 push @{$self->{par}}, $para;
2197 2666
2198 push @{$self->{par}}, [$height, $color, $text]; 2667 $self->{need_reflow}++;
2668 $self->update;
2669}
2199 2670
2200 $self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}]; 2671sub scroll_to_bottom {
2201 $self->{children}[1]->update; 2672 my ($self) = @_;
2673
2674 $self->{scroll_to_bottom} = 1;
2675 $self->update;
2202} 2676}
2203 2677
2204sub update { 2678sub update {
2205 my ($self) = @_; 2679 my ($self) = @_;
2206 2680
… …
2208 2682
2209 return unless $self->{h} > 0; 2683 return unless $self->{h} > 0;
2210 2684
2211 delete $self->{texture}; 2685 delete $self->{texture};
2212 2686
2213 $ROOT->on_refresh ($self, sub { 2687 $ROOT->on_post_alloc ($self => sub {
2688 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2689
2214 if (delete $self->{need_reflow}) { 2690 if (delete $self->{need_reflow}) {
2215 my $height = 0; 2691 my $height = 0;
2216 2692
2217 $height += $_->[0] = $self->text_height ($_->[2])
2218 for @{$self->{par}}; 2693 for my $para (@{$self->{par}}) {
2694 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2695 my $layout = $self->get_layout ($para);
2696 my ($w, $h) = $layout->size;
2697
2698 $para->{w} = $w + $para->{indent};
2699 $para->{h} = $h;
2700 $para->{wrapped} = $layout->has_wrapped;
2701 }
2702
2703 $height += $para->{h};
2704 }
2219 2705
2220 $self->{height} = $height; 2706 $self->{height} = $height;
2221 2707
2222 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2708 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2223 2709
2224 delete $self->{texture}; 2710 delete $self->{texture};
2225 } 2711 }
2226 2712
2713 if (delete $self->{scroll_to_bottom}) {
2714 $self->{children}[1]->set_value (1e10);
2715 }
2716
2227 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub { 2717 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2228 glClearColor 0, 0, 0, 0; 2718 glClearColor 0, 0, 0, 0;
2229 glClear GL_COLOR_BUFFER_BIT; 2719 glClear GL_COLOR_BUFFER_BIT;
2230 2720
2721 my $top = int $self->{children}[1]{range}[0];
2722
2723 my $y0 = $top;
2724 my $y1 = $top + $H;
2725
2726 my $y = 0;
2727
2231 glEnable GL_BLEND; 2728 glEnable GL_BLEND;
2729 #TODO# not correct in windows where rgba is forced off
2232 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2730 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2233 glEnable GL_TEXTURE_2D;
2234 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2235 2731
2236 my $top = int $self->{children}[1]{range}[0];
2237
2238 my $y0 = $top;
2239 my $y1 = $top + $self->{h};
2240
2241 my $y = 0;
2242
2243 my $layout = $self->{layout};
2244
2245 $layout->set_font ($self->{font}) if $self->{font};
2246
2247 for my $par (@{$self->{par}}) { 2732 for my $para (@{$self->{par}}) {
2248 my $h = $par->[0]; 2733 my $h = $para->{h};
2249 2734
2250 if ($y0 < $y + $h && $y < $y1) { 2735 if ($y0 < $y + $h && $y < $y1) {
2251 $layout->set_text ($par->[2]);
2252 2736
2253 glColor @{ $par->[1] }; 2737 my $layout = $self->get_layout ($para);
2254 my ($W, $H) = $layout->size; 2738
2255 CFClient::Texture->new_from_layout ($layout)->draw_quad (0, $y - $y0); 2739 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2740
2741 glRasterPos $para->{indent}, $y - $y0;
2742 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2743
2744 if (my @w = @{ $para->{widget} }) {
2745 my @s = $layout->get_shapes;
2746
2747 for (@w) {
2748 my ($dx, $dy) = splice @s, 0, 2, ();
2749
2750 $_->{x} = $dx + $para->{indent};
2751 $_->{y} = $dy + $y - $y0;
2752
2753 $_->draw;
2754 }
2755 }
2256 } 2756 }
2257 2757
2258 $y += $h; 2758 $y += $h;
2259 } 2759 }
2260 2760
2261 glDisable GL_TEXTURE_2D;
2262 glDisable GL_BLEND; 2761 glDisable GL_BLEND;
2263 }; 2762 };
2264 }); 2763 });
2265} 2764}
2266 2765
2766sub reconfigure {
2767 my ($self) = @_;
2768
2769 $self->SUPER::reconfigure;
2770
2771 $_->{w} = 1e10 for @{ $self->{par} };
2772 $self->reflow;
2773}
2774
2267sub _draw { 2775sub _draw {
2268 my ($self) = @_; 2776 my ($self) = @_;
2269 2777
2270 glEnable GL_BLEND;
2271 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2272 glEnable GL_TEXTURE_2D; 2778 glEnable GL_TEXTURE_2D;
2273 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2779 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2274 glColor 1, 1, 1, 1; 2780 glColor 0, 0, 0, 1;
2275 $self->{texture}->draw_quad (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2781 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2276 glDisable GL_TEXTURE_2D; 2782 glDisable GL_TEXTURE_2D;
2277 glDisable GL_BLEND;
2278 2783
2279 $self->{children}[1]->draw; 2784 $self->{children}[1]->draw;
2280
2281} 2785}
2282 2786
2283############################################################################# 2787#############################################################################
2284 2788
2285package CFClient::UI::Animator; 2789package CFClient::UI::Animator;
… …
2330 2834
2331sub new { 2835sub new {
2332 my $class = shift; 2836 my $class = shift;
2333 2837
2334 my $self = $class->SUPER::new ( 2838 my $self = $class->SUPER::new (
2335 state => 0, 2839 state => 0,
2336 connect_activate => \&toggle_flopper, 2840 on_activate => \&toggle_flopper,
2337 @_ 2841 @_
2338 ); 2842 );
2339 2843
2340 if ($self->{state}) {
2341 $self->{state} = 0;
2342 $self->toggle_flopper;
2343 }
2344
2345 $self 2844 $self
2346} 2845}
2347 2846
2348sub toggle_flopper { 2847sub toggle_flopper {
2349 my ($self) = @_; 2848 my ($self) = @_;
2350 2849
2351 # TODO: use animation 2850 $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} 2851}
2363 2852
2364############################################################################# 2853#############################################################################
2365 2854
2366package CFClient::UI::Tooltip; 2855package CFClient::UI::Tooltip;
… …
2376 @_, 2865 @_,
2377 can_events => 0, 2866 can_events => 0,
2378 ) 2867 )
2379} 2868}
2380 2869
2381sub set_markup { 2870sub set_tooltip_from {
2382 my ($self, $text) = @_; 2871 my ($self, $widget) = @_;
2383 2872
2384 $self->{label} ||= new CFClient::UI::Label fontsize => 0.8, fg => [0, 0, 0]; 2873 my $tooltip = $widget->{tooltip};
2385 $self->{label}->set_markup ($text); 2874
2386 $self->add ($self->{label}); 2875 if ($ENV{CFPLUS_DEBUG} & 2) {
2876 $tooltip .= "\n\n" . (ref $widget) . "\n"
2877 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2878 . "req $widget->{req_w} $widget->{req_h}\n"
2879 . "visible $widget->{visible}";
2880 }
2881
2882 $tooltip =~ s/^\n+//;
2883 $tooltip =~ s/\n+$//;
2884
2885 $self->add (new CFClient::UI::Label
2886 markup => $tooltip,
2887 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2888 fontsize => 0.8,
2889 fg => [0, 0, 0, 1],
2890 ellipsise => 0,
2891 font => ($widget->{tooltip_font} || $::FONT_PROP),
2892 );
2387} 2893}
2388 2894
2389sub size_request { 2895sub size_request {
2390 my ($self) = @_; 2896 my ($self) = @_;
2391 2897
2392 $self->child->set_max_size ($::WIDTH * 0.3);
2393
2394 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2898 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2395 2899
2396 ($w + 4, $h + 4) 2900 ($w + 4, $h + 4)
2397} 2901}
2398 2902
2399sub size_allocate { 2903sub invoke_size_allocate {
2400 my ($self, $w, $h) = @_; 2904 my ($self, $w, $h) = @_;
2401 2905
2402 $self->SUPER::size_allocate ($w - 4, $h - 4); 2906 $self->SUPER::invoke_size_allocate ($w - 4, $h - 4)
2907}
2908
2909sub invoke_visibility_change {
2910 my ($self, $visible) = @_;
2911
2912 return unless $visible;
2913
2914 $self->{root}->on_post_alloc ("move_$self" => sub {
2915 my $widget = $self->{owner}
2916 or return;
2917
2918 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2919
2920 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2921 if $x + $self->{w} > $self->{root}{w};
2922
2923 $self->move_abs ($x, $y);
2924 });
2403} 2925}
2404 2926
2405sub _draw { 2927sub _draw {
2406 my ($self) = @_; 2928 my ($self) = @_;
2407 2929
2408 glPushMatrix;
2409 glTranslate 0.375, 0.375; 2930 glTranslate 0.375, 0.375;
2410 2931
2411 my ($w, $h) = @$self{qw(w h)}; 2932 my ($w, $h) = @$self{qw(w h)};
2412 2933
2413 glColor 1, 0.8, 0.4; 2934 glColor 1, 0.8, 0.4;
… …
2424 glVertex 0 , $h; 2945 glVertex 0 , $h;
2425 glVertex $w, $h; 2946 glVertex $w, $h;
2426 glVertex $w, 0; 2947 glVertex $w, 0;
2427 glEnd; 2948 glEnd;
2428 2949
2429 glPopMatrix; 2950 glTranslate 2 - 0.375, 2 - 0.375;
2430 2951
2431 glTranslate 2, 2;
2432 $self->SUPER::_draw; 2952 $self->SUPER::_draw;
2433} 2953}
2434 2954
2435############################################################################# 2955#############################################################################
2436 2956
… …
2441use CFClient::OpenGL; 2961use CFClient::OpenGL;
2442 2962
2443sub new { 2963sub new {
2444 my $class = shift; 2964 my $class = shift;
2445 2965
2446 $class->SUPER::new ( 2966 my $self = $class->SUPER::new (
2447 aspect => 1, 2967 aspect => 1,
2968 can_events => 0,
2448 @_, 2969 @_,
2449 ) 2970 );
2971
2972 if ($self->{anim} && $self->{animspeed}) {
2973 Scalar::Util::weaken (my $widget = $self);
2974
2975 $self->{timer} = Event->timer (
2976 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2977 hard => 1,
2978 interval => $self->{animspeed},
2979 cb => sub {
2980 ++$widget->{frame};
2981 $widget->update;
2982 },
2983 );
2984 }
2985
2986 $self
2450} 2987}
2451 2988
2452sub size_request { 2989sub size_request {
2453 (32, 8) 2990 (32, 8)
2454} 2991}
2455 2992
2993sub update {
2994 my ($self) = @_;
2995
2996 return unless $self->{visible};
2997
2998 $self->SUPER::update;
2999}
3000
2456sub _draw { 3001sub _draw {
2457 my ($self) = @_; 3002 my ($self) = @_;
2458 3003
2459 return unless $::CONN;#d# manage and cache textures differently 3004 return unless $::CONN;
3005
3006 my $face;
3007
3008 if ($self->{frame}) {
3009 my $anim = $::CONN->{anim}[$self->{anim}];
3010
3011 $face = $anim->[ $self->{frame} % @$anim ]
3012 if $anim && @$anim;
3013 }
3014
2460 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]]; 3015 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2461 3016
2462 # TODO animation
2463 if ($tex) { 3017 if ($tex) {
2464 glEnable GL_BLEND;
2465 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2466 glEnable GL_TEXTURE_2D; 3018 glEnable GL_TEXTURE_2D;
2467 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3019 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2468 glColor 1, 1, 1, 1; 3020 glColor 0, 0, 0, 1;
2469 $tex->draw_quad (0, 0, $self->{w}, $self->{h}); 3021 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2470 glDisable GL_TEXTURE_2D; 3022 glDisable GL_TEXTURE_2D;
2471 glDisable GL_BLEND;
2472 } 3023 }
3024}
3025
3026sub destroy {
3027 my ($self) = @_;
3028
3029 $self->{timer}->cancel
3030 if $self->{timer};
3031
3032 $self->SUPER::destroy;
2473} 3033}
2474 3034
2475############################################################################# 3035#############################################################################
2476 3036
2477package CFClient::UI::InventoryItem; 3037package CFClient::UI::Buttonbar;
2478 3038
2479our @ISA = CFClient::UI::HBox::; 3039our @ISA = CFClient::UI::HBox::;
2480 3040
2481sub new { 3041# 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 3042
2580############################################################################# 3043#############################################################################
2581 3044
2582package CFClient::UI::Menu; 3045package CFClient::UI::Menu;
2583 3046
… …
2595 ); 3058 );
2596 3059
2597 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3060 $self->add ($self->{vbox} = new CFClient::UI::VBox);
2598 3061
2599 for my $item (@{ $self->{items} }) { 3062 for my $item (@{ $self->{items} }) {
2600 my ($widget, $cb) = @$item; 3063 my ($widget, $cb, $tooltip) = @$item;
2601 3064
2602 # handle various types of items, only text for now 3065 # handle various types of items, only text for now
2603 if (!ref $widget) { 3066 if (!ref $widget) {
2604 $widget = new CFClient::UI::Label 3067 $widget = new CFClient::UI::Label
2605 can_hover => 1, 3068 can_hover => 1,
2606 can_events => 1, 3069 can_events => 1,
2607 text => $widget; 3070 markup => $widget,
3071 tooltip => $tooltip
2608 } 3072 }
2609 3073
2610 $self->{item}{$widget} = $item; 3074 $self->{item}{$widget} = $item;
2611 3075
2612 $self->{vbox}->add ($widget); 3076 $self->{vbox}->add ($widget);
… …
2624 # maybe save $GRAB? must be careful about events... 3088 # maybe save $GRAB? must be careful about events...
2625 $GRAB = $self; 3089 $GRAB = $self;
2626 $self->{button} = $ev->{button}; 3090 $self->{button} = $ev->{button};
2627 3091
2628 $self->show; 3092 $self->show;
2629 $self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 3093 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2630} 3094}
2631 3095
2632sub mouse_motion { 3096sub invoke_mouse_motion {
2633 my ($self, $ev, $x, $y) = @_; 3097 my ($self, $ev, $x, $y) = @_;
2634 3098
2635 # TODO: should use vbox->find_widget or so 3099 # TODO: should use vbox->find_widget or so
2636 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 3100 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2637 $self->{hover} = $self->{item}{$HOVER}; 3101 $self->{hover} = $self->{item}{$HOVER};
2638}
2639 3102
3103 0
3104}
3105
2640sub button_up { 3106sub invoke_button_up {
2641 my ($self, $ev, $x, $y) = @_; 3107 my ($self, $ev, $x, $y) = @_;
2642 3108
2643 if ($ev->{button} == $self->{button}) { 3109 if ($ev->{button} == $self->{button}) {
2644 undef $GRAB; 3110 undef $GRAB;
2645 $self->hide; 3111 $self->hide;
2646 3112
2647 $self->emit ("popdown"); 3113 $self->emit ("popdown");
2648 $self->{hover}[1]->() if $self->{hover}; 3114 $self->{hover}[1]->() if $self->{hover};
3115 } else {
3116 return 0
3117 }
3118
2649 } 3119 1
2650} 3120}
2651 3121
2652############################################################################# 3122#############################################################################
2653 3123
2654package CFClient::UI::Root; 3124package CFClient::UI::Multiplexer;
2655 3125
2656our @ISA = CFClient::UI::Container::; 3126our @ISA = CFClient::UI::Container::;
2657
2658use CFClient::OpenGL;
2659 3127
2660sub new { 3128sub new {
2661 my $class = shift; 3129 my $class = shift;
2662 3130
2663 $class->SUPER::new ( 3131 my $self = $class->SUPER::new (
3132 @_,
3133 );
3134
3135 $self->{current} = $self->{children}[0]
3136 if @{ $self->{children} };
3137
3138 $self
3139}
3140
3141sub add {
3142 my ($self, @widgets) = @_;
3143
3144 $self->SUPER::add (@widgets);
3145
3146 $self->{current} = $self->{children}[0]
3147 if @{ $self->{children} };
3148}
3149
3150sub set_current_page {
3151 my ($self, $page_or_widget) = @_;
3152
3153 my $widget = ref $page_or_widget
3154 ? $page_or_widget
3155 : $self->{children}[$page_or_widget];
3156
3157 $self->{current} = $widget;
3158 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
3159
3160 $self->emit (page_changed => $self->{current});
3161
3162 $self->realloc;
3163}
3164
3165sub visible_children {
3166 $_[0]{current}
3167}
3168
3169sub size_request {
3170 my ($self) = @_;
3171
3172 $self->{current}->size_request
3173}
3174
3175sub invoke_size_allocate {
3176 my ($self, $w, $h) = @_;
3177
3178 $self->{current}->configure (0, 0, $w, $h);
3179
3180 1
3181}
3182
3183sub _draw {
3184 my ($self) = @_;
3185
3186 $self->{current}->draw;
3187}
3188
3189#############################################################################
3190
3191package CFClient::UI::Notebook;
3192
3193our @ISA = CFClient::UI::VBox::;
3194
3195sub new {
3196 my $class = shift;
3197
3198 my $self = $class->SUPER::new (
3199 buttonbar => (new CFClient::UI::Buttonbar),
3200 multiplexer => (new CFClient::UI::Multiplexer expand => 1),
3201 # filter => # will be put between multiplexer and $self
3202 @_,
3203 );
3204
3205 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3206 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3207
3208 $self
3209}
3210
3211sub add {
3212 my ($self, $title, $widget, $tooltip) = @_;
3213
3214 Scalar::Util::weaken $self;
3215
3216 $self->{buttonbar}->add (new CFClient::UI::Button
3217 markup => $title,
3218 tooltip => $tooltip,
3219 on_activate => sub { $self->set_current_page ($widget) },
3220 );
3221
3222 $self->{multiplexer}->add ($widget);
3223}
3224
3225sub set_current_page {
3226 my ($self, $page) = @_;
3227
3228 $self->{multiplexer}->set_current_page ($page);
3229 $self->emit (page_changed => $self->{multiplexer}{current});
3230}
3231
3232#############################################################################
3233
3234package CFClient::UI::Combobox;
3235
3236use utf8;
3237
3238our @ISA = CFClient::UI::Button::;
3239
3240sub new {
3241 my $class = shift;
3242
3243 my $self = $class->SUPER::new (
3244 options => [], # [value, title, longdesc], ...
3245 value => undef,
3246 @_,
3247 );
3248
3249 $self->_set_value ($self->{value});
3250
3251 $self
3252}
3253
3254sub invoke_button_down {
3255 my ($self, $ev) = @_;
3256
3257 my @menu_items;
3258
3259 for (@{ $self->{options} }) {
3260 my ($value, $title, $tooltip) = @$_;
3261
3262 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3263 }
3264
3265 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
3266}
3267
3268sub _set_value {
3269 my ($self, $value) = @_;
3270
3271 my ($item) = grep $_->[0] eq $value, @{ $self->{options} }
3272 or return;
3273
3274 $self->{value} = $item->[0];
3275 $self->set_markup ("$item->[1] ⇓");
3276 $self->set_tooltip ($item->[2]);
3277}
3278
3279sub set_value {
3280 my ($self, $value) = @_;
3281
3282 return unless $self->{value} ne $value;
3283
3284 $self->_set_value ($value);
3285 $self->emit (changed => $value);
3286}
3287
3288#############################################################################
3289
3290package CFClient::UI::Statusbox;
3291
3292our @ISA = CFClient::UI::VBox::;
3293
3294sub new {
3295 my $class = shift;
3296
3297 my $self = $class->SUPER::new (
3298 fontsize => 0.8,
3299 @_,
3300 );
3301
3302 Scalar::Util::weaken (my $this = $self);
3303
3304 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3305
3306 $self
3307}
3308
3309sub reorder {
3310 my ($self) = @_;
3311 my $NOW = Time::HiRes::time;
3312
3313 # freeze display when hovering over any label
3314 return if $CFClient::UI::TOOLTIP->{owner}
3315 && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},
3316 values %{ $self->{item} };
3317
3318 while (my ($k, $v) = each %{ $self->{item} }) {
3319 delete $self->{item}{$k} if $v->{timeout} < $NOW;
3320 }
3321
3322 my @widgets;
3323
3324 my @items = sort {
3325 $a->{pri} <=> $b->{pri}
3326 or $b->{id} <=> $a->{id}
3327 } values %{ $self->{item} };
3328
3329 $self->{timer}->interval (1);
3330
3331 my $count = 10 + 1;
3332 for my $item (@items) {
3333 last unless --$count;
3334
3335 my $label = $item->{label} ||= do {
3336 # TODO: doesn't handle markup well (read as: at all)
3337 my $short = $item->{count} > 1
3338 ? "<b>$item->{count} ×</b> $item->{text}"
3339 : $item->{text};
3340
3341 for ($short) {
3342 s/^\s+//;
3343 s/\s+/ /g;
3344 }
3345
3346 new CFClient::UI::Label
3347 markup => $short,
3348 tooltip => $item->{tooltip},
3349 tooltip_font => $::FONT_PROP,
3350 tooltip_width => 0.67,
3351 fontsize => $item->{fontsize} || $self->{fontsize},
3352 max_w => $::WIDTH * 0.44,
3353 fg => [@{ $item->{fg} }],
3354 can_events => 1,
3355 can_hover => 1
3356 };
3357
3358 if ((my $diff = $item->{timeout} - $NOW) < 2) {
3359 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
3360 $label->update;
3361 $label->set_max_size (undef, $label->{req_h} * $diff)
3362 if $diff < 1;
3363 $self->{timer}->interval (1/30);
3364 } else {
3365 $label->{fg}[3] = $item->{fg}[3] || 1;
3366 }
3367
3368 push @widgets, $label;
3369 }
3370
3371 $self->clear;
3372 $self->SUPER::add (reverse @widgets);
3373}
3374
3375sub add {
3376 my ($self, $text, %arg) = @_;
3377
3378 $text =~ s/^\s+//;
3379 $text =~ s/\s+$//;
3380
3381 return unless $text;
3382
3383 my $timeout = (int time) + ((delete $arg{timeout}) || 60);
3384
3385 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
3386
3387 if (my $item = $self->{item}{$group}) {
3388 if ($item->{text} eq $text) {
3389 $item->{count}++;
3390 } else {
3391 $item->{count} = 1;
3392 $item->{text} = $item->{tooltip} = $text;
3393 }
3394 $item->{id} += 0.2;#d#
3395 $item->{timeout} = $timeout;
3396 delete $item->{label};
3397 } else {
3398 $self->{item}{$group} = {
3399 id => ++$self->{id},
3400 text => $text,
3401 timeout => $timeout,
3402 tooltip => $text,
3403 fg => [0.8, 0.8, 0.8, 0.8],
3404 pri => 0,
3405 count => 1,
3406 %arg,
3407 };
3408 }
3409
3410 $self->reorder;
3411}
3412
3413sub reconfigure {
3414 my ($self) = @_;
3415
3416 delete $_->{label}
3417 for values %{ $self->{item} || {} };
3418
3419 $self->reorder;
3420 $self->SUPER::reconfigure;
3421}
3422
3423sub destroy {
3424 my ($self) = @_;
3425
3426 $self->{timer}->cancel;
3427
3428 $self->SUPER::destroy;
3429}
3430
3431#############################################################################
3432
3433package CFClient::UI::Inventory;
3434
3435our @ISA = CFClient::UI::ScrolledWindow::;
3436
3437sub new {
3438 my $class = shift;
3439
3440 my $self = $class->SUPER::new (
3441 child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
3442 @_,
3443 );
3444
3445 $self
3446}
3447
3448sub set_items {
3449 my ($self, $items) = @_;
3450
3451 $self->{child}->clear;
3452 return unless $items;
3453
3454 my @items = sort {
3455 ($a->{type} <=> $b->{type})
3456 or ($a->{name} cmp $b->{name})
3457 } @$items;
3458
3459 $self->{real_items} = \@items;
3460
3461 my $row = 0;
3462 for my $item (@items) {
3463 CFClient::Item::update_widgets $item;
3464
3465 $self->{child}->add (0, $row, $item->{face_widget});
3466 $self->{child}->add (1, $row, $item->{desc_widget});
3467 $self->{child}->add (2, $row, $item->{weight_widget});
3468
3469 $row++;
3470 }
3471}
3472
3473#############################################################################
3474
3475package CFClient::UI::BindEditor;
3476
3477our @ISA = CFClient::UI::FancyFrame::;
3478
3479sub new {
3480 my $class = shift;
3481
3482 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3483
3484 $self->add (my $vb = new CFClient::UI::VBox);
3485
3486
3487 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3488 text => "start recording",
3489 tooltip => "Start/Stops recording of actions."
3490 ."All subsequent actions after the recording started will be captured."
3491 ."The actions are displayed after the record was stopped."
3492 ."To bind the action you have to click on the 'Bind' button",
3493 on_activate => sub {
3494 unless ($self->{recording}) {
3495 $self->start;
3496 } else {
3497 $self->stop;
3498 }
3499 });
3500
3501 $vb->add (new CFClient::UI::Label text => "Actions:");
3502 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3503
3504 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3505 $vb->add (my $hb = new CFClient::UI::HBox);
3506 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3507 $hb->add (new CFClient::UI::Button
3508 text => "bind",
3509 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3510 on_activate => sub {
3511 $self->ask_for_bind;
3512 });
3513
3514 $vb->add (my $hb = new CFClient::UI::HBox);
3515 $hb->add (new CFClient::UI::Button
3516 text => "ok",
3517 expand => 1,
3518 tooltip => "This closes the binding editor and saves the binding",
3519 on_activate => sub {
3520 $self->hide;
3521 $self->commit;
3522 });
3523
3524 $hb->add (new CFClient::UI::Button
3525 text => "cancel",
3526 expand => 1,
3527 tooltip => "This closes the binding editor without saving",
3528 on_activate => sub {
3529 $self->hide;
3530 $self->{binding_cancel}->()
3531 if $self->{binding_cancel};
3532 });
3533
3534 $self->update_binding_widgets;
3535
3536 $self
3537}
3538
3539sub cfg_bind {
3540 my ($self, $mod, $sym, $cmds) = @_;
3541 $::CFG->{profile}{default}{bindings}{$mod}{$sym} = $cmds;
3542 ::update_bindings ();
3543}
3544
3545sub cfg_unbind {
3546 my ($self, $mod, $sym, $cmds) = @_;
3547 delete $::CFG->{profile}{default}{bindings}{$mod}{$sym};
3548 ::update_bindings ();
3549}
3550
3551sub commit {
3552 my ($self) = @_;
3553 my ($mod, $sym, $cmds) = $self->get_binding;
3554 if ($sym != 0 && @$cmds > 0) {
3555 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3556 ."'. Don't forget 'Save Config'!");
3557 $self->{binding_change}->($mod, $sym, $cmds)
3558 if $self->{binding_change};
3559 } else {
3560 $::STATUSBOX->add ("No action bound, no key or action specified!");
3561 $self->{binding_cancel}->()
3562 if $self->{binding_cancel};
3563 }
3564}
3565
3566sub start {
3567 my ($self) = @_;
3568
3569 $self->{rec_btn}->set_text ("stop recording");
3570 $self->{recording} = 1;
3571 $self->clear_command_list;
3572 $::CONN->start_record if $::CONN;
3573}
3574
3575sub stop {
3576 my ($self) = @_;
3577
3578 $self->{rec_btn}->set_text ("start recording");
3579 $self->{recording} = 0;
3580
3581 my $rec;
3582 $rec = $::CONN->stop_record if $::CONN;
3583 return unless ref $rec eq 'ARRAY';
3584 $self->set_command_list ($rec);
3585}
3586
3587
3588sub ask_for_bind_and_commit {
3589 my ($self) = @_;
3590 $self->ask_for_bind (1);
3591}
3592
3593sub ask_for_bind {
3594 my ($self, $commit, $end_cb) = @_;
3595
3596 CFClient::Binder::open_binding_dialog (sub {
3597 my ($mod, $sym) = @_;
3598 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3599 $self->update_binding_widgets;
3600 $self->commit if $commit;
3601 $end_cb->() if $end_cb;
3602 });
3603}
3604
3605# $mod and $sym are the modifiers and key symbol
3606# $cmds is a array ref of strings (the commands)
3607# $cb is the callback that is executed on OK
3608# $ccb is the callback that is executed on CANCEL and
3609# when the binding was unsuccessful on OK
3610sub set_binding {
3611 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3612
3613 $self->clear_command_list;
3614 $self->{recording} = 0;
3615 $self->{rec_btn}->set_text ("start recording");
3616
3617 $self->{binding} = [$mod, $sym];
3618 $self->{commands} = $cmds;
3619
3620 $self->{binding_change} = $cb;
3621 $self->{binding_cancel} = $ccb;
3622
3623 $self->update_binding_widgets;
3624}
3625
3626# this is a shortcut method that asks for a binding
3627# and then just binds it.
3628sub do_quick_binding {
3629 my ($self, $cmds, $end_cb) = @_;
3630 $self->set_binding (undef, undef, $cmds, sub { $self->cfg_bind (@_) });
3631 $self->ask_for_bind (1, $end_cb);
3632}
3633
3634sub update_binding_widgets {
3635 my ($self) = @_;
3636 my ($mod, $sym, $cmds) = $self->get_binding;
3637 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3638 $self->set_command_list ($cmds);
3639}
3640
3641sub get_binding {
3642 my ($self) = @_;
3643 return (
3644 $self->{binding}->[0],
3645 $self->{binding}->[1],
3646 [ grep { defined $_ } @{$self->{commands}} ]
3647 );
3648}
3649
3650sub clear_command_list {
3651 my ($self) = @_;
3652 $self->{cmdbox}->clear ();
3653}
3654
3655sub set_command_list {
3656 my ($self, $cmds) = @_;
3657
3658 $self->{cmdbox}->clear ();
3659 $self->{commands} = $cmds;
3660
3661 my $idx = 0;
3662
3663 for (@$cmds) {
3664 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3665
3666 my $i = $idx;
3667 $hb->add (new CFClient::UI::Label text => $_);
3668 $hb->add (new CFClient::UI::Button
3669 text => "delete",
3670 tooltip => "Deletes the action from the record",
3671 on_activate => sub {
3672 $self->{cmdbox}->remove ($hb);
3673 $cmds->[$i] = undef;
3674 });
3675
3676
3677 $idx++
3678 }
3679}
3680
3681#############################################################################
3682
3683package CFClient::UI::SpellList;
3684
3685our @ISA = CFClient::UI::Table::;
3686
3687sub new {
3688 my $class = shift;
3689
3690 my $self = $class->SUPER::new (
3691 binding => [],
3692 commands => [],
2664 @_, 3693 @_,
2665 ) 3694 )
2666} 3695}
2667 3696
2668sub configure { 3697my $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 3698
2671 $self->{w} = $w; 3699my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
2672 $self->{h} = $h; 3700 "<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
2673} 3701my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3702 "<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3703my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3704 "<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3705my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3706 "<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3707my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3708 "<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
2674 3709
2675sub check_size { 3710sub rebuild_spell_list {
3711 my ($self) = @_;
3712
3713 $CFClient::UI::ROOT->on_refresh ($self => sub {
3714 $self->clear;
3715
3716 return unless $::CONN;
3717
3718 $self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3719 $self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL);
3720 $self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3721 $self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3722 $self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3723
3724 my $row = 0;
3725
3726 for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3727 my $spell = $self->{spell}{$_};
3728
3729 $row++;
3730
3731 my $spell_cb = sub {
3732 my ($widget, $ev) = @_;
3733
3734 if ($ev->{button} == 1) {
3735 $::CONN->user_send ("cast $spell->{name}");
3736 } elsif ($ev->{button} == 2) {
3737 $::CONN->user_send ("invoke $spell->{name}");
3738 } elsif ($ev->{button} == 3) {
3739 (new CFClient::UI::Menu
3740 items => [
3741 ["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3742 ["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3743 ],
3744 )->popup ($ev);
3745 } else {
3746 return 0;
3747 }
3748
3749 1
3750 };
3751
3752 my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3753
3754 #TODO: add path info to tooltip
3755 #$self->add (6, $row, new CFClient::UI::Label text => $spell->{path});
3756
3757 $self->add (0, $row, new CFClient::UI::Face
3758 face => $spell->{face},
3759 can_hover => 1,
3760 can_events => 1,
3761 tooltip => $tooltip,
3762 on_button_down => $spell_cb,
3763 );
3764
3765 $self->add (1, $row, new CFClient::UI::Label
3766 expand => 1,
3767 text => $spell->{name},
3768 can_hover => 1,
3769 can_events => 1,
3770 tooltip => $tooltip,
3771 on_button_down => $spell_cb,
3772 );
3773
3774 $self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3775 $self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3776 $self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3777 $self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3778 }
3779 });
3780}
3781
3782sub add_spell {
2676 my ($self) = @_; 3783 my ($self, $spell) = @_;
2677 3784
2678 $self->size_allocate ($self->{w}, $self->{h}) 3785 $self->{spell}->{$spell->{name}} = $spell;
2679 if $self->{w}; 3786 $self->rebuild_spell_list;
3787}
3788
3789sub remove_spell {
3790 my ($self, $spell) = @_;
3791
3792 delete $self->{spell}->{$spell->{name}};
3793 $self->rebuild_spell_list;
3794}
3795
3796sub clear_spells {
3797 my ($self) = @_;
3798
3799 $self->{spell} = {};
3800 $self->rebuild_spell_list;
3801}
3802
3803#############################################################################
3804
3805package CFClient::UI::Root;
3806
3807our @ISA = CFClient::UI::Container::;
3808
3809use List::Util qw(min max);
3810
3811use CFClient::OpenGL;
3812
3813sub new {
3814 my $class = shift;
3815
3816 my $self = $class->SUPER::new (
3817 visible => 1,
3818 @_,
3819 );
3820
3821 Scalar::Util::weaken ($self->{root} = $self);
3822
3823 $self
2680} 3824}
2681 3825
2682sub size_request { 3826sub size_request {
2683 my ($self) = @_; 3827 my ($self) = @_;
2684 3828
2685 ($self->{w}, $self->{h}) 3829 ($self->{w}, $self->{h})
2686} 3830}
2687 3831
3832sub _to_pixel {
3833 my ($coord, $size, $max) = @_;
3834
3835 $coord =
3836 $coord eq "center" ? ($max - $size) * 0.5
3837 : $coord eq "max" ? $max
3838 : $coord;
3839
3840 $coord = 0 if $coord < 0;
3841 $coord = $max - $size if $coord > $max - $size;
3842
3843 int $coord + 0.5
3844}
3845
2688sub size_allocate { 3846sub invoke_size_allocate {
2689 my ($self, $w, $h) = @_; 3847 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 3848
2707 for my $child ($self->children) { 3849 for my $child ($self->children) {
2708 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3850 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2709 3851
2710 $X = List::Util::max 0, List::Util::min $w - $W, $X; 3852 $X = $child->{force_x} if exists $child->{force_x};
2711 $Y = List::Util::max 0, List::Util::min $h - $H, $Y; 3853 $Y = $child->{force_y} if exists $child->{force_y};
3854
3855 $X = _to_pixel $X, $W, $self->{w};
3856 $Y = _to_pixel $Y, $H, $self->{h};
3857
2712 $child->configure ($X, $Y, $W, $H); 3858 $child->configure ($X, $Y, $W, $H);
2713 } 3859 }
2714 3860
2715 $self->{old_w} = $w; 3861 1
2716 $self->{old_h} = $h;
2717} 3862}
2718 3863
2719sub coord2local { 3864sub coord2local {
2720 my ($self, $x, $y) = @_; 3865 my ($self, $x, $y) = @_;
2721 3866
… …
2729} 3874}
2730 3875
2731sub update { 3876sub update {
2732 my ($self) = @_; 3877 my ($self) = @_;
2733 3878
2734 $self->check_size;
2735 $::WANT_REFRESH++; 3879 $::WANT_REFRESH++;
2736} 3880}
2737 3881
2738sub add { 3882sub add {
2739 my ($self, $child) = @_; 3883 my ($self, @children) = @_;
2740 3884
2741 # integerise window positions 3885 $_->{is_toplevel} = 1
2742 $child->{x} = int $child->{x}; 3886 for @children;
2743 $child->{y} = int $child->{y};
2744 3887
2745 $self->SUPER::add ($child); 3888 $self->SUPER::add (@children);
3889}
3890
3891sub remove {
3892 my ($self, @children) = @_;
3893
3894 $self->SUPER::remove (@children);
3895
3896 delete $self->{is_toplevel}
3897 for @children;
3898
3899 while (@children) {
3900 my $w = pop @children;
3901 push @children, $w->children;
3902 $w->set_invisible;
3903 }
2746} 3904}
2747 3905
2748sub on_refresh { 3906sub on_refresh {
2749 my ($self, $id, $cb) = @_; 3907 my ($self, $id, $cb) = @_;
2750 3908
2751 $self->{refresh_hook}{$id} = $cb; 3909 $self->{refresh_hook}{$id} = $cb;
2752} 3910}
2753 3911
3912sub on_post_alloc {
3913 my ($self, $id, $cb) = @_;
3914
3915 $self->{post_alloc_hook}{$id} = $cb;
3916}
3917
2754sub draw { 3918sub draw {
2755 my ($self) = @_; 3919 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 3920
2796 while ($self->{refresh_hook}) { 3921 while ($self->{refresh_hook}) {
2797 $_->() 3922 $_->()
2798 for values %{delete $self->{refresh_hook}}; 3923 for values %{delete $self->{refresh_hook}};
2799 } 3924 }
2800 3925
3926 if ($self->{realloc}) {
3927 my %queue;
3928 my @queue;
3929 my $widget;
3930
3931 outer:
3932 while () {
3933 if (my $realloc = delete $self->{realloc}) {
3934 for $widget (values %$realloc) {
3935 $widget->{visible} or next; # do not resize invisible widgets
3936
3937 $queue{$widget+0}++ and next; # duplicates are common
3938
3939 push @{ $queue[$widget->{visible}] }, $widget;
3940 }
3941 }
3942
3943 while () {
3944 @queue or last outer;
3945
3946 $widget = pop @{ $queue[-1] || [] }
3947 and last;
3948
3949 pop @queue;
3950 }
3951
3952 delete $queue{$widget+0};
3953
3954 my ($w, $h) = $widget->size_request;
3955
3956 $w = max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3957 $h = max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3958
3959 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3960 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3961
3962 $w = $widget->{force_w} if exists $widget->{force_w};
3963 $h = $widget->{force_h} if exists $widget->{force_h};
3964
3965 if ($widget->{req_w} != $w || $widget->{req_h} != $h
3966 || delete $widget->{force_realloc}) {
3967 $widget->{req_w} = $w;
3968 $widget->{req_h} = $h;
3969
3970 $self->{size_alloc}{$widget+0} = $widget;
3971
3972 if (my $parent = $widget->{parent}) {
3973 $self->{realloc}{$parent+0} = $parent
3974 unless $queue{$parent+0};
3975
3976 $parent->{force_size_alloc} = 1;
3977 $self->{size_alloc}{$parent+0} = $parent;
3978 }
3979 }
3980
3981 delete $self->{realloc}{$widget+0};
3982 }
3983 }
3984
3985 while (my $size_alloc = delete $self->{size_alloc}) {
3986 my @queue = sort { $b->{visible} <=> $a->{visible} }
3987 values %$size_alloc;
3988
3989 while () {
3990 my $widget = pop @queue || last;
3991
3992 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3993
3994 $w = 0 if $w < 0;
3995 $h = 0 if $h < 0;
3996
3997 $w = int $w + 0.5;
3998 $h = int $h + 0.5;
3999
4000 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
4001 $widget->{old_w} = $widget->{w};
4002 $widget->{old_h} = $widget->{h};
4003
4004 $widget->{w} = $w;
4005 $widget->{h} = $h;
4006
4007 $widget->emit (size_allocate => $w, $h);
4008 }
4009 }
4010 }
4011
4012 while ($self->{post_alloc_hook}) {
4013 $_->()
4014 for values %{delete $self->{post_alloc_hook}};
4015 }
4016
4017
2801 glViewport 0, 0, $::WIDTH, $::HEIGHT; 4018 glViewport 0, 0, $::WIDTH, $::HEIGHT;
2802 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 4019 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2803 glClear GL_COLOR_BUFFER_BIT; 4020 glClear GL_COLOR_BUFFER_BIT;
2804 4021
2805 glMatrixMode GL_PROJECTION; 4022 glMatrixMode GL_PROJECTION;
2806 glLoadIdentity; 4023 glLoadIdentity;
2807 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000; 4024 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
2808 glMatrixMode GL_MODELVIEW; 4025 glMatrixMode GL_MODELVIEW;
2809 glLoadIdentity; 4026 glLoadIdentity;
2810 4027
4028 {
4029 package CFClient::UI::Base;
4030
4031 ($draw_x, $draw_y, $draw_w, $draw_h) =
4032 (0, 0, $self->{w}, $self->{h});
4033 }
4034
2811 $self->_draw; 4035 $self->_draw;
2812} 4036}
2813 4037
2814############################################################################# 4038#############################################################################
2815 4039
2816package CFClient::UI; 4040package CFClient::UI;
2817 4041
2818$ROOT = new CFClient::UI::Root; 4042$ROOT = new CFClient::UI::Root;
2819$TOOLTIP = new CFClient::UI::Tooltip; 4043$TOOLTIP = new CFClient::UI::Tooltip z => 900;
2820 4044
28211 40451
2822 4046

Diff Legend

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