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

Diff Legend

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