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.201 by root, Sat May 13 23:17:49 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 $TOOLTIP->check_size;
40 $TOOLTIP->update;
41 } 39 }
42 40
43 return; 41 return;
44 } 42 }
45 } 43 }
46 } 44 }
47 45
48 $TOOLTIP->hide; 46 $TOOLTIP->hide;
49 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;
50} 71}
51 72
52# class methods for events 73# class methods for events
53sub feed_sdl_key_down_event { 74sub feed_sdl_key_down_event {
54 $FOCUS->emit (key_down => $_[0]) || $FOCUS->key_down ($_[0]) 75 $FOCUS->emit (key_down => $_[0])
55 if $FOCUS; 76 if $FOCUS;
56} 77}
57 78
58sub feed_sdl_key_up_event { 79sub feed_sdl_key_up_event {
59 $FOCUS->emit (key_up => $_[0]) || $FOCUS->key_up ($_[0]) 80 $FOCUS->emit (key_up => $_[0])
60 if $FOCUS; 81 if $FOCUS;
61} 82}
62 83
63sub feed_sdl_button_down_event { 84sub feed_sdl_button_down_event {
64 my ($ev) = @_; 85 my ($ev) = @_;
… …
68 my $widget = $ROOT->find_widget ($x, $y); 89 my $widget = $ROOT->find_widget ($x, $y);
69 90
70 $GRAB = $widget; 91 $GRAB = $widget;
71 $GRAB->update if $GRAB; 92 $GRAB->update if $GRAB;
72 93
73 check_tooltip; 94 $TOOLTIP_WATCHER->cb->();
74 } 95 }
75 96
76 $BUTTON_STATE |= 1 << ($ev->{button} - 1); 97 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
77 98
78 if ($GRAB) { 99 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))
79 ($x, $y) = $GRAB->coord2local ($x, $y); 100 if $GRAB;
80 $GRAB->emit (button_down => $ev, $x, $y) || $GRAB->button_down ($ev, $x, $y);
81 }
82} 101}
83 102
84sub feed_sdl_button_up_event { 103sub feed_sdl_button_up_event {
85 my ($ev) = @_; 104 my ($ev) = @_;
86 my ($x, $y) = ($ev->{x}, $ev->{y}); 105 my ($x, $y) = ($ev->{x}, $ev->{y});
87 106
88 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 107 my $widget = $GRAB || $ROOT->find_widget ($x, $y);
89 108
90 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1)); 109 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
91 110
92 if ($GRAB) { 111 $GRAB->emit (button_up => $ev, $GRAB->coord2local ($x, $y))
93 ($x, $y) = $GRAB->coord2local ($x, $y); 112 if $GRAB;
94 $GRAB->emit (button_up => $ev, $x, $y) || $GRAB->button_up ($ev, $x, $y);
95 }
96 113
97 if (!$BUTTON_STATE) { 114 if (!$BUTTON_STATE) {
98 my $grab = $GRAB; undef $GRAB; 115 my $grab = $GRAB; undef $GRAB;
99 $grab->update if $grab; 116 $grab->update if $grab;
100 $GRAB->update if $GRAB; 117 $GRAB->update if $GRAB;
101 118
102 check_tooltip; 119 $TOOLTIP_WATCHER->cb->();
103 } 120 }
104} 121}
105 122
106sub feed_sdl_motion_event { 123sub feed_sdl_motion_event {
107 my ($ev) = @_; 124 my ($ev) = @_;
… …
113 my $hover = $HOVER; $HOVER = $widget; 130 my $hover = $HOVER; $HOVER = $widget;
114 131
115 $hover->update if $hover && $hover->{can_hover}; 132 $hover->update if $hover && $hover->{can_hover};
116 $HOVER->update if $HOVER && $HOVER->{can_hover}; 133 $HOVER->update if $HOVER && $HOVER->{can_hover};
117 134
118 check_tooltip; 135 $TOOLTIP_WATCHER->start;
119 } 136 }
120 137
121 if ($HOVER) {
122 ($x, $y) = $HOVER->coord2local ($x, $y);
123 $HOVER->emit (mouse_motion => $ev, $x, $y) || $HOVER->mouse_motion ($ev, $x, $y); 138 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
124 } 139 if $HOVER;
125} 140}
126 141
127# convert position array to integers 142# convert position array to integers
128sub harmonize { 143sub harmonize {
129 my ($vals) = @_; 144 my ($vals) = @_;
… …
135 $rem += $_ - $i; 150 $rem += $_ - $i;
136 $_ = $i; 151 $_ = $i;
137 } 152 }
138} 153}
139 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
140############################################################################# 196#############################################################################
141 197
142package CFClient::UI::Base; 198package CFClient::UI::Base;
143 199
144use strict; 200use strict;
… …
147 203
148sub new { 204sub new {
149 my $class = shift; 205 my $class = shift;
150 206
151 my $self = bless { 207 my $self = bless {
152 x => 0, 208 x => "center",
153 y => 0, 209 y => "center",
154 z => 0, 210 z => 0,
211 w => undef,
212 h => undef,
155 can_events => 1, 213 can_events => 1,
156 @_ 214 @_
157 }, $class; 215 }, $class;
158 216
217 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
218
159 for (keys %$self) { 219 for (keys %$self) {
160 if (/^connect_(.*)$/) { 220 if (/^on_(.*)$/) {
161 $self->connect ($1 => delete $self->{$_}); 221 $self->connect ($1 => delete $self->{$_});
162 } 222 }
163 } 223 }
164 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
165 $self 237 $self
166} 238}
167 239
168sub destroy { 240sub destroy {
169 my ($self) = @_; 241 my ($self) = @_;
… …
178 return if $self->{parent}; 250 return if $self->{parent};
179 251
180 $CFClient::UI::ROOT->add ($self); 252 $CFClient::UI::ROOT->add ($self);
181} 253}
182 254
183sub hide { 255sub set_visible {
184 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};
185 279
186 undef $GRAB if $GRAB == $self; 280 undef $GRAB if $GRAB == $self;
187 undef $HOVER if $HOVER == $self; 281 undef $HOVER if $HOVER == $self;
188 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
189 $self->{parent}->remove ($self) 312 $self->{parent}->remove ($self)
190 if $self->{parent}; 313 if $self->{parent};
191} 314}
192 315
193sub move { 316sub move_abs {
194 my ($self, $x, $y, $z) = @_; 317 my ($self, $x, $y, $z) = @_;
195 318
196 $self->{x} = int $x; 319 $self->{x} = List::Util::max 0, List::Util::min $self->{root}{w} - $self->{w}, int $x;
197 $self->{y} = int $y; 320 $self->{y} = List::Util::max 0, List::Util::min $self->{root}{h} - $self->{h}, int $y;
198 $self->{z} = $z if defined $z; 321 $self->{z} = $z if defined $z;
199 322
200 $self->update; 323 $self->update;
201} 324}
202 325
203sub set_size { 326sub set_size {
204 my ($self, $w, $h) = @_; 327 my ($self, $w, $h) = @_;
205 328
206 $self->{user_w} = $w; 329 $self->{force_w} = $w;
207 $self->{user_h} = $h; 330 $self->{force_h} = $h;
208 331
209 $self->check_size; 332 $self->realloc;
210} 333}
211 334
212sub size_request { 335sub size_request {
213 require Carp; 336 require Carp;
214 Carp::confess "size_request is abstract"; 337 Carp::confess "size_request is abstract";
… …
216 339
217sub configure { 340sub configure {
218 my ($self, $x, $y, $w, $h) = @_; 341 my ($self, $x, $y, $w, $h) = @_;
219 342
220 if ($self->{aspect}) { 343 if ($self->{aspect}) {
344 my ($ow, $oh) = ($w, $h);
345
221 my $w2 = List::Util::min $w, int $h * $self->{aspect}; 346 $w = List::Util::min $w, int $h * $self->{aspect};
222 my $h2 = List::Util::min $h, int $w / $self->{aspect}; 347 $h = List::Util::min $h, int $w / $self->{aspect};
223 348
224 # use alignment to adjust x, y 349 # use alignment to adjust x, y
225 350
226 $x += int +($w - $w2) * 0.5; 351 $x += int 0.5 * ($ow - $w);
227 $y += int +($h - $h2) * 0.5; 352 $y += int 0.5 * ($oh - $h);
228
229 ($w, $h) = ($w2, $h2);
230 } 353 }
231 354
232 if ($self->{x} != $x || $self->{y} != $y) { 355 if ($self->{x} ne $x || $self->{y} ne $y) {
233 $self->{x} = $x; 356 $self->{x} = $x;
234 $self->{y} = $y; 357 $self->{y} = $y;
235 $self->update; 358 $self->update;
236 } 359 }
237 360
238 if ($self->{w} != $w || $self->{h} != $h) { 361 if ($self->{alloc_w} != $w || $self->{alloc_h} != $h) {
239 $CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $w, $h]; 362 return unless $self->{visible};
240 }
241}
242 363
243sub size_allocate { 364 $self->{alloc_w} = $w;
244 # nothing to be done 365 $self->{alloc_h} = $h;
366
367 $self->{root}{size_alloc}{$self+0} = $self;
368 }
245} 369}
246 370
247sub children { 371sub children {
372 # nop
248} 373}
249 374
250# call when resolution changes etc. 375sub visible_children {
251sub reconfigure { 376 $_[0]->children
252 my ($self) = @_;
253
254 $_->reconfigure
255 for $self->children;
256
257 $self->check_size (1);
258 $self->update;
259} 377}
260 378
261sub set_max_size { 379sub set_max_size {
262 my ($self, $w, $h) = @_; 380 my ($self, $w, $h) = @_;
263 381
264 delete $self->{max_w}; $self->{max_w} = $w if $w; 382 $self->{max_w} = int $w if defined $w;
265 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 }
266} 402}
267 403
268# translate global coordinates to local coordinate system 404# translate global coordinates to local coordinate system
269sub coord2local { 405sub coord2local {
270 my ($self, $x, $y) = @_; 406 my ($self, $x, $y) = @_;
… …
277 my ($self, $x, $y) = @_; 413 my ($self, $x, $y) = @_;
278 414
279 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y}) 415 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
280} 416}
281 417
282sub focus_in { 418sub invoke_focus_in {
283 my ($self) = @_; 419 my ($self) = @_;
284 420
285 return if $FOCUS == $self; 421 return if $FOCUS == $self;
286 return unless $self->{can_focus}; 422 return unless $self->{can_focus};
287 423
288 my $focus = $FOCUS; $FOCUS = $self; 424 my $focus = $FOCUS; $FOCUS = $self;
289 425
290 $self->emit (focus_in => $focus);
291
292 $focus->update if $focus; 426 $focus->update if $focus;
293 $FOCUS->update; 427 $FOCUS->update;
294}
295 428
429 0
430}
431
296sub focus_out { 432sub invoke_focus_out {
297 my ($self) = @_; 433 my ($self) = @_;
298 434
299 return unless $FOCUS == $self; 435 return unless $FOCUS == $self;
300 436
301 my $focus = $FOCUS; undef $FOCUS; 437 my $focus = $FOCUS; undef $FOCUS;
302 438
303 $self->emit (focus_out => $focus);
304
305 $focus->update if $focus; #? 439 $focus->update if $focus; #?
306}
307 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
308sub mouse_motion { } 453sub invoke_mouse_motion { 1 }
309sub button_up { } 454sub invoke_button_up { 1 }
310sub key_down { } 455sub invoke_key_down { 1 }
311sub key_up { } 456sub invoke_key_up { 1 }
312 457
313sub button_down { 458sub invoke_button_down {
314 my ($self, $ev, $x, $y) = @_; 459 my ($self, $ev, $x, $y) = @_;
315 460
316 $self->focus_in; 461 $self->grab_focus;
317}
318 462
319sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} } 463 1
320sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } 464}
321sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} } 465
322sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} } 466sub connect {
323sub 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
324 531
325sub draw { 532sub draw {
326 my ($self) = @_; 533 my ($self) = @_;
327 534
328 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);
329 546
330 glPushMatrix; 547 glPushMatrix;
331 glTranslate $self->{x}, $self->{y}, 0; 548 glTranslate $self->{x}, $self->{y}, 0;
332 $self->_draw;
333 glPopMatrix;
334 549
335 if ($self == $HOVER && $self->{can_hover}) { 550 if ($self == $HOVER && $self->{can_hover}) {
336 my ($x, $y) = @$self{qw(x y)};
337
338 glColor 1, 0.8, 0.5, 0.2; 551 glColor 1*0.2, 0.8*0.2, 0.5*0.2, 0.2;
339 glEnable GL_BLEND; 552 glEnable GL_BLEND;
340 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 553 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
341 glBegin GL_QUADS; 554 glBegin GL_QUADS;
342 glVertex $x , $y;
343 glVertex $x + $self->{w}, $y;
344 glVertex $x + $self->{w}, $y + $self->{h};
345 glVertex $x , $y + $self->{h};
346 glEnd;
347 glDisable GL_BLEND;
348 }
349
350 if ($ENV{PCLIENT_DEBUG}) {
351 glPushMatrix;
352 glColor 1, 1, 0, 1;
353 glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
354 glBegin GL_LINE_LOOP;
355 glVertex 0 , 0; 555 glVertex 0 , 0;
356 glVertex $self->{w}, 0; 556 glVertex $self->{w}, 0;
357 glVertex $self->{w}, $self->{h}; 557 glVertex $self->{w}, $self->{h};
358 glVertex 0 , $self->{h}; 558 glVertex 0 , $self->{h};
359 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;
360 glPopMatrix; 573 glPopMatrix;
361 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;
362 } 575 }
576
577 $self->_draw;
578 glPopMatrix;
363} 579}
364 580
365sub _draw { 581sub _draw {
366 my ($self) = @_; 582 my ($self) = @_;
367 583
368 warn "no draw defined for $self\n"; 584 warn "no draw defined for $self\n";
369} 585}
370 586
371sub find_widget {
372 my ($self, $x, $y) = @_;
373
374 return () unless $self->{can_events};
375
376 return $self
377 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
378 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
379
380 ()
381}
382
383sub set_parent {
384 my ($self, $parent) = @_;
385
386 Scalar::Util::weaken ($self->{parent} = $parent);
387
388 # TODO: req_w _does_change after ->reconfigure
389 $self->check_size
390 unless exists $self->{req_w};
391}
392
393sub check_size {
394 my ($self, $forced) = @_;
395
396 $self->{force_alloc} = 1 if $forced;
397 $CFClient::UI::ROOT->{check_size}{$self} = $self;
398}
399
400sub update {
401 my ($self) = @_;
402
403 $self->{parent}->update
404 if $self->{parent};
405}
406
407sub connect {
408 my ($self, $signal, $cb) = @_;
409
410 push @{ $self->{signal_cb}{$signal} }, $cb;
411}
412
413sub emit {
414 my ($self, $signal, @args) = @_;
415
416 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
417}
418
419sub DESTROY { 587sub DESTROY {
420 my ($self) = @_; 588 my ($self) = @_;
421 589
422 #$self->deactivate; 590 delete $WIDGET{$self+0};
591
592 eval { $self->destroy };
593 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
423} 594}
424 595
425############################################################################# 596#############################################################################
426 597
427package CFClient::UI::DrawBG; 598package CFClient::UI::DrawBG;
… …
435 my $class = shift; 606 my $class = shift;
436 607
437 # range [value, low, high, page] 608 # range [value, low, high, page]
438 609
439 $class->SUPER::new ( 610 $class->SUPER::new (
440 bg => [0, 0, 0, 0.2], 611 #bg => [0, 0, 0, 0.2],
441 active_bg => [1, 1, 1, 0.5], 612 #active_bg => [1, 1, 1, 0.5],
442 @_ 613 @_
443 ) 614 )
444} 615}
445 616
446sub _draw { 617sub _draw {
447 my ($self) = @_; 618 my ($self) = @_;
448 619
620 my $color = $FOCUS == $self && $self->{active_bg}
621 ? $self->{active_bg}
622 : $self->{bg};
623
624 if ($color && (@$color < 4 || $color->[3])) {
449 my ($w, $h) = @$self{qw(w h)}; 625 my ($w, $h) = @$self{qw(w h)};
450 626
451 glEnable GL_BLEND; 627 glEnable GL_BLEND;
452 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 628 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
453 glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} }; 629 glColor_premultiply @$color;
454 630
455 glBegin GL_QUADS; 631 glBegin GL_QUADS;
456 glVertex 0 , 0; 632 glVertex 0 , 0;
457 glVertex 0 , $h; 633 glVertex 0 , $h;
458 glVertex $w, $h; 634 glVertex $w, $h;
459 glVertex $w, 0; 635 glVertex $w, 0;
460 glEnd; 636 glEnd;
461 637
462 glDisable GL_BLEND; 638 glDisable GL_BLEND;
639 }
463} 640}
464 641
465############################################################################# 642#############################################################################
466 643
467package CFClient::UI::Empty; 644package CFClient::UI::Empty;
… …
472 my ($class, %arg) = @_; 649 my ($class, %arg) = @_;
473 $class->SUPER::new (can_events => 0, %arg); 650 $class->SUPER::new (can_events => 0, %arg);
474} 651}
475 652
476sub size_request { 653sub size_request {
477 (0, 0) 654 my ($self) = @_;
655
656 ($self->{w} + 0, $self->{h} + 0)
478} 657}
479 658
480sub draw { } 659sub draw { }
481 660
482############################################################################# 661#############################################################################
… …
486our @ISA = CFClient::UI::Base::; 665our @ISA = CFClient::UI::Base::;
487 666
488sub new { 667sub new {
489 my ($class, %arg) = @_; 668 my ($class, %arg) = @_;
490 669
491 my $children = delete $arg{children} || []; 670 my $children = delete $arg{children};
492 671
493 my $self = $class->SUPER::new ( 672 my $self = $class->SUPER::new (
494 children => [], 673 children => [],
495 can_events => 0, 674 can_events => 0,
496 %arg, 675 %arg,
497 ); 676 );
677
498 $self->add ($_) for @$children; 678 $self->add (@$children)
679 if $children;
499 680
500 $self 681 $self
501} 682}
502 683
503sub add { 684sub add {
… …
511 $self->{children} = [ 692 $self->{children} = [
512 sort { $a->{z} <=> $b->{z} } 693 sort { $a->{z} <=> $b->{z} }
513 @{$self->{children}}, @widgets 694 @{$self->{children}}, @widgets
514 ]; 695 ];
515 696
516 $self->check_size (1); 697 $self->realloc;
517 $self->update;
518} 698}
519 699
520sub children { 700sub children {
521 @{ $_[0]{children} } 701 @{ $_[0]{children} }
522} 702}
… …
527 delete $child->{parent}; 707 delete $child->{parent};
528 $child->hide; 708 $child->hide;
529 709
530 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 710 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
531 711
532 $self->check_size; 712 $self->realloc;
533 $self->update;
534} 713}
535 714
536sub clear { 715sub clear {
537 my ($self) = @_; 716 my ($self) = @_;
538 717
… …
542 for (@$children) { 721 for (@$children) {
543 delete $_->{parent}; 722 delete $_->{parent};
544 $_->hide; 723 $_->hide;
545 } 724 }
546 725
547 $self->check_size; 726 $self->realloc;
548 $self->update;
549} 727}
550 728
551sub find_widget { 729sub find_widget {
552 my ($self, $x, $y) = @_; 730 my ($self, $x, $y) = @_;
553 731
554 $x -= $self->{x}; 732 $x -= $self->{x};
555 $y -= $self->{y}; 733 $y -= $self->{y};
556 734
557 my $res; 735 my $res;
558 736
559 for (reverse @{ $self->{children} }) { 737 for (reverse $self->visible_children) {
560 $res = $_->find_widget ($x, $y) 738 $res = $_->find_widget ($x, $y)
561 and return $res; 739 and return $res;
562 } 740 }
563 741
564 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y}) 742 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
… …
585} 763}
586 764
587sub add { 765sub add {
588 my ($self, $child) = @_; 766 my ($self, $child) = @_;
589 767
590 $self->{children} = []; 768 $self->SUPER::remove ($_) for @{ $self->{children} };
591
592 $self->SUPER::add ($child); 769 $self->SUPER::add ($child);
593} 770}
594 771
595sub remove { 772sub remove {
596 my ($self, $widget) = @_; 773 my ($self, $widget) = @_;
… …
605 782
606sub size_request { 783sub size_request {
607 $_[0]{children}[0]->size_request 784 $_[0]{children}[0]->size_request
608} 785}
609 786
610sub size_allocate { 787sub invoke_size_allocate {
611 my ($self, $w, $h) = @_; 788 my ($self, $w, $h) = @_;
612 789
613 $self->{children}[0]->configure (0, 0, $w, $h); 790 $self->{children}[0]->configure (0, 0, $w, $h);
791
792 1
614} 793}
615 794
616############################################################################# 795#############################################################################
796
797# back-buffered drawing area
617 798
618package CFClient::UI::Window; 799package CFClient::UI::Window;
619 800
620our @ISA = CFClient::UI::Bin::; 801our @ISA = CFClient::UI::Bin::;
621 802
… …
632 813
633 $ROOT->on_post_alloc ($self => sub { $self->render_child }); 814 $ROOT->on_post_alloc ($self => sub { $self->render_child });
634 $self->SUPER::update; 815 $self->SUPER::update;
635} 816}
636 817
637sub size_allocate { 818sub invoke_size_allocate {
638 my ($self, $w, $h) = @_; 819 my ($self, $w, $h) = @_;
639 820
640 $self->SUPER::size_allocate ($w, $h);
641 $self->update; 821 $self->update;
822
823 $self->SUPER::invoke_size_allocate ($w, $h)
642} 824}
643 825
644sub _render { 826sub _render {
827 my ($self) = @_;
828
645 $_[0]{children}[0]->draw; 829 $self->{children}[0]->draw;
646} 830}
647 831
648sub render_child { 832sub render_child {
649 my ($self) = @_; 833 my ($self) = @_;
650 834
651 $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 {
652 glClearColor 0, 0, 0, 0; 836 glClearColor 0, 0, 0, 0;
653 glClear GL_COLOR_BUFFER_BIT; 837 glClear GL_COLOR_BUFFER_BIT;
654 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
655 $self->_render; 846 $self->_render;
656# glColorMask 1, 1, 1, 0;
657# glEnable GL_BLEND;
658# glBlendFunc GL_SRC_ALPHA, GL_ZERO;
659# glRasterPos 0, 0;
660# glCopyPixels 0, 0, $self->{w}, $self->{h};
661# glDisable GL_BLEND;
662# glColorMask 1, 1, 1, 1;
663 }; 847 };
664} 848}
665 849
666sub _draw { 850sub _draw {
667 my ($self) = @_; 851 my ($self) = @_;
668 852
669 my ($w, $h) = ($self->w, $self->h); 853 my ($w, $h) = @$self{qw(w h)};
670 854
671 my $tex = $self->{texture} 855 my $tex = $self->{texture}
672 or return; 856 or return;
673 857
674 glEnable GL_TEXTURE_2D; 858 glEnable GL_TEXTURE_2D;
… …
684 868
685package CFClient::UI::ViewPort; 869package CFClient::UI::ViewPort;
686 870
687our @ISA = CFClient::UI::Window::; 871our @ISA = CFClient::UI::Window::;
688 872
873sub new {
874 my $class = shift;
875
876 $class->SUPER::new (
877 scroll_x => 0,
878 scroll_y => 1,
879 @_,
880 )
881}
882
689sub size_request { 883sub size_request {
690 my ($self) = @_; 884 my ($self) = @_;
691 885
692 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 886 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
693 $self->child->configure (0, 0, @$self{qw(child_w child_h)});
694 887
695 @$self{qw(child_w child_h)} 888 $w = 10 if $self->{scroll_x};
696} 889 $h = 10 if $self->{scroll_y};
697 890
891 ($w, $h)
892}
893
698sub size_allocate { 894sub invoke_size_allocate {
699 my ($self, $w, $h) = @_; 895 my ($self, $w, $h) = @_;
700 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);
701 $self->update; 903 $self->update;
904
905 1
702} 906}
703 907
704sub set_offset { 908sub set_offset {
705 my ($self, $x, $y) = @_; 909 my ($self, $x, $y) = @_;
706 910
… …
739} 943}
740 944
741sub _render { 945sub _render {
742 my ($self) = @_; 946 my ($self) = @_;
743 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
744 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 951 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
745 952
746 $self->SUPER::_render; 953 $self->SUPER::_render;
747} 954}
748 955
… …
751package CFClient::UI::ScrolledWindow; 958package CFClient::UI::ScrolledWindow;
752 959
753our @ISA = CFClient::UI::HBox::; 960our @ISA = CFClient::UI::HBox::;
754 961
755sub new { 962sub new {
756 my $class = shift; 963 my ($class, %arg) = @_;
964
965 my $child = delete $arg{child};
757 966
758 my $self; 967 my $self;
759 968
760 my $slider = new CFClient::UI::Slider 969 my $slider = new CFClient::UI::Slider
761 vertical => 1, 970 vertical => 1,
762 range => [0, 0, 1, 0.01], # HACK fix 971 range => [0, 0, 1, 0.01], # HACK fix
763 connect_changed => sub { 972 on_changed => sub {
764 $self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h})); 973 $self->{vp}->set_offset (0, $_[1]);
765 }, 974 },
766 ; 975 ;
767 976
768 $self = $class->SUPER::new ( 977 $self = $class->SUPER::new (
769 vp => (new CFClient::UI::ViewPort), 978 vp => (new CFClient::UI::ViewPort expand => 1),
770 slider => $slider, 979 slider => $slider,
771 @_, 980 %arg,
772 ); 981 );
773 982
774 $self->{vp}->add ($self->{scrolled});
775 $self->add ($self->{vp});
776 $self->add ($self->{slider}); 983 $self->SUPER::add ($self->{vp}, $self->{slider});
984 $self->add ($child) if $child;
777 985
778 $self 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)
779} 1012}
780 1013
781#TODO# update range on size_allocate depending on child 1014#TODO# update range on size_allocate depending on child
782# update viewport offset on scroll 1015# update viewport offset on scroll
783 1016
… …
803 1036
804 if ($self->{bg}) { 1037 if ($self->{bg}) {
805 my ($w, $h) = @$self{qw(w h)}; 1038 my ($w, $h) = @$self{qw(w h)};
806 1039
807 glEnable GL_BLEND; 1040 glEnable GL_BLEND;
808 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1041 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
809 glColor @{ $self->{bg} }; 1042 glColor_premultiply @{ $self->{bg} };
810 1043
811 glBegin GL_QUADS; 1044 glBegin GL_QUADS;
812 glVertex 0 , 0; 1045 glVertex 0 , 0;
813 glVertex 0 , $h; 1046 glVertex 0 , $h;
814 glVertex $w, $h; 1047 glVertex $w, $h;
… …
827 1060
828our @ISA = CFClient::UI::Bin::; 1061our @ISA = CFClient::UI::Bin::;
829 1062
830use CFClient::OpenGL; 1063use CFClient::OpenGL;
831 1064
832my @tex = 1065my $bg =
1066 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
1067 mipmap => 1, wrap => 1;
1068
1069my @border =
833 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1070 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
834 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 1071 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
835 1072
836sub new { 1073sub new {
837 my $class = shift; 1074 my ($class, %arg) = @_;
838
839 # TODO: user_x, user_y, overwrite moveto?
840 1075
841 my $self = $class->SUPER::new ( 1076 my $self = $class->SUPER::new (
842 bg => [1, 1, 1, 1], 1077 bg => [1, 1, 1, 1],
843 border_bg => [1, 1, 1, 1], 1078 border_bg => [1, 1, 1, 1],
844 border => 0.6, 1079 border => 0.6,
845 can_events => 1, 1080 can_events => 1,
846 @_ 1081 min_w => 16,
1082 min_h => 16,
1083 %arg,
847 ); 1084 );
848 1085
849 $self->{title} &&= new CFClient::UI::Label 1086 $self->{title_widget} = new CFClient::UI::Label
850 align => 0, 1087 align => 0,
851 valign => 1, 1088 valign => 1,
852 text => $self->{title}, 1089 text => $self->{title},
853 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 }
854 1101
855 $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};
856} 1111}
857 1112
858sub border { 1113sub border {
859 int $_[0]{border} * $::FONTSIZE 1114 int $_[0]{border} * $::FONTSIZE
860} 1115}
861 1116
862sub size_request { 1117sub size_request {
863 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};
864 1125
865 my ($w, $h) = $self->SUPER::size_request; 1126 my ($w, $h) = $self->SUPER::size_request;
866 1127
867 ( 1128 (
868 $w + $self->border * 2, 1129 $w + $self->border * 2,
869 $h + $self->border * 2, 1130 $h + $self->border * 2,
870 ) 1131 )
871} 1132}
872 1133
873sub size_allocate { 1134sub invoke_size_allocate {
874 my ($self, $w, $h) = @_; 1135 my ($self, $w, $h) = @_;
875 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
876 $h -= List::Util::max 0, $self->border * 2; 1145 $h -= List::Util::max 0, $border * 2;
877 $w -= List::Util::max 0, $self->border * 2; 1146 $w -= List::Util::max 0, $border * 2;
878 1147
879 $self->{title}->configure ($self->border, $self->border - $::FONTSIZE * 2, $w, $::FONTSIZE * 2)
880 if $self->{title};
881
882 $self->child->configure ($self->border, $self->border, $w, $h); 1148 $self->child->configure ($border, $border, $w, $h);
883}
884 1149
1150 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
1151 if $self->{close_button};
1152
1153 1
1154}
1155
885sub button_down { 1156sub invoke_button_down {
886 my ($self, $ev, $x, $y) = @_; 1157 my ($self, $ev, $x, $y) = @_;
887 1158
888 my ($w, $h) = @$self{qw(w h)}; 1159 my ($w, $h) = @$self{qw(w h)};
889 my $border = $self->border; 1160 my $border = $self->border;
890 1161
… …
903 my ($ev, $x, $y) = @_; 1174 my ($ev, $x, $y) = @_;
904 1175
905 my $dx = $ev->{x} - $ox; 1176 my $dx = $ev->{x} - $ox;
906 my $dy = $ev->{y} - $oy; 1177 my $dy = $ev->{y} - $oy;
907 1178
908 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1); 1179 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
909 $self->{user_h} = $bh + $dy * ($my ? -1 : 1); 1180 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1181
910 $self->move ($wx + $dx * $mx, $wy + $dy * $my); 1182 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
911 $self->check_size; 1183 $self->realloc;
912 }; 1184 };
913 1185
914 } elsif ($lr ^ $td) { 1186 } elsif ($lr ^ $td) {
915 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1187 my ($ox, $oy) = ($ev->{x}, $ev->{y});
916 my ($bx, $by) = ($self->{x}, $self->{y}); 1188 my ($bx, $by) = ($self->{x}, $self->{y});
… …
918 $self->{motion} = sub { 1190 $self->{motion} = sub {
919 my ($ev, $x, $y) = @_; 1191 my ($ev, $x, $y) = @_;
920 1192
921 ($x, $y) = ($ev->{x}, $ev->{y}); 1193 ($x, $y) = ($ev->{x}, $ev->{y});
922 1194
923 $self->move ($bx + $x - $ox, $by + $y - $oy); 1195 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
924 $self->update; 1196 # HACK: the next line is required to enforce placement
1197 $self->{parent}->invoke_size_allocate ($self->{parent}{w}, $self->{parent}{h});
925 }; 1198 };
1199 } else {
1200 return 0;
1201 }
1202
926 } 1203 1
927} 1204}
928 1205
929sub button_up { 1206sub invoke_button_up {
930 my ($self, $ev, $x, $y) = @_; 1207 my ($self, $ev, $x, $y) = @_;
931 1208
932 delete $self->{motion}; 1209 ! ! delete $self->{motion}
933} 1210}
934 1211
935sub mouse_motion { 1212sub invoke_mouse_motion {
936 my ($self, $ev, $x, $y) = @_; 1213 my ($self, $ev, $x, $y) = @_;
937 1214
938 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1215 $self->{motion}->($ev, $x, $y) if $self->{motion};
1216
1217 ! ! $self->{motion}
939} 1218}
940 1219
941sub _draw { 1220sub _draw {
942 my ($self) = @_; 1221 my ($self) = @_;
943 1222
1223 my $child = $self->{children}[0];
1224
944 my ($w, $h ) = ($self->{w}, $self->{h}); 1225 my ($w, $h ) = ($self->{w}, $self->{h});
945 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1226 my ($cw, $ch) = ($child->{w}, $child->{h});
946 1227
947 glEnable GL_TEXTURE_2D; 1228 glEnable GL_TEXTURE_2D;
948 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1229 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
949 1230
950 my $border = $self->border; 1231 my $border = $self->border;
951 1232
952 glColor @{ $self->{border_bg} }; 1233 glColor @{ $self->{border_bg} };
953 $tex[1]->draw_quad_alpha (0, 0, $w, $border); 1234 $border[0]->draw_quad_alpha (0, 0, $w, $border);
954 $tex[3]->draw_quad_alpha (0, $border, $border, $ch); 1235 $border[1]->draw_quad_alpha (0, $border, $border, $ch);
955 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1236 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
956 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border); 1237 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
957 1238
958 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1239 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
959 my $bg = $tex[0]; 1240 glColor @{ $self->{bg} };
960 1241
961 # TODO: repeat texture not scale 1242 # TODO: repeat texture not scale
1243 # solve this better(?)
962 my $rep_x = $cw / $bg->{w}; 1244 $bg->{s} = $cw / $bg->{w};
963 my $rep_y = $ch / $bg->{h}; 1245 $bg->{t} = $ch / $bg->{h};
964
965 glColor @{ $self->{bg} };
966
967 $bg->{s} = $rep_x;
968 $bg->{t} = $rep_y;
969 $bg->{wrap_mode} = 1;
970 $bg->draw_quad_alpha ($border, $border, $cw, $ch); 1246 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
971 } 1247 }
972 1248
973 glDisable GL_TEXTURE_2D; 1249 glDisable GL_TEXTURE_2D;
974 1250
975 $self->{title}->draw if $self->{title};
976
977 $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};
978} 1262}
979 1263
980############################################################################# 1264#############################################################################
981 1265
982package CFClient::UI::Table; 1266package CFClient::UI::Table;
… …
990sub new { 1274sub new {
991 my $class = shift; 1275 my $class = shift;
992 1276
993 $class->SUPER::new ( 1277 $class->SUPER::new (
994 col_expand => [], 1278 col_expand => [],
995 @_ 1279 @_,
996 ) 1280 )
1281}
1282
1283sub children {
1284 grep $_, map @$_, grep $_, @{ $_[0]{children} }
997} 1285}
998 1286
999sub add { 1287sub add {
1000 my ($self, $x, $y, $child) = @_; 1288 my ($self, $x, $y, $child) = @_;
1001 1289
1002 $child->set_parent ($self); 1290 $child->set_parent ($self);
1003 $self->{children}[$y][$x] = $child; 1291 $self->{children}[$y][$x] = $child;
1004 1292
1005 $child->check_size; 1293 $self->realloc;
1006} 1294}
1007 1295
1008sub children { 1296sub remove {
1009 grep $_, map @$_, grep $_, @{ $_[0]{children} } 1297 my ($self, $child) = @_;
1010}
1011 1298
1299 # TODO: not yet implemented
1300}
1301
1012# 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?
1013sub clear { 1303sub clear {
1014 my ($self) = @_; 1304 my ($self) = @_;
1015 1305
1016 my @children = $self->children; 1306 my @children = $self->children;
1017 delete $self->{children}; 1307 delete $self->{children};
… …
1019 for (@children) { 1309 for (@children) {
1020 delete $_->{parent}; 1310 delete $_->{parent};
1021 $_->hide; 1311 $_->hide;
1022 } 1312 }
1023 1313
1024 $self->update; 1314 $self->realloc;
1025} 1315}
1026 1316
1027sub get_wh { 1317sub get_wh {
1028 my ($self) = @_; 1318 my ($self) = @_;
1029 1319
… …
1055 (sum @$ws), 1345 (sum @$ws),
1056 (sum @$hs), 1346 (sum @$hs),
1057 ) 1347 )
1058} 1348}
1059 1349
1060sub size_allocate { 1350sub invoke_size_allocate {
1061 my ($self, $w, $h) = @_; 1351 my ($self, $w, $h) = @_;
1062 1352
1063 my ($ws, $hs) = $self->get_wh; 1353 my ($ws, $hs) = $self->get_wh;
1064 1354
1065 my $req_w = sum @$ws; 1355 my $req_w = (sum @$ws) || 1;
1066 my $req_h = sum @$hs; 1356 my $req_h = (sum @$hs) || 1;
1067 1357
1068 # TODO: nicer code && do row_expand 1358 # TODO: nicer code && do row_expand
1069 my @col_expand = @{$self->{col_expand}}; 1359 my @col_expand = @{$self->{col_expand}};
1070 @col_expand = (1) x @$ws unless @col_expand; 1360 @col_expand = (1) x @$ws unless @col_expand;
1071 my $col_expand = (sum @col_expand) || 1; 1361 my $col_expand = (sum @col_expand) || 1;
… …
1097 } 1387 }
1098 1388
1099 $y += $row_h; 1389 $y += $row_h;
1100 } 1390 }
1101 1391
1392 1
1102} 1393}
1103 1394
1104sub find_widget { 1395sub find_widget {
1105 my ($self, $x, $y) = @_; 1396 my ($self, $x, $y) = @_;
1106 1397
… …
1125 } 1416 }
1126} 1417}
1127 1418
1128############################################################################# 1419#############################################################################
1129 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
1130package CFClient::UI::HBox; 1481package CFClient::UI::HBox;
1131 1482
1132# TODO: wrap into common Box base class
1133
1134our @ISA = CFClient::UI::Container::; 1483our @ISA = CFClient::UI::Box::;
1135 1484
1136sub size_request { 1485sub new {
1137 my ($self) = @_; 1486 my $class = shift;
1138 1487
1139 my @alloc = map [$_->size_request], @{$self->{children}}; 1488 $class->SUPER::new (
1140 1489 vertical => 0,
1141 ( 1490 @_,
1142 (List::Util::sum map $_->[0], @alloc),
1143 (List::Util::max map $_->[1], @alloc),
1144 ) 1491 )
1145} 1492}
1146 1493
1147sub size_allocate {
1148 my ($self, $w, $h) = @_;
1149
1150 ($h, $w) = ($w, $h);
1151
1152 my $children = $self->{children};
1153
1154 my @h = map $_->{req_w}, @$children;
1155
1156 my $req_h = List::Util::sum @h;
1157
1158 if ($req_h > $h) {
1159 # ah well, not enough space
1160 $_ *= $h / $req_h for @h;
1161 } else {
1162 my $exp = List::Util::sum map $_->{expand}, @$children;
1163 $exp ||= 1;
1164
1165 for (0 .. $#$children) {
1166 my $child = $children->[$_];
1167
1168 my $alloc_h = $h[$_];
1169 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
1170 $h[$_] = $alloc_h;
1171 }
1172 }
1173
1174 CFClient::UI::harmonize \@h;
1175
1176 my $y = 0;
1177 for (0 .. $#$children) {
1178 my $child = $children->[$_];
1179 my $h = $h[$_];
1180 $child->configure ($y, 0, $h, $w);
1181
1182 $y += $h;
1183 }
1184
1185 1
1186}
1187
1188############################################################################# 1494#############################################################################
1189 1495
1190package CFClient::UI::VBox; 1496package CFClient::UI::VBox;
1191 1497
1192# TODO: wrap into common Box base class
1193
1194our @ISA = CFClient::UI::Container::; 1498our @ISA = CFClient::UI::Box::;
1195 1499
1196sub size_request { 1500sub new {
1197 my ($self) = @_; 1501 my $class = shift;
1198 1502
1199 my @alloc = map [$_->size_request], @{$self->{children}}; 1503 $class->SUPER::new (
1200 1504 vertical => 1,
1201 ( 1505 @_,
1202 (List::Util::max map $_->[0], @alloc),
1203 (List::Util::sum map $_->[1], @alloc),
1204 ) 1506 )
1205} 1507}
1206 1508
1207sub size_allocate {
1208 my ($self, $w, $h) = @_;
1209
1210 Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1211
1212 my $children = $self->{children};
1213
1214 my @h = map $_->{req_h}, @$children;
1215
1216 my $req_h = List::Util::sum @h;
1217
1218 if ($req_h > $h) {
1219 # ah well, not enough space
1220 $_ *= $h / $req_h for @h;
1221 } else {
1222 my $exp = List::Util::sum map $_->{expand}, @$children;
1223 $exp ||= 1;
1224
1225 for (0 .. $#$children) {
1226 my $child = $children->[$_];
1227
1228 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1229 }
1230 }
1231
1232 CFClient::UI::harmonize \@h;
1233
1234 my $y = 0;
1235 for (0 .. $#$children) {
1236 my $child = $children->[$_];
1237 my $h = $h[$_];
1238 $child->configure (0, $y, $w, $h);
1239
1240 $y += $h;
1241 }
1242
1243 1
1244}
1245
1246############################################################################# 1509#############################################################################
1247 1510
1248package CFClient::UI::Label; 1511package CFClient::UI::Label;
1249 1512
1250our @ISA = CFClient::UI::Base::; 1513our @ISA = CFClient::UI::DrawBG::;
1251 1514
1252use CFClient::OpenGL; 1515use CFClient::OpenGL;
1253 1516
1254sub new { 1517sub new {
1255 my ($class, %arg) = @_; 1518 my ($class, %arg) = @_;
1256 1519
1257 my $self = $class->SUPER::new ( 1520 my $self = $class->SUPER::new (
1258 fg => [1, 1, 1], 1521 fg => [1, 1, 1],
1522 #bg => none
1523 #active_bg => none
1259 #font => default_font 1524 #font => default_font
1260 #text => initial text 1525 #text => initial text
1261 #markup => initial narkup 1526 #markup => initial narkup
1527 #max_w => maximum pixel width
1528 ellipsise => 3, # end
1262 layout => (new CFClient::Layout), 1529 layout => (new CFClient::Layout),
1263 fontsize => 1, 1530 fontsize => 1,
1264 align => -1, 1531 align => -1,
1265 valign => -1, 1532 valign => -1,
1266 padding => 2, 1533 padding_x => 2,
1534 padding_y => 2,
1267 can_events => 0, 1535 can_events => 0,
1268 %arg 1536 %arg
1269 ); 1537 );
1270 1538
1271 if (exists $self->{template}) { 1539 if (exists $self->{template}) {
… …
1281 } 1549 }
1282 1550
1283 $self 1551 $self
1284} 1552}
1285 1553
1286sub escape { 1554sub escape($) {
1287 local $_ = $_[1]; 1555 local $_ = $_[0];
1288 1556
1289 s/&/&amp;/g; 1557 s/&/&amp;/g;
1290 s/>/&gt;/g; 1558 s/>/&gt;/g;
1291 s/</&lt;/g; 1559 s/</&lt;/g;
1292 1560
1293 $_[1] 1561 $_
1294} 1562}
1295 1563
1296sub update { 1564sub update {
1297 my ($self) = @_; 1565 my ($self) = @_;
1298 1566
1299 delete $self->{texture}; 1567 delete $self->{texture};
1300 $self->SUPER::update; 1568 $self->SUPER::update;
1301} 1569}
1302 1570
1571sub realloc {
1572 my ($self) = @_;
1573
1574 delete $self->{ox};
1575 $self->SUPER::realloc;
1576}
1577
1303sub set_text { 1578sub set_text {
1304 my ($self, $text) = @_; 1579 my ($self, $text) = @_;
1305 1580
1306 return if $self->{text} eq "T$text"; 1581 return if $self->{text} eq "T$text";
1307 $self->{text} = "T$text"; 1582 $self->{text} = "T$text";
1308 1583
1309 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba; 1584 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1310 $self->{layout}->set_text ($text); 1585 $self->{layout}->set_text ($text);
1311 1586
1587 delete $self->{size_req};
1588 $self->realloc;
1312 $self->update; 1589 $self->update;
1313 $self->check_size;
1314} 1590}
1315 1591
1316sub set_markup { 1592sub set_markup {
1317 my ($self, $markup) = @_; 1593 my ($self, $markup) = @_;
1318 1594
… …
1322 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1598 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1323 1599
1324 $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;
1325 $self->{layout}->set_markup ($markup); 1601 $self->{layout}->set_markup ($markup);
1326 1602
1603 delete $self->{size_req};
1604 $self->realloc;
1327 $self->update; 1605 $self->update;
1328 $self->check_size;
1329} 1606}
1330 1607
1331sub size_request { 1608sub size_request {
1332 my ($self) = @_; 1609 my ($self) = @_;
1333 1610
1611 $self->{size_req} ||= do {
1334 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1612 $self->{layout}->set_font ($self->{font}) if $self->{font};
1335 $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});
1336 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1616 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1337 1617
1338 my ($w, $h) = $self->{layout}->size; 1618 my ($w, $h) = $self->{layout}->size;
1339 1619
1340 if (exists $self->{template}) { 1620 if (exists $self->{template}) {
1341 $self->{template}->set_font ($self->{font}) if $self->{font}; 1621 $self->{template}->set_font ($self->{font}) if $self->{font};
1342 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1622 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1343 1623
1344 my ($w2, $h2) = $self->{template}->size; 1624 my ($w2, $h2) = $self->{template}->size;
1345 1625
1346 $w = List::Util::max $w, $w2; 1626 $w = List::Util::max $w, $w2;
1347 $h = List::Util::max $h, $h2; 1627 $h = List::Util::max $h, $h2;
1628 }
1629
1630 [$w, $h]
1348 } 1631 };
1349 1632
1350 ( 1633 @{ $self->{size_req} }
1351 $w + $self->{padding} * 2,
1352 $h + $self->{padding} * 2,
1353 )
1354} 1634}
1355 1635
1356sub size_allocate { 1636sub invoke_size_allocate {
1357 my ($self, $w, $h) = @_; 1637 my ($self, $w, $h) = @_;
1358 1638
1639 delete $self->{ox};
1640
1359 delete $self->{texture}; 1641 delete $self->{texture}
1642 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1643
1644 1
1360} 1645}
1361 1646
1362sub set_fontsize { 1647sub set_fontsize {
1363 my ($self, $fontsize) = @_; 1648 my ($self, $fontsize) = @_;
1364 1649
1365 $self->{fontsize} = $fontsize; 1650 $self->{fontsize} = $fontsize;
1366 delete $self->{texture}; 1651 delete $self->{texture};
1367 1652
1368 $self->update; 1653 $self->realloc;
1369 $self->check_size; 1654}
1655
1656sub reconfigure {
1657 my ($self) = @_;
1658
1659 delete $self->{size_req};
1660
1661 $self->SUPER::reconfigure;
1370} 1662}
1371 1663
1372sub _draw { 1664sub _draw {
1373 my ($self) = @_; 1665 my ($self) = @_;
1666
1667 $self->SUPER::_draw; # draw background, if applicable
1374 1668
1375 my $tex = $self->{texture} ||= do { 1669 my $tex = $self->{texture} ||= do {
1376 $self->{layout}->set_foreground (@{$self->{fg}}); 1670 $self->{layout}->set_foreground (@{$self->{fg}});
1377 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1671 $self->{layout}->set_font ($self->{font}) if $self->{font};
1378 $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});
1379 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE); 1675 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1380 1676
1381 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1677 new_from_layout CFClient::Texture $self->{layout}
1382
1383 $self->{ox} = int $self->{align} < 0 ? $self->{padding}
1384 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1385 : ($self->{w} - $tex->{w}) * 0.5;
1386
1387 $self->{oy} = int $self->{valign} < 0 ? $self->{padding}
1388 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1389 : ($self->{h} - $tex->{h}) * 0.5;
1390
1391 $tex
1392 }; 1678 };
1393 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
1394 glEnable GL_TEXTURE_2D; 1690 glEnable GL_TEXTURE_2D;
1395 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};
1396 1694
1397 if ($tex->{format} == GL_ALPHA) { 1695 if ($tex->{format} == GL_ALPHA) {
1696 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1398 glColor @{$self->{fg}}; 1697 glColor @{$self->{fg}};
1399 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}); 1698 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}, $w, $h);
1400 } else { 1699 } else {
1700 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1401 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}); 1701 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}, $w, $h);
1402 } 1702 }
1403 1703
1404 glDisable GL_TEXTURE_2D; 1704 glDisable GL_TEXTURE_2D;
1405} 1705}
1406 1706
… …
1422 active_fg => [0, 0, 0], 1722 active_fg => [0, 0, 0],
1423 can_hover => 1, 1723 can_hover => 1,
1424 can_focus => 1, 1724 can_focus => 1,
1425 valign => 0, 1725 valign => 0,
1426 can_events => 1, 1726 can_events => 1,
1727 #text => ...
1728 #hidden => "*",
1427 @_ 1729 @_
1428 ) 1730 )
1429} 1731}
1430 1732
1431sub _set_text { 1733sub _set_text {
… …
1433 1735
1434 delete $self->{cur_h}; 1736 delete $self->{cur_h};
1435 1737
1436 return if $self->{text} eq $text; 1738 return if $self->{text} eq $text;
1437 1739
1438 delete $self->{texture};
1439
1440 $self->{last_activity} = $::NOW; 1740 $self->{last_activity} = $::NOW;
1441 $self->{text} = $text; 1741 $self->{text} = $text;
1442 1742
1443 $text =~ s/./*/g if $self->{hidden}; 1743 $text =~ s/./*/g if $self->{hidden};
1444 $self->{layout}->set_text ("$text "); 1744 $self->{layout}->set_text ("$text ");
1745 delete $self->{size_req};
1445 1746
1446 $self->emit (changed => $self->{text}); 1747 $self->emit (changed => $self->{text});
1748
1749 $self->realloc;
1750 $self->update;
1447} 1751}
1448 1752
1449sub set_text { 1753sub set_text {
1450 my ($self, $text) = @_; 1754 my ($self, $text) = @_;
1451 1755
1452 $self->{cursor} = length $text; 1756 $self->{cursor} = length $text;
1453 $self->_set_text ($text); 1757 $self->_set_text ($text);
1454 $self->check_size;
1455 $self->update;
1456} 1758}
1457 1759
1458sub get_text { 1760sub get_text {
1459 $_[0]{text} 1761 $_[0]{text}
1460} 1762}
… …
1465 my ($w, $h) = $self->SUPER::size_request; 1767 my ($w, $h) = $self->SUPER::size_request;
1466 1768
1467 ($w + 1, $h) # add 1 for cursor 1769 ($w + 1, $h) # add 1 for cursor
1468} 1770}
1469 1771
1470sub size_allocate {
1471 my ($self, $w, $h) = @_;
1472
1473 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1474}
1475
1476sub key_down { 1772sub invoke_key_down {
1477 my ($self, $ev) = @_; 1773 my ($self, $ev) = @_;
1478 1774
1479 my $mod = $ev->{mod}; 1775 my $mod = $ev->{mod};
1480 my $sym = $ev->{sym}; 1776 my $sym = $ev->{sym};
1481 my $uni = $ev->{unicode}; 1777 my $uni = $ev->{unicode};
… …
1496 $self->{cursor} = length $text; 1792 $self->{cursor} = length $text;
1497 } elsif ($uni == 27) { 1793 } elsif ($uni == 27) {
1498 $self->emit ('escape'); 1794 $self->emit ('escape');
1499 } elsif ($uni) { 1795 } elsif ($uni) {
1500 substr $text, $self->{cursor}++, 0, chr $uni; 1796 substr $text, $self->{cursor}++, 0, chr $uni;
1797 } else {
1798 return 0;
1501 } 1799 }
1502 1800
1503 $self->_set_text ($text); 1801 $self->_set_text ($text);
1504 $self->update;
1505}
1506 1802
1803 $self->realloc;
1804
1805 1
1806}
1807
1507sub focus_in { 1808sub invoke_focus_in {
1508 my ($self) = @_; 1809 my ($self) = @_;
1509 1810
1510 $self->{last_activity} = $::NOW; 1811 $self->{last_activity} = $::NOW;
1511 1812
1512 $self->SUPER::focus_in; 1813 $self->SUPER::invoke_focus_in
1513} 1814}
1514 1815
1515sub button_down { 1816sub invoke_button_down {
1516 my ($self, $ev, $x, $y) = @_; 1817 my ($self, $ev, $x, $y) = @_;
1517 1818
1518 $self->SUPER::button_down ($ev, $x, $y); 1819 $self->SUPER::invoke_button_down ($ev, $x, $y);
1519 1820
1520 my $idx = $self->{layout}->xy_to_index ($x, $y); 1821 my $idx = $self->{layout}->xy_to_index ($x, $y);
1521 1822
1522 # byte-index to char-index 1823 # byte-index to char-index
1523 my $text = $self->{text}; 1824 my $text = $self->{text};
1524 utf8::encode $text; 1825 utf8::encode $text;
1525 $self->{cursor} = length substr $text, 0, $idx; 1826 $self->{cursor} = length substr $text, 0, $idx;
1526 1827
1527 $self->_set_text ($self->{text}); 1828 $self->_set_text ($self->{text});
1528 $self->update; 1829 $self->update;
1830
1831 1
1529} 1832}
1530 1833
1531sub mouse_motion { 1834sub invoke_mouse_motion {
1532 my ($self, $ev, $x, $y) = @_; 1835 my ($self, $ev, $x, $y) = @_;
1533# 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
1534} 1839}
1535 1840
1536sub _draw { 1841sub _draw {
1537 my ($self) = @_; 1842 my ($self) = @_;
1538 1843
1539 local $self->{fg} = $self->{fg}; 1844 local $self->{fg} = $self->{fg};
1540 1845
1541 if ($FOCUS == $self) { 1846 if ($FOCUS == $self) {
1542 glColor @{$self->{active_bg}}; 1847 glColor_premultiply @{$self->{active_bg}};
1543 $self->{fg} = $self->{active_fg}; 1848 $self->{fg} = $self->{active_fg};
1544 } else { 1849 } else {
1545 glColor @{$self->{bg}}; 1850 glColor_premultiply @{$self->{bg}};
1546 } 1851 }
1547 1852
1548 glEnable GL_BLEND; 1853 glEnable GL_BLEND;
1549 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1854 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1550 glBegin GL_QUADS; 1855 glBegin GL_QUADS;
1551 glVertex 0 , 0; 1856 glVertex 0 , 0;
1552 glVertex 0 , $self->{h}; 1857 glVertex 0 , $self->{h};
1553 glVertex $self->{w}, $self->{h}; 1858 glVertex $self->{w}, $self->{h};
1554 glVertex $self->{w}, 0; 1859 glVertex $self->{w}, 0;
… …
1579 1884
1580our @ISA = CFClient::UI::EntryBase::; 1885our @ISA = CFClient::UI::EntryBase::;
1581 1886
1582use CFClient::OpenGL; 1887use CFClient::OpenGL;
1583 1888
1584sub key_down { 1889sub invoke_key_down {
1585 my ($self, $ev) = @_; 1890 my ($self, $ev) = @_;
1586 1891
1587 my $sym = $ev->{sym}; 1892 my $sym = $ev->{sym};
1588 1893
1589 if ($sym == 13) { 1894 if ($sym == 13) {
1590 unshift @{$self->{history}}, 1895 unshift @{$self->{history}},
1591 my $txt = $self->get_text; 1896 my $txt = $self->get_text;
1897
1592 $self->{history_pointer} = -1; 1898 $self->{history_pointer} = -1;
1593 $self->{history_saveback} = ''; 1899 $self->{history_saveback} = '';
1594 $self->emit (activate => $txt); 1900 $self->emit (activate => $txt);
1595 $self->update; 1901 $self->update;
1596 1902
… …
1615 } else { 1921 } else {
1616 $self->set_text ($self->{history_saveback}); 1922 $self->set_text ($self->{history_saveback});
1617 } 1923 }
1618 1924
1619 } else { 1925 } else {
1620 $self->SUPER::key_down ($ev); 1926 return $self->SUPER::invoke_key_down ($ev)
1927 }
1928
1621 } 1929 1
1622
1623} 1930}
1624 1931
1625############################################################################# 1932#############################################################################
1626 1933
1627package CFClient::UI::Button; 1934package CFClient::UI::Button;
… …
1636 1943
1637sub new { 1944sub new {
1638 my $class = shift; 1945 my $class = shift;
1639 1946
1640 $class->SUPER::new ( 1947 $class->SUPER::new (
1641 padding => 4, 1948 padding_x => 4,
1949 padding_y => 4,
1642 fg => [1, 1, 1], 1950 fg => [1, 1, 1],
1643 bg => [1, 1, 1, 0.2],
1644 active_fg => [0, 0, 1], 1951 active_fg => [0, 0, 1],
1645 can_hover => 1, 1952 can_hover => 1,
1646 align => 0, 1953 align => 0,
1647 valign => 0, 1954 valign => 0,
1648 can_events => 1, 1955 can_events => 1,
1649 @_ 1956 @_
1650 ) 1957 )
1651} 1958}
1652 1959
1653sub button_up { 1960sub invoke_button_up {
1654 my ($self, $ev, $x, $y) = @_; 1961 my ($self, $ev, $x, $y) = @_;
1655 1962
1963 $self->emit ("activate")
1656 if ($x >= 0 && $x < $self->{w} 1964 if $x >= 0 && $x < $self->{w}
1657 && $y >= 0 && $y < $self->{h}) { 1965 && $y >= 0 && $y < $self->{h};
1658 $self->emit ("activate"); 1966
1659 } 1967 1
1660} 1968}
1661 1969
1662sub _draw { 1970sub _draw {
1663 my ($self) = @_; 1971 my ($self) = @_;
1664 1972
1665 local $self->{fg} = $self->{fg}; 1973 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1666
1667 if ($GRAB == $self) {
1668 $self->{fg} = $self->{active_fg};
1669 }
1670 1974
1671 glEnable GL_TEXTURE_2D; 1975 glEnable GL_TEXTURE_2D;
1672 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1976 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1673 glColor 0, 0, 0, 1; 1977 glColor 0, 0, 0, 1;
1674 1978
… …
1679 $self->SUPER::_draw; 1983 $self->SUPER::_draw;
1680} 1984}
1681 1985
1682############################################################################# 1986#############################################################################
1683 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
1684package CFClient::UI::CheckBox; 2024package CFClient::UI::CheckBox;
1685 2025
1686our @ISA = CFClient::UI::DrawBG::; 2026our @ISA = CFClient::UI::DrawBG::;
1687 2027
1688my @tex = 2028my @tex =
… …
1693 2033
1694sub new { 2034sub new {
1695 my $class = shift; 2035 my $class = shift;
1696 2036
1697 $class->SUPER::new ( 2037 $class->SUPER::new (
1698 padding => 2, 2038 padding_x => 2,
2039 padding_y => 2,
1699 fg => [1, 1, 1], 2040 fg => [1, 1, 1],
1700 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],
1701 state => 0, 2044 state => 0,
1702 can_hover => 1, 2045 can_hover => 1,
1703 @_ 2046 @_
1704 ) 2047 )
1705} 2048}
1706 2049
1707sub size_request { 2050sub size_request {
1708 my ($self) = @_; 2051 my ($self) = @_;
1709 2052
1710 ($self->{padding} * 2 + 6) x 2 2053 (6) x 2
1711} 2054}
1712 2055
1713sub button_down { 2056sub invoke_button_down {
1714 my ($self, $ev, $x, $y) = @_; 2057 my ($self, $ev, $x, $y) = @_;
1715 2058
1716 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 2059 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1717 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 2060 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1718 $self->{state} = !$self->{state}; 2061 $self->{state} = !$self->{state};
1719 $self->emit (changed => $self->{state}); 2062 $self->emit (changed => $self->{state});
2063 } else {
2064 return 0
2065 }
2066
1720 } 2067 1
1721} 2068}
1722 2069
1723sub _draw { 2070sub _draw {
1724 my ($self) = @_; 2071 my ($self) = @_;
1725 2072
1726 $self->SUPER::_draw; 2073 $self->SUPER::_draw;
1727 2074
1728 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 2075 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1729 2076
1730 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;
1731 2080
1732 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 2081 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1733 2082
1734 my $tex = $self->{state} ? $tex[1] : $tex[0]; 2083 my $tex = $self->{state} ? $tex[1] : $tex[0];
1735 2084
… …
1743package CFClient::UI::Image; 2092package CFClient::UI::Image;
1744 2093
1745our @ISA = CFClient::UI::Base::; 2094our @ISA = CFClient::UI::Base::;
1746 2095
1747use CFClient::OpenGL; 2096use CFClient::OpenGL;
1748use Carp qw/confess/;
1749 2097
1750our %loaded_images; 2098our %texture_cache;
1751 2099
1752sub new { 2100sub new {
1753 my $class = shift; 2101 my $class = shift;
1754 2102
1755 my $self = $class->SUPER::new (can_events => 0, @_); 2103 my $self = $class->SUPER::new (
2104 can_events => 0,
2105 @_,
2106 );
1756 2107
1757 $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";
1758 2110
1759 $loaded_images{$self->{image}} ||= 2111 $self->{tex} = $texture_cache{$self->{path}} ||=
1760 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;
1761 2113
1762 my $tex = $self->{tex} = $loaded_images{$self->{image}}; 2114 Scalar::Util::weaken $texture_cache{$self->{path}};
1763 2115
1764 Scalar::Util::weaken $loaded_images{$self->{image}}; 2116 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
1765
1766 $self->{aspect} = $tex->{w} / $tex->{h};
1767 2117
1768 $self 2118 $self
1769} 2119}
1770 2120
1771sub size_request { 2121sub size_request {
1772 my ($self) = @_; 2122 my ($self) = @_;
1773 2123
1774 ($self->{tex}->{w}, $self->{tex}->{h}) 2124 ($self->{tex}{w}, $self->{tex}{h})
1775} 2125}
1776 2126
1777sub _draw { 2127sub _draw {
1778 my ($self) = @_; 2128 my ($self) = @_;
1779 2129
… …
1890 2240
1891 my $h1 = $self->{h} * (1 - $ycut1); 2241 my $h1 = $self->{h} * (1 - $ycut1);
1892 my $h2 = $self->{h} * (1 - $ycut2); 2242 my $h2 = $self->{h} * (1 - $ycut2);
1893 2243
1894 glEnable GL_BLEND; 2244 glEnable GL_BLEND;
1895 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;
1896 glEnable GL_TEXTURE_2D; 2247 glEnable GL_TEXTURE_2D;
1897 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2248 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1898 2249
1899 glBindTexture GL_TEXTURE_2D, $t1->{name}; 2250 glBindTexture GL_TEXTURE_2D, $t1->{name};
1900 glBegin GL_QUADS; 2251 glBegin GL_QUADS;
… …
1989 qw(s1_slider.png s1_slider_bg.png); 2340 qw(s1_slider.png s1_slider_bg.png);
1990 2341
1991sub new { 2342sub new {
1992 my $class = shift; 2343 my $class = shift;
1993 2344
1994 # range [value, low, high, page] 2345 # range [value, low, high, page, unit]
1995 2346
1996 # TODO: 0-width page 2347 # TODO: 0-width page
1997 # TODO: req_w/h are wrong with vertical 2348 # TODO: req_w/h are wrong with vertical
1998 # TODO: calculations are off 2349 # TODO: calculations are off
1999 my $self = $class->SUPER::new ( 2350 my $self = $class->SUPER::new (
2000 fg => [1, 1, 1], 2351 fg => [1, 1, 1],
2001 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],
2002 range => [0, 0, 100, 10], 2355 range => [0, 0, 100, 10, 0],
2003 req_w => $::WIDTH / 80, 2356 min_w => $::WIDTH / 80,
2004 req_h => $::WIDTH / 80, 2357 min_h => $::WIDTH / 80,
2005 vertical => 0, 2358 vertical => 0,
2006 can_hover => 1, 2359 can_hover => 1,
2007 inner_pad => 5, 2360 inner_pad => 0.02,
2008 @_ 2361 @_
2009 ); 2362 );
2010 2363
2364 $self->set_value ($self->{range}[0]);
2365 $self->update;
2366
2011 $self 2367 $self
2012} 2368}
2013 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
2014sub size_request { 2404sub size_request {
2015 my ($self) = @_; 2405 my ($self) = @_;
2016 2406
2017 my $w = $self->{req_w}; 2407 ($self->{req_w}, $self->{req_h})
2018 my $h = $self->{req_h};
2019
2020 $self->{vertical} ? ($h, $w) : ($w, $h)
2021} 2408}
2022 2409
2023sub button_down { 2410sub invoke_button_down {
2024 my ($self, $ev, $x, $y) = @_; 2411 my ($self, $ev, $x, $y) = @_;
2025 2412
2026 $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
2027 $self->mouse_motion ($ev, $x, $y); 2417 $self->invoke_mouse_motion ($ev, $x, $y)
2028} 2418}
2029 2419
2030sub mouse_motion { 2420sub invoke_mouse_motion {
2031 my ($self, $ev, $x, $y) = @_; 2421 my ($self, $ev, $x, $y) = @_;
2032 2422
2033 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
2034 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2451 my ($value, $lo, $hi, $page) = @{$self->{range}};
2452 my $range = ($hi - $page - $lo) || 1e-100;
2035 2453
2036 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2454 my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
2037 2455
2038 my $inner_pad_px = $self->_calc_inner_pad_px ($w); 2456 $self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
2039 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right 2457 $self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
2040 2458
2041 $x -= $inner_pad_px; # substract the padding 2459 $value = ($value - $lo) / $range;
2042 $x = $x * ($hi - $lo) / $inner_w + $lo; 2460 $value = $value * $self->{scale} + $self->{offset};
2043 $x = $lo if $x < $lo;
2044 $x = $hi - $page if $x > $hi - $page;
2045 $self->{range}[0] = $x;
2046 2461
2047 $self->emit (changed => $x); 2462 $self->{knob_x} = $value - $knob_w * 0.5;
2048 $self->update; 2463 $self->{knob_w} = $knob_w;
2049 } 2464 }
2050}
2051
2052# the inner_* stuff is for generating a padding for the slider handle,
2053# so that the handle doesn't leave the texture. This calculation isn't 100%
2054# correct propably, but it does the job for now
2055sub _calc_inner_pad_px {
2056 my ($self, $w) = @_;
2057 ($w / 100) * $self->{inner_pad} # % to pixels
2058}
2059
2060sub _draw {
2061 my ($self) = @_;
2062 2465
2063 $self->SUPER::_draw (); 2466 $self->SUPER::_draw ();
2064 2467
2065 my ($w, $h) = @$self{qw(w h)}; 2468 glScale $self->{w}, $self->{h};
2066 2469
2067 if ($self->{vertical}) { 2470 if ($self->{vertical}) {
2068 # draw a vertical slider like a rotated horizontal slider 2471 # draw a vertical slider like a rotated horizontal slider
2069 2472
2473 glTranslate 1, 0, 0;
2070 glRotate 90, 0, 0, 1; 2474 glRotate 90, 0, 0, 1;
2071 glTranslate 0, -$self->{w}, 0;
2072
2073 ($w, $h) = ($h, $w);
2074 } 2475 }
2075 2476
2076 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg}; 2477 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
2077 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg}; 2478 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
2078 2479
2079 my ($value, $lo, $hi, $page) = @{$self->{range}};
2080
2081 $hi = $value + 1 if $lo == $hi;
2082
2083 my $inner_pad_px = $self->_calc_inner_pad_px ($w);
2084 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
2085
2086 $page = int $page * $inner_w / ($hi - $lo);
2087 $value = int +($value - $lo) * $inner_w / ($hi - $lo);
2088
2089 $w -= $page;
2090 $page &= ~1;
2091 glTranslate $page * 0.5, 0, 0;
2092 $page ||= 2;
2093
2094 my $knob_a = $inner_pad_px + ($value - $page * 0.5);
2095 my $knob_b = $inner_pad_px + ($value + $page * 0.5);
2096
2097 glEnable GL_TEXTURE_2D; 2480 glEnable GL_TEXTURE_2D;
2098 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2481 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2099 2482
2100 # draw background 2483 # draw background
2101 $tex[1]->draw_quad_alpha (0, 0, $w, $h); 2484 $tex[1]->draw_quad_alpha (0, 0, 1, 1);
2102 2485
2103 # draw handle 2486 # draw handle
2104 $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);
2105 2488
2106 glDisable GL_TEXTURE_2D; 2489 glDisable GL_TEXTURE_2D;
2107} 2490}
2108 2491
2109############################################################################# 2492#############################################################################
2110 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
2111package CFClient::UI::TextView; 2535package CFClient::UI::TextScroller;
2112 2536
2113our @ISA = CFClient::UI::HBox::; 2537our @ISA = CFClient::UI::HBox::;
2114 2538
2115use CFClient::OpenGL; 2539use CFClient::OpenGL;
2116 2540
… …
2118 my $class = shift; 2542 my $class = shift;
2119 2543
2120 my $self = $class->SUPER::new ( 2544 my $self = $class->SUPER::new (
2121 fontsize => 1, 2545 fontsize => 1,
2122 can_events => 0, 2546 can_events => 0,
2547 indent => 0,
2123 #font => default_font 2548 #font => default_font
2124 @_, 2549 @_,
2125 2550
2126 layout => (new CFClient::Layout 1), 2551 layout => (new CFClient::Layout 1),
2127 par => [], 2552 par => [],
… …
2142 2567
2143 $self->{fontsize} = $fontsize; 2568 $self->{fontsize} = $fontsize;
2144 $self->reflow; 2569 $self->reflow;
2145} 2570}
2146 2571
2147sub text_height { 2572sub visible_children {
2148 my ($self, $text) = @_; 2573 my ($self) = @_;
2149 2574
2150 my $layout = $self->{layout}; 2575 @{$self->{children}}[0,1]
2151
2152 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2153 $layout->set_width ($self->{children}[0]{w});
2154 $layout->set_markup ($text);
2155
2156 ($layout->size)[1]
2157} 2576}
2158 2577
2159sub reflow {
2160 my ($self) = @_;
2161
2162 $self->{need_reflow}++;
2163 $self->update;
2164}
2165
2166sub size_allocate { 2578sub invoke_size_allocate {
2167 my ($self, $w, $h) = @_; 2579 my ($self, $w, $h) = @_;
2168 2580
2169 $self->SUPER::size_allocate ($w, $h); 2581 my (undef, undef, @other) = @{ $self->{children} };
2582 $_->configure (@$_{qw(x y req_w req_h)}) for @other;
2170 2583
2171 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2584 $self->{layout}->set_font ($self->{font}) if $self->{font};
2172 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2585 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2173 $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});
2174 2588
2175 $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]);
2176} 2632}
2177 2633
2178sub add_paragraph { 2634sub add_paragraph {
2179 my ($self, $color, $text) = @_; 2635 my ($self, $color, $para, $indent) = @_;
2180 2636
2181 #TODO: intelligently "reformat" paragraph 2637 my ($text, @w) = ref $para ? @$para : $para;
2182 2638
2183 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 };
2184 2647
2185 $self->{height} += $height; 2648 $self->add (@w) if @w;
2649 push @{$self->{par}}, $para;
2186 2650
2187 push @{$self->{par}}, [$height, $color, $text]; 2651 $self->{need_reflow}++;
2652 $self->update;
2653}
2188 2654
2189 $self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}]; 2655sub scroll_to_bottom {
2190 $self->{children}[1]->update; 2656 my ($self) = @_;
2657
2658 $self->{scroll_to_bottom} = 1;
2659 $self->update;
2191} 2660}
2192 2661
2193sub update { 2662sub update {
2194 my ($self) = @_; 2663 my ($self) = @_;
2195 2664
… …
2197 2666
2198 return unless $self->{h} > 0; 2667 return unless $self->{h} > 0;
2199 2668
2200 delete $self->{texture}; 2669 delete $self->{texture};
2201 2670
2202 $ROOT->on_post_alloc ($self, sub { 2671 $ROOT->on_post_alloc ($self => sub {
2672 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2673
2203 if (delete $self->{need_reflow}) { 2674 if (delete $self->{need_reflow}) {
2204 my $height = 0; 2675 my $height = 0;
2205 2676
2206 $height += $_->[0] = $self->text_height ($_->[2])
2207 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 }
2208 2689
2209 $self->{height} = $height; 2690 $self->{height} = $height;
2210 2691
2211 $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]);
2212 2693
2213 delete $self->{texture}; 2694 delete $self->{texture};
2214 } 2695 }
2215 2696
2697 if (delete $self->{scroll_to_bottom}) {
2698 $self->{children}[1]->set_value (1e10);
2699 }
2700
2216 $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 {
2217 glClearColor 0, 0, 0, 0; 2702 glClearColor 0, 0, 0, 0;
2218 glClear GL_COLOR_BUFFER_BIT; 2703 glClear GL_COLOR_BUFFER_BIT;
2219 2704
2220 glEnable GL_TEXTURE_2D;
2221 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2222
2223 my $top = int $self->{children}[1]{range}[0]; 2705 my $top = int $self->{children}[1]{range}[0];
2224 2706
2225 my $y0 = $top; 2707 my $y0 = $top;
2226 my $y1 = $top + $self->{h}; 2708 my $y1 = $top + $H;
2227 2709
2228 my $y = 0; 2710 my $y = 0;
2229 2711
2230 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;
2231 2715
2232 $layout->set_font ($self->{font}) if $self->{font};
2233
2234 for my $par (@{$self->{par}}) { 2716 for my $para (@{$self->{par}}) {
2235 my $h = $par->[0]; 2717 my $h = $para->{h};
2236 2718
2237 if ($y0 < $y + $h && $y < $y1) { 2719 if ($y0 < $y + $h && $y < $y1) {
2238 $layout->set_foreground (@{ $par->[1] });
2239 $layout->set_markup ($par->[2]);
2240 2720
2241 my ($W, $H) = $layout->size; 2721 my $layout = $self->get_layout ($para);
2242 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 }
2243 } 2740 }
2244 2741
2245 $y += $h; 2742 $y += $h;
2246 } 2743 }
2247 2744
2248 glDisable GL_TEXTURE_2D; 2745 glDisable GL_BLEND;
2249 }; 2746 };
2250 }); 2747 });
2251} 2748}
2252 2749
2750sub reconfigure {
2751 my ($self) = @_;
2752
2753 $self->SUPER::reconfigure;
2754
2755 $_->{w} = 1e10 for @{ $self->{par} };
2756 $self->reflow;
2757}
2758
2253sub _draw { 2759sub _draw {
2254 my ($self) = @_; 2760 my ($self) = @_;
2255 2761
2256 glEnable GL_TEXTURE_2D; 2762 glEnable GL_TEXTURE_2D;
2257 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2763 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2258 glColor 1, 1, 1, 1; 2764 glColor 0, 0, 0, 1;
2259 $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});
2260 glDisable GL_TEXTURE_2D; 2766 glDisable GL_TEXTURE_2D;
2261 2767
2262 $self->{children}[1]->draw; 2768 $self->{children}[1]->draw;
2263
2264} 2769}
2265 2770
2266############################################################################# 2771#############################################################################
2267 2772
2268package CFClient::UI::Animator; 2773package CFClient::UI::Animator;
… …
2313 2818
2314sub new { 2819sub new {
2315 my $class = shift; 2820 my $class = shift;
2316 2821
2317 my $self = $class->SUPER::new ( 2822 my $self = $class->SUPER::new (
2318 state => 0, 2823 state => 0,
2319 connect_activate => \&toggle_flopper, 2824 on_activate => \&toggle_flopper,
2320 @_ 2825 @_
2321 ); 2826 );
2322 2827
2323 if ($self->{state}) {
2324 $self->{state} = 0;
2325 $self->toggle_flopper;
2326 }
2327
2328 $self 2828 $self
2329} 2829}
2330 2830
2331sub toggle_flopper { 2831sub toggle_flopper {
2332 my ($self) = @_; 2832 my ($self) = @_;
2333 2833
2334 # TODO: use animation 2834 $self->{other}->toggle_visibility;
2335 if ($self->{state} = !$self->{state}) {
2336 $CFClient::UI::ROOT->add ($self->{other});
2337 $self->{other}->move ($self->coord2global (0, $self->{h}));
2338 $self->emit ("open");
2339 } else {
2340 $CFClient::UI::ROOT->remove ($self->{other});
2341 $self->emit ("close");
2342 }
2343
2344 $self->emit (changed => $self->{state});
2345} 2835}
2346 2836
2347############################################################################# 2837#############################################################################
2348 2838
2349package CFClient::UI::Tooltip; 2839package CFClient::UI::Tooltip;
… …
2362} 2852}
2363 2853
2364sub set_tooltip_from { 2854sub set_tooltip_from {
2365 my ($self, $widget) = @_; 2855 my ($self, $widget) = @_;
2366 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
2367 $self->add (new CFClient::UI::Label 2869 $self->add (new CFClient::UI::Label
2368 markup => $widget->{tooltip}, 2870 markup => $tooltip,
2369 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2871 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2370 fontsize => 0.8, 2872 fontsize => 0.8,
2371 fg => [0, 0, 0, 1], 2873 fg => [0, 0, 0, 1],
2874 ellipsise => 0,
2372 font => ($widget->{tooltip_font} || $::FONT_PROP), 2875 font => ($widget->{tooltip_font} || $::FONT_PROP),
2373 ); 2876 );
2374} 2877}
2375 2878
2376sub size_request { 2879sub size_request {
2377 my ($self) = @_; 2880 my ($self) = @_;
… …
2379 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2882 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2380 2883
2381 ($w + 4, $h + 4) 2884 ($w + 4, $h + 4)
2382} 2885}
2383 2886
2384sub size_allocate { 2887sub invoke_size_allocate {
2385 my ($self, $w, $h) = @_; 2888 my ($self, $w, $h) = @_;
2386 2889
2387 $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 });
2388} 2909}
2389 2910
2390sub _draw { 2911sub _draw {
2391 my ($self) = @_; 2912 my ($self) = @_;
2392 2913
… …
2409 glVertex $w, $h; 2930 glVertex $w, $h;
2410 glVertex $w, 0; 2931 glVertex $w, 0;
2411 glEnd; 2932 glEnd;
2412 2933
2413 glTranslate 2 - 0.375, 2 - 0.375; 2934 glTranslate 2 - 0.375, 2 - 0.375;
2935
2414 $self->SUPER::_draw; 2936 $self->SUPER::_draw;
2415} 2937}
2416 2938
2417############################################################################# 2939#############################################################################
2418 2940
… …
2423use CFClient::OpenGL; 2945use CFClient::OpenGL;
2424 2946
2425sub new { 2947sub new {
2426 my $class = shift; 2948 my $class = shift;
2427 2949
2428 $class->SUPER::new ( 2950 my $self = $class->SUPER::new (
2429 aspect => 1, 2951 aspect => 1,
2952 can_events => 0,
2430 @_, 2953 @_,
2431 ) 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
2432} 2971}
2433 2972
2434sub size_request { 2973sub size_request {
2435 (32, 8) 2974 (32, 8)
2436} 2975}
2437 2976
2977sub update {
2978 my ($self) = @_;
2979
2980 return unless $self->{visible};
2981
2982 $self->SUPER::update;
2983}
2984
2438sub _draw { 2985sub _draw {
2439 my ($self) = @_; 2986 my ($self) = @_;
2440 2987
2441 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
2442 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]]; 2999 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2443 3000
2444 # TODO animation
2445 if ($tex) { 3001 if ($tex) {
2446 glEnable GL_TEXTURE_2D; 3002 glEnable GL_TEXTURE_2D;
2447 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3003 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2448 glColor 1, 1, 1, 1; 3004 glColor 0, 0, 0, 1;
2449 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3005 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2450 glDisable GL_TEXTURE_2D; 3006 glDisable GL_TEXTURE_2D;
2451 } 3007 }
2452} 3008}
2453 3009
3010sub destroy {
3011 my ($self) = @_;
3012
3013 $self->{timer}->cancel
3014 if $self->{timer};
3015
3016 $self->SUPER::destroy;
3017}
3018
2454############################################################################# 3019#############################################################################
2455 3020
2456package CFClient::UI::InventoryItem; 3021package CFClient::UI::Buttonbar;
2457 3022
2458our @ISA = CFClient::UI::HBox::; 3023our @ISA = CFClient::UI::HBox::;
2459 3024
2460sub new { 3025# TODO: should actualyl wrap buttons and other goodies.
2461 my $class = shift;
2462
2463 my %args = @_;
2464
2465 my $item = delete $args{item};
2466
2467 my $desc = $item->{nrof} < 2
2468 ? $item->{name}
2469 : "$item->{nrof} $item->{name_pl}";
2470
2471
2472 my $self = $class->SUPER::new (
2473 can_hover => 1,
2474 can_events => 1,
2475 tooltip => (CFClient::UI::Label->escape ($desc)
2476 . "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),
2477 connect_button_down => sub {
2478 my ($self, $ev, $x, $y) = @_;
2479
2480 # todo: maybe put examine on 1? but should just be a tooltip :(
2481 if ($ev->{button} == 1) {
2482 $::CONN->send ("move $::CONN->{player}{tag} $item->{tag} 0");
2483 } elsif ($ev->{button} == 2) {
2484 $::CONN->send ("apply $item->{tag}");
2485 } elsif ($ev->{button} == 3) {
2486 CFClient::UI::Menu->new (
2487 items => [
2488 ["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2489 [
2490 $item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock",
2491 sub { $::CONN->send ("lock $item->{tag}") },
2492 ],
2493 ["mark", sub { $::CONN->send ("mark $item->{tag}") }],
2494 ["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2495 ["drop", sub { $::CONN->send ("move 0 $item->{tag} 0") }],
2496 ],
2497 )->popup ($ev);
2498 }
2499
2500 1
2501 },
2502 %args
2503 );
2504
2505 $self->add (new CFClient::UI::Face
2506 can_events => 0,
2507 face => $item->{face},
2508 anim => $item->{anim},
2509 animspeed => $item->{animspeed},
2510 );
2511
2512 $self->add (new CFClient::UI::Label
2513 can_events => 0,
2514 text => $desc,
2515 );
2516
2517 $self
2518}
2519
2520#############################################################################
2521
2522package CFClient::UI::Inventory;
2523
2524our @ISA = CFClient::UI::ScrolledWindow::;
2525
2526sub new {
2527 my $class = shift;
2528
2529 my $self = $class->SUPER::new (
2530 scrolled => (new CFClient::UI::VBox),
2531 @_,
2532 );
2533
2534 $self
2535}
2536
2537sub set_items {
2538 my ($self, $items) = @_;
2539
2540 $self->{scrolled}->clear;
2541 return unless $items;
2542
2543 my @items = sort {
2544 ($a->{type} <=> $b->{type})
2545 or ($a->{name} cmp $b->{name})
2546 } @$items;
2547
2548 $self->{real_items} = \@items;
2549
2550 for my $item (@items) {
2551 my $desc = $item->{nrof} < 2
2552 ? $item->{name}
2553 : "$item->{nrof} $item->{name_pl}";
2554
2555 $item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item;
2556 }
2557
2558 $self->{scrolled}->add (@items);
2559
2560# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2561}
2562
2563sub size_request {
2564 my ($self) = @_;
2565 ($self->{req_w}, $self->{req_h});
2566}
2567 3026
2568############################################################################# 3027#############################################################################
2569 3028
2570package CFClient::UI::Menu; 3029package CFClient::UI::Menu;
2571 3030
… …
2583 ); 3042 );
2584 3043
2585 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3044 $self->add ($self->{vbox} = new CFClient::UI::VBox);
2586 3045
2587 for my $item (@{ $self->{items} }) { 3046 for my $item (@{ $self->{items} }) {
2588 my ($widget, $cb) = @$item; 3047 my ($widget, $cb, $tooltip) = @$item;
2589 3048
2590 # handle various types of items, only text for now 3049 # handle various types of items, only text for now
2591 if (!ref $widget) { 3050 if (!ref $widget) {
2592 $widget = new CFClient::UI::Label 3051 $widget = new CFClient::UI::Label
2593 can_hover => 1, 3052 can_hover => 1,
2594 can_events => 1, 3053 can_events => 1,
2595 text => $widget; 3054 markup => $widget,
3055 tooltip => $tooltip
2596 } 3056 }
2597 3057
2598 $self->{item}{$widget} = $item; 3058 $self->{item}{$widget} = $item;
2599 3059
2600 $self->{vbox}->add ($widget); 3060 $self->{vbox}->add ($widget);
… …
2612 # maybe save $GRAB? must be careful about events... 3072 # maybe save $GRAB? must be careful about events...
2613 $GRAB = $self; 3073 $GRAB = $self;
2614 $self->{button} = $ev->{button}; 3074 $self->{button} = $ev->{button};
2615 3075
2616 $self->show; 3076 $self->show;
2617 $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);
2618} 3078}
2619 3079
2620sub mouse_motion { 3080sub invoke_mouse_motion {
2621 my ($self, $ev, $x, $y) = @_; 3081 my ($self, $ev, $x, $y) = @_;
2622 3082
2623 # TODO: should use vbox->find_widget or so 3083 # TODO: should use vbox->find_widget or so
2624 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 3084 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2625 $self->{hover} = $self->{item}{$HOVER}; 3085 $self->{hover} = $self->{item}{$HOVER};
2626}
2627 3086
3087 0
3088}
3089
2628sub button_up { 3090sub invoke_button_up {
2629 my ($self, $ev, $x, $y) = @_; 3091 my ($self, $ev, $x, $y) = @_;
2630 3092
2631 if ($ev->{button} == $self->{button}) { 3093 if ($ev->{button} == $self->{button}) {
2632 undef $GRAB; 3094 undef $GRAB;
2633 $self->hide; 3095 $self->hide;
2634 3096
2635 $self->emit ("popdown"); 3097 $self->emit ("popdown");
2636 $self->{hover}[1]->() if $self->{hover}; 3098 $self->{hover}[1]->() if $self->{hover};
3099 } else {
3100 return 0
3101 }
3102
2637 } 3103 1
2638} 3104}
2639 3105
2640############################################################################# 3106#############################################################################
2641 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
2642package CFClient::UI::Statusbox; 3274package CFClient::UI::Statusbox;
2643 3275
2644our @ISA = CFClient::UI::VBox::; 3276our @ISA = CFClient::UI::VBox::;
2645 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
2646sub reorder { 3293sub reorder {
2647 my ($self) = @_; 3294 my ($self) = @_;
2648 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} };
2649 3301
2650 while (my ($k, $v) = each %{ $self->{item} }) { 3302 while (my ($k, $v) = each %{ $self->{item} }) {
2651 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3303 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2652 } 3304 }
2653 3305
… …
2656 my @items = sort { 3308 my @items = sort {
2657 $a->{pri} <=> $b->{pri} 3309 $a->{pri} <=> $b->{pri}
2658 or $b->{id} <=> $a->{id} 3310 or $b->{id} <=> $a->{id}
2659 } values %{ $self->{item} }; 3311 } values %{ $self->{item} };
2660 3312
3313 $self->{timer}->interval (1);
3314
2661 my $count = 10 + 1; 3315 my $count = 10 + 1;
2662 for my $item (@items) { 3316 for my $item (@items) {
2663 last unless --$count; 3317 last unless --$count;
2664 3318
2665 push @widgets, $item->{label} ||= do { 3319 my $label = $item->{label} ||= do {
2666 # TODO: doesn't handle markup well (read as: at all) 3320 # TODO: doesn't handle markup well (read as: at all)
2667 my $short = $item->{count} > 1 3321 my $short = $item->{count} > 1
2668 ? "<b>$item->{count} ×</b> $item->{text}" 3322 ? "<b>$item->{count} ×</b> $item->{text}"
2669 : $item->{text}; 3323 : $item->{text};
2670 3324
2671 for ($short) { 3325 for ($short) {
2672 s/^\s+//; 3326 s/^\s+//;
2673 s/\012.*/…/s; 3327 s/\s+/ /g;
2674 my $len = int 40 / $item->{fontsize};
2675 substr $_, $len, length, "…" if $len < length;
2676 } 3328 }
2677 3329
2678 new CFClient::UI::Label 3330 new CFClient::UI::Label
2679 markup => $short, 3331 markup => $short,
2680 tooltip => $item->{tooltip}, 3332 tooltip => $item->{tooltip},
2681 tooltip_font => $::FONT_PROP, 3333 tooltip_font => $::FONT_PROP,
2682 tooltip_width => 0.67, 3334 tooltip_width => 0.67,
2683 fontsize => $item->{fontsize}, 3335 fontsize => $item->{fontsize} || $self->{fontsize},
2684 color => $item->{color}, 3336 max_w => $::WIDTH * 0.44,
3337 fg => [@{ $item->{fg} }],
2685 can_events => 1, 3338 can_events => 1,
2686 can_hover => 1 3339 can_hover => 1
2687 }; 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;
2688 } 3353 }
2689 3354
2690 $self->clear; 3355 $self->clear;
2691 $self->SUPER::add (reverse @widgets); 3356 $self->SUPER::add (reverse @widgets);
2692} 3357}
… …
2695 my ($self, $text, %arg) = @_; 3360 my ($self, $text, %arg) = @_;
2696 3361
2697 $text =~ s/^\s+//; 3362 $text =~ s/^\s+//;
2698 $text =~ s/\s+$//; 3363 $text =~ s/\s+$//;
2699 3364
3365 return unless $text;
3366
2700 my $timeout = time + ((delete $arg{timeout}) || 60); 3367 my $timeout = (int time) + ((delete $arg{timeout}) || 60);
2701 3368
2702 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 3369 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2703 3370
2704 if (my $item = $self->{item}{$group}) { 3371 if (my $item = $self->{item}{$group}) {
2705 if ($item->{text} eq $text) { 3372 if ($item->{text} eq $text) {
2706 $item->{count}++; 3373 $item->{count}++;
2707 } else { 3374 } else {
2708 $item->{count} = 1; 3375 $item->{count} = 1;
2709 $item->{text} = $item->{tooltip} = $text; 3376 $item->{text} = $item->{tooltip} = $text;
2710 } 3377 }
2711 $item->{id} = ++$self->{id}; 3378 $item->{id} += 0.2;#d#
2712 $item->{timeout} = $timeout; 3379 $item->{timeout} = $timeout;
2713 delete $item->{label}; 3380 delete $item->{label};
2714 } else { 3381 } else {
2715 $self->{item}{$group} = { 3382 $self->{item}{$group} = {
2716 id => ++$self->{id}, 3383 id => ++$self->{id},
2717 text => $text, 3384 text => $text,
2718 timeout => $timeout, 3385 timeout => $timeout,
2719 tooltip => $text, 3386 tooltip => $text,
2720 fontsize => 0.8,
2721 color => [0.8, 0.8, 0.8, 0.8], 3387 fg => [0.8, 0.8, 0.8, 0.8],
2722 pri => 0, 3388 pri => 0,
2723 count => 1, 3389 count => 1,
2724 %arg, 3390 %arg,
2725 }; 3391 };
2726 } 3392 }
2727 3393
2728 $self->reorder; 3394 $self->reorder;
2729} 3395}
2730 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
2731############################################################################# 3415#############################################################################
2732 3416
2733package CFClient::UI::Root; 3417package CFClient::UI::Inventory;
2734 3418
2735our @ISA = CFClient::UI::Container::; 3419our @ISA = CFClient::UI::ScrolledWindow::;
2736
2737use CFClient::OpenGL;
2738 3420
2739sub new { 3421sub new {
2740 my $class = shift; 3422 my $class = shift;
2741 3423
2742 $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 => [],
2743 @_, 3677 @_,
2744 ) 3678 )
2745} 3679}
2746 3680
2747sub configure { 3681my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
2748 my ($self, $x, $y, $w, $h) = @_;
2749 3682
2750 $self->{w} = $w; 3683my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
2751 $self->{h} = $h; 3684 "<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
2752} 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");
2753 3693
2754sub 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 {
2755 my ($self) = @_; 3767 my ($self, $spell) = @_;
2756 3768
2757 $self->size_allocate ($self->{w}, $self->{h}) 3769 $self->{spell}->{$spell->{name}} = $spell;
2758 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
2759} 3808}
2760 3809
2761sub size_request { 3810sub size_request {
2762 my ($self) = @_; 3811 my ($self) = @_;
2763 3812
2764 ($self->{w}, $self->{h}) 3813 ($self->{w}, $self->{h})
2765} 3814}
2766 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
2767sub size_allocate { 3830sub invoke_size_allocate {
2768 my ($self, $w, $h) = @_; 3831 my ($self, $w, $h) = @_;
2769
2770 my $old_w = $self->{old_w};
2771 my $old_h = $self->{old_h};
2772
2773 if ($old_w && $old_h) {
2774 for my $child ($self->children) {
2775 $child->{x} = int 0.5 + $child->{x} * $w / $old_w;
2776 $child->{w} = int 0.5 + $child->{w} * $w / $old_w;
2777 $child->{req_w} = int 0.5 + $child->{req_w} * $w / $old_w if exists $child->{req_w};
2778 $child->{user_w} = int 0.5 + $child->{user_w} * $w / $old_w if exists $child->{user_w};
2779 $child->{y} = int 0.5 + $child->{y} * $h / $old_h;
2780 $child->{h} = int 0.5 + $child->{h} * $h / $old_h;
2781 $child->{req_h} = int 0.5 + $child->{req_h} * $h / $old_h if exists $child->{req_h};
2782 $child->{user_h} = int 0.5 + $child->{user_h} * $h / $old_h if exists $child->{user_h};
2783 }
2784 }
2785 3832
2786 for my $child ($self->children) { 3833 for my $child ($self->children) {
2787 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)};
2788 3835
2789 $X = List::Util::max 0, List::Util::min $w - $W, $X; 3836 $X = $child->{force_x} if exists $child->{force_x};
2790 $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
2791 $child->configure ($X, $Y, $W, $H); 3842 $child->configure ($X, $Y, $W, $H);
2792 } 3843 }
2793 3844
2794 $self->{old_w} = $w; 3845 1
2795 $self->{old_h} = $h;
2796} 3846}
2797 3847
2798sub coord2local { 3848sub coord2local {
2799 my ($self, $x, $y) = @_; 3849 my ($self, $x, $y) = @_;
2800 3850
… …
2808} 3858}
2809 3859
2810sub update { 3860sub update {
2811 my ($self) = @_; 3861 my ($self) = @_;
2812 3862
2813 $self->check_size;
2814 $::WANT_REFRESH++; 3863 $::WANT_REFRESH++;
2815} 3864}
2816 3865
2817sub add { 3866sub add {
2818 my ($self, $child) = @_; 3867 my ($self, @children) = @_;
2819 3868
2820 # integerise window positions 3869 $_->{is_toplevel} = 1
2821 $child->{x} = int $child->{x}; 3870 for @children;
2822 $child->{y} = int $child->{y};
2823 3871
2824 $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 }
2825} 3888}
2826 3889
2827sub on_refresh { 3890sub on_refresh {
2828 my ($self, $id, $cb) = @_; 3891 my ($self, $id, $cb) = @_;
2829 3892
… …
2842 while ($self->{refresh_hook}) { 3905 while ($self->{refresh_hook}) {
2843 $_->() 3906 $_->()
2844 for values %{delete $self->{refresh_hook}}; 3907 for values %{delete $self->{refresh_hook}};
2845 } 3908 }
2846 3909
2847 if ($self->{check_size}) { 3910 if ($self->{realloc}) {
2848 my @queue = ([], []); 3911 my %queue;
3912 my @queue;
3913 my $widget;
2849 3914
2850 for (;;) { 3915 outer:
2851 if ($self->{check_size}) { 3916 while () {
2852 # heuristic: check containers last 3917 if (my $realloc = delete $self->{realloc}) {
2853 push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_ 3918 for $widget (values %$realloc) {
2854 for values %{delete $self->{check_size}} 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 }
2855 } 3925 }
2856 3926
2857 my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last; 3927 while () {
3928 @queue or last outer;
2858 3929
2859 my ($w, $h) = $widget->{user_w} && $widget->{user_h} 3930 $widget = pop @{ $queue[-1] || [] }
2860 ? @$widget{qw(user_w user_h)} 3931 and last;
2861 : $widget->size_request;
2862
2863 if (delete $widget->{force_alloc}
2864 or $w != $widget->{req_w} or $h != $widget->{req_h}) {
2865 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
2866 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}) {
2867 $widget->{req_w} = $w; 3951 $widget->{req_w} = $w;
2868 $widget->{req_h} = $h; 3952 $widget->{req_h} = $h;
2869 3953
2870 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h]; 3954 $self->{size_alloc}{$widget+0} = $widget;
2871 3955
2872 $widget->{parent}->check_size
2873 if $widget->{parent}; 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 }
2874 } 3963 }
3964
3965 delete $self->{realloc}{$widget+0};
2875 } 3966 }
2876 } 3967 }
2877 3968
2878 while ($self->{size_alloc}) { 3969 while (my $size_alloc = delete $self->{size_alloc}) {
2879 for (values %{delete $self->{size_alloc}}) { 3970 my @queue = sort { $b->{visible} <=> $a->{visible} }
2880 my ($widget, $w, $h) = @$_; 3971 values %$size_alloc;
3972
3973 while () {
3974 my $widget = pop @queue || last;
3975
3976 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
2881 3977
2882 $w = 0 if $w < 0; 3978 $w = 0 if $w < 0;
2883 $h = 0 if $h < 0; 3979 $h = 0 if $h < 0;
2884 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
2885 $widget->{w} = $w; 3988 $widget->{w} = $w;
2886 $widget->{h} = $h; 3989 $widget->{h} = $h;
2887 $widget->size_allocate ($w, $h); 3990
2888 $widget->emit (size_allocate => $w, $h); 3991 $widget->emit (size_allocate => $w, $h);
3992 }
2889 } 3993 }
2890 } 3994 }
2891 3995
2892 while ($self->{post_alloc_hook}) { 3996 while ($self->{post_alloc_hook}) {
2893 $_->() 3997 $_->()
2894 for values %{delete $self->{post_alloc_hook}}; 3998 for values %{delete $self->{post_alloc_hook}};
2895 } 3999 }
2896 4000
4001
2897 glViewport 0, 0, $::WIDTH, $::HEIGHT; 4002 glViewport 0, 0, $::WIDTH, $::HEIGHT;
2898 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 4003 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2899 glClear GL_COLOR_BUFFER_BIT; 4004 glClear GL_COLOR_BUFFER_BIT;
2900 4005
2901 glMatrixMode GL_PROJECTION; 4006 glMatrixMode GL_PROJECTION;
2902 glLoadIdentity; 4007 glLoadIdentity;
2903 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000; 4008 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
2904 glMatrixMode GL_MODELVIEW; 4009 glMatrixMode GL_MODELVIEW;
2905 glLoadIdentity; 4010 glLoadIdentity;
2906 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
2907 $self->_draw; 4019 $self->_draw;
2908} 4020}
2909 4021
2910############################################################################# 4022#############################################################################
2911 4023
2912package CFClient::UI; 4024package CFClient::UI;
2913 4025
2914$ROOT = new CFClient::UI::Root; 4026$ROOT = new CFClient::UI::Root;
2915$TOOLTIP = new CFClient::UI::Tooltip; 4027$TOOLTIP = new CFClient::UI::Tooltip z => 900;
2916 4028
29171 40291
2918 4030

Diff Legend

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