ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/DC/UI.pm
(Generate patch)

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

Diff Legend

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