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.196 by root, Fri May 12 00:16:34 2006 UTC vs.
Revision 1.310 by root, Fri Jun 23 20:28:20 2006 UTC

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

Diff Legend

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