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.206 by root, Mon May 15 17:45:29 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
17our %WIDGET; # all widgets, weak-referenced 20our %WIDGET; # all widgets, weak-referenced
18 21
19sub check_tooltip { 22our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub {
20 if (!$GRAB) { 23 if (!$GRAB) {
21 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) { 24 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
22 if (length $widget->{tooltip}) { 25 if (length $widget->{tooltip}) {
23
24 if ($TOOLTIP->{owner} != $widget) { 26 if ($TOOLTIP->{owner} != $widget) {
27 $TOOLTIP->hide;
28
25 $TOOLTIP->{owner} = $widget; 29 $TOOLTIP->{owner} = $widget;
30
31 return if $ENV{CFPLUS_DEBUG} & 8;
26 32
27 my $tip = $widget->{tooltip}; 33 my $tip = $widget->{tooltip};
28 34
29 $tip = $tip->($widget) if CODE:: eq ref $tip; 35 $tip = $tip->($widget) if CODE:: eq ref $tip;
30 36
31 $TOOLTIP->set_tooltip_from ($widget); 37 $TOOLTIP->set_tooltip_from ($widget);
32 $TOOLTIP->show; 38 $TOOLTIP->show;
33
34 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
35
36 ($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0)
37 if $x + $TOOLTIP->{w} > $::WIDTH;
38
39 $TOOLTIP->move ($x, $y);
40 $TOOLTIP->check_size;
41 $TOOLTIP->update;
42 } 39 }
43 40
44 return; 41 return;
45 } 42 }
46 } 43 }
47 } 44 }
48 45
49 $TOOLTIP->hide; 46 $TOOLTIP->hide;
50 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;
51} 71}
52 72
53# class methods for events 73# class methods for events
54sub feed_sdl_key_down_event { 74sub feed_sdl_key_down_event {
55 $FOCUS->emit (key_down => $_[0]) || $FOCUS->key_down ($_[0]) 75 $FOCUS->emit (key_down => $_[0])
56 if $FOCUS; 76 if $FOCUS;
57} 77}
58 78
59sub feed_sdl_key_up_event { 79sub feed_sdl_key_up_event {
60 $FOCUS->emit (key_up => $_[0]) || $FOCUS->key_up ($_[0]) 80 $FOCUS->emit (key_up => $_[0])
61 if $FOCUS; 81 if $FOCUS;
62} 82}
63 83
64sub feed_sdl_button_down_event { 84sub feed_sdl_button_down_event {
65 my ($ev) = @_; 85 my ($ev) = @_;
… …
69 my $widget = $ROOT->find_widget ($x, $y); 89 my $widget = $ROOT->find_widget ($x, $y);
70 90
71 $GRAB = $widget; 91 $GRAB = $widget;
72 $GRAB->update if $GRAB; 92 $GRAB->update if $GRAB;
73 93
74 check_tooltip; 94 $TOOLTIP_WATCHER->cb->();
75 } 95 }
76 96
77 $BUTTON_STATE |= 1 << ($ev->{button} - 1); 97 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
78 98
79 if ($GRAB) { 99 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))
80 ($x, $y) = $GRAB->coord2local ($x, $y); 100 if $GRAB;
81 $GRAB->emit (button_down => $ev, $x, $y) || $GRAB->button_down ($ev, $x, $y);
82 }
83} 101}
84 102
85sub feed_sdl_button_up_event { 103sub feed_sdl_button_up_event {
86 my ($ev) = @_; 104 my ($ev) = @_;
87 my ($x, $y) = ($ev->{x}, $ev->{y}); 105 my ($x, $y) = ($ev->{x}, $ev->{y});
88 106
89 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 107 my $widget = $GRAB || $ROOT->find_widget ($x, $y);
90 108
91 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1)); 109 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
92 110
93 if ($GRAB) { 111 $GRAB->emit (button_up => $ev, $GRAB->coord2local ($x, $y))
94 ($x, $y) = $GRAB->coord2local ($x, $y); 112 if $GRAB;
95 $GRAB->emit (button_up => $ev, $x, $y) || $GRAB->button_up ($ev, $x, $y);
96 }
97 113
98 if (!$BUTTON_STATE) { 114 if (!$BUTTON_STATE) {
99 my $grab = $GRAB; undef $GRAB; 115 my $grab = $GRAB; undef $GRAB;
100 $grab->update if $grab; 116 $grab->update if $grab;
101 $GRAB->update if $GRAB; 117 $GRAB->update if $GRAB;
102 118
103 check_tooltip; 119 $TOOLTIP_WATCHER->cb->();
104 } 120 }
105} 121}
106 122
107sub feed_sdl_motion_event { 123sub feed_sdl_motion_event {
108 my ($ev) = @_; 124 my ($ev) = @_;
… …
114 my $hover = $HOVER; $HOVER = $widget; 130 my $hover = $HOVER; $HOVER = $widget;
115 131
116 $hover->update if $hover && $hover->{can_hover}; 132 $hover->update if $hover && $hover->{can_hover};
117 $HOVER->update if $HOVER && $HOVER->{can_hover}; 133 $HOVER->update if $HOVER && $HOVER->{can_hover};
118 134
119 check_tooltip; 135 $TOOLTIP_WATCHER->start;
120 } 136 }
121 137
122 if ($HOVER) {
123 ($x, $y) = $HOVER->coord2local ($x, $y);
124 $HOVER->emit (mouse_motion => $ev, $x, $y) || $HOVER->mouse_motion ($ev, $x, $y); 138 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
125 } 139 if $HOVER;
126} 140}
127 141
128# convert position array to integers 142# convert position array to integers
129sub harmonize { 143sub harmonize {
130 my ($vals) = @_; 144 my ($vals) = @_;
… …
136 $rem += $_ - $i; 150 $rem += $_ - $i;
137 $_ = $i; 151 $_ = $i;
138 } 152 }
139} 153}
140 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
141# call when resolution changes etc. 171# call when resolution changes etc.
142sub rescale_widgets { 172sub rescale_widgets {
143 my ($sx, $sy) = @_; 173 my ($sx, $sy) = @_;
144 174
145 for my $widget (values %WIDGET) { 175 for my $widget (values %WIDGET) {
146 if ($widget->{toplevel}) { 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
147 $widget->{x} = int 0.5 + $widget->{x} * $sx if exists $widget->{x}; 180 $widget->{x} = int 0.5 + $widget->{x} * $sx if $widget->{x} =~ /^[0-9.]+$/;
148 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w}; 181 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};
149 $widget->{req_w} = int 0.5 + $widget->{req_w} * $sx if exists $widget->{req_w}; 182 $widget->{force_w} = int 0.5 + $widget->{force_w} * $sx if exists $widget->{force_w};
150 $widget->{user_w} = int 0.5 + $widget->{user_w} * $sx if exists $widget->{user_w};
151 $widget->{y} = int 0.5 + $widget->{y} * $sy if exists $widget->{y}; 183 $widget->{y} = int 0.5 + $widget->{y} * $sy if $widget->{y} =~ /^[0-9.]+$/;
152 $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h}; 184 $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};
153 $widget->{req_h} = int 0.5 + $widget->{req_h} * $sy if exists $widget->{req_h}; 185 $widget->{force_h} = int 0.5 + $widget->{force_h} * $sy if exists $widget->{force_h};
154 $widget->{user_h} = int 0.5 + $widget->{user_h} * $sy if exists $widget->{user_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
155 } 190 }
156
157 $widget->reconfigure;
158 } 191 }
192
193 reconfigure_widgets;
159} 194}
160 195
161############################################################################# 196#############################################################################
162 197
163package CFClient::UI::Base; 198package CFClient::UI::Base;
… …
168 203
169sub new { 204sub new {
170 my $class = shift; 205 my $class = shift;
171 206
172 my $self = bless { 207 my $self = bless {
173 x => 0, 208 x => "center",
174 y => 0, 209 y => "center",
175 z => 0, 210 z => 0,
211 w => undef,
212 h => undef,
176 can_events => 1, 213 can_events => 1,
177 @_ 214 @_
178 }, $class; 215 }, $class;
179 216
217 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
218
180 for (keys %$self) { 219 for (keys %$self) {
181 if (/^connect_(.*)$/) { 220 if (/^on_(.*)$/) {
182 $self->connect ($1 => delete $self->{$_}); 221 $self->connect ($1 => delete $self->{$_});
183 } 222 }
184 } 223 }
185 224
186 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self); 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 }
187 236
188 $self 237 $self
189} 238}
190 239
191sub destroy { 240sub destroy {
… …
201 return if $self->{parent}; 250 return if $self->{parent};
202 251
203 $CFClient::UI::ROOT->add ($self); 252 $CFClient::UI::ROOT->add ($self);
204} 253}
205 254
206sub hide { 255sub set_visible {
207 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};
208 279
209 undef $GRAB if $GRAB == $self; 280 undef $GRAB if $GRAB == $self;
210 undef $HOVER if $HOVER == $self; 281 undef $HOVER if $HOVER == $self;
211 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
212 $self->{parent}->remove ($self) 312 $self->{parent}->remove ($self)
213 if $self->{parent}; 313 if $self->{parent};
214} 314}
215 315
216sub move { 316sub move_abs {
217 my ($self, $x, $y, $z) = @_; 317 my ($self, $x, $y, $z) = @_;
218 318
219 $self->{x} = int $x; 319 $self->{x} = List::Util::max 0, List::Util::min $self->{root}{w} - $self->{w}, int $x;
220 $self->{y} = int $y; 320 $self->{y} = List::Util::max 0, List::Util::min $self->{root}{h} - $self->{h}, int $y;
221 $self->{z} = $z if defined $z; 321 $self->{z} = $z if defined $z;
222 322
223 $self->update; 323 $self->update;
224} 324}
225 325
226sub set_size { 326sub set_size {
227 my ($self, $w, $h) = @_; 327 my ($self, $w, $h) = @_;
228 328
229 $self->{user_w} = $w; 329 $self->{force_w} = $w;
230 $self->{user_h} = $h; 330 $self->{force_h} = $h;
231 331
232 $self->check_size; 332 $self->realloc;
233} 333}
234 334
235sub size_request { 335sub size_request {
236 require Carp; 336 require Carp;
237 Carp::confess "size_request is abstract"; 337 Carp::confess "size_request is abstract";
238} 338}
239 339
340sub baseline_shift {
341 0
342}
343
240sub configure { 344sub configure {
241 my ($self, $x, $y, $w, $h) = @_; 345 my ($self, $x, $y, $w, $h) = @_;
242 346
243 if ($self->{aspect}) { 347 if ($self->{aspect}) {
348 my ($ow, $oh) = ($w, $h);
349
244 my $w2 = List::Util::min $w, int $h * $self->{aspect}; 350 $w = List::Util::min $w, int $h * $self->{aspect};
245 my $h2 = List::Util::min $h, int $w / $self->{aspect}; 351 $h = List::Util::min $h, int $w / $self->{aspect};
246 352
247 # use alignment to adjust x, y 353 # use alignment to adjust x, y
248 354
249 $x += int +($w - $w2) * 0.5; 355 $x += int 0.5 * ($ow - $w);
250 $y += int +($h - $h2) * 0.5; 356 $y += int 0.5 * ($oh - $h);
251
252 ($w, $h) = ($w2, $h2);
253 } 357 }
254 358
255 if ($self->{x} != $x || $self->{y} != $y) { 359 if ($self->{x} ne $x || $self->{y} ne $y) {
256 $self->{x} = $x; 360 $self->{x} = $x;
257 $self->{y} = $y; 361 $self->{y} = $y;
258 $self->update; 362 $self->update;
259 } 363 }
260 364
261 if ($self->{w} != $w || $self->{h} != $h) { 365 if ($self->{alloc_w} != $w || $self->{alloc_h} != $h) {
262 $CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $w, $h]; 366 return unless $self->{visible};
263 }
264}
265 367
266sub size_allocate { 368 $self->{alloc_w} = $w;
267 # nothing to be done 369 $self->{alloc_h} = $h;
268}
269 370
270sub reconfigure { 371 $self->{root}{size_alloc}{$self+0} = $self;
271 my ($self) = @_; 372 }
272
273 $self->check_size (1);
274 $self->update;
275} 373}
276 374
277sub children { 375sub children {
376 # nop
377}
378
379sub visible_children {
380 $_[0]->children
278} 381}
279 382
280sub set_max_size { 383sub set_max_size {
281 my ($self, $w, $h) = @_; 384 my ($self, $w, $h) = @_;
282 385
283 delete $self->{max_w}; $self->{max_w} = $w if $w; 386 $self->{max_w} = int $w if defined $w;
284 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 }
285} 406}
286 407
287# translate global coordinates to local coordinate system 408# translate global coordinates to local coordinate system
288sub coord2local { 409sub coord2local {
289 my ($self, $x, $y) = @_; 410 my ($self, $x, $y) = @_;
… …
296 my ($self, $x, $y) = @_; 417 my ($self, $x, $y) = @_;
297 418
298 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y}) 419 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
299} 420}
300 421
301sub focus_in { 422sub invoke_focus_in {
302 my ($self) = @_; 423 my ($self) = @_;
303 424
304 return if $FOCUS == $self; 425 return if $FOCUS == $self;
305 return unless $self->{can_focus}; 426 return unless $self->{can_focus};
306 427
307 my $focus = $FOCUS; $FOCUS = $self; 428 my $focus = $FOCUS; $FOCUS = $self;
308 429
309 $self->emit (focus_in => $focus);
310
311 $focus->update if $focus; 430 $focus->update if $focus;
312 $FOCUS->update; 431 $FOCUS->update;
313}
314 432
433 0
434}
435
315sub focus_out { 436sub invoke_focus_out {
316 my ($self) = @_; 437 my ($self) = @_;
317 438
318 return unless $FOCUS == $self; 439 return unless $FOCUS == $self;
319 440
320 my $focus = $FOCUS; undef $FOCUS; 441 my $focus = $FOCUS; undef $FOCUS;
321 442
322 $self->emit (focus_out => $focus);
323
324 $focus->update if $focus; #? 443 $focus->update if $focus; #?
325}
326 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
327sub mouse_motion { } 457sub invoke_mouse_motion { 1 }
328sub button_up { } 458sub invoke_button_up { 1 }
329sub key_down { } 459sub invoke_key_down { 1 }
330sub key_up { } 460sub invoke_key_up { 1 }
331 461
332sub button_down { 462sub invoke_button_down {
333 my ($self, $ev, $x, $y) = @_; 463 my ($self, $ev, $x, $y) = @_;
334 464
335 $self->focus_in; 465 $self->grab_focus;
336}
337 466
338sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} } 467 1
339sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } 468}
340sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} } 469
341sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} } 470sub connect {
342sub 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
343 535
344sub draw { 536sub draw {
345 my ($self) = @_; 537 my ($self) = @_;
346 538
347 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);
348 548
349 glPushMatrix; 549 glPushMatrix;
350 glTranslate $self->{x}, $self->{y}, 0; 550 glTranslate $self->{x}, $self->{y}, 0;
351 $self->_draw;
352 glPopMatrix;
353 551
354 if ($self == $HOVER && $self->{can_hover}) { 552 if ($self == $HOVER && $self->{can_hover}) {
355 my ($x, $y) = @$self{qw(x y)};
356
357 glColor 1, 0.8, 0.5, 0.2; 553 glColor 1*0.2, 0.8*0.2, 0.5*0.2, 0.2;
358 glEnable GL_BLEND; 554 glEnable GL_BLEND;
359 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 555 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
360 glBegin GL_QUADS; 556 glBegin GL_QUADS;
361 glVertex $x , $y;
362 glVertex $x + $self->{w}, $y;
363 glVertex $x + $self->{w}, $y + $self->{h};
364 glVertex $x , $y + $self->{h};
365 glEnd;
366 glDisable GL_BLEND;
367 }
368
369 if ($ENV{PCLIENT_DEBUG}) {
370 glPushMatrix;
371 glColor 1, 1, 0, 1;
372 glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
373 glBegin GL_LINE_LOOP;
374 glVertex 0 , 0; 557 glVertex 0 , 0;
375 glVertex $self->{w}, 0; 558 glVertex $self->{w}, 0;
376 glVertex $self->{w}, $self->{h}; 559 glVertex $self->{w}, $self->{h};
377 glVertex 0 , $self->{h}; 560 glVertex 0 , $self->{h};
378 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;
379 glPopMatrix; 575 glPopMatrix;
380 #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;
381 } 577 }
578
579 $self->_draw;
580 glPopMatrix;
382} 581}
383 582
384sub _draw { 583sub _draw {
385 my ($self) = @_; 584 my ($self) = @_;
386 585
387 warn "no draw defined for $self\n"; 586 warn "no draw defined for $self\n";
388} 587}
389 588
390sub find_widget {
391 my ($self, $x, $y) = @_;
392
393 return () unless $self->{can_events};
394
395 return $self
396 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
397 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
398
399 ()
400}
401
402sub set_parent {
403 my ($self, $parent) = @_;
404
405 Scalar::Util::weaken ($self->{parent} = $parent);
406
407 # TODO: req_w _does_change after ->reconfigure
408 $self->check_size
409 unless exists $self->{req_w};
410}
411
412sub check_size {
413 my ($self, $forced) = @_;
414
415 $self->{force_alloc} = 1 if $forced;
416 $CFClient::UI::ROOT->{check_size}{$self} = $self;
417}
418
419sub update {
420 my ($self) = @_;
421
422 $self->{parent}->update
423 if $self->{parent};
424}
425
426sub connect {
427 my ($self, $signal, $cb) = @_;
428
429 push @{ $self->{signal_cb}{$signal} }, $cb;
430}
431
432sub emit {
433 my ($self, $signal, @args) = @_;
434
435 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
436}
437
438sub DESTROY { 589sub DESTROY {
439 my ($self) = @_; 590 my ($self) = @_;
440 591
441 delete $WIDGET{$self+0}; 592 delete $WIDGET{$self+0};
442 #$self->deactivate; 593
594 eval { $self->destroy };
595 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
443} 596}
444 597
445############################################################################# 598#############################################################################
446 599
447package CFClient::UI::DrawBG; 600package CFClient::UI::DrawBG;
… …
455 my $class = shift; 608 my $class = shift;
456 609
457 # range [value, low, high, page] 610 # range [value, low, high, page]
458 611
459 $class->SUPER::new ( 612 $class->SUPER::new (
460 bg => [0, 0, 0, 0.2], 613 #bg => [0, 0, 0, 0.2],
461 active_bg => [1, 1, 1, 0.5], 614 #active_bg => [1, 1, 1, 0.5],
462 @_ 615 @_
463 ) 616 )
464} 617}
465 618
466sub _draw { 619sub _draw {
467 my ($self) = @_; 620 my ($self) = @_;
468 621
622 my $color = $FOCUS == $self && $self->{active_bg}
623 ? $self->{active_bg}
624 : $self->{bg};
625
626 if ($color && (@$color < 4 || $color->[3])) {
469 my ($w, $h) = @$self{qw(w h)}; 627 my ($w, $h) = @$self{qw(w h)};
470 628
471 glEnable GL_BLEND; 629 glEnable GL_BLEND;
472 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 630 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
473 glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} }; 631 glColor_premultiply @$color;
474 632
475 glBegin GL_QUADS; 633 glBegin GL_QUADS;
476 glVertex 0 , 0; 634 glVertex 0 , 0;
477 glVertex 0 , $h; 635 glVertex 0 , $h;
478 glVertex $w, $h; 636 glVertex $w, $h;
479 glVertex $w, 0; 637 glVertex $w, 0;
480 glEnd; 638 glEnd;
481 639
482 glDisable GL_BLEND; 640 glDisable GL_BLEND;
641 }
483} 642}
484 643
485############################################################################# 644#############################################################################
486 645
487package CFClient::UI::Empty; 646package CFClient::UI::Empty;
… …
492 my ($class, %arg) = @_; 651 my ($class, %arg) = @_;
493 $class->SUPER::new (can_events => 0, %arg); 652 $class->SUPER::new (can_events => 0, %arg);
494} 653}
495 654
496sub size_request { 655sub size_request {
497 (0, 0) 656 my ($self) = @_;
657
658 ($self->{w} + 0, $self->{h} + 0)
498} 659}
499 660
500sub draw { } 661sub draw { }
501 662
502############################################################################# 663#############################################################################
… …
506our @ISA = CFClient::UI::Base::; 667our @ISA = CFClient::UI::Base::;
507 668
508sub new { 669sub new {
509 my ($class, %arg) = @_; 670 my ($class, %arg) = @_;
510 671
511 my $children = delete $arg{children} || []; 672 my $children = delete $arg{children};
512 673
513 my $self = $class->SUPER::new ( 674 my $self = $class->SUPER::new (
514 children => [], 675 children => [],
515 can_events => 0, 676 can_events => 0,
516 %arg, 677 %arg,
517 ); 678 );
679
518 $self->add ($_) for @$children; 680 $self->add (@$children)
681 if $children;
519 682
520 $self 683 $self
521} 684}
522 685
523sub add { 686sub add {
… …
531 $self->{children} = [ 694 $self->{children} = [
532 sort { $a->{z} <=> $b->{z} } 695 sort { $a->{z} <=> $b->{z} }
533 @{$self->{children}}, @widgets 696 @{$self->{children}}, @widgets
534 ]; 697 ];
535 698
536 $self->check_size (1); 699 $self->realloc;
537 $self->update;
538} 700}
539 701
540sub children { 702sub children {
541 @{ $_[0]{children} } 703 @{ $_[0]{children} }
542} 704}
… …
547 delete $child->{parent}; 709 delete $child->{parent};
548 $child->hide; 710 $child->hide;
549 711
550 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 712 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
551 713
552 $self->check_size; 714 $self->realloc;
553 $self->update;
554} 715}
555 716
556sub clear { 717sub clear {
557 my ($self) = @_; 718 my ($self) = @_;
558 719
… …
562 for (@$children) { 723 for (@$children) {
563 delete $_->{parent}; 724 delete $_->{parent};
564 $_->hide; 725 $_->hide;
565 } 726 }
566 727
567 $self->check_size; 728 $self->realloc;
568 $self->update;
569} 729}
570 730
571sub find_widget { 731sub find_widget {
572 my ($self, $x, $y) = @_; 732 my ($self, $x, $y) = @_;
573 733
574 $x -= $self->{x}; 734 $x -= $self->{x};
575 $y -= $self->{y}; 735 $y -= $self->{y};
576 736
577 my $res; 737 my $res;
578 738
579 for (reverse @{ $self->{children} }) { 739 for (reverse $self->visible_children) {
580 $res = $_->find_widget ($x, $y) 740 $res = $_->find_widget ($x, $y)
581 and return $res; 741 and return $res;
582 } 742 }
583 743
584 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y}) 744 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
… …
605} 765}
606 766
607sub add { 767sub add {
608 my ($self, $child) = @_; 768 my ($self, $child) = @_;
609 769
610 $self->{children} = []; 770 $self->SUPER::remove ($_) for @{ $self->{children} };
611
612 $self->SUPER::add ($child); 771 $self->SUPER::add ($child);
613} 772}
614 773
615sub remove { 774sub remove {
616 my ($self, $widget) = @_; 775 my ($self, $widget) = @_;
… …
625 784
626sub size_request { 785sub size_request {
627 $_[0]{children}[0]->size_request 786 $_[0]{children}[0]->size_request
628} 787}
629 788
630sub size_allocate { 789sub invoke_size_allocate {
631 my ($self, $w, $h) = @_; 790 my ($self, $w, $h) = @_;
632 791
633 $self->{children}[0]->configure (0, 0, $w, $h); 792 $self->{children}[0]->configure (0, 0, $w, $h);
793
794 1
634} 795}
635 796
636############################################################################# 797#############################################################################
798
799# back-buffered drawing area
637 800
638package CFClient::UI::Window; 801package CFClient::UI::Window;
639 802
640our @ISA = CFClient::UI::Bin::; 803our @ISA = CFClient::UI::Bin::;
641 804
… …
652 815
653 $ROOT->on_post_alloc ($self => sub { $self->render_child }); 816 $ROOT->on_post_alloc ($self => sub { $self->render_child });
654 $self->SUPER::update; 817 $self->SUPER::update;
655} 818}
656 819
657sub size_allocate { 820sub invoke_size_allocate {
658 my ($self, $w, $h) = @_; 821 my ($self, $w, $h) = @_;
659 822
660 $self->SUPER::size_allocate ($w, $h);
661 $self->update; 823 $self->update;
824
825 $self->SUPER::invoke_size_allocate ($w, $h)
662} 826}
663 827
664sub _render { 828sub _render {
829 my ($self) = @_;
830
665 $_[0]{children}[0]->draw; 831 $self->{children}[0]->draw;
666} 832}
667 833
668sub render_child { 834sub render_child {
669 my ($self) = @_; 835 my ($self) = @_;
670 836
671 $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 {
672 glClearColor 0, 0, 0, 0; 838 glClearColor 0, 0, 0, 0;
673 glClear GL_COLOR_BUFFER_BIT; 839 glClear GL_COLOR_BUFFER_BIT;
674 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
675 $self->_render; 848 $self->_render;
676# glColorMask 1, 1, 1, 0;
677# glEnable GL_BLEND;
678# glBlendFunc GL_SRC_ALPHA, GL_ZERO;
679# glRasterPos 0, 0;
680# glCopyPixels 0, 0, $self->{w}, $self->{h};
681# glDisable GL_BLEND;
682# glColorMask 1, 1, 1, 1;
683 }; 849 };
684} 850}
685 851
686sub _draw { 852sub _draw {
687 my ($self) = @_; 853 my ($self) = @_;
688 854
689 my ($w, $h) = ($self->w, $self->h); 855 my ($w, $h) = @$self{qw(w h)};
690 856
691 my $tex = $self->{texture} 857 my $tex = $self->{texture}
692 or return; 858 or return;
693 859
694 glEnable GL_TEXTURE_2D; 860 glEnable GL_TEXTURE_2D;
… …
704 870
705package CFClient::UI::ViewPort; 871package CFClient::UI::ViewPort;
706 872
707our @ISA = CFClient::UI::Window::; 873our @ISA = CFClient::UI::Window::;
708 874
875sub new {
876 my $class = shift;
877
878 $class->SUPER::new (
879 scroll_x => 0,
880 scroll_y => 1,
881 @_,
882 )
883}
884
709sub size_request { 885sub size_request {
710 my ($self) = @_; 886 my ($self) = @_;
711 887
712 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 888 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
713 $self->child->configure (0, 0, @$self{qw(child_w child_h)});
714 889
715 @$self{qw(child_w child_h)} 890 $w = 10 if $self->{scroll_x};
716} 891 $h = 10 if $self->{scroll_y};
717 892
893 ($w, $h)
894}
895
718sub size_allocate { 896sub invoke_size_allocate {
719 my ($self, $w, $h) = @_; 897 my ($self, $w, $h) = @_;
720 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);
721 $self->update; 905 $self->update;
906
907 1
722} 908}
723 909
724sub set_offset { 910sub set_offset {
725 my ($self, $x, $y) = @_; 911 my ($self, $x, $y) = @_;
726 912
… …
759} 945}
760 946
761sub _render { 947sub _render {
762 my ($self) = @_; 948 my ($self) = @_;
763 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
764 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 953 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
765 954
766 $self->SUPER::_render; 955 $self->SUPER::_render;
767} 956}
768 957
… …
771package CFClient::UI::ScrolledWindow; 960package CFClient::UI::ScrolledWindow;
772 961
773our @ISA = CFClient::UI::HBox::; 962our @ISA = CFClient::UI::HBox::;
774 963
775sub new { 964sub new {
776 my $class = shift; 965 my ($class, %arg) = @_;
966
967 my $child = delete $arg{child};
777 968
778 my $self; 969 my $self;
779 970
780 my $slider = new CFClient::UI::Slider 971 my $slider = new CFClient::UI::Slider
781 vertical => 1, 972 vertical => 1,
782 range => [0, 0, 1, 0.01], # HACK fix 973 range => [0, 0, 1, 0.01], # HACK fix
783 connect_changed => sub { 974 on_changed => sub {
784 $self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h})); 975 $self->{vp}->set_offset (0, $_[1]);
785 }, 976 },
786 ; 977 ;
787 978
788 $self = $class->SUPER::new ( 979 $self = $class->SUPER::new (
789 vp => (new CFClient::UI::ViewPort), 980 vp => (new CFClient::UI::ViewPort expand => 1),
790 slider => $slider, 981 slider => $slider,
791 @_, 982 %arg,
792 ); 983 );
793 984
794 $self->{vp}->add ($self->{scrolled});
795 $self->add ($self->{vp});
796 $self->add ($self->{slider}); 985 $self->SUPER::add ($self->{vp}, $self->{slider});
986 $self->add ($child) if $child;
797 987
798 $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)
799} 1014}
800 1015
801#TODO# update range on size_allocate depending on child 1016#TODO# update range on size_allocate depending on child
802# update viewport offset on scroll 1017# update viewport offset on scroll
803 1018
… …
823 1038
824 if ($self->{bg}) { 1039 if ($self->{bg}) {
825 my ($w, $h) = @$self{qw(w h)}; 1040 my ($w, $h) = @$self{qw(w h)};
826 1041
827 glEnable GL_BLEND; 1042 glEnable GL_BLEND;
828 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1043 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
829 glColor @{ $self->{bg} }; 1044 glColor_premultiply @{ $self->{bg} };
830 1045
831 glBegin GL_QUADS; 1046 glBegin GL_QUADS;
832 glVertex 0 , 0; 1047 glVertex 0 , 0;
833 glVertex 0 , $h; 1048 glVertex 0 , $h;
834 glVertex $w, $h; 1049 glVertex $w, $h;
… …
847 1062
848our @ISA = CFClient::UI::Bin::; 1063our @ISA = CFClient::UI::Bin::;
849 1064
850use CFClient::OpenGL; 1065use CFClient::OpenGL;
851 1066
852my @tex = 1067my $bg =
1068 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
1069 mipmap => 1, wrap => 1;
1070
1071my @border =
853 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1072 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
854 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);
855 1074
856sub new { 1075sub new {
857 my $class = shift; 1076 my ($class, %arg) = @_;
858
859 # TODO: user_x, user_y, overwrite moveto?
860 1077
861 my $self = $class->SUPER::new ( 1078 my $self = $class->SUPER::new (
862 bg => [1, 1, 1, 1], 1079 bg => [1, 1, 1, 1],
863 border_bg => [1, 1, 1, 1], 1080 border_bg => [1, 1, 1, 1],
864 border => 0.6, 1081 border => 0.6,
865 toplevel => 1,
866 can_events => 1, 1082 can_events => 1,
867 @_ 1083 min_w => 16,
1084 min_h => 16,
1085 %arg,
868 ); 1086 );
869 1087
870 $self->{title} &&= new CFClient::UI::Label 1088 $self->{title_widget} = new CFClient::UI::Label
871 align => 0, 1089 align => 0,
872 valign => 1, 1090 valign => 1,
873 text => $self->{title}, 1091 text => $self->{title},
874 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 }
875 1103
876 $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};
877} 1113}
878 1114
879sub border { 1115sub border {
880 int $_[0]{border} * $::FONTSIZE 1116 int $_[0]{border} * $::FONTSIZE
881} 1117}
882 1118
883sub size_request { 1119sub size_request {
884 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};
885 1127
886 my ($w, $h) = $self->SUPER::size_request; 1128 my ($w, $h) = $self->SUPER::size_request;
887 1129
888 ( 1130 (
889 $w + $self->border * 2, 1131 $w + $self->border * 2,
890 $h + $self->border * 2, 1132 $h + $self->border * 2,
891 ) 1133 )
892} 1134}
893 1135
894sub size_allocate { 1136sub invoke_size_allocate {
895 my ($self, $w, $h) = @_; 1137 my ($self, $w, $h) = @_;
896 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
897 $h -= List::Util::max 0, $self->border * 2; 1147 $h -= List::Util::max 0, $border * 2;
898 $w -= List::Util::max 0, $self->border * 2; 1148 $w -= List::Util::max 0, $border * 2;
899 1149
900 $self->{title}->configure ($self->border, $self->border - $::FONTSIZE * 2, $w, $::FONTSIZE * 2)
901 if $self->{title};
902
903 $self->child->configure ($self->border, $self->border, $w, $h); 1150 $self->child->configure ($border, $border, $w, $h);
904}
905 1151
1152 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
1153 if $self->{close_button};
1154
1155 1
1156}
1157
906sub button_down { 1158sub invoke_button_down {
907 my ($self, $ev, $x, $y) = @_; 1159 my ($self, $ev, $x, $y) = @_;
908 1160
909 my ($w, $h) = @$self{qw(w h)}; 1161 my ($w, $h) = @$self{qw(w h)};
910 my $border = $self->border; 1162 my $border = $self->border;
911 1163
… …
924 my ($ev, $x, $y) = @_; 1176 my ($ev, $x, $y) = @_;
925 1177
926 my $dx = $ev->{x} - $ox; 1178 my $dx = $ev->{x} - $ox;
927 my $dy = $ev->{y} - $oy; 1179 my $dy = $ev->{y} - $oy;
928 1180
929 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1); 1181 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
930 $self->{user_h} = $bh + $dy * ($my ? -1 : 1); 1182 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1183
931 $self->move ($wx + $dx * $mx, $wy + $dy * $my); 1184 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
932 $self->check_size; 1185 $self->realloc;
933 }; 1186 };
934 1187
935 } elsif ($lr ^ $td) { 1188 } elsif ($lr ^ $td) {
936 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1189 my ($ox, $oy) = ($ev->{x}, $ev->{y});
937 my ($bx, $by) = ($self->{x}, $self->{y}); 1190 my ($bx, $by) = ($self->{x}, $self->{y});
… …
939 $self->{motion} = sub { 1192 $self->{motion} = sub {
940 my ($ev, $x, $y) = @_; 1193 my ($ev, $x, $y) = @_;
941 1194
942 ($x, $y) = ($ev->{x}, $ev->{y}); 1195 ($x, $y) = ($ev->{x}, $ev->{y});
943 1196
944 $self->move ($bx + $x - $ox, $by + $y - $oy); 1197 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
945 $self->update; 1198 # HACK: the next line is required to enforce placement
1199 $self->{parent}->invoke_size_allocate ($self->{parent}{w}, $self->{parent}{h});
946 }; 1200 };
1201 } else {
1202 return 0;
1203 }
1204
947 } 1205 1
948} 1206}
949 1207
950sub button_up { 1208sub invoke_button_up {
951 my ($self, $ev, $x, $y) = @_; 1209 my ($self, $ev, $x, $y) = @_;
952 1210
953 delete $self->{motion}; 1211 ! ! delete $self->{motion}
954} 1212}
955 1213
956sub mouse_motion { 1214sub invoke_mouse_motion {
957 my ($self, $ev, $x, $y) = @_; 1215 my ($self, $ev, $x, $y) = @_;
958 1216
959 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1217 $self->{motion}->($ev, $x, $y) if $self->{motion};
1218
1219 ! ! $self->{motion}
960} 1220}
961 1221
962sub _draw { 1222sub _draw {
963 my ($self) = @_; 1223 my ($self) = @_;
964 1224
1225 my $child = $self->{children}[0];
1226
965 my ($w, $h ) = ($self->{w}, $self->{h}); 1227 my ($w, $h ) = ($self->{w}, $self->{h});
966 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1228 my ($cw, $ch) = ($child->{w}, $child->{h});
967 1229
968 glEnable GL_TEXTURE_2D; 1230 glEnable GL_TEXTURE_2D;
969 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1231 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
970 1232
971 my $border = $self->border; 1233 my $border = $self->border;
972 1234
973 glColor @{ $self->{border_bg} }; 1235 glColor @{ $self->{border_bg} };
974 $tex[1]->draw_quad_alpha (0, 0, $w, $border); 1236 $border[0]->draw_quad_alpha (0, 0, $w, $border);
975 $tex[3]->draw_quad_alpha (0, $border, $border, $ch); 1237 $border[1]->draw_quad_alpha (0, $border, $border, $ch);
976 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1238 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
977 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border); 1239 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
978 1240
979 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1241 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
980 my $bg = $tex[0]; 1242 glColor @{ $self->{bg} };
981 1243
982 # TODO: repeat texture not scale 1244 # TODO: repeat texture not scale
1245 # solve this better(?)
983 my $rep_x = $cw / $bg->{w}; 1246 $bg->{s} = $cw / $bg->{w};
984 my $rep_y = $ch / $bg->{h}; 1247 $bg->{t} = $ch / $bg->{h};
985
986 glColor @{ $self->{bg} };
987
988 $bg->{s} = $rep_x;
989 $bg->{t} = $rep_y;
990 $bg->{wrap_mode} = 1;
991 $bg->draw_quad_alpha ($border, $border, $cw, $ch); 1248 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
992 } 1249 }
993 1250
994 glDisable GL_TEXTURE_2D; 1251 glDisable GL_TEXTURE_2D;
995 1252
996 $self->{title}->draw if $self->{title};
997
998 $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};
999} 1264}
1000 1265
1001############################################################################# 1266#############################################################################
1002 1267
1003package CFClient::UI::Table; 1268package CFClient::UI::Table;
… …
1011sub new { 1276sub new {
1012 my $class = shift; 1277 my $class = shift;
1013 1278
1014 $class->SUPER::new ( 1279 $class->SUPER::new (
1015 col_expand => [], 1280 col_expand => [],
1016 @_ 1281 @_,
1017 ) 1282 )
1283}
1284
1285sub children {
1286 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1018} 1287}
1019 1288
1020sub add { 1289sub add {
1021 my ($self, $x, $y, $child) = @_; 1290 my ($self, $x, $y, $child) = @_;
1022 1291
1023 $child->set_parent ($self); 1292 $child->set_parent ($self);
1024 $self->{children}[$y][$x] = $child; 1293 $self->{children}[$y][$x] = $child;
1025 1294
1026 $child->check_size; 1295 $self->realloc;
1027} 1296}
1028 1297
1029sub children { 1298sub remove {
1030 grep $_, map @$_, grep $_, @{ $_[0]{children} } 1299 my ($self, $child) = @_;
1031}
1032 1300
1301 # TODO: not yet implemented
1302}
1303
1033# 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?
1034sub clear { 1305sub clear {
1035 my ($self) = @_; 1306 my ($self) = @_;
1036 1307
1037 my @children = $self->children; 1308 my @children = $self->children;
1038 delete $self->{children}; 1309 delete $self->{children};
… …
1040 for (@children) { 1311 for (@children) {
1041 delete $_->{parent}; 1312 delete $_->{parent};
1042 $_->hide; 1313 $_->hide;
1043 } 1314 }
1044 1315
1045 $self->update; 1316 $self->realloc;
1046} 1317}
1047 1318
1048sub get_wh { 1319sub get_wh {
1049 my ($self) = @_; 1320 my ($self) = @_;
1050 1321
… …
1076 (sum @$ws), 1347 (sum @$ws),
1077 (sum @$hs), 1348 (sum @$hs),
1078 ) 1349 )
1079} 1350}
1080 1351
1081sub size_allocate { 1352sub invoke_size_allocate {
1082 my ($self, $w, $h) = @_; 1353 my ($self, $w, $h) = @_;
1083 1354
1084 my ($ws, $hs) = $self->get_wh; 1355 my ($ws, $hs) = $self->get_wh;
1085 1356
1086 my $req_w = sum @$ws; 1357 my $req_w = (sum @$ws) || 1;
1087 my $req_h = sum @$hs; 1358 my $req_h = (sum @$hs) || 1;
1088 1359
1089 # TODO: nicer code && do row_expand 1360 # TODO: nicer code && do row_expand
1090 my @col_expand = @{$self->{col_expand}}; 1361 my @col_expand = @{$self->{col_expand}};
1091 @col_expand = (1) x @$ws unless @col_expand; 1362 @col_expand = (1) x @$ws unless @col_expand;
1092 my $col_expand = (sum @col_expand) || 1; 1363 my $col_expand = (sum @col_expand) || 1;
… …
1118 } 1389 }
1119 1390
1120 $y += $row_h; 1391 $y += $row_h;
1121 } 1392 }
1122 1393
1394 1
1123} 1395}
1124 1396
1125sub find_widget { 1397sub find_widget {
1126 my ($self, $x, $y) = @_; 1398 my ($self, $x, $y) = @_;
1127 1399
… …
1146 } 1418 }
1147} 1419}
1148 1420
1149############################################################################# 1421#############################################################################
1150 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
1151package CFClient::UI::HBox; 1483package CFClient::UI::HBox;
1152 1484
1153# TODO: wrap into common Box base class
1154
1155our @ISA = CFClient::UI::Container::; 1485our @ISA = CFClient::UI::Box::;
1156 1486
1157sub size_request { 1487sub new {
1158 my ($self) = @_; 1488 my $class = shift;
1159 1489
1160 my @alloc = map [$_->size_request], @{$self->{children}}; 1490 $class->SUPER::new (
1161 1491 vertical => 0,
1162 ( 1492 @_,
1163 (List::Util::sum map $_->[0], @alloc),
1164 (List::Util::max map $_->[1], @alloc),
1165 ) 1493 )
1166} 1494}
1167 1495
1168sub size_allocate {
1169 my ($self, $w, $h) = @_;
1170
1171 ($h, $w) = ($w, $h);
1172
1173 my $children = $self->{children};
1174
1175 my @h = map $_->{req_w}, @$children;
1176
1177 my $req_h = List::Util::sum @h;
1178
1179 if ($req_h > $h) {
1180 # ah well, not enough space
1181 $_ *= $h / $req_h for @h;
1182 } else {
1183 my $exp = List::Util::sum map $_->{expand}, @$children;
1184 $exp ||= 1;
1185
1186 for (0 .. $#$children) {
1187 my $child = $children->[$_];
1188
1189 my $alloc_h = $h[$_];
1190 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
1191 $h[$_] = $alloc_h;
1192 }
1193 }
1194
1195 CFClient::UI::harmonize \@h;
1196
1197 my $y = 0;
1198 for (0 .. $#$children) {
1199 my $child = $children->[$_];
1200 my $h = $h[$_];
1201 $child->configure ($y, 0, $h, $w);
1202
1203 $y += $h;
1204 }
1205
1206 1
1207}
1208
1209############################################################################# 1496#############################################################################
1210 1497
1211package CFClient::UI::VBox; 1498package CFClient::UI::VBox;
1212 1499
1213# TODO: wrap into common Box base class
1214
1215our @ISA = CFClient::UI::Container::; 1500our @ISA = CFClient::UI::Box::;
1216 1501
1217sub size_request { 1502sub new {
1218 my ($self) = @_; 1503 my $class = shift;
1219 1504
1220 my @alloc = map [$_->size_request], @{$self->{children}}; 1505 $class->SUPER::new (
1221 1506 vertical => 1,
1222 ( 1507 @_,
1223 (List::Util::max map $_->[0], @alloc),
1224 (List::Util::sum map $_->[1], @alloc),
1225 ) 1508 )
1226} 1509}
1227 1510
1228sub size_allocate {
1229 my ($self, $w, $h) = @_;
1230
1231 Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1232
1233 my $children = $self->{children};
1234
1235 my @h = map $_->{req_h}, @$children;
1236
1237 my $req_h = List::Util::sum @h;
1238
1239 if ($req_h > $h) {
1240 # ah well, not enough space
1241 $_ *= $h / $req_h for @h;
1242 } else {
1243 my $exp = List::Util::sum map $_->{expand}, @$children;
1244 $exp ||= 1;
1245
1246 for (0 .. $#$children) {
1247 my $child = $children->[$_];
1248
1249 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1250 }
1251 }
1252
1253 CFClient::UI::harmonize \@h;
1254
1255 my $y = 0;
1256 for (0 .. $#$children) {
1257 my $child = $children->[$_];
1258 my $h = $h[$_];
1259 $child->configure (0, $y, $w, $h);
1260
1261 $y += $h;
1262 }
1263
1264 1
1265}
1266
1267############################################################################# 1511#############################################################################
1268 1512
1269package CFClient::UI::Label; 1513package CFClient::UI::Label;
1270 1514
1271our @ISA = CFClient::UI::Base::; 1515our @ISA = CFClient::UI::DrawBG::;
1272 1516
1273use CFClient::OpenGL; 1517use CFClient::OpenGL;
1274 1518
1275sub new { 1519sub new {
1276 my ($class, %arg) = @_; 1520 my ($class, %arg) = @_;
1277 1521
1278 my $self = $class->SUPER::new ( 1522 my $self = $class->SUPER::new (
1279 fg => [1, 1, 1], 1523 fg => [1, 1, 1],
1524 #bg => none
1525 #active_bg => none
1280 #font => default_font 1526 #font => default_font
1281 #text => initial text 1527 #text => initial text
1282 #markup => initial narkup 1528 #markup => initial narkup
1529 #max_w => maximum pixel width
1530 ellipsise => 3, # end
1283 layout => (new CFClient::Layout), 1531 layout => (new CFClient::Layout),
1284 fontsize => 1, 1532 fontsize => 1,
1285 align => -1, 1533 align => -1,
1286 valign => -1, 1534 valign => -1,
1287 padding => 2, 1535 padding_x => 2,
1536 padding_y => 2,
1288 can_events => 0, 1537 can_events => 0,
1289 %arg 1538 %arg
1290 ); 1539 );
1291 1540
1292 if (exists $self->{template}) { 1541 if (exists $self->{template}) {
… …
1302 } 1551 }
1303 1552
1304 $self 1553 $self
1305} 1554}
1306 1555
1307sub escape { 1556sub escape($) {
1308 local $_ = $_[1]; 1557 local $_ = $_[0];
1309 1558
1310 s/&/&amp;/g; 1559 s/&/&amp;/g;
1311 s/>/&gt;/g; 1560 s/>/&gt;/g;
1312 s/</&lt;/g; 1561 s/</&lt;/g;
1313 1562
1314 $_[1] 1563 $_
1315} 1564}
1316 1565
1317sub update { 1566sub update {
1318 my ($self) = @_; 1567 my ($self) = @_;
1319 1568
1320 delete $self->{texture}; 1569 delete $self->{texture};
1321 $self->SUPER::update; 1570 $self->SUPER::update;
1322} 1571}
1323 1572
1573sub realloc {
1574 my ($self) = @_;
1575
1576 delete $self->{ox};
1577 $self->SUPER::realloc;
1578}
1579
1324sub set_text { 1580sub set_text {
1325 my ($self, $text) = @_; 1581 my ($self, $text) = @_;
1326 1582
1327 return if $self->{text} eq "T$text"; 1583 return if $self->{text} eq "T$text";
1328 $self->{text} = "T$text"; 1584 $self->{text} = "T$text";
1329 1585
1330 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba; 1586 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1331 $self->{layout}->set_text ($text); 1587 $self->{layout}->set_text ($text);
1332 1588
1589 delete $self->{size_req};
1590 $self->realloc;
1333 $self->update; 1591 $self->update;
1334 $self->check_size;
1335} 1592}
1336 1593
1337sub set_markup { 1594sub set_markup {
1338 my ($self, $markup) = @_; 1595 my ($self, $markup) = @_;
1339 1596
… …
1343 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1600 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1344 1601
1345 $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;
1346 $self->{layout}->set_markup ($markup); 1603 $self->{layout}->set_markup ($markup);
1347 1604
1605 delete $self->{size_req};
1606 $self->realloc;
1348 $self->update; 1607 $self->update;
1349 $self->check_size;
1350} 1608}
1351 1609
1352sub size_request { 1610sub size_request {
1353 my ($self) = @_; 1611 my ($self) = @_;
1354 1612
1613 $self->{size_req} ||= do {
1355 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1614 $self->{layout}->set_font ($self->{font}) if $self->{font};
1356 $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});
1357 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1618 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1358 1619
1359 my ($w, $h) = $self->{layout}->size; 1620 my ($w, $h) = $self->{layout}->size;
1360 1621
1361 if (exists $self->{template}) { 1622 if (exists $self->{template}) {
1362 $self->{template}->set_font ($self->{font}) if $self->{font}; 1623 $self->{template}->set_font ($self->{font}) if $self->{font};
1363 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1624 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1364 1625
1365 my ($w2, $h2) = $self->{template}->size; 1626 my ($w2, $h2) = $self->{template}->size;
1366 1627
1367 $w = List::Util::max $w, $w2; 1628 $w = List::Util::max $w, $w2;
1368 $h = List::Util::max $h, $h2; 1629 $h = List::Util::max $h, $h2;
1630 }
1631
1632 [$w, $h]
1369 } 1633 };
1370 1634
1371 ( 1635 @{ $self->{size_req} }
1372 $w + $self->{padding} * 2,
1373 $h + $self->{padding} * 2,
1374 )
1375} 1636}
1376 1637
1638sub baseline_shift {
1639 $_[0]{layout}->descent
1640}
1641
1377sub size_allocate { 1642sub invoke_size_allocate {
1378 my ($self, $w, $h) = @_; 1643 my ($self, $w, $h) = @_;
1379 1644
1645 delete $self->{ox};
1646
1380 delete $self->{texture}; 1647 delete $self->{texture}
1648 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1649
1650 1
1381} 1651}
1382 1652
1383sub set_fontsize { 1653sub set_fontsize {
1384 my ($self, $fontsize) = @_; 1654 my ($self, $fontsize) = @_;
1385 1655
1386 $self->{fontsize} = $fontsize; 1656 $self->{fontsize} = $fontsize;
1387 delete $self->{texture}; 1657 delete $self->{texture};
1388 1658
1389 $self->update; 1659 $self->realloc;
1390 $self->check_size; 1660}
1661
1662sub reconfigure {
1663 my ($self) = @_;
1664
1665 delete $self->{size_req};
1666
1667 $self->SUPER::reconfigure;
1391} 1668}
1392 1669
1393sub _draw { 1670sub _draw {
1394 my ($self) = @_; 1671 my ($self) = @_;
1672
1673 $self->SUPER::_draw; # draw background, if applicable
1395 1674
1396 my $tex = $self->{texture} ||= do { 1675 my $tex = $self->{texture} ||= do {
1397 $self->{layout}->set_foreground (@{$self->{fg}}); 1676 $self->{layout}->set_foreground (@{$self->{fg}});
1398 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1677 $self->{layout}->set_font ($self->{font}) if $self->{font};
1399 $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});
1400 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE); 1681 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1401 1682
1402 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1683 new_from_layout CFClient::Texture $self->{layout}
1403
1404 $self->{ox} = int $self->{align} < 0 ? $self->{padding}
1405 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1406 : ($self->{w} - $tex->{w}) * 0.5;
1407
1408 $self->{oy} = int $self->{valign} < 0 ? $self->{padding}
1409 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1410 : ($self->{h} - $tex->{h}) * 0.5;
1411
1412 $tex
1413 }; 1684 };
1414 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
1415 glEnable GL_TEXTURE_2D; 1696 glEnable GL_TEXTURE_2D;
1416 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};
1417 1700
1418 if ($tex->{format} == GL_ALPHA) { 1701 if ($tex->{format} == GL_ALPHA) {
1702 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1419 glColor @{$self->{fg}}; 1703 glColor @{$self->{fg}};
1420 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}); 1704 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}, $w, $h);
1421 } else { 1705 } else {
1706 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1422 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}); 1707 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}, $w, $h);
1423 } 1708 }
1424 1709
1425 glDisable GL_TEXTURE_2D; 1710 glDisable GL_TEXTURE_2D;
1426} 1711}
1427 1712
… …
1443 active_fg => [0, 0, 0], 1728 active_fg => [0, 0, 0],
1444 can_hover => 1, 1729 can_hover => 1,
1445 can_focus => 1, 1730 can_focus => 1,
1446 valign => 0, 1731 valign => 0,
1447 can_events => 1, 1732 can_events => 1,
1733 #text => ...
1734 #hidden => "*",
1448 @_ 1735 @_
1449 ) 1736 )
1450} 1737}
1451 1738
1452sub _set_text { 1739sub _set_text {
… …
1454 1741
1455 delete $self->{cur_h}; 1742 delete $self->{cur_h};
1456 1743
1457 return if $self->{text} eq $text; 1744 return if $self->{text} eq $text;
1458 1745
1459 delete $self->{texture};
1460
1461 $self->{last_activity} = $::NOW; 1746 $self->{last_activity} = $::NOW;
1462 $self->{text} = $text; 1747 $self->{text} = $text;
1463 1748
1464 $text =~ s/./*/g if $self->{hidden}; 1749 $text =~ s/./*/g if $self->{hidden};
1465 $self->{layout}->set_text ("$text "); 1750 $self->{layout}->set_text ("$text ");
1751 delete $self->{size_req};
1466 1752
1467 $self->emit (changed => $self->{text}); 1753 $self->emit (changed => $self->{text});
1754
1755 $self->realloc;
1756 $self->update;
1468} 1757}
1469 1758
1470sub set_text { 1759sub set_text {
1471 my ($self, $text) = @_; 1760 my ($self, $text) = @_;
1472 1761
1473 $self->{cursor} = length $text; 1762 $self->{cursor} = length $text;
1474 $self->_set_text ($text); 1763 $self->_set_text ($text);
1475 $self->check_size;
1476 $self->update;
1477} 1764}
1478 1765
1479sub get_text { 1766sub get_text {
1480 $_[0]{text} 1767 $_[0]{text}
1481} 1768}
… …
1486 my ($w, $h) = $self->SUPER::size_request; 1773 my ($w, $h) = $self->SUPER::size_request;
1487 1774
1488 ($w + 1, $h) # add 1 for cursor 1775 ($w + 1, $h) # add 1 for cursor
1489} 1776}
1490 1777
1491sub size_allocate {
1492 my ($self, $w, $h) = @_;
1493
1494 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1495}
1496
1497sub key_down { 1778sub invoke_key_down {
1498 my ($self, $ev) = @_; 1779 my ($self, $ev) = @_;
1499 1780
1500 my $mod = $ev->{mod}; 1781 my $mod = $ev->{mod};
1501 my $sym = $ev->{sym}; 1782 my $sym = $ev->{sym};
1502 my $uni = $ev->{unicode}; 1783 my $uni = $ev->{unicode};
… …
1517 $self->{cursor} = length $text; 1798 $self->{cursor} = length $text;
1518 } elsif ($uni == 27) { 1799 } elsif ($uni == 27) {
1519 $self->emit ('escape'); 1800 $self->emit ('escape');
1520 } elsif ($uni) { 1801 } elsif ($uni) {
1521 substr $text, $self->{cursor}++, 0, chr $uni; 1802 substr $text, $self->{cursor}++, 0, chr $uni;
1803 } else {
1804 return 0;
1522 } 1805 }
1523 1806
1524 $self->_set_text ($text); 1807 $self->_set_text ($text);
1525 $self->update;
1526}
1527 1808
1809 $self->realloc;
1810
1811 1
1812}
1813
1528sub focus_in { 1814sub invoke_focus_in {
1529 my ($self) = @_; 1815 my ($self) = @_;
1530 1816
1531 $self->{last_activity} = $::NOW; 1817 $self->{last_activity} = $::NOW;
1532 1818
1533 $self->SUPER::focus_in; 1819 $self->SUPER::invoke_focus_in
1534} 1820}
1535 1821
1536sub button_down { 1822sub invoke_button_down {
1537 my ($self, $ev, $x, $y) = @_; 1823 my ($self, $ev, $x, $y) = @_;
1538 1824
1539 $self->SUPER::button_down ($ev, $x, $y); 1825 $self->SUPER::invoke_button_down ($ev, $x, $y);
1540 1826
1541 my $idx = $self->{layout}->xy_to_index ($x, $y); 1827 my $idx = $self->{layout}->xy_to_index ($x, $y);
1542 1828
1543 # byte-index to char-index 1829 # byte-index to char-index
1544 my $text = $self->{text}; 1830 my $text = $self->{text};
1545 utf8::encode $text; 1831 utf8::encode $text;
1546 $self->{cursor} = length substr $text, 0, $idx; 1832 $self->{cursor} = length substr $text, 0, $idx;
1547 1833
1548 $self->_set_text ($self->{text}); 1834 $self->_set_text ($self->{text});
1549 $self->update; 1835 $self->update;
1836
1837 1
1550} 1838}
1551 1839
1552sub mouse_motion { 1840sub invoke_mouse_motion {
1553 my ($self, $ev, $x, $y) = @_; 1841 my ($self, $ev, $x, $y) = @_;
1554# 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
1555} 1845}
1556 1846
1557sub _draw { 1847sub _draw {
1558 my ($self) = @_; 1848 my ($self) = @_;
1559 1849
1560 local $self->{fg} = $self->{fg}; 1850 local $self->{fg} = $self->{fg};
1561 1851
1562 if ($FOCUS == $self) { 1852 if ($FOCUS == $self) {
1563 glColor @{$self->{active_bg}}; 1853 glColor_premultiply @{$self->{active_bg}};
1564 $self->{fg} = $self->{active_fg}; 1854 $self->{fg} = $self->{active_fg};
1565 } else { 1855 } else {
1566 glColor @{$self->{bg}}; 1856 glColor_premultiply @{$self->{bg}};
1567 } 1857 }
1568 1858
1569 glEnable GL_BLEND; 1859 glEnable GL_BLEND;
1570 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1860 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1571 glBegin GL_QUADS; 1861 glBegin GL_QUADS;
1572 glVertex 0 , 0; 1862 glVertex 0 , 0;
1573 glVertex 0 , $self->{h}; 1863 glVertex 0 , $self->{h};
1574 glVertex $self->{w}, $self->{h}; 1864 glVertex $self->{w}, $self->{h};
1575 glVertex $self->{w}, 0; 1865 glVertex $self->{w}, 0;
… …
1600 1890
1601our @ISA = CFClient::UI::EntryBase::; 1891our @ISA = CFClient::UI::EntryBase::;
1602 1892
1603use CFClient::OpenGL; 1893use CFClient::OpenGL;
1604 1894
1605sub key_down { 1895sub invoke_key_down {
1606 my ($self, $ev) = @_; 1896 my ($self, $ev) = @_;
1607 1897
1608 my $sym = $ev->{sym}; 1898 my $sym = $ev->{sym};
1609 1899
1610 if ($sym == 13) { 1900 if ($sym == 13) {
1611 unshift @{$self->{history}}, 1901 unshift @{$self->{history}},
1612 my $txt = $self->get_text; 1902 my $txt = $self->get_text;
1903
1613 $self->{history_pointer} = -1; 1904 $self->{history_pointer} = -1;
1614 $self->{history_saveback} = ''; 1905 $self->{history_saveback} = '';
1615 $self->emit (activate => $txt); 1906 $self->emit (activate => $txt);
1616 $self->update; 1907 $self->update;
1617 1908
… …
1636 } else { 1927 } else {
1637 $self->set_text ($self->{history_saveback}); 1928 $self->set_text ($self->{history_saveback});
1638 } 1929 }
1639 1930
1640 } else { 1931 } else {
1641 $self->SUPER::key_down ($ev); 1932 return $self->SUPER::invoke_key_down ($ev)
1933 }
1934
1642 } 1935 1
1643
1644} 1936}
1645 1937
1646############################################################################# 1938#############################################################################
1647 1939
1648package CFClient::UI::Button; 1940package CFClient::UI::Button;
… …
1657 1949
1658sub new { 1950sub new {
1659 my $class = shift; 1951 my $class = shift;
1660 1952
1661 $class->SUPER::new ( 1953 $class->SUPER::new (
1662 padding => 4, 1954 padding_x => 4,
1955 padding_y => 4,
1663 fg => [1, 1, 1], 1956 fg => [1, 1, 1],
1664 bg => [1, 1, 1, 0.2],
1665 active_fg => [0, 0, 1], 1957 active_fg => [0, 0, 1],
1666 can_hover => 1, 1958 can_hover => 1,
1667 align => 0, 1959 align => 0,
1668 valign => 0, 1960 valign => 0,
1669 can_events => 1, 1961 can_events => 1,
1670 @_ 1962 @_
1671 ) 1963 )
1672} 1964}
1673 1965
1674sub button_up { 1966sub invoke_button_up {
1675 my ($self, $ev, $x, $y) = @_; 1967 my ($self, $ev, $x, $y) = @_;
1676 1968
1969 $self->emit ("activate")
1677 if ($x >= 0 && $x < $self->{w} 1970 if $x >= 0 && $x < $self->{w}
1678 && $y >= 0 && $y < $self->{h}) { 1971 && $y >= 0 && $y < $self->{h};
1679 $self->emit ("activate"); 1972
1680 } 1973 1
1681} 1974}
1682 1975
1683sub _draw { 1976sub _draw {
1684 my ($self) = @_; 1977 my ($self) = @_;
1685 1978
1686 local $self->{fg} = $self->{fg}; 1979 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1687
1688 if ($GRAB == $self) {
1689 $self->{fg} = $self->{active_fg};
1690 }
1691 1980
1692 glEnable GL_TEXTURE_2D; 1981 glEnable GL_TEXTURE_2D;
1693 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1982 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1694 glColor 0, 0, 0, 1; 1983 glColor 0, 0, 0, 1;
1695 1984
… …
1700 $self->SUPER::_draw; 1989 $self->SUPER::_draw;
1701} 1990}
1702 1991
1703############################################################################# 1992#############################################################################
1704 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
1705package CFClient::UI::CheckBox; 2030package CFClient::UI::CheckBox;
1706 2031
1707our @ISA = CFClient::UI::DrawBG::; 2032our @ISA = CFClient::UI::DrawBG::;
1708 2033
1709my @tex = 2034my @tex =
… …
1714 2039
1715sub new { 2040sub new {
1716 my $class = shift; 2041 my $class = shift;
1717 2042
1718 $class->SUPER::new ( 2043 $class->SUPER::new (
1719 padding => 2, 2044 padding_x => 2,
2045 padding_y => 2,
1720 fg => [1, 1, 1], 2046 fg => [1, 1, 1],
1721 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],
1722 state => 0, 2050 state => 0,
1723 can_hover => 1, 2051 can_hover => 1,
1724 @_ 2052 @_
1725 ) 2053 )
1726} 2054}
1727 2055
1728sub size_request { 2056sub size_request {
1729 my ($self) = @_; 2057 my ($self) = @_;
1730 2058
1731 ($self->{padding} * 2 + 6) x 2 2059 (6) x 2
1732} 2060}
1733 2061
1734sub button_down { 2062sub invoke_button_down {
1735 my ($self, $ev, $x, $y) = @_; 2063 my ($self, $ev, $x, $y) = @_;
1736 2064
1737 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 2065 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1738 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 2066 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1739 $self->{state} = !$self->{state}; 2067 $self->{state} = !$self->{state};
1740 $self->emit (changed => $self->{state}); 2068 $self->emit (changed => $self->{state});
2069 } else {
2070 return 0
2071 }
2072
1741 } 2073 1
1742} 2074}
1743 2075
1744sub _draw { 2076sub _draw {
1745 my ($self) = @_; 2077 my ($self) = @_;
1746 2078
1747 $self->SUPER::_draw; 2079 $self->SUPER::_draw;
1748 2080
1749 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 2081 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1750 2082
1751 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;
1752 2086
1753 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 2087 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1754 2088
1755 my $tex = $self->{state} ? $tex[1] : $tex[0]; 2089 my $tex = $self->{state} ? $tex[1] : $tex[0];
1756 2090
… …
1764package CFClient::UI::Image; 2098package CFClient::UI::Image;
1765 2099
1766our @ISA = CFClient::UI::Base::; 2100our @ISA = CFClient::UI::Base::;
1767 2101
1768use CFClient::OpenGL; 2102use CFClient::OpenGL;
1769use Carp qw/confess/;
1770 2103
1771our %loaded_images; 2104our %texture_cache;
1772 2105
1773sub new { 2106sub new {
1774 my $class = shift; 2107 my $class = shift;
1775 2108
1776 my $self = $class->SUPER::new (can_events => 0, @_); 2109 my $self = $class->SUPER::new (
2110 can_events => 0,
2111 @_,
2112 );
1777 2113
1778 $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";
1779 2116
1780 $loaded_images{$self->{image}} ||= 2117 $self->{tex} = $texture_cache{$self->{path}} ||=
1781 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;
1782 2119
1783 my $tex = $self->{tex} = $loaded_images{$self->{image}}; 2120 Scalar::Util::weaken $texture_cache{$self->{path}};
1784 2121
1785 Scalar::Util::weaken $loaded_images{$self->{image}}; 2122 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
1786
1787 $self->{aspect} = $tex->{w} / $tex->{h};
1788 2123
1789 $self 2124 $self
1790} 2125}
1791 2126
1792sub size_request { 2127sub size_request {
1793 my ($self) = @_; 2128 my ($self) = @_;
1794 2129
1795 ($self->{tex}->{w}, $self->{tex}->{h}) 2130 ($self->{tex}{w}, $self->{tex}{h})
1796} 2131}
1797 2132
1798sub _draw { 2133sub _draw {
1799 my ($self) = @_; 2134 my ($self) = @_;
1800 2135
… …
1911 2246
1912 my $h1 = $self->{h} * (1 - $ycut1); 2247 my $h1 = $self->{h} * (1 - $ycut1);
1913 my $h2 = $self->{h} * (1 - $ycut2); 2248 my $h2 = $self->{h} * (1 - $ycut2);
1914 2249
1915 glEnable GL_BLEND; 2250 glEnable GL_BLEND;
1916 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;
1917 glEnable GL_TEXTURE_2D; 2253 glEnable GL_TEXTURE_2D;
1918 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2254 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1919 2255
1920 glBindTexture GL_TEXTURE_2D, $t1->{name}; 2256 glBindTexture GL_TEXTURE_2D, $t1->{name};
1921 glBegin GL_QUADS; 2257 glBegin GL_QUADS;
… …
2018 # TODO: req_w/h are wrong with vertical 2354 # TODO: req_w/h are wrong with vertical
2019 # TODO: calculations are off 2355 # TODO: calculations are off
2020 my $self = $class->SUPER::new ( 2356 my $self = $class->SUPER::new (
2021 fg => [1, 1, 1], 2357 fg => [1, 1, 1],
2022 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],
2023 range => [0, 0, 100, 10], 2361 range => [0, 0, 100, 10, 0],
2024 req_w => $::WIDTH / 80, 2362 min_w => $::WIDTH / 80,
2025 req_h => $::WIDTH / 80, 2363 min_h => $::WIDTH / 80,
2026 vertical => 0, 2364 vertical => 0,
2027 can_hover => 1, 2365 can_hover => 1,
2028 inner_pad => .05, 2366 inner_pad => 0.02,
2029 @_ 2367 @_
2030 ); 2368 );
2031 2369
2032 $self->set_value ($self->{range}[0]); 2370 $self->set_value ($self->{range}[0]);
2033 $self->update; 2371 $self->update;
2034 2372
2035 $self 2373 $self
2036} 2374}
2037 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
2038sub set_value { 2387sub set_value {
2039 my ($self, $value) = @_; 2388 my ($self, $value) = @_;
2040 2389
2041 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}}; 2390 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
2042 2391
2043 $hi = $lo + 1 if $hi <= $lo; 2392 $hi = $lo + 1 if $hi <= $lo;
2044 2393
2394 $page = $hi - $lo if $page > $hi - $lo;
2395
2045 $value = $lo if $value < $lo; 2396 $value = $lo if $value < $lo;
2046 $value = $hi if $value > $hi; 2397 $value = $hi - $page if $value > $hi - $page;
2047 2398
2048 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit 2399 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
2049 if $unit; 2400 if $unit;
2050
2051 $page = $hi - $lo if $page > $hi - $lo;
2052 2401
2053 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2402 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2054 2403
2055 if ($value != $old_value) { 2404 if ($value != $old_value) {
2056 $self->emit (changed => $value); 2405 $self->emit (changed => $value);
… …
2059} 2408}
2060 2409
2061sub size_request { 2410sub size_request {
2062 my ($self) = @_; 2411 my ($self) = @_;
2063 2412
2064 my $w = $self->{req_w}; 2413 ($self->{req_w}, $self->{req_h})
2065 my $h = $self->{req_h};
2066
2067 $self->{vertical} ? ($h, $w) : ($w, $h)
2068} 2414}
2069 2415
2070sub button_down { 2416sub invoke_button_down {
2071 my ($self, $ev, $x, $y) = @_; 2417 my ($self, $ev, $x, $y) = @_;
2072 2418
2073 $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
2074 $self->mouse_motion ($ev, $x, $y); 2423 $self->invoke_mouse_motion ($ev, $x, $y)
2075} 2424}
2076 2425
2077sub mouse_motion { 2426sub invoke_mouse_motion {
2078 my ($self, $ev, $x, $y) = @_; 2427 my ($self, $ev, $x, $y) = @_;
2079 2428
2080 if ($GRAB == $self) { 2429 if ($GRAB == $self) {
2081 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2430 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2082 2431
2083 my (undef, $lo, $hi, $page) = @{$self->{range}}; 2432 my (undef, $lo, $hi, $page) = @{$self->{range}};
2084 2433
2085 $x = $x / ($w * (1 - 2 * $self->{inner_pad})) - $self->{inner_pad}; 2434 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2086 2435
2087 $self->set_value ($x * ($hi - $lo) + $lo); 2436 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2437 } else {
2438 return 0;
2439 }
2440
2088 } 2441 1
2089} 2442}
2090 2443
2091sub update { 2444sub update {
2092 my ($self) = @_; 2445 my ($self) = @_;
2093 2446
2094 $CFClient::UI::ROOT->on_post_alloc ($self => sub { 2447 delete $self->{knob_w};
2448 $self->SUPER::update;
2449}
2450
2451sub _draw {
2452 my ($self) = @_;
2453
2454 unless ($self->{knob_w}) {
2095 $self->set_value ($self->{range}[0]); 2455 $self->set_value ($self->{range}[0]);
2096 2456
2097 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2457 my ($value, $lo, $hi, $page) = @{$self->{range}};
2458 my $range = ($hi - $page - $lo) || 1e-100;
2098 2459
2099 my $inner_w = 1 - 2 * $self->{inner_pad}; 2460 my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
2100 2461
2101 $self->{scale} = ($inner_w / ($hi - $lo)) || 1; 2462 $self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
2463 $self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
2102 2464
2103 $page = $self->{scale} * $page || 10 / ($self->{w} || 1); 2465 $value = ($value - $lo) / $range;
2104 $value = $self->{scale} * ($value - $lo); 2466 $value = $value * $self->{scale} + $self->{offset};
2105 2467
2106 $value = $self->{inner_pad} + ($value - $page * 0.5);
2107
2108 $value = 0 if $value < 0;
2109 $page = 1 - $value if $value + $page > 1;
2110
2111 $self->{knob_x} = $value; 2468 $self->{knob_x} = $value - $knob_w * 0.5;
2112 $self->{knob_w} = $page; 2469 $self->{knob_w} = $knob_w;
2113 }); 2470 }
2114
2115 $self->SUPER::update;
2116}
2117
2118sub _draw {
2119 my ($self) = @_;
2120 2471
2121 $self->SUPER::_draw (); 2472 $self->SUPER::_draw ();
2122 2473
2123 glScale $self->{w}, $self->{h}; 2474 glScale $self->{w}, $self->{h};
2124 2475
2125 if ($self->{vertical}) { 2476 if ($self->{vertical}) {
2126 # draw a vertical slider like a rotated horizontal slider 2477 # draw a vertical slider like a rotated horizontal slider
2127 2478
2479 glTranslate 1, 0, 0;
2128 glRotate 90, 0, 0, 1; 2480 glRotate 90, 0, 0, 1;
2129 glTranslate 0, 1, 0;
2130 } 2481 }
2131 2482
2132 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg}; 2483 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
2133 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg}; 2484 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
2134 2485
… …
2144 glDisable GL_TEXTURE_2D; 2495 glDisable GL_TEXTURE_2D;
2145} 2496}
2146 2497
2147############################################################################# 2498#############################################################################
2148 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
2149package CFClient::UI::TextView; 2541package CFClient::UI::TextScroller;
2150 2542
2151our @ISA = CFClient::UI::HBox::; 2543our @ISA = CFClient::UI::HBox::;
2152 2544
2153use CFClient::OpenGL; 2545use CFClient::OpenGL;
2154 2546
… …
2156 my $class = shift; 2548 my $class = shift;
2157 2549
2158 my $self = $class->SUPER::new ( 2550 my $self = $class->SUPER::new (
2159 fontsize => 1, 2551 fontsize => 1,
2160 can_events => 0, 2552 can_events => 0,
2553 indent => 0,
2161 #font => default_font 2554 #font => default_font
2162 @_, 2555 @_,
2163 2556
2164 layout => (new CFClient::Layout 1), 2557 layout => (new CFClient::Layout 1),
2165 par => [], 2558 par => [],
… …
2180 2573
2181 $self->{fontsize} = $fontsize; 2574 $self->{fontsize} = $fontsize;
2182 $self->reflow; 2575 $self->reflow;
2183} 2576}
2184 2577
2185sub 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 {
2186 my ($self, $text) = @_; 2605 my ($self, $para) = @_;
2187 2606
2188 my $layout = $self->{layout}; 2607 my $layout = $self->{layout};
2189 2608
2609 $layout->set_font ($self->{font}) if $self->{font};
2610 $layout->set_foreground (@{$para->{fg}});
2190 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2611 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2191 $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});
2192 $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}}
2193 2620 );
2194 ($layout->size)[1] 2621
2622 $layout
2195} 2623}
2196 2624
2197sub reflow { 2625sub reflow {
2198 my ($self) = @_; 2626 my ($self) = @_;
2199 2627
2200 $self->{need_reflow}++; 2628 $self->{need_reflow}++;
2201 $self->update; 2629 $self->update;
2202} 2630}
2203 2631
2204sub 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 {
2205 my ($self, $w, $h) = @_; 2640 my ($self) = @_;
2206 2641
2207 $self->SUPER::size_allocate ($w, $h); 2642 my (undef, undef, @other) = @{ $self->{children} };
2643 $self->remove ($_) for @other;
2208 2644
2209 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2645 $self->{par} = [];
2210 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2646 $self->{height} = 0;
2211 $self->{layout}->set_width ($self->{children}[0]{w}); 2647 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2212
2213 $self->reflow;
2214} 2648}
2215 2649
2216sub add_paragraph { 2650sub add_paragraph {
2217 my ($self, $color, $text) = @_; 2651 my ($self, $color, $para, $indent) = @_;
2218 2652
2219 #TODO: intelligently "reformat" paragraph 2653 my ($text, @w) = ref $para ? @$para : $para;
2220 2654
2221 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 };
2222 2663
2223 $self->{height} += $height; 2664 $self->add (@w) if @w;
2665 push @{$self->{par}}, $para;
2224 2666
2225 push @{$self->{par}}, [$height, $color, $text]; 2667 $self->{need_reflow}++;
2668 $self->update;
2669}
2226 2670
2227 $self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}]; 2671sub scroll_to_bottom {
2228 $self->{children}[1]->update; 2672 my ($self) = @_;
2673
2674 $self->{scroll_to_bottom} = 1;
2675 $self->update;
2229} 2676}
2230 2677
2231sub update { 2678sub update {
2232 my ($self) = @_; 2679 my ($self) = @_;
2233 2680
… …
2235 2682
2236 return unless $self->{h} > 0; 2683 return unless $self->{h} > 0;
2237 2684
2238 delete $self->{texture}; 2685 delete $self->{texture};
2239 2686
2240 $ROOT->on_post_alloc ($self, sub { 2687 $ROOT->on_post_alloc ($self => sub {
2688 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2689
2241 if (delete $self->{need_reflow}) { 2690 if (delete $self->{need_reflow}) {
2242 my $height = 0; 2691 my $height = 0;
2243 2692
2244 $height += $_->[0] = $self->text_height ($_->[2])
2245 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 }
2246 2705
2247 $self->{height} = $height; 2706 $self->{height} = $height;
2248 2707
2249 $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]);
2250 2709
2251 delete $self->{texture}; 2710 delete $self->{texture};
2252 } 2711 }
2253 2712
2713 if (delete $self->{scroll_to_bottom}) {
2714 $self->{children}[1]->set_value (1e10);
2715 }
2716
2254 $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 {
2255 glClearColor 0, 0, 0, 0; 2718 glClearColor 0, 0, 0, 0;
2256 glClear GL_COLOR_BUFFER_BIT; 2719 glClear GL_COLOR_BUFFER_BIT;
2257 2720
2258 glEnable GL_TEXTURE_2D;
2259 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2260
2261 my $top = int $self->{children}[1]{range}[0]; 2721 my $top = int $self->{children}[1]{range}[0];
2262 2722
2263 my $y0 = $top; 2723 my $y0 = $top;
2264 my $y1 = $top + $self->{h}; 2724 my $y1 = $top + $H;
2265 2725
2266 my $y = 0; 2726 my $y = 0;
2267 2727
2268 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;
2269 2731
2270 $layout->set_font ($self->{font}) if $self->{font};
2271
2272 for my $par (@{$self->{par}}) { 2732 for my $para (@{$self->{par}}) {
2273 my $h = $par->[0]; 2733 my $h = $para->{h};
2274 2734
2275 if ($y0 < $y + $h && $y < $y1) { 2735 if ($y0 < $y + $h && $y < $y1) {
2276 $layout->set_foreground (@{ $par->[1] });
2277 $layout->set_markup ($par->[2]);
2278 2736
2279 my ($W, $H) = $layout->size; 2737 my $layout = $self->get_layout ($para);
2280 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 }
2281 } 2756 }
2282 2757
2283 $y += $h; 2758 $y += $h;
2284 } 2759 }
2285 2760
2286 glDisable GL_TEXTURE_2D; 2761 glDisable GL_BLEND;
2287 }; 2762 };
2288 }); 2763 });
2289} 2764}
2290 2765
2766sub reconfigure {
2767 my ($self) = @_;
2768
2769 $self->SUPER::reconfigure;
2770
2771 $_->{w} = 1e10 for @{ $self->{par} };
2772 $self->reflow;
2773}
2774
2291sub _draw { 2775sub _draw {
2292 my ($self) = @_; 2776 my ($self) = @_;
2293 2777
2294 glEnable GL_TEXTURE_2D; 2778 glEnable GL_TEXTURE_2D;
2295 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2779 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2296 glColor 1, 1, 1, 1; 2780 glColor 0, 0, 0, 1;
2297 $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});
2298 glDisable GL_TEXTURE_2D; 2782 glDisable GL_TEXTURE_2D;
2299 2783
2300 $self->{children}[1]->draw; 2784 $self->{children}[1]->draw;
2301
2302} 2785}
2303 2786
2304############################################################################# 2787#############################################################################
2305 2788
2306package CFClient::UI::Animator; 2789package CFClient::UI::Animator;
… …
2351 2834
2352sub new { 2835sub new {
2353 my $class = shift; 2836 my $class = shift;
2354 2837
2355 my $self = $class->SUPER::new ( 2838 my $self = $class->SUPER::new (
2356 state => 0, 2839 state => 0,
2357 connect_activate => \&toggle_flopper, 2840 on_activate => \&toggle_flopper,
2358 @_ 2841 @_
2359 ); 2842 );
2360 2843
2361 if ($self->{state}) {
2362 $self->{state} = 0;
2363 $self->toggle_flopper;
2364 }
2365
2366 $self 2844 $self
2367} 2845}
2368 2846
2369sub toggle_flopper { 2847sub toggle_flopper {
2370 my ($self) = @_; 2848 my ($self) = @_;
2371 2849
2372 # TODO: use animation 2850 $self->{other}->toggle_visibility;
2373 if ($self->{state} = !$self->{state}) {
2374 $CFClient::UI::ROOT->add ($self->{other});
2375 $self->{other}->move ($self->coord2global (0, $self->{h}));
2376 $self->emit ("open");
2377 } else {
2378 $CFClient::UI::ROOT->remove ($self->{other});
2379 $self->emit ("close");
2380 }
2381
2382 $self->emit (changed => $self->{state});
2383} 2851}
2384 2852
2385############################################################################# 2853#############################################################################
2386 2854
2387package CFClient::UI::Tooltip; 2855package CFClient::UI::Tooltip;
… …
2400} 2868}
2401 2869
2402sub set_tooltip_from { 2870sub set_tooltip_from {
2403 my ($self, $widget) = @_; 2871 my ($self, $widget) = @_;
2404 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
2405 $self->add (new CFClient::UI::Label 2885 $self->add (new CFClient::UI::Label
2406 markup => $widget->{tooltip}, 2886 markup => $tooltip,
2407 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2887 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2408 fontsize => 0.8, 2888 fontsize => 0.8,
2409 fg => [0, 0, 0, 1], 2889 fg => [0, 0, 0, 1],
2890 ellipsise => 0,
2410 font => ($widget->{tooltip_font} || $::FONT_PROP), 2891 font => ($widget->{tooltip_font} || $::FONT_PROP),
2411 ); 2892 );
2412} 2893}
2413 2894
2414sub size_request { 2895sub size_request {
2415 my ($self) = @_; 2896 my ($self) = @_;
… …
2417 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2898 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2418 2899
2419 ($w + 4, $h + 4) 2900 ($w + 4, $h + 4)
2420} 2901}
2421 2902
2422sub size_allocate { 2903sub invoke_size_allocate {
2423 my ($self, $w, $h) = @_; 2904 my ($self, $w, $h) = @_;
2424 2905
2425 $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 });
2426} 2925}
2427 2926
2428sub _draw { 2927sub _draw {
2429 my ($self) = @_; 2928 my ($self) = @_;
2430 2929
… …
2447 glVertex $w, $h; 2946 glVertex $w, $h;
2448 glVertex $w, 0; 2947 glVertex $w, 0;
2449 glEnd; 2948 glEnd;
2450 2949
2451 glTranslate 2 - 0.375, 2 - 0.375; 2950 glTranslate 2 - 0.375, 2 - 0.375;
2951
2452 $self->SUPER::_draw; 2952 $self->SUPER::_draw;
2453} 2953}
2454 2954
2455############################################################################# 2955#############################################################################
2456 2956
… …
2461use CFClient::OpenGL; 2961use CFClient::OpenGL;
2462 2962
2463sub new { 2963sub new {
2464 my $class = shift; 2964 my $class = shift;
2465 2965
2466 $class->SUPER::new ( 2966 my $self = $class->SUPER::new (
2467 aspect => 1, 2967 aspect => 1,
2968 can_events => 0,
2468 @_, 2969 @_,
2469 ) 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
2470} 2987}
2471 2988
2472sub size_request { 2989sub size_request {
2473 (32, 8) 2990 (32, 8)
2474} 2991}
2475 2992
2993sub update {
2994 my ($self) = @_;
2995
2996 return unless $self->{visible};
2997
2998 $self->SUPER::update;
2999}
3000
2476sub _draw { 3001sub _draw {
2477 my ($self) = @_; 3002 my ($self) = @_;
2478 3003
2479 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
2480 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]]; 3015 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2481 3016
2482 # TODO animation
2483 if ($tex) { 3017 if ($tex) {
2484 glEnable GL_TEXTURE_2D; 3018 glEnable GL_TEXTURE_2D;
2485 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3019 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2486 glColor 1, 1, 1, 1; 3020 glColor 0, 0, 0, 1;
2487 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3021 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2488 glDisable GL_TEXTURE_2D; 3022 glDisable GL_TEXTURE_2D;
2489 } 3023 }
2490} 3024}
2491 3025
3026sub destroy {
3027 my ($self) = @_;
3028
3029 $self->{timer}->cancel
3030 if $self->{timer};
3031
3032 $self->SUPER::destroy;
3033}
3034
2492############################################################################# 3035#############################################################################
2493 3036
2494package CFClient::UI::InventoryItem; 3037package CFClient::UI::Buttonbar;
2495 3038
2496our @ISA = CFClient::UI::HBox::; 3039our @ISA = CFClient::UI::HBox::;
2497 3040
2498sub new { 3041# TODO: should actualyl wrap buttons and other goodies.
2499 my $class = shift;
2500
2501 my %args = @_;
2502
2503 my $item = delete $args{item};
2504
2505 my $desc = $item->{nrof} < 2
2506 ? $item->{name}
2507 : "$item->{nrof} $item->{name_pl}";
2508
2509
2510 my $self = $class->SUPER::new (
2511 can_hover => 1,
2512 can_events => 1,
2513 tooltip => (CFClient::UI::Label->escape ($desc)
2514 . "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),
2515 connect_button_down => sub {
2516 my ($self, $ev, $x, $y) = @_;
2517
2518 # todo: maybe put examine on 1? but should just be a tooltip :(
2519 if ($ev->{button} == 1) {
2520 $::CONN->send ("move $::CONN->{player}{tag} $item->{tag} 0");
2521 } elsif ($ev->{button} == 2) {
2522 $::CONN->send ("apply $item->{tag}");
2523 } elsif ($ev->{button} == 3) {
2524 CFClient::UI::Menu->new (
2525 items => [
2526 ["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2527 [
2528 $item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock",
2529 sub { $::CONN->send ("lock $item->{tag}") },
2530 ],
2531 ["mark", sub { $::CONN->send ("mark $item->{tag}") }],
2532 ["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2533 ["drop", sub { $::CONN->send ("move 0 $item->{tag} 0") }],
2534 ],
2535 )->popup ($ev);
2536 }
2537
2538 1
2539 },
2540 %args
2541 );
2542
2543 $self->add (new CFClient::UI::Face
2544 can_events => 0,
2545 face => $item->{face},
2546 anim => $item->{anim},
2547 animspeed => $item->{animspeed},
2548 );
2549
2550 $self->add (new CFClient::UI::Label
2551 can_events => 0,
2552 text => $desc,
2553 );
2554
2555 $self
2556}
2557
2558#############################################################################
2559
2560package CFClient::UI::Inventory;
2561
2562our @ISA = CFClient::UI::ScrolledWindow::;
2563
2564sub new {
2565 my $class = shift;
2566
2567 my $self = $class->SUPER::new (
2568 scrolled => (new CFClient::UI::VBox),
2569 @_,
2570 );
2571
2572 $self
2573}
2574
2575sub set_items {
2576 my ($self, $items) = @_;
2577
2578 $self->{scrolled}->clear;
2579 return unless $items;
2580
2581 my @items = sort {
2582 ($a->{type} <=> $b->{type})
2583 or ($a->{name} cmp $b->{name})
2584 } @$items;
2585
2586 $self->{real_items} = \@items;
2587
2588 for my $item (@items) {
2589 my $desc = $item->{nrof} < 2
2590 ? $item->{name}
2591 : "$item->{nrof} $item->{name_pl}";
2592
2593 $item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item;
2594 }
2595
2596 $self->{scrolled}->add (@items);
2597
2598# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2599}
2600
2601sub size_request {
2602 my ($self) = @_;
2603 ($self->{req_w}, $self->{req_h});
2604}
2605 3042
2606############################################################################# 3043#############################################################################
2607 3044
2608package CFClient::UI::Menu; 3045package CFClient::UI::Menu;
2609 3046
… …
2621 ); 3058 );
2622 3059
2623 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3060 $self->add ($self->{vbox} = new CFClient::UI::VBox);
2624 3061
2625 for my $item (@{ $self->{items} }) { 3062 for my $item (@{ $self->{items} }) {
2626 my ($widget, $cb) = @$item; 3063 my ($widget, $cb, $tooltip) = @$item;
2627 3064
2628 # handle various types of items, only text for now 3065 # handle various types of items, only text for now
2629 if (!ref $widget) { 3066 if (!ref $widget) {
2630 $widget = new CFClient::UI::Label 3067 $widget = new CFClient::UI::Label
2631 can_hover => 1, 3068 can_hover => 1,
2632 can_events => 1, 3069 can_events => 1,
2633 text => $widget; 3070 markup => $widget,
3071 tooltip => $tooltip
2634 } 3072 }
2635 3073
2636 $self->{item}{$widget} = $item; 3074 $self->{item}{$widget} = $item;
2637 3075
2638 $self->{vbox}->add ($widget); 3076 $self->{vbox}->add ($widget);
… …
2650 # maybe save $GRAB? must be careful about events... 3088 # maybe save $GRAB? must be careful about events...
2651 $GRAB = $self; 3089 $GRAB = $self;
2652 $self->{button} = $ev->{button}; 3090 $self->{button} = $ev->{button};
2653 3091
2654 $self->show; 3092 $self->show;
2655 $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);
2656} 3094}
2657 3095
2658sub mouse_motion { 3096sub invoke_mouse_motion {
2659 my ($self, $ev, $x, $y) = @_; 3097 my ($self, $ev, $x, $y) = @_;
2660 3098
2661 # TODO: should use vbox->find_widget or so 3099 # TODO: should use vbox->find_widget or so
2662 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 3100 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2663 $self->{hover} = $self->{item}{$HOVER}; 3101 $self->{hover} = $self->{item}{$HOVER};
2664}
2665 3102
3103 0
3104}
3105
2666sub button_up { 3106sub invoke_button_up {
2667 my ($self, $ev, $x, $y) = @_; 3107 my ($self, $ev, $x, $y) = @_;
2668 3108
2669 if ($ev->{button} == $self->{button}) { 3109 if ($ev->{button} == $self->{button}) {
2670 undef $GRAB; 3110 undef $GRAB;
2671 $self->hide; 3111 $self->hide;
2672 3112
2673 $self->emit ("popdown"); 3113 $self->emit ("popdown");
2674 $self->{hover}[1]->() if $self->{hover}; 3114 $self->{hover}[1]->() if $self->{hover};
3115 } else {
3116 return 0
3117 }
3118
2675 } 3119 1
2676} 3120}
2677 3121
2678############################################################################# 3122#############################################################################
2679 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
2680package CFClient::UI::Statusbox; 3290package CFClient::UI::Statusbox;
2681 3291
2682our @ISA = CFClient::UI::VBox::; 3292our @ISA = CFClient::UI::VBox::;
2683 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
2684sub reorder { 3309sub reorder {
2685 my ($self) = @_; 3310 my ($self) = @_;
2686 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} };
2687 3317
2688 while (my ($k, $v) = each %{ $self->{item} }) { 3318 while (my ($k, $v) = each %{ $self->{item} }) {
2689 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3319 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2690 } 3320 }
2691 3321
… …
2694 my @items = sort { 3324 my @items = sort {
2695 $a->{pri} <=> $b->{pri} 3325 $a->{pri} <=> $b->{pri}
2696 or $b->{id} <=> $a->{id} 3326 or $b->{id} <=> $a->{id}
2697 } values %{ $self->{item} }; 3327 } values %{ $self->{item} };
2698 3328
3329 $self->{timer}->interval (1);
3330
2699 my $count = 10 + 1; 3331 my $count = 10 + 1;
2700 for my $item (@items) { 3332 for my $item (@items) {
2701 last unless --$count; 3333 last unless --$count;
2702 3334
2703 push @widgets, $item->{label} ||= do { 3335 my $label = $item->{label} ||= do {
2704 # TODO: doesn't handle markup well (read as: at all) 3336 # TODO: doesn't handle markup well (read as: at all)
2705 my $short = $item->{count} > 1 3337 my $short = $item->{count} > 1
2706 ? "<b>$item->{count} ×</b> $item->{text}" 3338 ? "<b>$item->{count} ×</b> $item->{text}"
2707 : $item->{text}; 3339 : $item->{text};
2708 3340
2709 for ($short) { 3341 for ($short) {
2710 s/^\s+//; 3342 s/^\s+//;
2711 s/\s+/ /g; 3343 s/\s+/ /g;
2712 my $len = int 40 / $item->{fontsize};
2713 substr $_, $len, length, "…" if $len < length;
2714 } 3344 }
2715 3345
2716 new CFClient::UI::Label 3346 new CFClient::UI::Label
2717 markup => $short, 3347 markup => $short,
2718 tooltip => $item->{tooltip}, 3348 tooltip => $item->{tooltip},
2719 tooltip_font => $::FONT_PROP, 3349 tooltip_font => $::FONT_PROP,
2720 tooltip_width => 0.67, 3350 tooltip_width => 0.67,
2721 fontsize => $item->{fontsize}, 3351 fontsize => $item->{fontsize} || $self->{fontsize},
3352 max_w => $::WIDTH * 0.44,
2722 fg => $item->{fg}, 3353 fg => [@{ $item->{fg} }],
2723 can_events => 1, 3354 can_events => 1,
2724 can_hover => 1 3355 can_hover => 1
2725 }; 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;
2726 } 3369 }
2727 3370
2728 $self->clear; 3371 $self->clear;
2729 $self->SUPER::add (reverse @widgets); 3372 $self->SUPER::add (reverse @widgets);
2730} 3373}
… …
2733 my ($self, $text, %arg) = @_; 3376 my ($self, $text, %arg) = @_;
2734 3377
2735 $text =~ s/^\s+//; 3378 $text =~ s/^\s+//;
2736 $text =~ s/\s+$//; 3379 $text =~ s/\s+$//;
2737 3380
3381 return unless $text;
3382
2738 my $timeout = time + ((delete $arg{timeout}) || 60); 3383 my $timeout = (int time) + ((delete $arg{timeout}) || 60);
2739 3384
2740 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 3385 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2741 3386
2742 if (my $item = $self->{item}{$group}) { 3387 if (my $item = $self->{item}{$group}) {
2743 if ($item->{text} eq $text) { 3388 if ($item->{text} eq $text) {
2744 $item->{count}++; 3389 $item->{count}++;
2745 } else { 3390 } else {
2746 $item->{count} = 1; 3391 $item->{count} = 1;
2747 $item->{text} = $item->{tooltip} = $text; 3392 $item->{text} = $item->{tooltip} = $text;
2748 } 3393 }
2749 $item->{id} = ++$self->{id}; 3394 $item->{id} += 0.2;#d#
2750 $item->{timeout} = $timeout; 3395 $item->{timeout} = $timeout;
2751 delete $item->{label}; 3396 delete $item->{label};
2752 } else { 3397 } else {
2753 $self->{item}{$group} = { 3398 $self->{item}{$group} = {
2754 id => ++$self->{id}, 3399 id => ++$self->{id},
2755 text => $text, 3400 text => $text,
2756 timeout => $timeout, 3401 timeout => $timeout,
2757 tooltip => $text, 3402 tooltip => $text,
2758 fontsize => 0.8,
2759 fg => [0.8, 0.8, 0.8, 0.8], 3403 fg => [0.8, 0.8, 0.8, 0.8],
2760 pri => 0, 3404 pri => 0,
2761 count => 1, 3405 count => 1,
2762 %arg, 3406 %arg,
2763 }; 3407 };
2764 } 3408 }
2765 3409
2766 $self->reorder; 3410 $self->reorder;
2767} 3411}
2768 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
2769############################################################################# 3431#############################################################################
2770 3432
2771package CFClient::UI::Root; 3433package CFClient::UI::Inventory;
2772 3434
2773our @ISA = CFClient::UI::Container::; 3435our @ISA = CFClient::UI::ScrolledWindow::;
2774
2775use CFClient::OpenGL;
2776 3436
2777sub new { 3437sub new {
2778 my $class = shift; 3438 my $class = shift;
2779 3439
2780 $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 => [],
2781 @_, 3693 @_,
2782 ) 3694 )
2783} 3695}
2784 3696
2785sub configure { 3697my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
2786 my ($self, $x, $y, $w, $h) = @_;
2787 3698
2788 $self->{w} = $w; 3699my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
2789 $self->{h} = $h; 3700 "<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
2790} 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");
2791 3709
2792sub 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 {
2793 my ($self) = @_; 3783 my ($self, $spell) = @_;
2794 3784
2795 $self->size_allocate ($self->{w}, $self->{h}) 3785 $self->{spell}->{$spell->{name}} = $spell;
2796 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
2797} 3824}
2798 3825
2799sub size_request { 3826sub size_request {
2800 my ($self) = @_; 3827 my ($self) = @_;
2801 3828
2802 ($self->{w}, $self->{h}) 3829 ($self->{w}, $self->{h})
2803} 3830}
2804 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
2805sub size_allocate { 3846sub invoke_size_allocate {
2806 my ($self, $w, $h) = @_; 3847 my ($self, $w, $h) = @_;
2807
2808 my $old_w = $self->{old_w}; $self->{old_w} = $w;
2809 my $old_h = $self->{old_h}; $self->{old_h} = $h;
2810
2811 CFClient::UI::rescale_widgets $w / $old_w, $h / $old_h
2812 if $old_w && $old_h && ($old_w != $w || $old_h != $h);
2813 3848
2814 for my $child ($self->children) { 3849 for my $child ($self->children) {
2815 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)};
2816 3851
2817 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1 3852 $X = $child->{force_x} if exists $child->{force_x};
2818 if exists $child->{req_x}; 3853 $Y = $child->{force_y} if exists $child->{force_y};
2819 3854
2820 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1 3855 $X = _to_pixel $X, $W, $self->{w};
2821 if exists $child->{req_y}; 3856 $Y = _to_pixel $Y, $H, $self->{h};
2822
2823 $X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
2824 $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
2825 3857
2826 $child->configure ($X, $Y, $W, $H); 3858 $child->configure ($X, $Y, $W, $H);
2827 } 3859 }
3860
3861 1
2828} 3862}
2829 3863
2830sub coord2local { 3864sub coord2local {
2831 my ($self, $x, $y) = @_; 3865 my ($self, $x, $y) = @_;
2832 3866
… …
2840} 3874}
2841 3875
2842sub update { 3876sub update {
2843 my ($self) = @_; 3877 my ($self) = @_;
2844 3878
2845 $self->check_size;
2846 $::WANT_REFRESH++; 3879 $::WANT_REFRESH++;
2847} 3880}
2848 3881
2849sub add { 3882sub add {
2850 my ($self, @children) = @_; 3883 my ($self, @children) = @_;
2851 3884
2852 for my $child (@children) {
2853 $child->{toplevel} = 1; 3885 $_->{is_toplevel} = 1
2854 3886 for @children;
2855 # integerise window positions
2856 $child->{x} = int $child->{x};
2857 $child->{y} = int $child->{y};
2858 }
2859 3887
2860 $self->SUPER::add (@children); 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 }
2861} 3904}
2862 3905
2863sub on_refresh { 3906sub on_refresh {
2864 my ($self, $id, $cb) = @_; 3907 my ($self, $id, $cb) = @_;
2865 3908
… …
2878 while ($self->{refresh_hook}) { 3921 while ($self->{refresh_hook}) {
2879 $_->() 3922 $_->()
2880 for values %{delete $self->{refresh_hook}}; 3923 for values %{delete $self->{refresh_hook}};
2881 } 3924 }
2882 3925
2883 if ($self->{check_size}) { 3926 if ($self->{realloc}) {
2884 my @queue = ([], []); 3927 my %queue;
3928 my @queue;
3929 my $widget;
2885 3930
2886 for (;;) { 3931 outer:
2887 if ($self->{check_size}) { 3932 while () {
2888 # heuristic: check containers last 3933 if (my $realloc = delete $self->{realloc}) {
2889 push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_ 3934 for $widget (values %$realloc) {
2890 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 }
2891 } 3941 }
2892 3942
2893 my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last; 3943 while () {
3944 @queue or last outer;
2894 3945
2895 my ($w, $h) = $widget->{user_w} && $widget->{user_h} 3946 $widget = pop @{ $queue[-1] || [] }
2896 ? @$widget{qw(user_w user_h)} 3947 and last;
2897 : $widget->size_request;
2898
2899 if (delete $widget->{force_alloc}
2900 or $w != $widget->{req_w} or $h != $widget->{req_h}) {
2901 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
2902 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}) {
2903 $widget->{req_w} = $w; 3967 $widget->{req_w} = $w;
2904 $widget->{req_h} = $h; 3968 $widget->{req_h} = $h;
2905 3969
2906 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h]; 3970 $self->{size_alloc}{$widget+0} = $widget;
2907 3971
2908 $widget->{parent}->check_size
2909 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 }
2910 } 3979 }
3980
3981 delete $self->{realloc}{$widget+0};
2911 } 3982 }
2912 } 3983 }
2913 3984
2914 while ($self->{size_alloc}) { 3985 while (my $size_alloc = delete $self->{size_alloc}) {
2915 for (values %{delete $self->{size_alloc}}) { 3986 my @queue = sort { $b->{visible} <=> $a->{visible} }
2916 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)};
2917 3993
2918 $w = 0 if $w < 0; 3994 $w = 0 if $w < 0;
2919 $h = 0 if $h < 0; 3995 $h = 0 if $h < 0;
2920 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
2921 $widget->{w} = $w; 4004 $widget->{w} = $w;
2922 $widget->{h} = $h; 4005 $widget->{h} = $h;
2923 $widget->size_allocate ($w, $h); 4006
2924 $widget->emit (size_allocate => $w, $h); 4007 $widget->emit (size_allocate => $w, $h);
4008 }
2925 } 4009 }
2926 } 4010 }
2927 4011
2928 while ($self->{post_alloc_hook}) { 4012 while ($self->{post_alloc_hook}) {
2929 $_->() 4013 $_->()
2930 for values %{delete $self->{post_alloc_hook}}; 4014 for values %{delete $self->{post_alloc_hook}};
2931 } 4015 }
2932 4016
4017
2933 glViewport 0, 0, $::WIDTH, $::HEIGHT; 4018 glViewport 0, 0, $::WIDTH, $::HEIGHT;
2934 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 4019 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2935 glClear GL_COLOR_BUFFER_BIT; 4020 glClear GL_COLOR_BUFFER_BIT;
2936 4021
2937 glMatrixMode GL_PROJECTION; 4022 glMatrixMode GL_PROJECTION;
2938 glLoadIdentity; 4023 glLoadIdentity;
2939 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000; 4024 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
2940 glMatrixMode GL_MODELVIEW; 4025 glMatrixMode GL_MODELVIEW;
2941 glLoadIdentity; 4026 glLoadIdentity;
2942 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
2943 $self->_draw; 4035 $self->_draw;
2944} 4036}
2945 4037
2946############################################################################# 4038#############################################################################
2947 4039
2948package CFClient::UI; 4040package CFClient::UI;
2949 4041
2950$ROOT = new CFClient::UI::Root; 4042$ROOT = new CFClient::UI::Root;
2951$TOOLTIP = new CFClient::UI::Tooltip; 4043$TOOLTIP = new CFClient::UI::Tooltip z => 900;
2952 4044
29531 40451
2954 4046

Diff Legend

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