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

Diff Legend

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