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

Diff Legend

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