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

Diff Legend

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