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.198 by root, Fri May 12 02:08:52 2006 UTC vs.
Revision 1.362 by root, Sat Dec 9 21:26:46 2006 UTC

1package CFClient::UI; 1package CFPlus::UI;
2 2
3use utf8; 3use utf8;
4use strict; 4use strict;
5 5
6use Scalar::Util ();
7use List::Util (); 6use List::Util ();
7use Event;
8 8
9use CFClient; 9use CFPlus;
10use CFPlus::Pod;
11use CFPlus::Texture;
10 12
11our ($FOCUS, $HOVER, $GRAB); # various widgets 13our ($FOCUS, $HOVER, $GRAB); # various widgets
12 14
15our $LAYOUT;
13our $ROOT; 16our $ROOT;
14our $TOOLTIP; 17our $TOOLTIP;
15our $BUTTON_STATE; 18our $BUTTON_STATE;
16 19
17sub check_tooltip { 20our %WIDGET; # all widgets, weak-referenced
21
22our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub {
18 if (!$GRAB) { 23 if (!$GRAB) {
19 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) { 24 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
20 if (length $widget->{tooltip}) { 25 if (length $widget->{tooltip}) {
21
22 if ($TOOLTIP->{owner} != $widget) { 26 if ($TOOLTIP->{owner} != $widget) {
27 $TOOLTIP->hide;
28
23 $TOOLTIP->{owner} = $widget; 29 $TOOLTIP->{owner} = $widget;
30
31 return if $ENV{CFPLUS_DEBUG} & 8;
24 32
25 my $tip = $widget->{tooltip}; 33 my $tip = $widget->{tooltip};
26 34
27 $tip = $tip->($widget) if CODE:: eq ref $tip; 35 $tip = $tip->($widget) if CODE:: eq ref $tip;
28 36
29 $TOOLTIP->set_tooltip_from ($widget); 37 $TOOLTIP->set_tooltip_from ($widget);
30 $TOOLTIP->show; 38 $TOOLTIP->show;
31
32 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
33
34 if ($x + $TOOLTIP->{w} > $::WIDTH) {
35 ($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0);
36 }
37
38 $TOOLTIP->move ($x, $y);
39 $TOOLTIP->check_size;
40 $TOOLTIP->update;
41 } 39 }
42 40
43 return; 41 return;
44 } 42 }
45 } 43 }
46 } 44 }
47 45
48 $TOOLTIP->hide; 46 $TOOLTIP->hide;
49 delete $TOOLTIP->{owner}; 47 delete $TOOLTIP->{owner};
48});
49
50sub get_layout {
51 my $layout;
52
53 for (grep { $_->{name} } values %WIDGET) {
54 my $win = $layout->{$_->{name}} = { };
55
56 $win->{x} = ($_->{x} + $_->{w} * 0.5) / $::WIDTH if $_->{x} =~ /^[0-9.]+$/;
57 $win->{y} = ($_->{y} + $_->{h} * 0.5) / $::HEIGHT if $_->{y} =~ /^[0-9.]+$/;
58 $win->{w} = $_->{w} / $::WIDTH if defined $_->{w};
59 $win->{h} = $_->{h} / $::HEIGHT if defined $_->{h};
60
61 $win->{show} = $_->{visible} && $_->{is_toplevel};
62 }
63
64 $layout
65}
66
67sub set_layout {
68 my ($layout) = @_;
69
70 $LAYOUT = $layout;
50} 71}
51 72
52# class methods for events 73# class methods for events
53sub feed_sdl_key_down_event { 74sub feed_sdl_key_down_event {
54 $FOCUS->emit (key_down => $_[0]) || $FOCUS->key_down ($_[0]) 75 $FOCUS->emit (key_down => $_[0])
55 if $FOCUS; 76 if $FOCUS;
56} 77}
57 78
58sub feed_sdl_key_up_event { 79sub feed_sdl_key_up_event {
59 $FOCUS->emit (key_up => $_[0]) || $FOCUS->key_up ($_[0]) 80 $FOCUS->emit (key_up => $_[0])
60 if $FOCUS; 81 if $FOCUS;
82}
83
84sub check_hover {
85 my ($widget) = @_;
86
87 if ($widget != $HOVER) {
88 my $hover = $HOVER; $HOVER = $widget;
89
90 $hover->update if $hover && $hover->{can_hover};
91 $HOVER->update if $HOVER && $HOVER->{can_hover};
92
93 $TOOLTIP_WATCHER->start;
94 }
61} 95}
62 96
63sub feed_sdl_button_down_event { 97sub feed_sdl_button_down_event {
64 my ($ev) = @_; 98 my ($ev) = @_;
65 my ($x, $y) = ($ev->{x}, $ev->{y}); 99 my ($x, $y) = ($ev->{x}, $ev->{y});
66 100
67 if (!$BUTTON_STATE) { 101 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
102
103 unless ($GRAB) {
68 my $widget = $ROOT->find_widget ($x, $y); 104 my $widget = $ROOT->find_widget ($x, $y);
69 105
70 $GRAB = $widget; 106 $GRAB = $widget;
71 $GRAB->update if $GRAB; 107 $GRAB->update if $GRAB;
72 108
73 check_tooltip; 109 $TOOLTIP_WATCHER->cb->();
74 } 110 }
75
76 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
77 111
78 if ($GRAB) { 112 if ($GRAB) {
79 ($x, $y) = $GRAB->coord2local ($x, $y); 113 if ($ev->{button} == 4 || $ev->{button} == 5) {
80 $GRAB->emit (button_down => $ev, $x, $y) || $GRAB->button_down ($ev, $x, $y); 114 # mousewheel
115 $ev->{dx} = 0;
116 $ev->{dy} = $ev->{button} * 2 - 9;
117 $GRAB->emit (mouse_wheel => $ev);
118 } else {
119 $GRAB->emit (button_down => $ev)
120 }
81 } 121 }
82} 122}
83 123
84sub feed_sdl_button_up_event { 124sub feed_sdl_button_up_event {
85 my ($ev) = @_; 125 my ($ev) = @_;
86 my ($x, $y) = ($ev->{x}, $ev->{y});
87 126
88 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 127 my $widget = $GRAB || $ROOT->find_widget ($ev->{x}, $ev->{y});
89 128
90 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1)); 129 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
91 130
92 if ($GRAB) { 131 $GRAB->emit (button_up => $ev)
93 ($x, $y) = $GRAB->coord2local ($x, $y); 132 if $GRAB && $ev->{button} != 4 && $ev->{button} != 5;
94 $GRAB->emit (button_up => $ev, $x, $y) || $GRAB->button_up ($ev, $x, $y);
95 }
96 133
97 if (!$BUTTON_STATE) { 134 unless ($BUTTON_STATE) {
98 my $grab = $GRAB; undef $GRAB; 135 my $grab = $GRAB; undef $GRAB;
99 $grab->update if $grab; 136 $grab->update if $grab;
100 $GRAB->update if $GRAB; 137 $GRAB->update if $GRAB;
101 138
102 check_tooltip; 139 check_hover $widget;
140 $TOOLTIP_WATCHER->cb->();
103 } 141 }
104} 142}
105 143
106sub feed_sdl_motion_event { 144sub feed_sdl_motion_event {
107 my ($ev) = @_; 145 my ($ev) = @_;
108 my ($x, $y) = ($ev->{x}, $ev->{y}); 146 my ($x, $y) = ($ev->{x}, $ev->{y});
109 147
110 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 148 my $widget = $GRAB || $ROOT->find_widget ($x, $y);
111 149
112 if ($widget != $HOVER) { 150 check_hover $widget;
113 my $hover = $HOVER; $HOVER = $widget;
114 151
115 $hover->update if $hover && $hover->{can_hover}; 152 $HOVER->emit (mouse_motion => $ev)
116 $HOVER->update if $HOVER && $HOVER->{can_hover};
117
118 check_tooltip;
119 }
120
121 if ($HOVER) { 153 if $HOVER;
122 ($x, $y) = $HOVER->coord2local ($x, $y);
123 $HOVER->emit (mouse_motion => $ev, $x, $y) || $HOVER->mouse_motion ($ev, $x, $y);
124 }
125} 154}
126 155
127# convert position array to integers 156# convert position array to integers
128sub harmonize { 157sub harmonize {
129 my ($vals) = @_; 158 my ($vals) = @_;
… …
135 $rem += $_ - $i; 164 $rem += $_ - $i;
136 $_ = $i; 165 $_ = $i;
137 } 166 }
138} 167}
139 168
169sub full_refresh {
170 # make a copy, otherwise for complains about freed values.
171 my @widgets = values %WIDGET;
172
173 $_->update
174 for @widgets;
175}
176
177sub reconfigure_widgets {
178 # make a copy, otherwise C<for> complains about freed values.
179 my @widgets = values %WIDGET;
180
181 $_->reconfigure
182 for @widgets;
183}
184
185# call when resolution changes etc.
186sub rescale_widgets {
187 my ($sx, $sy) = @_;
188
189 for my $widget (values %WIDGET) {
190 if ($widget->{is_toplevel}) {
191 $widget->{x} += int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
192 $widget->{y} += int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
193
194 $widget->{x} = int 0.5 + $widget->{x} * $sx if $widget->{x} =~ /^[0-9.]+$/;
195 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};
196 $widget->{force_w} = int 0.5 + $widget->{force_w} * $sx if exists $widget->{force_w};
197 $widget->{y} = int 0.5 + $widget->{y} * $sy if $widget->{y} =~ /^[0-9.]+$/;
198 $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};
199 $widget->{force_h} = int 0.5 + $widget->{force_h} * $sy if exists $widget->{force_h};
200
201 $widget->{x} -= int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
202 $widget->{y} -= int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
203
204 }
205 }
206
207 reconfigure_widgets;
208}
209
140############################################################################# 210#############################################################################
141 211
212package CFPlus::UI::Event;
213
214sub xy {
215 $_[1]->coord2local ($_[0]{x}, $_[0]{y})
216}
217
218#############################################################################
219
142package CFClient::UI::Base; 220package CFPlus::UI::Base;
143 221
144use strict; 222use strict;
145 223
146use CFClient::OpenGL; 224use CFPlus::OpenGL;
147 225
148sub new { 226sub new {
149 my $class = shift; 227 my $class = shift;
150 228
151 my $self = bless { 229 my $self = bless {
152 x => 0, 230 x => "center",
153 y => 0, 231 y => "center",
154 z => 0, 232 z => 0,
233 w => undef,
234 h => undef,
155 can_events => 1, 235 can_events => 1,
156 @_ 236 @_
157 }, $class; 237 }, $class;
158 238
239 CFPlus::weaken ($CFPlus::UI::WIDGET{$self+0} = $self);
240
159 for (keys %$self) { 241 for (keys %$self) {
160 if (/^connect_(.*)$/) { 242 if (/^on_(.*)$/) {
161 $self->connect ($1 => delete $self->{$_}); 243 $self->connect ($1 => delete $self->{$_});
162 } 244 }
163 } 245 }
164 246
247 if (my $layout = $CFPlus::UI::LAYOUT->{$self->{name}}) {
248 $self->{x} = $layout->{x} * $CFPlus::UI::ROOT->{alloc_w} if exists $layout->{x};
249 $self->{y} = $layout->{y} * $CFPlus::UI::ROOT->{alloc_h} if exists $layout->{y};
250 $self->{force_w} = $layout->{w} * $CFPlus::UI::ROOT->{alloc_w} if exists $layout->{w};
251 $self->{force_h} = $layout->{h} * $CFPlus::UI::ROOT->{alloc_h} if exists $layout->{h};
252
253 $self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
254 $self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
255
256 $self->show if $layout->{show};
257 }
258
165 $self 259 $self
166} 260}
167 261
168sub destroy { 262sub destroy {
169 my ($self) = @_; 263 my ($self) = @_;
170 264
171 $self->hide; 265 $self->hide;
266 $self->emit ("destroy");
172 %$self = (); 267 %$self = ();
173} 268}
174 269
175sub show { 270sub show {
176 my ($self) = @_; 271 my ($self) = @_;
177 272
178 return if $self->{parent}; 273 return if $self->{parent};
179 274
180 $CFClient::UI::ROOT->add ($self); 275 $CFPlus::UI::ROOT->add ($self);
181} 276}
182 277
183sub hide { 278sub set_visible {
184 my ($self) = @_; 279 my ($self) = @_;
280
281 return if $self->{visible};
282
283 $self->{root} = $self->{parent}{root};
284 $self->{visible} = $self->{parent}{visible} + 1;
285
286 $self->emit (visibility_change => 1);
287
288 $self->realloc if !exists $self->{req_w};
289
290 $_->set_visible for $self->children;
291}
292
293sub set_invisible {
294 my ($self) = @_;
295
296 return unless $self->{visible};
297
298 $_->set_invisible for $self->children;
299
300 delete $self->{visible};
301 delete $self->{root};
185 302
186 undef $GRAB if $GRAB == $self; 303 undef $GRAB if $GRAB == $self;
187 undef $HOVER if $HOVER == $self; 304 undef $HOVER if $HOVER == $self;
188 305
306 $CFPlus::UI::TOOLTIP_WATCHER->cb->()
307 if $TOOLTIP->{owner} == $self;
308
309 $self->emit ("focus_out");
310 $self->emit (visibility_change => 0);
311}
312
313sub set_visibility {
314 my ($self, $visible) = @_;
315
316 return if $self->{visible} == $visible;
317
318 $visible ? $self->hide
319 : $self->show;
320}
321
322sub toggle_visibility {
323 my ($self) = @_;
324
325 $self->{visible}
326 ? $self->hide
327 : $self->show;
328}
329
330sub hide {
331 my ($self) = @_;
332
333 $self->set_invisible;
334
189 $self->{parent}->remove ($self) 335 $self->{parent}->remove ($self)
190 if $self->{parent}; 336 if $self->{parent};
191} 337}
192 338
193sub move { 339sub move_abs {
194 my ($self, $x, $y, $z) = @_; 340 my ($self, $x, $y, $z) = @_;
195 341
196 $self->{x} = int $x; 342 $self->{x} = List::Util::max 0, List::Util::min $self->{root}{w} - $self->{w}, int $x;
197 $self->{y} = int $y; 343 $self->{y} = List::Util::max 0, List::Util::min $self->{root}{h} - $self->{h}, int $y;
198 $self->{z} = $z if defined $z; 344 $self->{z} = $z if defined $z;
199 345
200 $self->update; 346 $self->update;
201} 347}
202 348
203sub set_size { 349sub set_size {
204 my ($self, $w, $h) = @_; 350 my ($self, $w, $h) = @_;
205 351
206 $self->{user_w} = $w; 352 $self->{force_w} = $w;
207 $self->{user_h} = $h; 353 $self->{force_h} = $h;
208 354
209 $self->check_size; 355 $self->realloc;
210} 356}
211 357
212sub size_request { 358sub size_request {
213 require Carp; 359 require Carp;
214 Carp::confess "size_request is abstract"; 360 Carp::confess "size_request is abstract";
215} 361}
216 362
363sub baseline_shift {
364 0
365}
366
217sub configure { 367sub configure {
218 my ($self, $x, $y, $w, $h) = @_; 368 my ($self, $x, $y, $w, $h) = @_;
219 369
220 if ($self->{aspect}) { 370 if ($self->{aspect}) {
371 my ($ow, $oh) = ($w, $h);
372
221 my $w2 = List::Util::min $w, int $h * $self->{aspect}; 373 $w = List::Util::min $w, CFPlus::ceil $h * $self->{aspect};
222 my $h2 = List::Util::min $h, int $w / $self->{aspect}; 374 $h = List::Util::min $h, CFPlus::ceil $w / $self->{aspect};
223 375
224 # use alignment to adjust x, y 376 # use alignment to adjust x, y
225 377
226 $x += int +($w - $w2) * 0.5; 378 $x += int 0.5 * ($ow - $w);
227 $y += int +($h - $h2) * 0.5; 379 $y += int 0.5 * ($oh - $h);
228
229 ($w, $h) = ($w2, $h2);
230 } 380 }
231 381
232 if ($self->{x} != $x || $self->{y} != $y) { 382 if ($self->{x} ne $x || $self->{y} ne $y) {
233 $self->{x} = $x; 383 $self->{x} = $x;
234 $self->{y} = $y; 384 $self->{y} = $y;
235 $self->update; 385 $self->update;
236 } 386 }
237 387
238 if ($self->{w} != $w || $self->{h} != $h) { 388 if ($self->{alloc_w} != $w || $self->{alloc_h} != $h) {
239 $CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $w, $h]; 389 return unless $self->{visible};
240 }
241}
242 390
243sub size_allocate { 391 $self->{alloc_w} = $w;
244 # nothing to be done 392 $self->{alloc_h} = $h;
393
394 $self->{root}{size_alloc}{$self+0} = $self;
395 }
245} 396}
246 397
247sub children { 398sub children {
399 # nop
248} 400}
249 401
250# call when resolution changes etc. 402sub visible_children {
251sub reconfigure { 403 $_[0]->children
252 my ($self) = @_;
253
254 $_->reconfigure
255 for $self->children;
256
257 $self->check_size (1);
258 $self->update;
259} 404}
260 405
261sub set_max_size { 406sub set_max_size {
262 my ($self, $w, $h) = @_; 407 my ($self, $w, $h) = @_;
263 408
264 delete $self->{max_w}; $self->{max_w} = $w if $w; 409 $self->{max_w} = int $w if defined $w;
265 delete $self->{max_h}; $self->{max_h} = $h if $h; 410 $self->{max_h} = int $h if defined $h;
411
412 $self->realloc;
413}
414
415sub set_tooltip {
416 my ($self, $tooltip) = @_;
417
418 $tooltip =~ s/^\s+//;
419 $tooltip =~ s/\s+$//;
420
421 return if $self->{tooltip} eq $tooltip;
422
423 $self->{tooltip} = $tooltip;
424
425 if ($CFPlus::UI::TOOLTIP->{owner} == $self) {
426 delete $CFPlus::UI::TOOLTIP->{owner};
427 $CFPlus::UI::TOOLTIP_WATCHER->cb->();
428 }
266} 429}
267 430
268# translate global coordinates to local coordinate system 431# translate global coordinates to local coordinate system
269sub coord2local { 432sub coord2local {
270 my ($self, $x, $y) = @_; 433 my ($self, $x, $y) = @_;
271 434
435 Carp::confess unless $self->{parent};#d#
436
272 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y}) 437 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
273} 438}
274 439
275# translate local coordinates to global coordinate system 440# translate local coordinates to global coordinate system
276sub coord2global { 441sub coord2global {
277 my ($self, $x, $y) = @_; 442 my ($self, $x, $y) = @_;
278 443
444 Carp::confess unless $self->{parent};#d#
445
279 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y}) 446 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
280} 447}
281 448
282sub focus_in { 449sub invoke_focus_in {
283 my ($self) = @_; 450 my ($self) = @_;
284 451
285 return if $FOCUS == $self; 452 return if $FOCUS == $self;
286 return unless $self->{can_focus}; 453 return unless $self->{can_focus};
287 454
288 my $focus = $FOCUS; $FOCUS = $self; 455 $FOCUS = $self;
289 456
290 $self->emit (focus_in => $focus); 457 $self->update;
291 458
292 $focus->update if $focus; 459 0
293 $FOCUS->update;
294} 460}
295 461
296sub focus_out { 462sub invoke_focus_out {
297 my ($self) = @_; 463 my ($self) = @_;
298 464
299 return unless $FOCUS == $self; 465 return unless $FOCUS == $self;
300 466
301 my $focus = $FOCUS; undef $FOCUS; 467 undef $FOCUS;
302 468
303 $self->emit (focus_out => $focus); 469 $self->update;
304 470
305 $focus->update if $focus; #? 471 $::MAPWIDGET->grab_focus #d# focus mapwidget if no other widget has focus
306} 472 unless $FOCUS;
307 473
474 0
475}
476
477sub grab_focus {
478 my ($self) = @_;
479
480 $FOCUS->emit ("focus_out") if $FOCUS;
481 $self->emit ("focus_in");
482}
483
308sub mouse_motion { } 484sub invoke_mouse_motion { 0 }
309sub button_up { } 485sub invoke_button_up { 0 }
310sub key_down { } 486sub invoke_key_down { 0 }
311sub key_up { } 487sub invoke_key_up { 0 }
488sub invoke_mouse_wheel { 0 }
312 489
313sub button_down { 490sub invoke_button_down {
314 my ($self, $ev, $x, $y) = @_; 491 my ($self, $ev, $x, $y) = @_;
315 492
316 $self->focus_in; 493 $self->grab_focus;
317}
318 494
319sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} } 495 0
320sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } 496}
321sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} } 497
322sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} } 498sub connect {
323sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} } 499 my ($self, $signal, $cb) = @_;
500
501 push @{ $self->{signal_cb}{$signal} }, $cb;
502
503 defined wantarray and CFPlus::guard {
504 @{ $self->{signal_cb}{$signal} } = grep $_ != $cb,
505 @{ $self->{signal_cb}{$signal} };
506 }
507}
508
509sub disconnect_all {
510 my ($self, $signal) = @_;
511
512 delete $self->{signal_cb}{$signal};
513}
514
515my %has_coords = (
516 button_down => 1,
517 button_up => 1,
518 mouse_motion => 1,
519 mouse_wheel => 1,
520);
521
522sub emit {
523 my ($self, $signal, @args) = @_;
524
525 # I do not really like this solution, but I do not like duplication
526 # and needlessly verbose code, either.
527 my @append
528 = $has_coords{$signal}
529 ? $args[0]->xy ($self)
530 : ();
531
532 #warn +(caller(1))[3] . "emit $signal on $self (parent $self->{parent})\n";#d#
533
534 for my $cb (
535 @{$self->{signal_cb}{$signal} || []}, # before
536 ($self->can ("invoke_$signal") || sub { 1 }), # closure
537 ) {
538 return $cb->($self, @args, @append) || next;
539 }
540
541 # parent
542 $self->{parent} && $self->{parent}->emit ($signal, @args)
543}
544
545sub find_widget {
546 my ($self, $x, $y) = @_;
547
548 return () unless $self->{can_events};
549
550 return $self
551 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
552 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
553
554 ()
555}
556
557sub set_parent {
558 my ($self, $parent) = @_;
559
560 CFPlus::weaken ($self->{parent} = $parent);
561 $self->set_visible if $parent->{visible};
562}
563
564sub realloc {
565 my ($self) = @_;
566
567 if ($self->{visible}) {
568 return if $self->{root}{realloc}{$self+0};
569
570 $self->{root}{realloc}{$self+0} = $self;
571 $self->{root}->update;
572 } else {
573 delete $self->{req_w};
574 delete $self->{req_h};
575 }
576}
577
578sub update {
579 my ($self) = @_;
580
581 $self->{parent}->update
582 if $self->{parent};
583}
584
585sub reconfigure {
586 my ($self) = @_;
587
588 $self->realloc;
589 $self->update;
590}
591
592# using global variables seems a bit hacky, but passing through all drawing
593# functions seems pointless.
594our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn
324 595
325sub draw { 596sub draw {
326 my ($self) = @_; 597 my ($self) = @_;
327 598
328 return unless $self->{h} && $self->{w}; 599 return unless $self->{h} && $self->{w};
600
601 # update screen rectangle
602 local $draw_x = $draw_x + $self->{x};
603 local $draw_y = $draw_y + $self->{y};
604
605 # skip widgets that are entirely outside the drawing area
606 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
607 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
329 608
330 glPushMatrix; 609 glPushMatrix;
331 glTranslate $self->{x}, $self->{y}, 0; 610 glTranslate $self->{x}, $self->{y}, 0;
332 $self->_draw;
333 glPopMatrix;
334 611
335 if ($self == $HOVER && $self->{can_hover}) { 612 if ($self == $HOVER && $self->{can_hover}) {
336 my ($x, $y) = @$self{qw(x y)};
337
338 glColor 1, 0.8, 0.5, 0.2; 613 glColor 1*0.2, 0.8*0.2, 0.5*0.2, 0.2;
339 glEnable GL_BLEND; 614 glEnable GL_BLEND;
340 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 615 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
341 glBegin GL_QUADS; 616 glBegin GL_QUADS;
342 glVertex $x , $y;
343 glVertex $x + $self->{w}, $y;
344 glVertex $x + $self->{w}, $y + $self->{h};
345 glVertex $x , $y + $self->{h};
346 glEnd;
347 glDisable GL_BLEND;
348 }
349
350 if ($ENV{PCLIENT_DEBUG}) {
351 glPushMatrix;
352 glColor 1, 1, 0, 1;
353 glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
354 glBegin GL_LINE_LOOP;
355 glVertex 0 , 0; 617 glVertex 0 , 0;
356 glVertex $self->{w}, 0; 618 glVertex $self->{w}, 0;
357 glVertex $self->{w}, $self->{h}; 619 glVertex $self->{w}, $self->{h};
358 glVertex 0 , $self->{h}; 620 glVertex 0 , $self->{h};
359 glEnd; 621 glEnd;
622 glDisable GL_BLEND;
623 }
624
625 if ($ENV{CFPLUS_DEBUG} & 1) {
626 glPushMatrix;
627 glColor 1, 1, 0, 1;
628 glTranslate 0.375, 0.375;
629 glBegin GL_LINE_LOOP;
630 glVertex 0 , 0;
631 glVertex $self->{w} - 1, 0;
632 glVertex $self->{w} - 1, $self->{h} - 1;
633 glVertex 0 , $self->{h} - 1;
634 glEnd;
360 glPopMatrix; 635 glPopMatrix;
361 CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw; 636 #CFPlus::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
362 } 637 }
638
639 $self->_draw;
640 glPopMatrix;
363} 641}
364 642
365sub _draw { 643sub _draw {
366 my ($self) = @_; 644 my ($self) = @_;
367 645
368 warn "no draw defined for $self\n"; 646 warn "no draw defined for $self\n";
369} 647}
370 648
371sub find_widget { 649my $cntx;#d#
372 my ($self, $x, $y) = @_;
373
374 return () unless $self->{can_events};
375
376 return $self
377 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
378 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
379
380 ()
381}
382
383sub set_parent {
384 my ($self, $parent) = @_;
385
386 Scalar::Util::weaken ($self->{parent} = $parent);
387
388
389 # TODO: req_w _does_change after ->reconfigure
390 $self->check_size
391 unless exists $self->{req_w};
392}
393
394sub check_size {
395 my ($self, $forced) = @_;
396
397 $self->{force_alloc} = 1 if $forced;
398 $CFClient::UI::ROOT->{check_size}{$self} = $self;
399}
400
401sub update {
402 my ($self) = @_;
403
404 $self->{parent}->update
405 if $self->{parent};
406}
407
408sub connect {
409 my ($self, $signal, $cb) = @_;
410
411 push @{ $self->{signal_cb}{$signal} }, $cb;
412}
413
414sub emit {
415 my ($self, $signal, @args) = @_;
416
417 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
418}
419
420sub DESTROY { 650sub DESTROY {
421 my ($self) = @_; 651 my ($self) = @_;
422 652
423 #$self->deactivate; 653 return if CFPlus::in_destruct;
654
655 eval { $self->destroy };
656 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
657
658 delete $WIDGET{$self+0};
424} 659}
425 660
426############################################################################# 661#############################################################################
427 662
428package CFClient::UI::DrawBG; 663package CFPlus::UI::DrawBG;
429 664
430our @ISA = CFClient::UI::Base::; 665our @ISA = CFPlus::UI::Base::;
431 666
432use strict; 667use strict;
433use CFClient::OpenGL; 668use CFPlus::OpenGL;
434 669
435sub new { 670sub new {
436 my $class = shift; 671 my $class = shift;
437 672
438 # range [value, low, high, page] 673 # range [value, low, high, page]
439 674
440 $class->SUPER::new ( 675 $class->SUPER::new (
441 bg => [0, 0, 0, 0.2], 676 #bg => [0, 0, 0, 0.2],
442 active_bg => [1, 1, 1, 0.5], 677 #active_bg => [1, 1, 1, 0.5],
443 @_ 678 @_
444 ) 679 )
445} 680}
446 681
447sub _draw { 682sub _draw {
448 my ($self) = @_; 683 my ($self) = @_;
449 684
685 my $color = $FOCUS == $self && $self->{active_bg}
686 ? $self->{active_bg}
687 : $self->{bg};
688
689 if ($color && (@$color < 4 || $color->[3])) {
450 my ($w, $h) = @$self{qw(w h)}; 690 my ($w, $h) = @$self{qw(w h)};
451 691
452 glEnable GL_BLEND; 692 glEnable GL_BLEND;
453 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 693 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
454 glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} }; 694 glColor_premultiply @$color;
455 695
456 glBegin GL_QUADS; 696 glBegin GL_QUADS;
457 glVertex 0 , 0; 697 glVertex 0 , 0;
458 glVertex 0 , $h; 698 glVertex 0 , $h;
459 glVertex $w, $h; 699 glVertex $w, $h;
460 glVertex $w, 0; 700 glVertex $w, 0;
461 glEnd; 701 glEnd;
462 702
463 glDisable GL_BLEND; 703 glDisable GL_BLEND;
704 }
464} 705}
465 706
466############################################################################# 707#############################################################################
467 708
468package CFClient::UI::Empty; 709package CFPlus::UI::Empty;
469 710
470our @ISA = CFClient::UI::Base::; 711our @ISA = CFPlus::UI::Base::;
471 712
472sub new { 713sub new {
473 my ($class, %arg) = @_; 714 my ($class, %arg) = @_;
474 $class->SUPER::new (can_events => 0, %arg); 715 $class->SUPER::new (can_events => 0, %arg);
475} 716}
476 717
477sub size_request { 718sub size_request {
478 (0, 0) 719 my ($self) = @_;
720
721 ($self->{w} + 0, $self->{h} + 0)
479} 722}
480 723
481sub draw { } 724sub draw { }
482 725
483############################################################################# 726#############################################################################
484 727
485package CFClient::UI::Container; 728package CFPlus::UI::Container;
486 729
487our @ISA = CFClient::UI::Base::; 730our @ISA = CFPlus::UI::Base::;
488 731
489sub new { 732sub new {
490 my ($class, %arg) = @_; 733 my ($class, %arg) = @_;
491 734
492 my $children = delete $arg{children} || []; 735 my $children = delete $arg{children};
493 736
494 my $self = $class->SUPER::new ( 737 my $self = $class->SUPER::new (
495 children => [], 738 children => [],
496 can_events => 0, 739 can_events => 0,
497 %arg, 740 %arg,
498 ); 741 );
742
499 $self->add ($_) for @$children; 743 $self->add (@$children)
744 if $children;
500 745
501 $self 746 $self
747}
748
749sub realloc {
750 my ($self) = @_;
751
752 $self->{force_realloc} = 1;
753 $self->{force_size_alloc} = 1;
754 $self->SUPER::realloc;
502} 755}
503 756
504sub add { 757sub add {
505 my ($self, @widgets) = @_; 758 my ($self, @widgets) = @_;
506 759
… …
512 $self->{children} = [ 765 $self->{children} = [
513 sort { $a->{z} <=> $b->{z} } 766 sort { $a->{z} <=> $b->{z} }
514 @{$self->{children}}, @widgets 767 @{$self->{children}}, @widgets
515 ]; 768 ];
516 769
517 $self->check_size (1); 770 $self->realloc;
518 $self->update;
519} 771}
520 772
521sub children { 773sub children {
522 @{ $_[0]{children} } 774 @{ $_[0]{children} }
523} 775}
… …
528 delete $child->{parent}; 780 delete $child->{parent};
529 $child->hide; 781 $child->hide;
530 782
531 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 783 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
532 784
533 $self->check_size; 785 $self->realloc;
534 $self->update;
535} 786}
536 787
537sub clear { 788sub clear {
538 my ($self) = @_; 789 my ($self) = @_;
539 790
… …
543 for (@$children) { 794 for (@$children) {
544 delete $_->{parent}; 795 delete $_->{parent};
545 $_->hide; 796 $_->hide;
546 } 797 }
547 798
548 $self->check_size; 799 $self->realloc;
549 $self->update;
550} 800}
551 801
552sub find_widget { 802sub find_widget {
553 my ($self, $x, $y) = @_; 803 my ($self, $x, $y) = @_;
554 804
555 $x -= $self->{x}; 805 $x -= $self->{x};
556 $y -= $self->{y}; 806 $y -= $self->{y};
557 807
558 my $res; 808 my $res;
559 809
560 for (reverse @{ $self->{children} }) { 810 for (reverse $self->visible_children) {
561 $res = $_->find_widget ($x, $y) 811 $res = $_->find_widget ($x, $y)
562 and return $res; 812 and return $res;
563 } 813 }
564 814
565 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y}) 815 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
… …
571 $_->draw for @{$self->{children}}; 821 $_->draw for @{$self->{children}};
572} 822}
573 823
574############################################################################# 824#############################################################################
575 825
576package CFClient::UI::Bin; 826package CFPlus::UI::Bin;
577 827
578our @ISA = CFClient::UI::Container::; 828our @ISA = CFPlus::UI::Container::;
579 829
580sub new { 830sub new {
581 my ($class, %arg) = @_; 831 my ($class, %arg) = @_;
582 832
583 my $child = (delete $arg{child}) || new CFClient::UI::Empty::; 833 my $child = (delete $arg{child}) || new CFPlus::UI::Empty::;
584 834
585 $class->SUPER::new (children => [$child], %arg) 835 $class->SUPER::new (children => [$child], %arg)
586} 836}
587 837
588sub add { 838sub add {
589 my ($self, $child) = @_; 839 my ($self, $child) = @_;
590 840
591 $self->{children} = []; 841 $self->SUPER::remove ($_) for @{ $self->{children} };
592
593 $self->SUPER::add ($child); 842 $self->SUPER::add ($child);
594} 843}
595 844
596sub remove { 845sub remove {
597 my ($self, $widget) = @_; 846 my ($self, $widget) = @_;
598 847
599 $self->SUPER::remove ($widget); 848 $self->SUPER::remove ($widget);
600 849
601 $self->{children} = [new CFClient::UI::Empty] 850 $self->{children} = [new CFPlus::UI::Empty]
602 unless @{$self->{children}}; 851 unless @{$self->{children}};
603} 852}
604 853
605sub child { $_[0]->{children}[0] } 854sub child { $_[0]->{children}[0] }
606 855
607sub size_request { 856sub size_request {
608 $_[0]{children}[0]->size_request 857 $_[0]{children}[0]->size_request
609} 858}
610 859
611sub size_allocate { 860sub invoke_size_allocate {
612 my ($self, $w, $h) = @_; 861 my ($self, $w, $h) = @_;
613 862
614 $self->{children}[0]->configure (0, 0, $w, $h); 863 $self->{children}[0]->configure (0, 0, $w, $h);
864
865 1
615} 866}
616 867
617############################################################################# 868#############################################################################
618 869
870# back-buffered drawing area
871
619package CFClient::UI::Window; 872package CFPlus::UI::Window;
620 873
621our @ISA = CFClient::UI::Bin::; 874our @ISA = CFPlus::UI::Bin::;
622 875
623use CFClient::OpenGL; 876use CFPlus::OpenGL;
624 877
625sub new { 878sub new {
626 my ($class, %arg) = @_; 879 my ($class, %arg) = @_;
627 880
628 my $self = $class->SUPER::new (%arg); 881 my $self = $class->SUPER::new (%arg);
… …
633 886
634 $ROOT->on_post_alloc ($self => sub { $self->render_child }); 887 $ROOT->on_post_alloc ($self => sub { $self->render_child });
635 $self->SUPER::update; 888 $self->SUPER::update;
636} 889}
637 890
638sub size_allocate { 891sub invoke_size_allocate {
639 my ($self, $w, $h) = @_; 892 my ($self, $w, $h) = @_;
640 893
641 $self->SUPER::size_allocate ($w, $h);
642 $self->update; 894 $self->update;
895
896 $self->SUPER::invoke_size_allocate ($w, $h)
643} 897}
644 898
645sub _render { 899sub _render {
900 my ($self) = @_;
901
646 $_[0]{children}[0]->draw; 902 $self->{children}[0]->draw;
647} 903}
648 904
649sub render_child { 905sub render_child {
650 my ($self) = @_; 906 my ($self) = @_;
651 907
652 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 908 $self->{texture} = new_from_opengl CFPlus::Texture $self->{w}, $self->{h}, sub {
653 glClearColor 0, 0, 0, 0; 909 glClearColor 0, 0, 0, 0;
654 glClear GL_COLOR_BUFFER_BIT; 910 glClear GL_COLOR_BUFFER_BIT;
655 911
912 {
913 package CFPlus::UI::Base;
914
915 local ($draw_x, $draw_y, $draw_w, $draw_h) =
916 (0, 0, $self->{w}, $self->{h});
917
656 $self->_render; 918 $self->_render;
657# glColorMask 1, 1, 1, 0; 919 }
658# glEnable GL_BLEND;
659# glBlendFunc GL_SRC_ALPHA, GL_ZERO;
660# glRasterPos 0, 0;
661# glCopyPixels 0, 0, $self->{w}, $self->{h};
662# glDisable GL_BLEND;
663# glColorMask 1, 1, 1, 1;
664 }; 920 };
665} 921}
666 922
667sub _draw { 923sub _draw {
668 my ($self) = @_; 924 my ($self) = @_;
669
670 my ($w, $h) = ($self->w, $self->h);
671 925
672 my $tex = $self->{texture} 926 my $tex = $self->{texture}
673 or return; 927 or return;
674 928
675 glEnable GL_TEXTURE_2D; 929 glEnable GL_TEXTURE_2D;
676 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 930 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
677 glColor 0, 0, 0, 1; 931 glColor 0, 0, 0, 1;
678 932
679 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 933 $tex->draw_quad_alpha_premultiplied (0, 0);
680 934
681 glDisable GL_TEXTURE_2D; 935 glDisable GL_TEXTURE_2D;
682} 936}
683 937
684############################################################################# 938#############################################################################
685 939
686package CFClient::UI::ViewPort; 940package CFPlus::UI::ViewPort;
687 941
688our @ISA = CFClient::UI::Window::; 942our @ISA = CFPlus::UI::Window::;
943
944sub new {
945 my $class = shift;
946
947 $class->SUPER::new (
948 scroll_x => 0,
949 scroll_y => 1,
950 @_,
951 )
952}
689 953
690sub size_request { 954sub size_request {
691 my ($self) = @_; 955 my ($self) = @_;
692 956
693 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 957 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
694 $self->child->configure (0, 0, @$self{qw(child_w child_h)});
695 958
696 @$self{qw(child_w child_h)} 959 $w = 10 if $self->{scroll_x};
697} 960 $h = 10 if $self->{scroll_y};
698 961
962 ($w, $h)
963}
964
699sub size_allocate { 965sub invoke_size_allocate {
700 my ($self, $w, $h) = @_; 966 my ($self, $w, $h) = @_;
701 967
968 my $child = $self->child;
969
970 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
971 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
972
973 $self->child->configure (0, 0, $w, $h);
702 $self->update; 974 $self->update;
975
976 1
703} 977}
704 978
705sub set_offset { 979sub set_offset {
706 my ($self, $x, $y) = @_; 980 my ($self, $x, $y) = @_;
707 981
… …
733 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w} 1007 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
734 && $y >= $self->{y} && $y < $self->{y} + $self->{h} 1008 && $y >= $self->{y} && $y < $self->{y} + $self->{h}
735 ) { 1009 ) {
736 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y}) 1010 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
737 } else { 1011 } else {
738 $self->CFClient::UI::Base::find_widget ($x, $y) 1012 $self->CFPlus::UI::Base::find_widget ($x, $y)
739 } 1013 }
740} 1014}
741 1015
742sub _render { 1016sub _render {
743 my ($self) = @_; 1017 my ($self) = @_;
744 1018
1019 local $CFPlus::UI::Base::draw_x = $CFPlus::UI::Base::draw_x - $self->{view_x};
1020 local $CFPlus::UI::Base::draw_y = $CFPlus::UI::Base::draw_y - $self->{view_y};
1021
745 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 1022 CFPlus::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
746 1023
747 $self->SUPER::_render; 1024 $self->SUPER::_render;
748} 1025}
749 1026
750############################################################################# 1027#############################################################################
751 1028
752package CFClient::UI::ScrolledWindow; 1029package CFPlus::UI::ScrolledWindow;
753 1030
754our @ISA = CFClient::UI::HBox::; 1031our @ISA = CFPlus::UI::HBox::;
1032
1033sub new {
1034 my ($class, %arg) = @_;
1035
1036 my $child = delete $arg{child};
1037
1038 my $self;
1039
1040 my $slider = new CFPlus::UI::Slider
1041 vertical => 1,
1042 range => [0, 0, 1, 0.01], # HACK fix
1043 on_changed => sub {
1044 $self->{vp}->set_offset (0, $_[1]);
1045 },
1046 ;
1047
1048 $self = $class->SUPER::new (
1049 vp => (new CFPlus::UI::ViewPort expand => 1),
1050 can_events => 1,
1051 slider => $slider,
1052 %arg,
1053 );
1054
1055 $self->SUPER::add ($self->{vp}, $self->{slider});
1056 $self->add ($child) if $child;
1057
1058 $self
1059}
1060
1061#TODO# update range on size_allocate depending on child
1062
1063sub add {
1064 my ($self, $widget) = @_;
1065
1066 $self->{vp}->add ($self->{child} = $widget);
1067}
1068
1069sub invoke_mouse_wheel {
1070 my ($self, $ev) = @_;
1071
1072 return 0 unless $ev->{dy}; # only vertical movements
1073
1074 $self->{slider}->emit (mouse_wheel => $ev);
1075
1076 1
1077}
1078
1079sub update_slider {
1080 my ($self) = @_;
1081
1082 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $self->{vp}->child->{h}, $self->{vp}{h}, 1]);
1083}
1084
1085sub update {
1086 my ($self) = @_;
1087
1088 $self->SUPER::update;
1089
1090 $self->update_slider;
1091}
1092
1093sub invoke_size_allocate {
1094 my ($self, $w, $h) = @_;
1095
1096 $self->update_slider;
1097
1098 $self->SUPER::invoke_size_allocate ($w, $h)
1099}
1100
1101#############################################################################
1102
1103package CFPlus::UI::Frame;
1104
1105our @ISA = CFPlus::UI::Bin::;
1106
1107use CFPlus::OpenGL;
755 1108
756sub new { 1109sub new {
757 my $class = shift; 1110 my $class = shift;
758 1111
759 my $self;
760
761 my $slider = new CFClient::UI::Slider
762 vertical => 1,
763 range => [0, 0, 1, 0.01], # HACK fix
764 connect_changed => sub {
765 $self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h}));
766 },
767 ;
768
769 $self = $class->SUPER::new ( 1112 $class->SUPER::new (
770 vp => (new CFClient::UI::ViewPort), 1113 bg => undef,
771 slider => $slider,
772 @_, 1114 @_,
1115 )
1116}
1117
1118sub _draw {
1119 my ($self) = @_;
1120
1121 if ($self->{bg}) {
1122 my ($w, $h) = @$self{qw(w h)};
1123
1124 glEnable GL_BLEND;
1125 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1126 glColor_premultiply @{ $self->{bg} };
1127
1128 glBegin GL_QUADS;
1129 glVertex 0 , 0;
1130 glVertex 0 , $h;
1131 glVertex $w, $h;
1132 glVertex $w, 0;
1133 glEnd;
1134
1135 glDisable GL_BLEND;
1136 }
1137
1138 $self->SUPER::_draw;
1139}
1140
1141#############################################################################
1142
1143package CFPlus::UI::FancyFrame;
1144
1145our @ISA = CFPlus::UI::Bin::;
1146
1147use CFPlus::OpenGL;
1148
1149sub new {
1150 my ($class, %arg) = @_;
1151
1152 if ((exists $arg{label}) && !ref $arg{label}) {
1153 $arg{label} = new CFPlus::UI::Label
1154 align => 1,
1155 valign => 0,
1156 text => $arg{label},
1157 fontsize => ($arg{border} || 0.8) * 0.75;
1158 }
1159
1160 my $self = $class->SUPER::new (
1161 # label => "",
1162 fg => [0.6, 0.3, 0.1],
1163 border => 0.8,
1164 style => 'single',
1165 %arg,
773 ); 1166 );
774 1167
775 $self->{vp}->add ($self->{scrolled});
776 $self->add ($self->{vp});
777 $self->add ($self->{slider});
778
779 $self 1168 $self
780} 1169}
781 1170
782#TODO# update range on size_allocate depeneing on child 1171sub add {
783# update viewport offset on scroll 1172 my ($self, @widgets) = @_;
784 1173
785############################################################################# 1174 $self->SUPER::add (@widgets);
786 1175 $self->CFPlus::UI::Container::add ($self->{label}) if $self->{label};
787package CFClient::UI::Frame;
788
789our @ISA = CFClient::UI::Bin::;
790
791use CFClient::OpenGL;
792
793#############################################################################
794
795package CFClient::UI::FancyFrame;
796
797our @ISA = CFClient::UI::Bin::;
798
799use CFClient::OpenGL;
800
801my @tex =
802 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
803 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
804
805sub new {
806 my $class = shift;
807
808 # TODO: user_x, user_y, overwrite moveto?
809
810 my $self = $class->SUPER::new (
811 bg => [1, 1, 1, 1],
812 border_bg => [1, 1, 1, 1],
813 border => 0.6,
814 can_events => 1,
815 @_
816 );
817
818 $self->{title} &&= new CFClient::UI::Label
819 align => 0,
820 valign => 1,
821 text => $self->{title},
822 fontsize => $self->{border};
823
824 $self
825} 1176}
826 1177
827sub border { 1178sub border {
828 int $_[0]{border} * $::FONTSIZE 1179 int $_[0]{border} * $::FONTSIZE
829} 1180}
830 1181
831sub size_request { 1182sub size_request {
832 my ($self) = @_; 1183 my ($self) = @_;
1184
1185 ($self->{label_w}, undef) = $self->{label}->size_request
1186 if $self->{label};
833 1187
834 my ($w, $h) = $self->SUPER::size_request; 1188 my ($w, $h) = $self->SUPER::size_request;
835 1189
836 ( 1190 (
837 $w + $self->border * 2, 1191 $w + $self->border * 2,
838 $h + $self->border * 2, 1192 $h + $self->border * 2,
839 ) 1193 )
840} 1194}
841 1195
842sub size_allocate { 1196sub invoke_size_allocate {
843 my ($self, $w, $h) = @_; 1197 my ($self, $w, $h) = @_;
844 1198
845 $h -= List::Util::max 0, $self->border * 2; 1199 my $border = $self->border;
1200
846 $w -= List::Util::max 0, $self->border * 2; 1201 $w -= List::Util::max 0, $border * 2;
1202 $h -= List::Util::max 0, $border * 2;
847 1203
848 $self->{title}->configure ($self->border, $self->border - $::FONTSIZE * 2, $w, $::FONTSIZE * 2) 1204 if (my $label = $self->{label}) {
849 if $self->{title}; 1205 $label->{w} = List::Util::max 0, List::Util::min $self->{label_w}, $w - $border * 2;
1206 $label->{h} = List::Util::min $h, $border;
1207 $label->invoke_size_allocate ($label->{w}, $label->{h});
1208 }
850 1209
851 $self->child->configure ($self->border, $self->border, $w, $h); 1210 $self->child->configure ($border, $border, $w, $h);
852}
853 1211
1212 1
1213}
1214
1215sub _draw {
1216 my ($self) = @_;
1217
1218 my $child = $self->{children}[0];
1219
1220 my $border = $self->border;
1221 my ($w, $h) = ($self->{w}, $self->{h});
1222
1223 $child->draw;
1224
1225 glColor @{$self->{fg}};
1226 glBegin GL_LINE_STRIP;
1227 glVertex $border * 1.5 , $border * 0.5 + 0.5;
1228 glVertex $border * 0.5 + 0.5, $border * 0.5 + 0.5;
1229 glVertex $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
1230 glVertex $w - $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
1231 glVertex $w - $border * 0.5 + 0.5, $border * 0.5 + 0.5;
1232 glVertex $self->{label} ? $border * 2 + $self->{label}{w} : $border * 1.5, $border * 0.5 + 0.5;
1233 glEnd;
1234
1235 if ($self->{label}) {
1236 glTranslate $border * 2, 0;
1237 $self->{label}->_draw;
1238 }
1239}
1240
1241#############################################################################
1242
1243package CFPlus::UI::Toplevel;
1244
1245our @ISA = CFPlus::UI::Bin::;
1246
1247use CFPlus::OpenGL;
1248
1249my $bg =
1250 new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png",
1251 mipmap => 1, wrap => 1;
1252
1253my @border =
1254 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1255 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1256
1257sub new {
1258 my ($class, %arg) = @_;
1259
1260 my $self = $class->SUPER::new (
1261 bg => [1, 1, 1, 1],
1262 border_bg => [1, 1, 1, 1],
1263 border => 0.6,
1264 can_events => 1,
1265 min_w => 64,
1266 min_h => 32,
1267 %arg,
1268 );
1269
1270 $self->{title_widget} = new CFPlus::UI::Label
1271 align => 0,
1272 valign => 1,
1273 text => $self->{title},
1274 fontsize => $self->{border},
1275 if exists $self->{title};
1276
1277 if ($self->{has_close_button}) {
1278 $self->{close_button} =
1279 new CFPlus::UI::ImageButton
1280 path => 'x1_close.png',
1281 on_activate => sub { $self->emit ("delete") };
1282
1283 $self->CFPlus::UI::Container::add ($self->{close_button});
1284 }
1285
1286 $self
1287}
1288
1289sub add {
1290 my ($self, @widgets) = @_;
1291
1292 $self->SUPER::add (@widgets);
1293 $self->CFPlus::UI::Container::add ($self->{close_button}) if $self->{close_button};
1294 $self->CFPlus::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1295}
1296
1297sub border {
1298 int $_[0]{border} * $::FONTSIZE
1299}
1300
1301sub size_request {
1302 my ($self) = @_;
1303
1304 $self->{title_widget}->size_request
1305 if $self->{title_widget};
1306
1307 $self->{close_button}->size_request
1308 if $self->{close_button};
1309
1310 my ($w, $h) = $self->SUPER::size_request;
1311
1312 (
1313 $w + $self->border * 2,
1314 $h + $self->border * 2,
1315 )
1316}
1317
1318sub invoke_size_allocate {
1319 my ($self, $w, $h) = @_;
1320
1321 if ($self->{title_widget}) {
1322 $self->{title_widget}{w} = $w;
1323 $self->{title_widget}{h} = $h;
1324 $self->{title_widget}->invoke_size_allocate ($w, $h);
1325 }
1326
1327 my $border = $self->border;
1328
1329 $h -= List::Util::max 0, $border * 2;
1330 $w -= List::Util::max 0, $border * 2;
1331
1332 $self->child->configure ($border, $border, $w, $h);
1333
1334 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
1335 if $self->{close_button};
1336
1337 1
1338}
1339
1340sub invoke_delete {
1341 my ($self) = @_;
1342
1343 $self->hide;
1344
1345 1
1346}
1347
854sub button_down { 1348sub invoke_button_down {
855 my ($self, $ev, $x, $y) = @_; 1349 my ($self, $ev, $x, $y) = @_;
856 1350
857 my ($w, $h) = @$self{qw(w h)}; 1351 my ($w, $h) = @$self{qw(w h)};
858 my $border = $self->border; 1352 my $border = $self->border;
859 1353
… …
872 my ($ev, $x, $y) = @_; 1366 my ($ev, $x, $y) = @_;
873 1367
874 my $dx = $ev->{x} - $ox; 1368 my $dx = $ev->{x} - $ox;
875 my $dy = $ev->{y} - $oy; 1369 my $dy = $ev->{y} - $oy;
876 1370
877 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1); 1371 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
878 $self->{user_h} = $bh + $dy * ($my ? -1 : 1); 1372 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1373
879 $self->move ($wx + $dx * $mx, $wy + $dy * $my); 1374 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
880 $self->check_size; 1375 $self->realloc;
881 }; 1376 };
882 1377
883 } elsif ($lr ^ $td) { 1378 } elsif ($lr ^ $td) {
884 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1379 my ($ox, $oy) = ($ev->{x}, $ev->{y});
885 my ($bx, $by) = ($self->{x}, $self->{y}); 1380 my ($bx, $by) = ($self->{x}, $self->{y});
… …
887 $self->{motion} = sub { 1382 $self->{motion} = sub {
888 my ($ev, $x, $y) = @_; 1383 my ($ev, $x, $y) = @_;
889 1384
890 ($x, $y) = ($ev->{x}, $ev->{y}); 1385 ($x, $y) = ($ev->{x}, $ev->{y});
891 1386
892 $self->move ($bx + $x - $ox, $by + $y - $oy); 1387 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
893 $self->update; 1388 # HACK: the next line is required to enforce placement
1389 $self->{parent}->invoke_size_allocate ($self->{parent}{w}, $self->{parent}{h});
894 }; 1390 };
1391 } else {
1392 return 0;
1393 }
1394
895 } 1395 1
896} 1396}
897 1397
898sub button_up { 1398sub invoke_button_up {
899 my ($self, $ev, $x, $y) = @_; 1399 my ($self, $ev, $x, $y) = @_;
900 1400
901 delete $self->{motion}; 1401 ! ! delete $self->{motion}
902} 1402}
903 1403
904sub mouse_motion { 1404sub invoke_mouse_motion {
905 my ($self, $ev, $x, $y) = @_; 1405 my ($self, $ev, $x, $y) = @_;
906 1406
907 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1407 $self->{motion}->($ev, $x, $y) if $self->{motion};
1408
1409 ! ! $self->{motion}
1410}
1411
1412sub invoke_visibility_change {
1413 my ($self, $visible) = @_;
1414
1415 delete $self->{motion} unless $visible;
1416
1417 0
908} 1418}
909 1419
910sub _draw { 1420sub _draw {
911 my ($self) = @_; 1421 my ($self) = @_;
912 1422
1423 my $child = $self->{children}[0];
1424
913 my ($w, $h ) = ($self->{w}, $self->{h}); 1425 my ($w, $h ) = ($self->{w}, $self->{h});
914 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1426 my ($cw, $ch) = ($child->{w}, $child->{h});
915 1427
916 glEnable GL_TEXTURE_2D; 1428 glEnable GL_TEXTURE_2D;
917 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1429 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
918 1430
919 my $border = $self->border; 1431 my $border = $self->border;
920 1432
921 glColor @{ $self->{border_bg} }; 1433 glColor @{ $self->{border_bg} };
922 $tex[1]->draw_quad_alpha (0, 0, $w, $border); 1434 $border[0]->draw_quad_alpha (0, 0, $w, $border);
923 $tex[3]->draw_quad_alpha (0, $border, $border, $ch); 1435 $border[1]->draw_quad_alpha (0, $border, $border, $ch);
924 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1436 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
925 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border); 1437 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
926 1438
927 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1439 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
928 my $bg = $tex[0]; 1440 glColor @{ $self->{bg} };
929 1441
930 # TODO: repeat texture not scale 1442 # TODO: repeat texture not scale
1443 # solve this better(?)
931 my $rep_x = $cw / $bg->{w}; 1444 $bg->{s} = $cw / $bg->{w};
932 my $rep_y = $ch / $bg->{h}; 1445 $bg->{t} = $ch / $bg->{h};
933
934 glColor @{ $self->{bg} };
935
936 $bg->{s} = $rep_x;
937 $bg->{t} = $rep_y;
938 $bg->{wrap_mode} = 1;
939 $bg->draw_quad_alpha ($border, $border, $cw, $ch); 1446 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
940 } 1447 }
941 1448
942 glDisable GL_TEXTURE_2D; 1449 glDisable GL_TEXTURE_2D;
943 1450
944 $self->{title}->draw if $self->{title};
945
946 $self->child->draw; 1451 $child->draw;
1452
1453 if ($self->{title_widget}) {
1454 glTranslate 0, $border - $self->{h};
1455 $self->{title_widget}->_draw;
1456
1457 glTranslate 0, - ($border - $self->{h});
1458 }
1459
1460 $self->{close_button}->draw
1461 if $self->{close_button};
947} 1462}
948 1463
949############################################################################# 1464#############################################################################
950 1465
951package CFClient::UI::Table; 1466package CFPlus::UI::Table;
952 1467
953our @ISA = CFClient::UI::Base::; 1468our @ISA = CFPlus::UI::Base::;
954 1469
955use List::Util qw(max sum); 1470use List::Util qw(max sum);
956 1471
957use CFClient::OpenGL; 1472use CFPlus::OpenGL;
958 1473
959sub new { 1474sub new {
960 my $class = shift; 1475 my $class = shift;
961 1476
962 $class->SUPER::new ( 1477 $class->SUPER::new (
963 col_expand => [], 1478 col_expand => [],
964 @_ 1479 @_,
965 ) 1480 )
966}
967
968sub add {
969 my ($self, $x, $y, $child) = @_;
970
971 $child->set_parent ($self);
972 $self->{children}[$y][$x] = $child;
973
974 $child->check_size;
975} 1481}
976 1482
977sub children { 1483sub children {
978 grep $_, map @$_, grep $_, @{ $_[0]{children} } 1484 grep $_, map @$_, grep $_, @{ $_[0]{children} }
979} 1485}
980 1486
1487sub add {
1488 my ($self) = shift;
1489
1490 while (@_) {
1491 my ($x, $y, $child) = splice @_, 0, 3, ();
1492 $child->set_parent ($self);
1493 $self->{children}[$y][$x] = $child;
1494 }
1495
1496 $self->{force_realloc} = 1;
1497 $self->{force_size_alloc} = 1;
1498 $self->realloc;
1499}
1500
1501sub remove {
1502 my ($self, $child) = @_;
1503
1504 # TODO: not yet implemented
1505}
1506
981# TODO: move to container class maybe? send childs a signal on removal? 1507# TODO: move to container class maybe? send children a signal on removal?
982sub clear { 1508sub clear {
983 my ($self) = @_; 1509 my ($self) = @_;
984 1510
985 my @children = $self->children; 1511 my @children = $self->children;
986 delete $self->{children}; 1512 delete $self->{children};
… …
988 for (@children) { 1514 for (@children) {
989 delete $_->{parent}; 1515 delete $_->{parent};
990 $_->hide; 1516 $_->hide;
991 } 1517 }
992 1518
993 $self->update; 1519 $self->realloc;
994} 1520}
995 1521
996sub get_wh { 1522sub get_wh {
997 my ($self) = @_; 1523 my ($self) = @_;
998 1524
… …
1024 (sum @$ws), 1550 (sum @$ws),
1025 (sum @$hs), 1551 (sum @$hs),
1026 ) 1552 )
1027} 1553}
1028 1554
1029sub size_allocate { 1555sub invoke_size_allocate {
1030 my ($self, $w, $h) = @_; 1556 my ($self, $w, $h) = @_;
1031 1557
1032 my ($ws, $hs) = $self->get_wh; 1558 my ($ws, $hs) = $self->get_wh;
1033 1559
1034 my $req_w = sum @$ws; 1560 my $req_w = (sum @$ws) || 1;
1035 my $req_h = sum @$hs; 1561 my $req_h = (sum @$hs) || 1;
1036 1562
1037 # TODO: nicer code && do row_expand 1563 # TODO: nicer code && do row_expand
1038 my @col_expand = @{$self->{col_expand}}; 1564 my @col_expand = @{$self->{col_expand}};
1039 @col_expand = (1) x @$ws unless @col_expand; 1565 @col_expand = (1) x @$ws unless @col_expand;
1040 my $col_expand = (sum @col_expand) || 1; 1566 my $col_expand = (sum @col_expand) || 1;
1041 1567
1042 # linearly scale sizes 1568 # linearly scale sizes
1043 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 1569 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1044 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs; 1570 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1045 1571
1046 CFClient::UI::harmonize $ws; 1572 CFPlus::UI::harmonize $ws;
1047 CFClient::UI::harmonize $hs; 1573 CFPlus::UI::harmonize $hs;
1048 1574
1049 my $y; 1575 my $y;
1050 1576
1051 for my $r (0 .. $#{$self->{children}}) { 1577 for my $r (0 .. $#{$self->{children}}) {
1052 my $row = $self->{children}[$r] 1578 my $row = $self->{children}[$r]
… …
1066 } 1592 }
1067 1593
1068 $y += $row_h; 1594 $y += $row_h;
1069 } 1595 }
1070 1596
1597 1
1071} 1598}
1072 1599
1073sub find_widget { 1600sub find_widget {
1074 my ($self, $x, $y) = @_; 1601 my ($self, $x, $y) = @_;
1075 1602
… …
1094 } 1621 }
1095} 1622}
1096 1623
1097############################################################################# 1624#############################################################################
1098 1625
1099package CFClient::UI::HBox; 1626package CFPlus::UI::Box;
1100 1627
1101# TODO: wrap into common Box base class
1102
1103our @ISA = CFClient::UI::Container::; 1628our @ISA = CFPlus::UI::Container::;
1104 1629
1105sub size_request { 1630sub size_request {
1106 my ($self) = @_; 1631 my ($self) = @_;
1107 1632
1108 my @alloc = map [$_->size_request], @{$self->{children}}; 1633 $self->{vertical}
1634 ? (
1635 (List::Util::max map $_->{req_w}, @{$self->{children}}),
1636 (List::Util::sum map $_->{req_h}, @{$self->{children}}),
1637 )
1638 : (
1639 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1640 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1641 )
1642}
1109 1643
1644sub invoke_size_allocate {
1645 my ($self, $w, $h) = @_;
1646
1647 my $space = $self->{vertical} ? $h : $w;
1648 my @children = $self->visible_children;
1649
1650 my @req;
1651
1652 if ($self->{homogeneous}) {
1653 @req = ($space / (@children || 1)) x @children;
1654 } else {
1655 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @children;
1656 my $req = List::Util::sum @req;
1657
1658 if ($req > $space) {
1659 # ah well, not enough space
1660 $_ *= $space / $req for @req;
1661 } else {
1662 my $expand = (List::Util::sum map $_->{expand}, @children) || 1;
1663
1664 $space = ($space - $req) / $expand; # remaining space to give away
1665
1666 $req[$_] += $space * $children[$_]{expand}
1667 for 0 .. $#children;
1668 }
1110 ( 1669 }
1111 (List::Util::sum map $_->[0], @alloc), 1670
1112 (List::Util::max map $_->[1], @alloc), 1671 CFPlus::UI::harmonize \@req;
1672
1673 my $pos = 0;
1674 for (0 .. $#children) {
1675 my $alloc = $req[$_];
1676 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1677
1678 $pos += $alloc;
1679 }
1680
1681 1
1682}
1683
1684#############################################################################
1685
1686package CFPlus::UI::HBox;
1687
1688our @ISA = CFPlus::UI::Box::;
1689
1690sub new {
1691 my $class = shift;
1692
1693 $class->SUPER::new (
1694 vertical => 0,
1695 @_,
1113 ) 1696 )
1114} 1697}
1115 1698
1116sub size_allocate {
1117 my ($self, $w, $h) = @_;
1118
1119 ($h, $w) = ($w, $h);
1120
1121 my $children = $self->{children};
1122
1123 my @h = map $_->{req_w}, @$children;
1124
1125 my $req_h = List::Util::sum @h;
1126
1127 if ($req_h > $h) {
1128 # ah well, not enough space
1129 $_ *= $h / $req_h for @h;
1130 } else {
1131 my $exp = List::Util::sum map $_->{expand}, @$children;
1132 $exp ||= 1;
1133
1134 for (0 .. $#$children) {
1135 my $child = $children->[$_];
1136
1137 my $alloc_h = $h[$_];
1138 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
1139 $h[$_] = $alloc_h;
1140 }
1141 }
1142
1143 CFClient::UI::harmonize \@h;
1144
1145 my $y = 0;
1146 for (0 .. $#$children) {
1147 my $child = $children->[$_];
1148 my $h = $h[$_];
1149 $child->configure ($y, 0, $h, $w);
1150
1151 $y += $h;
1152 }
1153
1154 1
1155}
1156
1157############################################################################# 1699#############################################################################
1158 1700
1159package CFClient::UI::VBox; 1701package CFPlus::UI::VBox;
1160 1702
1161# TODO: wrap into common Box base class 1703our @ISA = CFPlus::UI::Box::;
1162 1704
1163our @ISA = CFClient::UI::Container::; 1705sub new {
1706 my $class = shift;
1164 1707
1165sub size_request { 1708 $class->SUPER::new (
1166 my ($self) = @_; 1709 vertical => 1,
1167 1710 @_,
1168 my @alloc = map [$_->size_request], @{$self->{children}};
1169
1170 (
1171 (List::Util::max map $_->[0], @alloc),
1172 (List::Util::sum map $_->[1], @alloc),
1173 ) 1711 )
1174} 1712}
1175 1713
1176sub size_allocate {
1177 my ($self, $w, $h) = @_;
1178
1179 Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1180
1181 my $children = $self->{children};
1182
1183 my @h = map $_->{req_h}, @$children;
1184
1185 my $req_h = List::Util::sum @h;
1186
1187 if ($req_h > $h) {
1188 # ah well, not enough space
1189 $_ *= $h / $req_h for @h;
1190 } else {
1191 my $exp = List::Util::sum map $_->{expand}, @$children;
1192 $exp ||= 1;
1193
1194 for (0 .. $#$children) {
1195 my $child = $children->[$_];
1196
1197 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1198 }
1199 }
1200
1201 CFClient::UI::harmonize \@h;
1202
1203 my $y = 0;
1204 for (0 .. $#$children) {
1205 my $child = $children->[$_];
1206 my $h = $h[$_];
1207 $child->configure (0, $y, $w, $h);
1208
1209 $y += $h;
1210 }
1211
1212 1
1213}
1214
1215############################################################################# 1714#############################################################################
1216 1715
1217package CFClient::UI::Label; 1716package CFPlus::UI::Label;
1218 1717
1219our @ISA = CFClient::UI::Base::; 1718our @ISA = CFPlus::UI::DrawBG::;
1220 1719
1221use CFClient::OpenGL; 1720use CFPlus::OpenGL;
1222 1721
1223sub new { 1722sub new {
1224 my ($class, %arg) = @_; 1723 my ($class, %arg) = @_;
1225 1724
1226 my $self = $class->SUPER::new ( 1725 my $self = $class->SUPER::new (
1227 fg => [1, 1, 1], 1726 fg => [1, 1, 1],
1727 #bg => none
1728 #active_bg => none
1228 #font => default_font 1729 #font => default_font
1229 #text => initial text 1730 #text => initial text
1230 #markup => initial narkup 1731 #markup => initial narkup
1732 #max_w => maximum pixel width
1733 #style => 0, # render flags
1734 ellipsise => 3, # end
1231 layout => (new CFClient::Layout), 1735 layout => (new CFPlus::Layout),
1232 fontsize => 1, 1736 fontsize => 1,
1233 align => -1, 1737 align => -1,
1234 valign => -1, 1738 valign => -1,
1235 padding => 2, 1739 padding_x => 2,
1740 padding_y => 2,
1236 can_events => 0, 1741 can_events => 0,
1237 %arg 1742 %arg
1238 ); 1743 );
1239 1744
1240 if (exists $self->{template}) { 1745 if (exists $self->{template}) {
1241 my $layout = new CFClient::Layout; 1746 my $layout = new CFPlus::Layout;
1242 $layout->set_text (delete $self->{template}); 1747 $layout->set_text (delete $self->{template});
1243 $self->{template} = $layout; 1748 $self->{template} = $layout;
1244 } 1749 }
1245 1750
1246 if (exists $self->{markup}) { 1751 if (exists $self->{markup}) {
… …
1250 } 1755 }
1251 1756
1252 $self 1757 $self
1253} 1758}
1254 1759
1255sub escape {
1256 local $_ = $_[1];
1257
1258 s/&/&amp;/g;
1259 s/>/&gt;/g;
1260 s/</&lt;/g;
1261
1262 $_[1]
1263}
1264
1265sub update { 1760sub update {
1266 my ($self) = @_; 1761 my ($self) = @_;
1267 1762
1268 delete $self->{texture}; 1763 delete $self->{texture};
1269 $self->SUPER::update; 1764 $self->SUPER::update;
1270} 1765}
1271 1766
1767sub realloc {
1768 my ($self) = @_;
1769
1770 delete $self->{ox};
1771 $self->SUPER::realloc;
1772}
1773
1272sub set_text { 1774sub set_text {
1273 my ($self, $text) = @_; 1775 my ($self, $text) = @_;
1274 1776
1275 return if $self->{text} eq "T$text"; 1777 return if $self->{text} eq "T$text";
1276 $self->{text} = "T$text"; 1778 $self->{text} = "T$text";
1277 1779
1278 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1279 $self->{layout}->set_text ($text); 1780 $self->{layout}->set_text ($text);
1280 1781
1782 delete $self->{size_req};
1783 $self->realloc;
1281 $self->update; 1784 $self->update;
1282 $self->check_size;
1283} 1785}
1284 1786
1285sub set_markup { 1787sub set_markup {
1286 my ($self, $markup) = @_; 1788 my ($self, $markup) = @_;
1287 1789
1288 return if $self->{text} eq "M$markup"; 1790 return if $self->{text} eq "M$markup";
1289 $self->{text} = "M$markup"; 1791 $self->{text} = "M$markup";
1290 1792
1291 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1793 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1292 1794
1293 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1294 $self->{layout}->set_markup ($markup); 1795 $self->{layout}->set_markup ($markup);
1295 1796
1797 delete $self->{size_req};
1798 $self->realloc;
1296 $self->update; 1799 $self->update;
1297 $self->check_size;
1298} 1800}
1299 1801
1300sub size_request { 1802sub size_request {
1301 my ($self) = @_; 1803 my ($self) = @_;
1302 1804
1805 $self->{size_req} ||= do {
1303 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1806 $self->{layout}->set_font ($self->{font}) if $self->{font};
1304 $self->{layout}->set_width ($self->{max_w} || -1); 1807 $self->{layout}->set_width ($self->{max_w} || -1);
1808 $self->{layout}->set_ellipsise ($self->{ellipsise});
1809 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1305 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1810 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1306 1811
1307 my ($w, $h) = $self->{layout}->size; 1812 my ($w, $h) = $self->{layout}->size;
1308 1813
1309 if (exists $self->{template}) { 1814 if (exists $self->{template}) {
1310 $self->{template}->set_font ($self->{font}) if $self->{font}; 1815 $self->{template}->set_font ($self->{font}) if $self->{font};
1816 $self->{template}->set_width ($self->{max_w} || -1);
1311 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1817 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1312 1818
1313 my ($w2, $h2) = $self->{template}->size; 1819 my ($w2, $h2) = $self->{template}->size;
1314 1820
1315 $w = List::Util::max $w, $w2; 1821 $w = List::Util::max $w, $w2;
1316 $h = List::Util::max $h, $h2; 1822 $h = List::Util::max $h, $h2;
1823 }
1824
1825 [$w, $h]
1317 } 1826 };
1318 1827
1319 ( 1828 @{ $self->{size_req} }
1320 $w + $self->{padding} * 2,
1321 $h + $self->{padding} * 2,
1322 )
1323} 1829}
1324 1830
1831sub baseline_shift {
1832 $_[0]{layout}->descent
1833}
1834
1325sub size_allocate { 1835sub invoke_size_allocate {
1326 my ($self, $w, $h) = @_; 1836 my ($self, $w, $h) = @_;
1327 1837
1838 delete $self->{ox};
1839
1328 delete $self->{texture}; 1840 delete $self->{texture}
1841 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1842
1843 1
1329} 1844}
1330 1845
1331sub set_fontsize { 1846sub set_fontsize {
1332 my ($self, $fontsize) = @_; 1847 my ($self, $fontsize) = @_;
1333 1848
1334 $self->{fontsize} = $fontsize; 1849 $self->{fontsize} = $fontsize;
1850 delete $self->{size_req};
1335 delete $self->{texture}; 1851 delete $self->{texture};
1336 1852
1337 $self->update; 1853 $self->realloc;
1338 $self->check_size; 1854}
1855
1856sub reconfigure {
1857 my ($self) = @_;
1858
1859 delete $self->{size_req};
1860 delete $self->{texture};
1861
1862 $self->SUPER::reconfigure;
1339} 1863}
1340 1864
1341sub _draw { 1865sub _draw {
1342 my ($self) = @_; 1866 my ($self) = @_;
1343 1867
1868 $self->SUPER::_draw; # draw background, if applicable
1869
1344 my $tex = $self->{texture} ||= do { 1870 my $size = $self->{texture} ||= do {
1345 $self->{layout}->set_foreground (@{$self->{fg}}); 1871 $self->{layout}->set_foreground (@{$self->{fg}});
1346 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1872 $self->{layout}->set_font ($self->{font}) if $self->{font};
1347 $self->{layout}->set_width ($self->{w}); 1873 $self->{layout}->set_width ($self->{w});
1874 $self->{layout}->set_ellipsise ($self->{ellipsise});
1875 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1348 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE); 1876 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1349 1877
1350 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1878 [$self->{layout}->size]
1351
1352 $self->{ox} = int $self->{align} < 0 ? $self->{padding}
1353 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1354 : ($self->{w} - $tex->{w}) * 0.5;
1355
1356 $self->{oy} = int $self->{valign} < 0 ? $self->{padding}
1357 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1358 : ($self->{h} - $tex->{h}) * 0.5;
1359
1360 $tex
1361 }; 1879 };
1362 1880
1363 glEnable GL_TEXTURE_2D; 1881 unless (exists $self->{ox}) {
1364 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1882 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1883 : $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
1884 : ($self->{w} - $size->[0]) * 0.5);
1365 1885
1366 if ($tex->{format} == GL_ALPHA) { 1886 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1367 glColor @{$self->{fg}}; 1887 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1368 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}); 1888 : ($self->{h} - $size->[1]) * 0.5);
1369 } else {
1370 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1371 } 1889 };
1372 1890
1373 glDisable GL_TEXTURE_2D; 1891 my $w = List::Util::min $self->{w} + 4, $size->[0];
1892 my $h = List::Util::min $self->{h} + 2, $size->[1];
1893
1894 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1374} 1895}
1375 1896
1376############################################################################# 1897#############################################################################
1377 1898
1378package CFClient::UI::EntryBase; 1899package CFPlus::UI::EntryBase;
1379 1900
1380our @ISA = CFClient::UI::Label::; 1901our @ISA = CFPlus::UI::Label::;
1381 1902
1382use CFClient::OpenGL; 1903use CFPlus::OpenGL;
1383 1904
1384sub new { 1905sub new {
1385 my $class = shift; 1906 my $class = shift;
1386 1907
1387 $class->SUPER::new ( 1908 $class->SUPER::new (
… …
1391 active_fg => [0, 0, 0], 1912 active_fg => [0, 0, 0],
1392 can_hover => 1, 1913 can_hover => 1,
1393 can_focus => 1, 1914 can_focus => 1,
1394 valign => 0, 1915 valign => 0,
1395 can_events => 1, 1916 can_events => 1,
1917 ellipsise => 0,
1918 #text => ...
1919 #hidden => "*",
1396 @_ 1920 @_
1397 ) 1921 )
1398} 1922}
1399 1923
1400sub _set_text { 1924sub _set_text {
… …
1402 1926
1403 delete $self->{cur_h}; 1927 delete $self->{cur_h};
1404 1928
1405 return if $self->{text} eq $text; 1929 return if $self->{text} eq $text;
1406 1930
1407 delete $self->{texture};
1408
1409 $self->{last_activity} = $::NOW; 1931 $self->{last_activity} = $::NOW;
1410 $self->{text} = $text; 1932 $self->{text} = $text;
1411 1933
1412 $text =~ s/./*/g if $self->{hidden}; 1934 $text =~ s/./*/g if $self->{hidden};
1413 $self->{layout}->set_text ("$text "); 1935 $self->{layout}->set_text ("$text ");
1936 delete $self->{size_req};
1414 1937
1415 $self->emit (changed => $self->{text}); 1938 $self->emit (changed => $self->{text});
1939
1940 $self->realloc;
1941 $self->update;
1416} 1942}
1417 1943
1418sub set_text { 1944sub set_text {
1419 my ($self, $text) = @_; 1945 my ($self, $text) = @_;
1420 1946
1421 $self->{cursor} = length $text; 1947 $self->{cursor} = length $text;
1422 $self->_set_text ($text); 1948 $self->_set_text ($text);
1423 $self->check_size;
1424 $self->update;
1425} 1949}
1426 1950
1427sub get_text { 1951sub get_text {
1428 $_[0]{text} 1952 $_[0]{text}
1429} 1953}
… …
1434 my ($w, $h) = $self->SUPER::size_request; 1958 my ($w, $h) = $self->SUPER::size_request;
1435 1959
1436 ($w + 1, $h) # add 1 for cursor 1960 ($w + 1, $h) # add 1 for cursor
1437} 1961}
1438 1962
1439sub size_allocate {
1440 my ($self, $w, $h) = @_;
1441
1442 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1443}
1444
1445sub key_down { 1963sub invoke_key_down {
1446 my ($self, $ev) = @_; 1964 my ($self, $ev) = @_;
1447 1965
1448 my $mod = $ev->{mod}; 1966 my $mod = $ev->{mod};
1449 my $sym = $ev->{sym}; 1967 my $sym = $ev->{sym};
1450 my $uni = $ev->{unicode}; 1968 my $uni = $ev->{unicode};
1451 1969
1452 my $text = $self->get_text; 1970 my $text = $self->get_text;
1453 1971
1454 if ($sym == 8) { 1972 if ($uni == 8) {
1455 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 1973 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1456 } elsif ($sym == 127) { 1974 } elsif ($uni == 127) {
1457 substr $text, $self->{cursor}, 1, ""; 1975 substr $text, $self->{cursor}, 1, "";
1458 } elsif ($sym == CFClient::SDLK_LEFT) { 1976 } elsif ($sym == CFPlus::SDLK_LEFT) {
1459 --$self->{cursor} if $self->{cursor}; 1977 --$self->{cursor} if $self->{cursor};
1460 } elsif ($sym == CFClient::SDLK_RIGHT) { 1978 } elsif ($sym == CFPlus::SDLK_RIGHT) {
1461 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1979 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1462 } elsif ($sym == CFClient::SDLK_HOME) { 1980 } elsif ($sym == CFPlus::SDLK_HOME) {
1463 $self->{cursor} = 0; 1981 $self->{cursor} = 0;
1464 } elsif ($sym == CFClient::SDLK_END) { 1982 } elsif ($sym == CFPlus::SDLK_END) {
1465 $self->{cursor} = length $text; 1983 $self->{cursor} = length $text;
1984 } elsif ($uni == 21) { # ctrl-u
1985 $text = "";
1986 $self->{cursor} = 0;
1466 } elsif ($sym == 27) { 1987 } elsif ($uni == 27) {
1467 $self->emit ('escape'); 1988 $self->emit ('escape');
1468 } elsif ($uni) { 1989 } elsif ($uni >= 0x20 || $uni == 0x0d) {
1469 substr $text, $self->{cursor}++, 0, chr $uni; 1990 substr $text, $self->{cursor}++, 0, chr $uni;
1991 } else {
1992 return 0;
1470 } 1993 }
1471 1994
1472 $self->_set_text ($text); 1995 $self->_set_text ($text);
1996
1997 $self->realloc;
1473 $self->update; 1998 $self->update;
1474}
1475 1999
2000 1
2001}
2002
1476sub focus_in { 2003sub invoke_focus_in {
1477 my ($self) = @_; 2004 my ($self) = @_;
1478 2005
1479 $self->{last_activity} = $::NOW; 2006 $self->{last_activity} = $::NOW;
1480 2007
1481 $self->SUPER::focus_in; 2008 $self->SUPER::invoke_focus_in
1482} 2009}
1483 2010
1484sub button_down { 2011sub invoke_button_down {
1485 my ($self, $ev, $x, $y) = @_; 2012 my ($self, $ev, $x, $y) = @_;
1486 2013
1487 $self->SUPER::button_down ($ev, $x, $y); 2014 $self->SUPER::invoke_button_down ($ev, $x, $y);
1488 2015
1489 my $idx = $self->{layout}->xy_to_index ($x, $y); 2016 my $idx = $self->{layout}->xy_to_index ($x, $y);
1490 2017
1491 # byte-index to char-index 2018 # byte-index to char-index
1492 my $text = $self->{text}; 2019 my $text = $self->{text};
1493 utf8::encode $text; 2020 utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1494 $self->{cursor} = length substr $text, 0, $idx; 2021 $self->{cursor} = length $text;
1495 2022
1496 $self->_set_text ($self->{text}); 2023 $self->_set_text ($self->{text});
1497 $self->update; 2024 $self->update;
2025
2026 1
1498} 2027}
1499 2028
1500sub mouse_motion { 2029sub invoke_mouse_motion {
1501 my ($self, $ev, $x, $y) = @_; 2030 my ($self, $ev, $x, $y) = @_;
1502# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 2031# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
2032
2033 1
1503} 2034}
1504 2035
1505sub _draw { 2036sub _draw {
1506 my ($self) = @_; 2037 my ($self) = @_;
1507 2038
1508 local $self->{fg} = $self->{fg}; 2039 local $self->{fg} = $self->{fg};
1509 2040
1510 if ($FOCUS == $self) { 2041 if ($FOCUS == $self) {
1511 glColor @{$self->{active_bg}}; 2042 glColor_premultiply @{$self->{active_bg}};
1512 $self->{fg} = $self->{active_fg}; 2043 $self->{fg} = $self->{active_fg};
1513 } else { 2044 } else {
1514 glColor @{$self->{bg}}; 2045 glColor_premultiply @{$self->{bg}};
1515 } 2046 }
1516 2047
1517 glEnable GL_BLEND; 2048 glEnable GL_BLEND;
1518 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2049 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1519 glBegin GL_QUADS; 2050 glBegin GL_QUADS;
1520 glVertex 0 , 0; 2051 glVertex 0 , 0;
1521 glVertex 0 , $self->{h}; 2052 glVertex 0 , $self->{h};
1522 glVertex $self->{w}, $self->{h}; 2053 glVertex $self->{w}, $self->{h};
1523 glVertex $self->{w}, 0; 2054 glVertex $self->{w}, 0;
… …
1534 utf8::encode $text; 2065 utf8::encode $text;
1535 2066
1536 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text) 2067 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)
1537 } 2068 }
1538 2069
1539 glColor @{$self->{fg}};
1540 glBegin GL_LINES; 2070 glBegin GL_LINES;
1541 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy}; 2071 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};
1542 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h}; 2072 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1543 glEnd; 2073 glEnd;
1544 } 2074 }
1545} 2075}
1546 2076
2077#############################################################################
2078
1547package CFClient::UI::Entry; 2079package CFPlus::UI::Entry;
1548 2080
1549our @ISA = CFClient::UI::EntryBase::; 2081our @ISA = CFPlus::UI::EntryBase::;
1550 2082
1551use CFClient::OpenGL; 2083use CFPlus::OpenGL;
1552 2084
1553sub key_down { 2085sub invoke_key_down {
1554 my ($self, $ev) = @_; 2086 my ($self, $ev) = @_;
1555 2087
1556 my $sym = $ev->{sym}; 2088 my $sym = $ev->{sym};
1557 2089
1558 if ($sym == 13) { 2090 if ($ev->{uni} == 0x0d || $sym == 13) {
1559 unshift @{$self->{history}}, 2091 unshift @{$self->{history}},
1560 my $txt = $self->get_text; 2092 my $txt = $self->get_text;
2093
1561 $self->{history_pointer} = -1; 2094 $self->{history_pointer} = -1;
1562 $self->{history_saveback} = ''; 2095 $self->{history_saveback} = '';
1563 $self->emit (activate => $txt); 2096 $self->emit (activate => $txt);
1564 $self->update; 2097 $self->update;
1565 2098
1566 } elsif ($sym == CFClient::SDLK_UP) { 2099 } elsif ($sym == CFPlus::SDLK_UP) {
1567 if ($self->{history_pointer} < 0) { 2100 if ($self->{history_pointer} < 0) {
1568 $self->{history_saveback} = $self->get_text; 2101 $self->{history_saveback} = $self->get_text;
1569 } 2102 }
1570 if (@{$self->{history} || []} > 0) { 2103 if (@{$self->{history} || []} > 0) {
1571 $self->{history_pointer}++; 2104 $self->{history_pointer}++;
… …
1573 $self->{history_pointer} = @{$self->{history} || []} - 1; 2106 $self->{history_pointer} = @{$self->{history} || []} - 1;
1574 } 2107 }
1575 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2108 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1576 } 2109 }
1577 2110
1578 } elsif ($sym == CFClient::SDLK_DOWN) { 2111 } elsif ($sym == CFPlus::SDLK_DOWN) {
1579 $self->{history_pointer}--; 2112 $self->{history_pointer}--;
1580 $self->{history_pointer} = -1 if $self->{history_pointer} < 0; 2113 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1581 2114
1582 if ($self->{history_pointer} >= 0) { 2115 if ($self->{history_pointer} >= 0) {
1583 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2116 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1584 } else { 2117 } else {
1585 $self->set_text ($self->{history_saveback}); 2118 $self->set_text ($self->{history_saveback});
1586 } 2119 }
1587 2120
1588 } else { 2121 } else {
1589 $self->SUPER::key_down ($ev); 2122 return $self->SUPER::invoke_key_down ($ev)
2123 }
2124
1590 } 2125 1
1591
1592} 2126}
1593 2127
1594############################################################################# 2128#############################################################################
1595 2129
2130package CFPlus::UI::TextEdit;
2131
2132our @ISA = CFPlus::UI::EntryBase::;
2133
2134use CFPlus::OpenGL;
2135
2136sub move_cursor_ver {
2137 my ($self, $dy) = @_;
2138
2139 my ($y, $x) = $self->{layout}->index_to_line_x ($self->{cursor});
2140
2141 $y += $dy;
2142
2143 if (defined (my $index = $self->{layout}->line_x_to_index ($y, $x))) {
2144 $self->{cursor} = $index;
2145 delete $self->{cur_h};
2146 $self->update;
2147 return;
2148 }
2149}
2150
2151sub invoke_key_down {
2152 my ($self, $ev) = @_;
2153
2154 my $sym = $ev->{sym};
2155
2156 if ($sym == CFPlus::SDLK_UP) {
2157 $self->move_cursor_ver (-1);
2158 } elsif ($sym == CFPlus::SDLK_DOWN) {
2159 $self->move_cursor_ver (+1);
2160 } else {
2161 return $self->SUPER::invoke_key_down ($ev)
2162 }
2163
2164 1
2165}
2166
2167#############################################################################
2168
1596package CFClient::UI::Button; 2169package CFPlus::UI::Button;
1597 2170
1598our @ISA = CFClient::UI::Label::; 2171our @ISA = CFPlus::UI::Label::;
1599 2172
1600use CFClient::OpenGL; 2173use CFPlus::OpenGL;
1601 2174
1602my @tex = 2175my @tex =
1603 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2176 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1604 qw(b1_button_active.png); 2177 qw(b1_button_active.png);
1605 2178
1606sub new { 2179sub new {
1607 my $class = shift; 2180 my $class = shift;
1608 2181
1609 $class->SUPER::new ( 2182 $class->SUPER::new (
1610 padding => 4, 2183 padding_x => 4,
2184 padding_y => 4,
1611 fg => [1, 1, 1], 2185 fg => [1, 1, 1],
1612 bg => [1, 1, 1, 0.2],
1613 active_fg => [0, 0, 1], 2186 active_fg => [0, 0, 1],
1614 can_hover => 1, 2187 can_hover => 1,
1615 align => 0, 2188 align => 0,
1616 valign => 0, 2189 valign => 0,
1617 can_events => 1, 2190 can_events => 1,
1618 @_ 2191 @_
1619 ) 2192 )
1620} 2193}
1621 2194
1622sub button_up { 2195sub invoke_button_up {
1623 my ($self, $ev, $x, $y) = @_; 2196 my ($self, $ev, $x, $y) = @_;
1624 2197
2198 $self->emit ("activate")
1625 if ($x >= 0 && $x < $self->{w} 2199 if $x >= 0 && $x < $self->{w}
1626 && $y >= 0 && $y < $self->{h}) { 2200 && $y >= 0 && $y < $self->{h};
1627 $self->emit ("activate"); 2201
1628 } 2202 1
1629} 2203}
1630 2204
1631sub _draw { 2205sub _draw {
1632 my ($self) = @_; 2206 my ($self) = @_;
1633 2207
1634 local $self->{fg} = $self->{fg}; 2208 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1635
1636 if ($GRAB == $self) {
1637 $self->{fg} = $self->{active_fg};
1638 }
1639 2209
1640 glEnable GL_TEXTURE_2D; 2210 glEnable GL_TEXTURE_2D;
1641 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2211 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1642 glColor 0, 0, 0, 1; 2212 glColor 0, 0, 0, 1;
1643 2213
… …
1648 $self->SUPER::_draw; 2218 $self->SUPER::_draw;
1649} 2219}
1650 2220
1651############################################################################# 2221#############################################################################
1652 2222
1653package CFClient::UI::CheckBox; 2223package CFPlus::UI::CheckBox;
1654 2224
1655our @ISA = CFClient::UI::DrawBG::; 2225our @ISA = CFPlus::UI::DrawBG::;
1656 2226
1657my @tex = 2227my @tex =
1658 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2228 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1659 qw(c1_checkbox_bg.png c1_checkbox_active.png); 2229 qw(c1_checkbox_bg.png c1_checkbox_active.png);
1660 2230
1661use CFClient::OpenGL; 2231use CFPlus::OpenGL;
1662 2232
1663sub new { 2233sub new {
1664 my $class = shift; 2234 my $class = shift;
1665 2235
1666 $class->SUPER::new ( 2236 $class->SUPER::new (
1667 padding => 2, 2237 padding_x => 2,
2238 padding_y => 2,
1668 fg => [1, 1, 1], 2239 fg => [1, 1, 1],
1669 active_fg => [1, 1, 0], 2240 active_fg => [1, 1, 0],
2241 bg => [0, 0, 0, 0.2],
2242 active_bg => [1, 1, 1, 0.5],
1670 state => 0, 2243 state => 0,
1671 can_hover => 1, 2244 can_hover => 1,
1672 @_ 2245 @_
1673 ) 2246 )
1674} 2247}
1675 2248
1676sub size_request { 2249sub size_request {
1677 my ($self) = @_; 2250 my ($self) = @_;
1678 2251
1679 ($self->{padding} * 2 + 6) x 2 2252 (6) x 2
1680} 2253}
1681 2254
2255sub toggle {
2256 my ($self) = @_;
2257
2258 $self->{state} = !$self->{state};
2259 $self->emit (changed => $self->{state});
2260 $self->update;
2261}
2262
1682sub button_down { 2263sub invoke_button_down {
1683 my ($self, $ev, $x, $y) = @_; 2264 my ($self, $ev, $x, $y) = @_;
1684 2265
1685 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 2266 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1686 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 2267 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1687 $self->{state} = !$self->{state}; 2268 $self->toggle;
1688 $self->emit (changed => $self->{state}); 2269 } else {
2270 return 0
2271 }
2272
1689 } 2273 1
1690} 2274}
1691 2275
1692sub _draw { 2276sub _draw {
1693 my ($self) = @_; 2277 my ($self) = @_;
1694 2278
1695 $self->SUPER::_draw; 2279 $self->SUPER::_draw;
1696 2280
1697 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 2281 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1698 2282
1699 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; 2283 my ($w, $h) = @$self{qw(w h)};
2284
2285 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
1700 2286
1701 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 2287 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1702 2288
1703 my $tex = $self->{state} ? $tex[1] : $tex[0]; 2289 my $tex = $self->{state} ? $tex[1] : $tex[0];
1704 2290
… …
1707 glDisable GL_TEXTURE_2D; 2293 glDisable GL_TEXTURE_2D;
1708} 2294}
1709 2295
1710############################################################################# 2296#############################################################################
1711 2297
1712package CFClient::UI::Image; 2298package CFPlus::UI::Image;
1713 2299
1714our @ISA = CFClient::UI::Base::; 2300our @ISA = CFPlus::UI::Base::;
1715 2301
1716use CFClient::OpenGL; 2302use CFPlus::OpenGL;
1717use Carp qw/confess/;
1718 2303
1719our %loaded_images; 2304our %texture_cache;
1720 2305
1721sub new { 2306sub new {
1722 my $class = shift; 2307 my $class = shift;
1723 2308
1724 my $self = $class->SUPER::new (can_events => 0, @_); 2309 my $self = $class->SUPER::new (
2310 can_events => 0,
2311 @_,
2312 );
1725 2313
1726 $self->{image} or confess "Image has 'image' not set. This is a fatal error!"; 2314 $self->{path} || $self->{tex}
2315 or Carp::croak "'path' or 'tex' attributes required";
1727 2316
1728 $loaded_images{$self->{image}} ||= 2317 $self->{tex} ||= $texture_cache{$self->{path}} ||=
1729 new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1; 2318 new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;
1730 2319
1731 my $tex = $self->{tex} = $loaded_images{$self->{image}}; 2320 CFPlus::weaken $texture_cache{$self->{path}};
1732 2321
1733 Scalar::Util::weaken $loaded_images{$self->{image}}; 2322 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
1734
1735 $self->{aspect} = $tex->{w} / $tex->{h};
1736 2323
1737 $self 2324 $self
1738} 2325}
1739 2326
2327sub STORABLE_freeze {
2328 my ($self, $cloning) = @_;
2329
2330 $self->{path}
2331 or die "cannot serialise CFPlus::UI::Image on non-loadable images\n";
2332
2333 $self->{path}
2334}
2335
2336sub STORABLE_attach {
2337 my ($self, $cloning, $path) = @_;
2338
2339 $self->new (path => $path)
2340}
2341
1740sub size_request { 2342sub size_request {
1741 my ($self) = @_; 2343 my ($self) = @_;
1742 2344
1743 ($self->{tex}->{w}, $self->{tex}->{h}) 2345 ($self->{tex}{w}, $self->{tex}{h})
1744} 2346}
1745 2347
1746sub _draw { 2348sub _draw {
1747 my ($self) = @_; 2349 my ($self) = @_;
1748 2350
… …
1758 } 2360 }
1759 2361
1760 glEnable GL_TEXTURE_2D; 2362 glEnable GL_TEXTURE_2D;
1761 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2363 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1762 2364
1763 $tex->draw_quad_alpha (0, 0, $w, $h); 2365 $tex->draw_quad (0, 0, $w, $h);
1764 2366
1765 glDisable GL_TEXTURE_2D; 2367 glDisable GL_TEXTURE_2D;
1766} 2368}
1767 2369
1768############################################################################# 2370#############################################################################
1769 2371
2372package CFPlus::UI::ImageButton;
2373
2374our @ISA = CFPlus::UI::Image::;
2375
2376use CFPlus::OpenGL;
2377
2378my %textures;
2379
2380sub new {
2381 my $class = shift;
2382
2383 my $self = $class->SUPER::new (
2384 padding_x => 4,
2385 padding_y => 4,
2386 fg => [1, 1, 1],
2387 active_fg => [0, 0, 1],
2388 can_hover => 1,
2389 align => 0,
2390 valign => 0,
2391 can_events => 1,
2392 @_
2393 );
2394}
2395
2396sub invoke_button_up {
2397 my ($self, $ev, $x, $y) = @_;
2398
2399 $self->emit ("activate")
2400 if $x >= 0 && $x < $self->{w}
2401 && $y >= 0 && $y < $self->{h};
2402
2403 1
2404}
2405
2406#############################################################################
2407
1770package CFClient::UI::VGauge; 2408package CFPlus::UI::VGauge;
1771 2409
1772our @ISA = CFClient::UI::Base::; 2410our @ISA = CFPlus::UI::Base::;
1773 2411
1774use List::Util qw(min max); 2412use List::Util qw(min max);
1775 2413
1776use CFClient::OpenGL; 2414use CFPlus::OpenGL;
1777 2415
1778my %tex = ( 2416my %tex = (
1779 food => [ 2417 food => [
1780 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2418 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1781 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ 2419 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
1782 ], 2420 ],
1783 grace => [ 2421 grace => [
1784 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2422 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1785 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/ 2423 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
1786 ], 2424 ],
1787 hp => [ 2425 hp => [
1788 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2426 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1789 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/ 2427 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
1790 ], 2428 ],
1791 mana => [ 2429 mana => [
1792 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2430 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1793 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/ 2431 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
1794 ], 2432 ],
1795); 2433);
1796 2434
1797# eg. VGauge->new (gauge => 'food'), default gauge: food 2435# eg. VGauge->new (gauge => 'food'), default gauge: food
… …
1857 my $ycut1 = max 0, min 1, $ycut; 2495 my $ycut1 = max 0, min 1, $ycut;
1858 my $ycut2 = max 0, min 1, $ycut - 1; 2496 my $ycut2 = max 0, min 1, $ycut - 1;
1859 2497
1860 my $h1 = $self->{h} * (1 - $ycut1); 2498 my $h1 = $self->{h} * (1 - $ycut1);
1861 my $h2 = $self->{h} * (1 - $ycut2); 2499 my $h2 = $self->{h} * (1 - $ycut2);
2500 my $h3 = $self->{h};
2501
2502 $_ = $_ * (284-4)/288 + 4/288 for ($h1, $h2, $h3);
1862 2503
1863 glEnable GL_BLEND; 2504 glEnable GL_BLEND;
1864 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2505 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2506 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1865 glEnable GL_TEXTURE_2D; 2507 glEnable GL_TEXTURE_2D;
1866 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2508 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1867 2509
1868 glBindTexture GL_TEXTURE_2D, $t1->{name}; 2510 glBindTexture GL_TEXTURE_2D, $t1->{name};
1869 glBegin GL_QUADS; 2511 glBegin GL_QUADS;
… …
1884 2526
1885 if ($t3) { 2527 if ($t3) {
1886 glBindTexture GL_TEXTURE_2D, $t3->{name}; 2528 glBindTexture GL_TEXTURE_2D, $t3->{name};
1887 glBegin GL_QUADS; 2529 glBegin GL_QUADS;
1888 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2; 2530 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
1889 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h}; 2531 glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
1890 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h}; 2532 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
1891 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2; 2533 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
1892 glEnd; 2534 glEnd;
1893 } 2535 }
1894 2536
1895 glDisable GL_BLEND; 2537 glDisable GL_BLEND;
1896 glDisable GL_TEXTURE_2D; 2538 glDisable GL_TEXTURE_2D;
1897} 2539}
1898 2540
1899############################################################################# 2541#############################################################################
1900 2542
1901package CFClient::UI::Gauge; 2543package CFPlus::UI::Gauge;
1902 2544
1903our @ISA = CFClient::UI::VBox::; 2545our @ISA = CFPlus::UI::VBox::;
1904 2546
1905sub new { 2547sub new {
1906 my ($class, %arg) = @_; 2548 my ($class, %arg) = @_;
1907 2549
1908 my $self = $class->SUPER::new ( 2550 my $self = $class->SUPER::new (
… …
1910 can_hover => 1, 2552 can_hover => 1,
1911 can_events => 1, 2553 can_events => 1,
1912 %arg, 2554 %arg,
1913 ); 2555 );
1914 2556
1915 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999"); 2557 $self->add ($self->{value} = new CFPlus::UI::Label valign => +1, align => 0, template => "999");
1916 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1); 2558 $self->add ($self->{gauge} = new CFPlus::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
1917 $self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999"); 2559 $self->add ($self->{max} = new CFPlus::UI::Label valign => -1, align => 0, template => "999");
1918 2560
1919 $self 2561 $self
1920} 2562}
1921 2563
1922sub set_fontsize { 2564sub set_fontsize {
… …
1943 $self->{value}->set_text ($val); 2585 $self->{value}->set_text ($val);
1944} 2586}
1945 2587
1946############################################################################# 2588#############################################################################
1947 2589
1948package CFClient::UI::Slider; 2590package CFPlus::UI::Slider;
1949 2591
1950use strict; 2592use strict;
1951 2593
1952use CFClient::OpenGL; 2594use CFPlus::OpenGL;
1953 2595
1954our @ISA = CFClient::UI::DrawBG::; 2596our @ISA = CFPlus::UI::DrawBG::;
1955 2597
1956my @tex = 2598my @tex =
1957 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 2599 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
1958 qw(s1_slider.png s1_slider_bg.png); 2600 qw(s1_slider.png s1_slider_bg.png);
1959 2601
1960sub new { 2602sub new {
1961 my $class = shift; 2603 my $class = shift;
1962 2604
1963 # range [value, low, high, page] 2605 # range [value, low, high, page, unit]
1964 2606
1965 # TODO: 0-width page 2607 # TODO: 0-width page
1966 # TODO: req_w/h are wrong with vertical 2608 # TODO: req_w/h are wrong with vertical
1967 # TODO: calculations are off 2609 # TODO: calculations are off
1968 my $self = $class->SUPER::new ( 2610 my $self = $class->SUPER::new (
1969 fg => [1, 1, 1], 2611 fg => [1, 1, 1],
1970 active_fg => [0, 0, 0], 2612 active_fg => [0, 0, 0],
2613 bg => [0, 0, 0, 0.2],
2614 active_bg => [1, 1, 1, 0.5],
1971 range => [0, 0, 100, 10], 2615 range => [0, 0, 100, 10, 0],
1972 req_w => $::WIDTH / 80, 2616 min_w => $::WIDTH / 80,
1973 req_h => $::WIDTH / 80, 2617 min_h => $::WIDTH / 80,
1974 vertical => 0, 2618 vertical => 0,
1975 can_hover => 1, 2619 can_hover => 1,
1976 inner_pad => 5, 2620 inner_pad => 0.02,
1977 @_ 2621 @_
1978 ); 2622 );
1979 2623
2624 $self->set_value ($self->{range}[0]);
2625 $self->update;
2626
1980 $self 2627 $self
1981} 2628}
1982 2629
2630sub set_range {
2631 my ($self, $range) = @_;
2632
2633 ($range, $self->{range}) = ($self->{range}, $range);
2634
2635 if ("@$range" ne "@{$self->{range}}") {
2636 $self->update;
2637 $self->set_value ($self->{range}[0]);
2638 }
2639}
2640
2641sub set_value {
2642 my ($self, $value) = @_;
2643
2644 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
2645
2646 $hi = $lo + 1 if $hi <= $lo;
2647
2648 $page = $hi - $lo if $page > $hi - $lo;
2649
2650 $value = $lo if $value < $lo;
2651 $value = $hi - $page if $value > $hi - $page;
2652
2653 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
2654 if $unit;
2655
2656 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2657
2658 if ($value != $old_value) {
2659 $self->emit (changed => $value);
2660 $self->update;
2661 }
2662}
2663
1983sub size_request { 2664sub size_request {
1984 my ($self) = @_; 2665 my ($self) = @_;
1985 2666
1986 my $w = $self->{req_w}; 2667 ($self->{req_w}, $self->{req_h})
1987 my $h = $self->{req_h};
1988
1989 $self->{vertical} ? ($h, $w) : ($w, $h)
1990} 2668}
1991 2669
1992sub button_down { 2670sub invoke_button_down {
1993 my ($self, $ev, $x, $y) = @_; 2671 my ($self, $ev, $x, $y) = @_;
1994 2672
1995 $self->SUPER::button_down ($ev, $x, $y); 2673 $self->SUPER::invoke_button_down ($ev, $x, $y);
2674
2675 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2676
1996 $self->mouse_motion ($ev, $x, $y); 2677 $self->invoke_mouse_motion ($ev, $x, $y)
1997} 2678}
1998 2679
1999sub mouse_motion { 2680sub invoke_mouse_motion {
2000 my ($self, $ev, $x, $y) = @_; 2681 my ($self, $ev, $x, $y) = @_;
2001 2682
2002 if ($GRAB == $self) { 2683 if ($GRAB == $self) {
2684 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2685
2686 my (undef, $lo, $hi, $page) = @{$self->{range}};
2687
2688 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2689
2690 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2691 } else {
2692 return 0;
2693 }
2694
2695 1
2696}
2697
2698sub invoke_mouse_wheel {
2699 my ($self, $ev) = @_;
2700
2701 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
2702
2703 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * 0.2);
2704
2705 ! ! $delta
2706}
2707
2708sub update {
2709 my ($self) = @_;
2710
2711 delete $self->{knob_w};
2712 $self->SUPER::update;
2713}
2714
2715sub _draw {
2716 my ($self) = @_;
2717
2718 unless ($self->{knob_w}) {
2719 $self->set_value ($self->{range}[0]);
2720
2003 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2721 my ($value, $lo, $hi, $page) = @{$self->{range}};
2722 my $range = ($hi - $page - $lo) || 1e-100;
2004 2723
2005 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2724 my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
2006 2725
2007 my $inner_pad_px = $self->_calc_inner_pad_px ($w); 2726 $self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
2008 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right 2727 $self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
2009 2728
2010 $x -= $inner_pad_px; # substract the padding 2729 $value = ($value - $lo) / $range;
2011 $x = $x * ($hi - $lo) / $inner_w + $lo; 2730 $value = $value * $self->{scale} + $self->{offset};
2012 $x = $lo if $x < $lo;
2013 $x = $hi - $page if $x > $hi - $page;
2014 $self->{range}[0] = $x;
2015 2731
2016 $self->emit (changed => $x); 2732 $self->{knob_x} = $value - $knob_w * 0.5;
2017 $self->update; 2733 $self->{knob_w} = $knob_w;
2018 } 2734 }
2019}
2020
2021# the inner_* stuff is for generating a padding for the slider handle,
2022# so that the handle doesn't leave the texture. This calculation isn't 100%
2023# correct propably, but it does the job for now
2024sub _calc_inner_pad_px {
2025 my ($self, $w) = @_;
2026 ($w / 100) * $self->{inner_pad} # % to pixels
2027}
2028
2029sub _draw {
2030 my ($self) = @_;
2031 2735
2032 $self->SUPER::_draw (); 2736 $self->SUPER::_draw ();
2033 2737
2034 my ($w, $h) = @$self{qw(w h)}; 2738 glScale $self->{w}, $self->{h};
2035 2739
2036 if ($self->{vertical}) { 2740 if ($self->{vertical}) {
2037 # draw a vertical slider like a rotated horizontal slider 2741 # draw a vertical slider like a rotated horizontal slider
2038 2742
2743 glTranslate 1, 0, 0;
2039 glRotate 90, 0, 0, 1; 2744 glRotate 90, 0, 0, 1;
2040 glTranslate 0, -$self->{w}, 0;
2041
2042 ($w, $h) = ($h, $w);
2043 } 2745 }
2044 2746
2045 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg}; 2747 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
2046 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg}; 2748 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
2047 2749
2048 my ($value, $lo, $hi, $page) = @{$self->{range}};
2049
2050 $hi = $value + 1 if $lo == $hi;
2051
2052 my $inner_pad_px = $self->_calc_inner_pad_px ($w);
2053 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
2054
2055 $page = int $page * $inner_w / ($hi - $lo);
2056 $value = int +($value - $lo) * $inner_w / ($hi - $lo);
2057
2058 $w -= $page;
2059 $page &= ~1;
2060 glTranslate $page * 0.5, 0, 0;
2061 $page ||= 2;
2062
2063 my $knob_a = $inner_pad_px + ($value - $page * 0.5);
2064 my $knob_b = $inner_pad_px + ($value + $page * 0.5);
2065
2066 glEnable GL_TEXTURE_2D; 2750 glEnable GL_TEXTURE_2D;
2067 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2751 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2068 2752
2069 # draw background 2753 # draw background
2070 $tex[1]->draw_quad_alpha (0, 0, $w, $h); 2754 $tex[1]->draw_quad_alpha (0, 0, 1, 1);
2071 2755
2072 # draw handle 2756 # draw handle
2073 $tex[0]->draw_quad_alpha ($knob_a, 0, $knob_b - $knob_a, $h); 2757 $tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1);
2074 2758
2075 glDisable GL_TEXTURE_2D; 2759 glDisable GL_TEXTURE_2D;
2076} 2760}
2077 2761
2078############################################################################# 2762#############################################################################
2079 2763
2080package CFClient::UI::TextView; 2764package CFPlus::UI::ValSlider;
2081 2765
2082our @ISA = CFClient::UI::HBox::; 2766our @ISA = CFPlus::UI::HBox::;
2083 2767
2768sub new {
2769 my ($class, %arg) = @_;
2770
2771 my $range = delete $arg{range};
2772
2773 my $self = $class->SUPER::new (
2774 slider => (new CFPlus::UI::Slider expand => 1, range => $range),
2775 entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
2776 to_value => sub { shift },
2777 from_value => sub { shift },
2778 %arg,
2779 );
2780
2781 $self->{slider}->connect (changed => sub {
2782 my ($self, $value) = @_;
2783 $self->{parent}{entry}->set_text ($self->{parent}{to_value}->($value));
2784 $self->{parent}->emit (changed => $value);
2785 });
2786
2787# $self->{entry}->connect (changed => sub {
2788# my ($self, $value) = @_;
2789# $self->{parent}{slider}->set_value ($self->{parent}{from_value}->($value));
2790# $self->{parent}->emit (changed => $value);
2791# });
2792
2793 $self->add ($self->{slider}, $self->{entry});
2794
2795 $self->{slider}->emit (changed => $self->{slider}{range}[0]);
2796
2797 $self
2798}
2799
2800sub set_range { shift->{slider}->set_range (@_) }
2801sub set_value { shift->{slider}->set_value (@_) }
2802
2803#############################################################################
2804
2805package CFPlus::UI::TextScroller;
2806
2807our @ISA = CFPlus::UI::HBox::;
2808
2084use CFClient::OpenGL; 2809use CFPlus::OpenGL;
2085 2810
2086sub new { 2811sub new {
2087 my $class = shift; 2812 my $class = shift;
2088 2813
2089 my $self = $class->SUPER::new ( 2814 my $self = $class->SUPER::new (
2090 fontsize => 1, 2815 fontsize => 1,
2091 can_events => 0, 2816 can_events => 1,
2817 indent => 0,
2092 #font => default_font 2818 #font => default_font
2093 @_, 2819 @_,
2094 2820
2095 layout => (new CFClient::Layout 1), 2821 layout => (new CFPlus::Layout),
2096 par => [], 2822 par => [],
2097 height => 0, 2823 height => 0,
2098 children => [ 2824 children => [
2099 (new CFClient::UI::Empty expand => 1), 2825 (new CFPlus::UI::Empty expand => 1),
2100 (new CFClient::UI::Slider vertical => 1), 2826 (new CFPlus::UI::Slider vertical => 1),
2101 ], 2827 ],
2102 ); 2828 );
2103 2829
2104 $self->{children}[1]->connect (changed => sub { $self->update }); 2830 $self->{children}[1]->connect (changed => sub { $self->update });
2105 2831
… …
2111 2837
2112 $self->{fontsize} = $fontsize; 2838 $self->{fontsize} = $fontsize;
2113 $self->reflow; 2839 $self->reflow;
2114} 2840}
2115 2841
2116sub text_height { 2842sub size_request {
2843 my ($self) = @_;
2844
2845 my ($empty, $slider) = @{ $self->{children} };
2846
2847 local $self->{children} = [$empty, $slider];
2848 $self->SUPER::size_request
2849}
2850
2851sub invoke_size_allocate {
2852 my ($self, $w, $h) = @_;
2853
2854 my ($empty, $slider, @other) = @{ $self->{children} };
2855 $_->configure (@$_{qw(x y req_w req_h)}) for @other;
2856
2857 $self->{layout}->set_font ($self->{font}) if $self->{font};
2858 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2859 $self->{layout}->set_width ($empty->{w});
2860 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2861
2862 $self->reflow;
2863
2864 local $self->{children} = [$empty, $slider];
2865 $self->SUPER::invoke_size_allocate ($w, $h)
2866}
2867
2868sub invoke_mouse_wheel {
2117 my ($self, $text) = @_; 2869 my ($self, $ev) = @_;
2870
2871 return 0 unless $ev->{dy}; # only vertical movements
2872
2873 $self->{children}[1]->emit (mouse_wheel => $ev);
2874
2875 1
2876}
2877
2878sub get_layout {
2879 my ($self, $para) = @_;
2118 2880
2119 my $layout = $self->{layout}; 2881 my $layout = $self->{layout};
2120 2882
2883 $layout->set_font ($self->{font}) if $self->{font};
2884 $layout->set_foreground (@{$para->{fg}});
2121 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2885 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2122 $layout->set_width ($self->{children}[0]{w}); 2886 $layout->set_width ($self->{children}[0]{w} - $para->{indent});
2887 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2123 $layout->set_markup ($text); 2888 $layout->set_markup ($para->{markup});
2889
2890 $layout->set_shapes (
2891 map
2892 +(0, $_->baseline_shift +$_->{padding_y} - $_->{h}, $_->{w}, $_->{h}),
2893 @{$para->{widget}}
2124 2894 );
2125 ($layout->size)[1] 2895
2896 $layout
2126} 2897}
2127 2898
2128sub reflow { 2899sub reflow {
2129 my ($self) = @_; 2900 my ($self) = @_;
2130 2901
2131 $self->{need_reflow}++; 2902 $self->{need_reflow}++;
2132 $self->update; 2903 $self->update;
2133} 2904}
2134 2905
2135sub size_allocate { 2906sub set_offset {
2907 my ($self, $offset) = @_;
2908
2909 # todo: base offset on lines or so, not on pixels
2910 $self->{children}[1]->set_value ($offset);
2911}
2912
2913sub current_paragraph {
2914 my ($self) = @_;
2915
2916 $self->{top_paragraph} - 1
2917}
2918
2919sub scroll_to {
2136 my ($self, $w, $h) = @_; 2920 my ($self, $para) = @_;
2137 2921
2138 $self->SUPER::size_allocate ($w, $h); 2922 $para = List::Util::max 0, List::Util::min $#{$self->{par}}, $para;
2139 2923
2140 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2924 $self->{scroll_to} = $para;
2141 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2925 $self->update;
2142 $self->{layout}->set_width ($self->{children}[0]{w}); 2926}
2143 2927
2144 $self->reflow; 2928sub clear {
2929 my ($self) = @_;
2930
2931 my (undef, undef, @other) = @{ $self->{children} };
2932 $self->remove ($_) for @other;
2933
2934 $self->{par} = [];
2935 $self->{height} = 0;
2936 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2145} 2937}
2146 2938
2147sub add_paragraph { 2939sub add_paragraph {
2148 my ($self, $color, $text) = @_; 2940 my $self = shift;
2149 2941
2150 #TODO: intelligently "reformat" paragraph 2942 for my $para (@_) {
2943 $para = {
2944 fg => [1, 1, 1, 1],
2945 indent => 0,
2946 markup => "",
2947 widget => [],
2948 ref $para ? %$para : (markup => $para),
2949 w => 1e10,
2950 wrapped => 1,
2951 };
2151 2952
2152 my $height = $self->text_height ($text); 2953 $self->add (@{ $para->{widget} }) if @{ $para->{widget} };
2954 push @{$self->{par}}, $para;
2955 }
2153 2956
2957 $self->{need_reflow}++;
2958 $self->update;
2959}
2960
2961sub scroll_to_bottom {
2962 my ($self) = @_;
2963
2964 $self->{scroll_to} = $#{$self->{par}};
2965 $self->update;
2966}
2967
2968sub force_uptodate {
2969 my ($self) = @_;
2970
2971 if (delete $self->{need_reflow}) {
2972 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2973
2974 my $height = 0;
2975
2976 for my $para (@{$self->{par}}) {
2977 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2978 my $layout = $self->get_layout ($para);
2979 my ($w, $h) = $layout->size;
2980
2981 $para->{w} = $w + $para->{indent};
2982 $para->{h} = $h;
2983 $para->{wrapped} = $layout->has_wrapped;
2984 }
2985
2986 $para->{y} = $height;
2987 $height += $para->{h};
2988 }
2989
2154 $self->{height} += $height; 2990 $self->{height} = $height;
2991 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2155 2992
2156 push @{$self->{par}}, [$height, $color, $text]; 2993 delete $self->{texture};
2994 }
2157 2995
2158 $self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}]; 2996 if (my $paridx = delete $self->{scroll_to}) {
2159 $self->{children}[1]->update; 2997 $self->{children}[1]->set_value ($self->{par}[$paridx]{y});
2998 }
2160} 2999}
2161 3000
2162sub update { 3001sub update {
2163 my ($self) = @_; 3002 my ($self) = @_;
2164 3003
… …
2166 3005
2167 return unless $self->{h} > 0; 3006 return unless $self->{h} > 0;
2168 3007
2169 delete $self->{texture}; 3008 delete $self->{texture};
2170 3009
2171 $ROOT->on_post_alloc ($self, sub { 3010 $ROOT->on_post_alloc ($self => sub {
2172 if (delete $self->{need_reflow}) { 3011 $self->force_uptodate;
2173 my $height = 0;
2174 3012
2175 $height += $_->[0] = $self->text_height ($_->[2]) 3013 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2176 for @{$self->{par}};
2177 3014
2178 $self->{height} = $height; 3015 $self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2179
2180 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];
2181
2182 delete $self->{texture};
2183 }
2184
2185 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub {
2186 glClearColor 0, 0, 0, 0; 3016 glClearColor 0, 0, 0, 0;
2187 glClear GL_COLOR_BUFFER_BIT; 3017 glClear GL_COLOR_BUFFER_BIT;
2188 3018
2189 glEnable GL_TEXTURE_2D; 3019 package CFPlus::UI::Base;
2190 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3020 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3021 (0, 0, $self->{w}, $self->{h});
2191 3022
2192 my $top = int $self->{children}[1]{range}[0]; 3023 my $top = int $self->{children}[1]{range}[0];
2193 3024
3025 my $paridx = 0;
3026 my $top_paragraph;
3027 my $top = int $self->{children}[1]{range}[0];
3028
2194 my $y0 = $top; 3029 my $y0 = $top;
2195 my $y1 = $top + $self->{h}; 3030 my $y1 = $top + $H;
2196 3031
2197 my $y = 0;
2198
2199 my $layout = $self->{layout};
2200
2201 $layout->set_font ($self->{font}) if $self->{font};
2202
2203 for my $par (@{$self->{par}}) { 3032 for my $para (@{$self->{par}}) {
2204 my $h = $par->[0]; 3033 my $h = $para->{h};
3034 my $y = $para->{y};
2205 3035
2206 if ($y0 < $y + $h && $y < $y1) { 3036 if ($y0 < $y + $h && $y < $y1) {
2207 $layout->set_foreground (@{ $par->[1] }); 3037 my $layout = $self->get_layout ($para);
2208 $layout->set_markup ($par->[2]);
2209 3038
2210 my ($W, $H) = $layout->size; 3039 $layout->render ($para->{indent}, $y - $y0);
2211 CFClient::Texture->new_from_layout ($layout)->draw_quad_alpha_premultiplied (0, $y - $y0); 3040
3041 if (my @w = @{ $para->{widget} }) {
3042 my @s = $layout->get_shapes;
3043
3044 for (@w) {
3045 my ($dx, $dy) = splice @s, 0, 2, ();
3046
3047 $_->{x} = $dx + $para->{indent};
3048 $_->{y} = $dy + $y - $y0;
3049
3050 $_->draw;
3051 }
3052 }
2212 } 3053 }
2213 3054
2214 $y += $h; 3055 $paridx++;
3056 $top_paragraph ||= $paridx if $y >= $top;
2215 } 3057 }
2216 3058
2217 glDisable GL_TEXTURE_2D; 3059 $self->{top_paragraph} = $top_paragraph;
2218 }; 3060 };
2219 }); 3061 });
2220} 3062}
2221 3063
3064sub reconfigure {
3065 my ($self) = @_;
3066
3067 $self->SUPER::reconfigure;
3068
3069 $_->{w} = 1e10 for @{ $self->{par} };
3070 $self->reflow;
3071}
3072
2222sub _draw { 3073sub _draw {
2223 my ($self) = @_; 3074 my ($self) = @_;
2224 3075
2225 glEnable GL_TEXTURE_2D; 3076 glEnable GL_TEXTURE_2D;
2226 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3077 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2227 glColor 1, 1, 1, 1; 3078 glColor 0, 0, 0, 1;
2228 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 3079 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2229 glDisable GL_TEXTURE_2D; 3080 glDisable GL_TEXTURE_2D;
2230 3081
2231 $self->{children}[1]->draw; 3082 $self->{children}[1]->draw;
2232
2233} 3083}
2234 3084
2235############################################################################# 3085#############################################################################
2236 3086
2237package CFClient::UI::Animator; 3087package CFPlus::UI::Animator;
2238 3088
2239use CFClient::OpenGL; 3089use CFPlus::OpenGL;
2240 3090
2241our @ISA = CFClient::UI::Bin::; 3091our @ISA = CFPlus::UI::Bin::;
2242 3092
2243sub moveto { 3093sub moveto {
2244 my ($self, $x, $y) = @_; 3094 my ($self, $x, $y) = @_;
2245 3095
2246 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y]; 3096 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
… …
2274 glPopMatrix; 3124 glPopMatrix;
2275} 3125}
2276 3126
2277############################################################################# 3127#############################################################################
2278 3128
2279package CFClient::UI::Flopper; 3129package CFPlus::UI::Flopper;
2280 3130
2281our @ISA = CFClient::UI::Button::; 3131our @ISA = CFPlus::UI::Button::;
2282 3132
2283sub new { 3133sub new {
2284 my $class = shift; 3134 my $class = shift;
2285 3135
2286 my $self = $class->SUPER::new ( 3136 my $self = $class->SUPER::new (
2287 state => 0, 3137 state => 0,
2288 connect_activate => \&toggle_flopper, 3138 on_activate => \&toggle_flopper,
2289 @_ 3139 @_
2290 ); 3140 );
2291 3141
2292 if ($self->{state}) {
2293 $self->{state} = 0;
2294 $self->toggle_flopper;
2295 }
2296
2297 $self 3142 $self
2298} 3143}
2299 3144
2300sub toggle_flopper { 3145sub toggle_flopper {
2301 my ($self) = @_; 3146 my ($self) = @_;
2302 3147
2303 # TODO: use animation 3148 $self->{other}->toggle_visibility;
2304 if ($self->{state} = !$self->{state}) {
2305 $CFClient::UI::ROOT->add ($self->{other});
2306 $self->{other}->move ($self->coord2global (0, $self->{h}));
2307 $self->emit ("open");
2308 } else {
2309 $CFClient::UI::ROOT->remove ($self->{other});
2310 $self->emit ("close");
2311 }
2312
2313 $self->emit (changed => $self->{state});
2314} 3149}
2315 3150
2316############################################################################# 3151#############################################################################
2317 3152
2318package CFClient::UI::Tooltip; 3153package CFPlus::UI::Tooltip;
2319 3154
2320our @ISA = CFClient::UI::Bin::; 3155our @ISA = CFPlus::UI::Bin::;
2321 3156
2322use CFClient::OpenGL; 3157use CFPlus::OpenGL;
2323 3158
2324sub new { 3159sub new {
2325 my $class = shift; 3160 my $class = shift;
2326 3161
2327 $class->SUPER::new ( 3162 $class->SUPER::new (
… …
2331} 3166}
2332 3167
2333sub set_tooltip_from { 3168sub set_tooltip_from {
2334 my ($self, $widget) = @_; 3169 my ($self, $widget) = @_;
2335 3170
3171 $widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
3172 if $widget->{tooltip} =~ /^#(.*)$/;
3173
3174 my $tooltip = $widget->{tooltip};
3175
3176 if ($ENV{CFPLUS_DEBUG} & 2) {
3177 $tooltip .= "\n\n" . (ref $widget) . "\n"
3178 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
3179 . "req $widget->{req_w} $widget->{req_h}\n"
3180 . "visible $widget->{visible}";
3181 }
3182
3183 $tooltip =~ s/^\n+//;
3184 $tooltip =~ s/\n+$//;
3185
2336 $self->add (new CFClient::UI::Label 3186 $self->add (new CFPlus::UI::Label
2337 markup => $widget->{tooltip}, 3187 markup => $tooltip,
2338 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 3188 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2339 fontsize => 0.8, 3189 fontsize => 0.8,
2340 fg => [0, 0, 0, 1], 3190 style => 1, # FLAG_INVERSE
3191 ellipsise => 0,
2341 font => ($widget->{tooltip_font} || $::FONT_PROP), 3192 font => ($widget->{tooltip_font} || $::FONT_PROP),
2342 ); 3193 );
2343} 3194}
2344 3195
2345sub size_request { 3196sub size_request {
2346 my ($self) = @_; 3197 my ($self) = @_;
… …
2348 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 3199 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2349 3200
2350 ($w + 4, $h + 4) 3201 ($w + 4, $h + 4)
2351} 3202}
2352 3203
2353sub size_allocate { 3204sub invoke_size_allocate {
2354 my ($self, $w, $h) = @_; 3205 my ($self, $w, $h) = @_;
2355 3206
2356 $self->SUPER::size_allocate ($w - 4, $h - 4); 3207 $self->SUPER::invoke_size_allocate ($w - 4, $h - 4)
3208}
3209
3210sub invoke_visibility_change {
3211 my ($self, $visible) = @_;
3212
3213 return unless $visible;
3214
3215 $self->{root}->on_post_alloc ("move_$self" => sub {
3216 my $widget = $self->{owner}
3217 or return;
3218
3219 if ($widget->{visible}) {
3220 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
3221
3222 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
3223 if $x + $self->{w} > $self->{root}{w};
3224
3225 $self->move_abs ($x, $y);
3226 } else {
3227 $self->hide;
3228 }
3229 });
2357} 3230}
2358 3231
2359sub _draw { 3232sub _draw {
2360 my ($self) = @_; 3233 my ($self) = @_;
2361 3234
… …
2378 glVertex $w, $h; 3251 glVertex $w, $h;
2379 glVertex $w, 0; 3252 glVertex $w, 0;
2380 glEnd; 3253 glEnd;
2381 3254
2382 glTranslate 2 - 0.375, 2 - 0.375; 3255 glTranslate 2 - 0.375, 2 - 0.375;
3256
2383 $self->SUPER::_draw; 3257 $self->SUPER::_draw;
2384} 3258}
2385 3259
2386############################################################################# 3260#############################################################################
2387 3261
2388package CFClient::UI::Face; 3262package CFPlus::UI::Face;
2389 3263
2390our @ISA = CFClient::UI::Base::; 3264our @ISA = CFPlus::UI::DrawBG::;
2391 3265
2392use CFClient::OpenGL; 3266use CFPlus::OpenGL;
2393 3267
2394sub new { 3268sub new {
2395 my $class = shift; 3269 my $class = shift;
2396 3270
2397 $class->SUPER::new ( 3271 my $self = $class->SUPER::new (
2398 aspect => 1, 3272 aspect => 1,
3273 can_events => 0,
2399 @_, 3274 @_,
2400 ) 3275 );
3276
3277 if ($self->{anim} && $self->{animspeed}) {
3278 CFPlus::weaken (my $widget = $self);
3279
3280 $self->{timer} = Event->timer (
3281 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
3282 hard => 1,
3283 interval => $self->{animspeed},
3284 cb => sub {
3285 ++$widget->{frame};
3286 $widget->update;
3287 },
3288 );
3289 }
3290
3291 $self
2401} 3292}
2402 3293
2403sub size_request { 3294sub size_request {
2404 (32, 8) 3295 (32, 8)
2405} 3296}
2406 3297
3298sub update {
3299 my ($self) = @_;
3300
3301 return unless $self->{visible};
3302
3303 $self->SUPER::update;
3304}
3305
2407sub _draw { 3306sub _draw {
2408 my ($self) = @_; 3307 my ($self) = @_;
2409 3308
2410 return unless $::CONN;#d# manage and cache textures differently 3309 return unless $::CONN;
3310
3311 $self->SUPER::_draw;
3312
3313 my $face;
3314
3315 if ($self->{frame}) {
3316 my $anim = $::CONN->{anim}[$self->{anim}];
3317
3318 $face = $anim->[ $self->{frame} % @$anim ]
3319 if $anim && @$anim;
3320 }
3321
2411 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]]; 3322 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2412 3323
2413 # TODO animation
2414 if ($tex) { 3324 if ($tex) {
2415 glEnable GL_TEXTURE_2D; 3325 glEnable GL_TEXTURE_2D;
2416 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3326 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2417 glColor 1, 1, 1, 1; 3327 glColor 0, 0, 0, 1;
2418 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3328 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2419 glDisable GL_TEXTURE_2D; 3329 glDisable GL_TEXTURE_2D;
2420 } 3330 }
2421} 3331}
2422 3332
3333sub destroy {
3334 my ($self) = @_;
3335
3336 $self->{timer}->cancel
3337 if $self->{timer};
3338
3339 $self->SUPER::destroy;
3340}
3341
2423############################################################################# 3342#############################################################################
2424 3343
2425package CFClient::UI::InventoryItem; 3344package CFPlus::UI::Buttonbar;
2426 3345
2427our @ISA = CFClient::UI::HBox::; 3346our @ISA = CFPlus::UI::HBox::;
2428 3347
2429sub new { 3348# TODO: should actually wrap buttons and other goodies.
2430 my $class = shift;
2431
2432 my %args = @_;
2433
2434 my $item = delete $args{item};
2435
2436 my $desc = $item->{nrof} < 2
2437 ? $item->{name}
2438 : "$item->{nrof} $item->{name_pl}";
2439
2440
2441 my $self = $class->SUPER::new (
2442 can_hover => 1,
2443 can_events => 1,
2444 tooltip => (CFClient::UI::Label->escape ($desc)
2445 . "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),
2446 connect_button_down => sub {
2447 my ($self, $ev, $x, $y) = @_;
2448
2449 # todo: maybe put examine on 1? but should just be a tooltip :(
2450 if ($ev->{button} == 1) {
2451 $::CONN->send ("move $::CONN->{player}{tag} $item->{tag} 0");
2452 } elsif ($ev->{button} == 2) {
2453 $::CONN->send ("apply $item->{tag}");
2454 } elsif ($ev->{button} == 3) {
2455 CFClient::UI::Menu->new (
2456 items => [
2457 ["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2458 [
2459 $item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock",
2460 sub { $::CONN->send ("lock $item->{tag}") },
2461 ],
2462 ["mark", sub { $::CONN->send ("mark $item->{tag}") }],
2463 ["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2464 ["drop", sub { $::CONN->send ("move 0 $item->{tag} 0") }],
2465 ],
2466 )->popup ($ev);
2467 }
2468
2469 1
2470 },
2471 %args
2472 );
2473
2474 $self->add (new CFClient::UI::Face
2475 can_events => 0,
2476 face => $item->{face},
2477 anim => $item->{anim},
2478 animspeed => $item->{animspeed},
2479 );
2480
2481 $self->add (new CFClient::UI::Label
2482 can_events => 0,
2483 text => $desc,
2484 );
2485
2486 $self
2487}
2488 3349
2489############################################################################# 3350#############################################################################
2490 3351
2491package CFClient::UI::Inventory;
2492
2493our @ISA = CFClient::UI::ScrolledWindow::;
2494
2495sub new {
2496 my $class = shift;
2497
2498 my $self = $class->SUPER::new (
2499 scrolled => (new CFClient::UI::VBox),
2500 @_,
2501 );
2502
2503 $self
2504}
2505
2506sub set_items {
2507 my ($self, $items) = @_;
2508
2509 $self->{scrolled}->clear;
2510 return unless $items;
2511
2512 my @items = sort { $a->{type} <=> $b->{type} } @$items;
2513
2514 $self->{real_items} = \@items;
2515
2516 for my $item (@items) {
2517 my $desc = $item->{nrof} < 2
2518 ? $item->{name}
2519 : "$item->{nrof} $item->{name_pl}";
2520
2521 $self->{scrolled}->add ($item->{widget} ||= new CFClient::UI::InventoryItem item => $item);
2522 }
2523
2524# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2525}
2526
2527sub size_request {
2528 my ($self) = @_;
2529 ($self->{req_w}, $self->{req_h});
2530}
2531
2532#############################################################################
2533
2534package CFClient::UI::Menu; 3352package CFPlus::UI::Menu;
2535 3353
2536our @ISA = CFClient::UI::FancyFrame::; 3354our @ISA = CFPlus::UI::Toplevel::;
2537 3355
2538use CFClient::OpenGL; 3356use CFPlus::OpenGL;
2539 3357
2540sub new { 3358sub new {
2541 my $class = shift; 3359 my $class = shift;
2542 3360
2543 my $self = $class->SUPER::new ( 3361 my $self = $class->SUPER::new (
2544 items => [], 3362 items => [],
2545 z => 100, 3363 z => 100,
2546 @_, 3364 @_,
2547 ); 3365 );
2548 3366
2549 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3367 $self->add ($self->{vbox} = new CFPlus::UI::VBox);
2550 3368
2551 for my $item (@{ $self->{items} }) { 3369 for my $item (@{ $self->{items} }) {
2552 my ($widget, $cb) = @$item; 3370 my ($widget, $cb, $tooltip) = @$item;
2553 3371
2554 # handle various types of items, only text for now 3372 # handle various types of items, only text for now
2555 if (!ref $widget) { 3373 if (!ref $widget) {
3374 if ($widget =~ /\t/) {
3375 my ($left, $right) = split /\t/, $widget, 2;
3376
2556 $widget = new CFClient::UI::Label 3377 $widget = new CFPlus::UI::HBox
2557 can_hover => 1, 3378 can_hover => 1,
2558 can_events => 1, 3379 can_events => 1,
3380 tooltip => $tooltip,
3381 children => [
3382 (new CFPlus::UI::Label markup => $left, expand => 1),
3383 (new CFPlus::UI::Label markup => $right, align => +1),
3384 ],
3385 ;
3386
3387 } else {
3388 $widget = new CFPlus::UI::Label
3389 can_hover => 1,
3390 can_events => 1,
2559 text => $widget; 3391 markup => $widget,
3392 tooltip => $tooltip;
3393 }
2560 } 3394 }
2561 3395
2562 $self->{item}{$widget} = $item; 3396 $self->{item}{$widget} = $item;
2563 3397
2564 $self->{vbox}->add ($widget); 3398 $self->{vbox}->add ($widget);
… …
2576 # maybe save $GRAB? must be careful about events... 3410 # maybe save $GRAB? must be careful about events...
2577 $GRAB = $self; 3411 $GRAB = $self;
2578 $self->{button} = $ev->{button}; 3412 $self->{button} = $ev->{button};
2579 3413
2580 $self->show; 3414 $self->show;
2581 $self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 3415 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2582} 3416}
2583 3417
2584sub mouse_motion { 3418sub invoke_mouse_motion {
2585 my ($self, $ev, $x, $y) = @_; 3419 my ($self, $ev, $x, $y) = @_;
2586 3420
2587 # TODO: should use vbox->find_widget or so 3421 # TODO: should use vbox->find_widget or so
2588 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 3422 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2589 $self->{hover} = $self->{item}{$HOVER}; 3423 $self->{hover} = $self->{item}{$HOVER};
2590}
2591 3424
3425 0
3426}
3427
2592sub button_up { 3428sub invoke_button_up {
2593 my ($self, $ev, $x, $y) = @_; 3429 my ($self, $ev, $x, $y) = @_;
2594 3430
2595 if ($ev->{button} == $self->{button}) { 3431 if ($ev->{button} == $self->{button}) {
2596 undef $GRAB; 3432 undef $GRAB;
2597 $self->hide; 3433 $self->hide;
2598 3434
2599 $self->emit ("popdown"); 3435 $self->emit ("popdown");
2600 $self->{hover}[1]->() if $self->{hover}; 3436 $self->{hover}[1]->() if $self->{hover};
3437 } else {
3438 return 0
3439 }
3440
2601 } 3441 1
2602} 3442}
2603 3443
2604############################################################################# 3444#############################################################################
2605 3445
2606package CFClient::UI::Statusbox; 3446package CFPlus::UI::Multiplexer;
2607 3447
3448our @ISA = CFPlus::UI::Container::;
3449
3450sub new {
3451 my $class = shift;
3452
3453 my $self = $class->SUPER::new (
3454 @_,
3455 );
3456
3457 $self->{current} = $self->{children}[0]
3458 if @{ $self->{children} };
3459
3460 $self
3461}
3462
3463sub add {
3464 my ($self, @widgets) = @_;
3465
3466 $self->SUPER::add (@widgets);
3467
3468 $self->{current} = $self->{children}[0]
3469 if @{ $self->{children} };
3470}
3471
3472sub get_current_page {
3473 my ($self) = @_;
3474
3475 $self->{current}
3476}
3477
3478sub set_current_page {
3479 my ($self, $page_or_widget) = @_;
3480
3481 my $widget = ref $page_or_widget
3482 ? $page_or_widget
3483 : $self->{children}[$page_or_widget];
3484
3485 $self->{current} = $widget;
3486 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
3487
3488 $self->emit (page_changed => $self->{current});
3489
3490 $self->realloc;
3491}
3492
3493sub visible_children {
3494 $_[0]{current}
3495}
3496
3497sub size_request {
3498 my ($self) = @_;
3499
3500 $self->{current}->size_request
3501}
3502
3503sub invoke_size_allocate {
3504 my ($self, $w, $h) = @_;
3505
3506 $self->{current}->configure (0, 0, $w, $h);
3507
3508 1
3509}
3510
3511sub _draw {
3512 my ($self) = @_;
3513
3514 $self->{current}->draw;
3515}
3516
3517#############################################################################
3518
3519package CFPlus::UI::Notebook;
3520
2608our @ISA = CFClient::UI::VBox::; 3521our @ISA = CFPlus::UI::VBox::;
3522
3523sub new {
3524 my $class = shift;
3525
3526 my $self = $class->SUPER::new (
3527 buttonbar => (new CFPlus::UI::Buttonbar),
3528 multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3529 # filter => # will be put between multiplexer and $self
3530 @_,
3531 );
3532
3533 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3534 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3535
3536 $self
3537}
3538
3539sub add {
3540 my ($self, $title, $widget, $tooltip) = @_;
3541
3542 CFPlus::weaken $self;
3543
3544 $self->{buttonbar}->add (new CFPlus::UI::Button
3545 markup => $title,
3546 tooltip => $tooltip,
3547 on_activate => sub { $self->set_current_page ($widget) },
3548 );
3549
3550 $self->{multiplexer}->add ($widget);
3551}
3552
3553sub get_current_page {
3554 my ($self) = @_;
3555
3556 $self->{multiplexer}->get_current_page
3557}
3558
3559sub set_current_page {
3560 my ($self, $page) = @_;
3561
3562 $self->{multiplexer}->set_current_page ($page);
3563 $self->emit (page_changed => $self->{multiplexer}{current});
3564}
3565
3566#############################################################################
3567
3568package CFPlus::UI::Selector;
3569
3570use utf8;
3571
3572our @ISA = CFPlus::UI::Button::;
3573
3574sub new {
3575 my $class = shift;
3576
3577 my $self = $class->SUPER::new (
3578 options => [], # [value, title, longdesc], ...
3579 value => undef,
3580 @_,
3581 );
3582
3583 $self->_set_value ($self->{value});
3584
3585 $self
3586}
3587
3588sub invoke_button_down {
3589 my ($self, $ev) = @_;
3590
3591 my @menu_items;
3592
3593 for (@{ $self->{options} }) {
3594 my ($value, $title, $tooltip) = @$_;
3595
3596 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3597 }
3598
3599 CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
3600}
3601
3602sub _set_value {
3603 my ($self, $value) = @_;
3604
3605 my ($item) = grep $_->[0] eq $value, @{ $self->{options} }
3606 or return;
3607
3608 $self->{value} = $item->[0];
3609 $self->set_markup ("$item->[1] ⇓");
3610 $self->set_tooltip ($item->[2]);
3611}
3612
3613sub set_value {
3614 my ($self, $value) = @_;
3615
3616 return unless $self->{value} ne $value;
3617
3618 $self->_set_value ($value);
3619 $self->emit (changed => $value);
3620}
3621
3622#############################################################################
3623
3624package CFPlus::UI::Statusbox;
3625
3626our @ISA = CFPlus::UI::VBox::;
3627
3628sub new {
3629 my $class = shift;
3630
3631 my $self = $class->SUPER::new (
3632 fontsize => 0.8,
3633 @_,
3634 );
3635
3636 CFPlus::weaken (my $this = $self);
3637
3638 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3639
3640 $self
3641}
2609 3642
2610sub reorder { 3643sub reorder {
2611 my ($self) = @_; 3644 my ($self) = @_;
2612 my $NOW = time; 3645 my $NOW = Time::HiRes::time;
3646
3647 # freeze display when hovering over any label
3648 return if $CFPlus::UI::TOOLTIP->{owner}
3649 && grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},
3650 values %{ $self->{item} };
2613 3651
2614 while (my ($k, $v) = each %{ $self->{item} }) { 3652 while (my ($k, $v) = each %{ $self->{item} }) {
2615 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3653 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2616 } 3654 }
2617 3655
… …
2620 my @items = sort { 3658 my @items = sort {
2621 $a->{pri} <=> $b->{pri} 3659 $a->{pri} <=> $b->{pri}
2622 or $b->{id} <=> $a->{id} 3660 or $b->{id} <=> $a->{id}
2623 } values %{ $self->{item} }; 3661 } values %{ $self->{item} };
2624 3662
3663 $self->{timer}->interval (1);
3664
2625 my $count = 10 + 1; 3665 my $count = 10 + 1;
2626 for my $item (@items) { 3666 for my $item (@items) {
2627 last unless --$count; 3667 last unless --$count;
2628 3668
2629 push @widgets, $item->{label} ||= do { 3669 my $label = $item->{label} ||= do {
2630 # TODO: doesn't handle markup well (read as: at all) 3670 # TODO: doesn't handle markup well (read as: at all)
2631 my $short = $item->{count} > 1 3671 my $short = $item->{count} > 1
2632 ? "<b>$item->{count} ×</b> $item->{text}" 3672 ? "<b>$item->{count} ×</b> $item->{text}"
2633 : $item->{text}; 3673 : $item->{text};
2634 3674
2635 for ($short) { 3675 for ($short) {
2636 s/^\s+//; 3676 s/^\s+//;
2637 s/\012.*/…/s; 3677 s/\s+/ /g;
2638 my $len = int 40 / $item->{fontsize};
2639 substr $_, $len, length, "…" if $len < length;
2640 } 3678 }
2641 3679
2642 new CFClient::UI::Label 3680 new CFPlus::UI::Label
2643 markup => $short, 3681 markup => $short,
2644 tooltip => $item->{tooltip}, 3682 tooltip => $item->{tooltip},
2645 tooltip_font => $::FONT_PROP, 3683 tooltip_font => $::FONT_PROP,
2646 tooltip_width => 0.67, 3684 tooltip_width => 0.67,
2647 fontsize => $item->{fontsize}, 3685 fontsize => $item->{fontsize} || $self->{fontsize},
2648 color => $item->{color}, 3686 max_w => $::WIDTH * 0.44,
3687 fg => [@{ $item->{fg} }],
2649 can_events => 1, 3688 can_events => 1,
2650 can_hover => 1 3689 can_hover => 1
2651 }; 3690 };
3691
3692 if ((my $diff = $item->{timeout} - $NOW) < 2) {
3693 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
3694 $label->update;
3695 $label->set_max_size (undef, $label->{req_h} * $diff)
3696 if $diff < 1;
3697 $self->{timer}->interval (1/30);
3698 } else {
3699 $label->{fg}[3] = $item->{fg}[3] || 1;
3700 }
3701
3702 push @widgets, $label;
2652 } 3703 }
2653 3704
2654 $self->clear; 3705 $self->clear;
2655 $self->SUPER::add (reverse @widgets); 3706 $self->SUPER::add (reverse @widgets);
2656} 3707}
… …
2659 my ($self, $text, %arg) = @_; 3710 my ($self, $text, %arg) = @_;
2660 3711
2661 $text =~ s/^\s+//; 3712 $text =~ s/^\s+//;
2662 $text =~ s/\s+$//; 3713 $text =~ s/\s+$//;
2663 3714
3715 return unless $text;
3716
2664 my $timeout = time + ((delete $arg{timeout}) || 60); 3717 my $timeout = (int time) + ((delete $arg{timeout}) || 60);
2665 3718
2666 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 3719 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2667 3720
2668 if (my $item = $self->{item}{$group}) { 3721 if (my $item = $self->{item}{$group}) {
2669 if ($item->{text} eq $text) { 3722 if ($item->{text} eq $text) {
2670 $item->{count}++; 3723 $item->{count}++;
2671 } else { 3724 } else {
2672 $item->{count} = 1; 3725 $item->{count} = 1;
2673 $item->{text} = $item->{tooltip} = $text; 3726 $item->{text} = $item->{tooltip} = $text;
2674 } 3727 }
2675 $item->{id} = ++$self->{id}; 3728 $item->{id} += 0.2;#d#
2676 $item->{timeout} = $timeout; 3729 $item->{timeout} = $timeout;
2677 delete $item->{label}; 3730 delete $item->{label};
2678 } else { 3731 } else {
2679 $self->{item}{$group} = { 3732 $self->{item}{$group} = {
2680 id => ++$self->{id}, 3733 id => ++$self->{id},
2681 text => $text, 3734 text => $text,
2682 timeout => $timeout, 3735 timeout => $timeout,
2683 tooltip => $text, 3736 tooltip => $text,
2684 fontsize => 0.8,
2685 color => [0.8, 0.8, 0.8, 0.8], 3737 fg => [0.8, 0.8, 0.8, 0.8],
2686 pri => 0, 3738 pri => 0,
2687 count => 1, 3739 count => 1,
2688 %arg, 3740 %arg,
2689 }; 3741 };
2690 } 3742 }
2691 3743
3744 $ROOT->on_refresh (reorder => sub {
3745 $self->reorder;
3746 });
3747}
3748
3749sub reconfigure {
3750 my ($self) = @_;
3751
3752 delete $_->{label}
3753 for values %{ $self->{item} || {} };
3754
2692 $self->reorder; 3755 $self->reorder;
3756 $self->SUPER::reconfigure;
3757}
3758
3759sub destroy {
3760 my ($self) = @_;
3761
3762 $self->{timer}->cancel;
3763
3764 $self->SUPER::destroy;
2693} 3765}
2694 3766
2695############################################################################# 3767#############################################################################
2696 3768
2697package CFClient::UI::Root; 3769package CFPlus::UI::Root;
2698 3770
2699our @ISA = CFClient::UI::Container::; 3771our @ISA = CFPlus::UI::Container::;
2700 3772
3773use List::Util qw(min max);
3774
2701use CFClient::OpenGL; 3775use CFPlus::OpenGL;
2702 3776
2703sub new { 3777sub new {
2704 my $class = shift; 3778 my $class = shift;
2705 3779
2706 $class->SUPER::new ( 3780 my $self = $class->SUPER::new (
3781 visible => 1,
2707 @_, 3782 @_,
2708 ) 3783 );
2709}
2710 3784
2711sub configure { 3785 CFPlus::weaken ($self->{root} = $self);
2712 my ($self, $x, $y, $w, $h) = @_;
2713 3786
2714 $self->{w} = $w; 3787 $self
2715 $self->{h} = $h;
2716}
2717
2718sub check_size {
2719 my ($self) = @_;
2720
2721 $self->size_allocate ($self->{w}, $self->{h})
2722 if $self->{w};
2723} 3788}
2724 3789
2725sub size_request { 3790sub size_request {
2726 my ($self) = @_; 3791 my ($self) = @_;
2727 3792
2728 ($self->{w}, $self->{h}) 3793 ($self->{w}, $self->{h})
2729} 3794}
2730 3795
3796sub _to_pixel {
3797 my ($coord, $size, $max) = @_;
3798
3799 $coord =
3800 $coord eq "center" ? ($max - $size) * 0.5
3801 : $coord eq "max" ? $max
3802 : $coord;
3803
3804 $coord = 0 if $coord < 0;
3805 $coord = $max - $size if $coord > $max - $size;
3806
3807 int $coord + 0.5
3808}
3809
2731sub size_allocate { 3810sub invoke_size_allocate {
2732 my ($self, $w, $h) = @_; 3811 my ($self, $w, $h) = @_;
2733
2734 my $old_w = $self->{old_w};
2735 my $old_h = $self->{old_h};
2736
2737 if ($old_w && $old_h) {
2738 for my $child ($self->children) {
2739 $child->{x} = int 0.5 + $child->{x} * $w / $old_w;
2740 $child->{w} = int 0.5 + $child->{w} * $w / $old_w;
2741 $child->{req_w} = int 0.5 + $child->{req_w} * $w / $old_w if exists $child->{req_w};
2742 $child->{user_w} = int 0.5 + $child->{user_w} * $w / $old_w if exists $child->{user_w};
2743 $child->{y} = int 0.5 + $child->{y} * $h / $old_h;
2744 $child->{h} = int 0.5 + $child->{h} * $h / $old_h;
2745 $child->{req_h} = int 0.5 + $child->{req_h} * $h / $old_h if exists $child->{req_h};
2746 $child->{user_h} = int 0.5 + $child->{user_h} * $h / $old_h if exists $child->{user_h};
2747 }
2748 }
2749 3812
2750 for my $child ($self->children) { 3813 for my $child ($self->children) {
2751 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3814 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2752 3815
2753 $X = List::Util::max 0, List::Util::min $w - $W, $X; 3816 $X = $child->{force_x} if exists $child->{force_x};
2754 $Y = List::Util::max 0, List::Util::min $h - $H, $Y; 3817 $Y = $child->{force_y} if exists $child->{force_y};
3818
3819 $X = _to_pixel $X, $W, $self->{w};
3820 $Y = _to_pixel $Y, $H, $self->{h};
3821
2755 $child->configure ($X, $Y, $W, $H); 3822 $child->configure ($X, $Y, $W, $H);
2756 } 3823 }
2757 3824
2758 $self->{old_w} = $w; 3825 1
2759 $self->{old_h} = $h;
2760} 3826}
2761 3827
2762sub coord2local { 3828sub coord2local {
2763 my ($self, $x, $y) = @_; 3829 my ($self, $x, $y) = @_;
2764 3830
… …
2772} 3838}
2773 3839
2774sub update { 3840sub update {
2775 my ($self) = @_; 3841 my ($self) = @_;
2776 3842
2777 $self->check_size;
2778 $::WANT_REFRESH++; 3843 $::WANT_REFRESH++;
2779} 3844}
2780 3845
2781sub add { 3846sub add {
2782 my ($self, $child) = @_; 3847 my ($self, @children) = @_;
2783 3848
2784 # integerise window positions 3849 $_->{is_toplevel} = 1
2785 $child->{x} = int $child->{x}; 3850 for @children;
2786 $child->{y} = int $child->{y};
2787 3851
2788 $self->SUPER::add ($child); 3852 $self->SUPER::add (@children);
3853}
3854
3855sub remove {
3856 my ($self, @children) = @_;
3857
3858 $self->SUPER::remove (@children);
3859
3860 delete $self->{is_toplevel}
3861 for @children;
3862
3863 while (@children) {
3864 my $w = pop @children;
3865 push @children, $w->children;
3866 $w->set_invisible;
3867 }
2789} 3868}
2790 3869
2791sub on_refresh { 3870sub on_refresh {
2792 my ($self, $id, $cb) = @_; 3871 my ($self, $id, $cb) = @_;
2793 3872
… …
2806 while ($self->{refresh_hook}) { 3885 while ($self->{refresh_hook}) {
2807 $_->() 3886 $_->()
2808 for values %{delete $self->{refresh_hook}}; 3887 for values %{delete $self->{refresh_hook}};
2809 } 3888 }
2810 3889
2811 if ($self->{check_size}) { 3890 if ($self->{realloc}) {
2812 my @queue = ([], []); 3891 my %queue;
3892 my @queue;
3893 my $widget;
2813 3894
2814 for (;;) { 3895 outer:
2815 if ($self->{check_size}) { 3896 while () {
2816 # heuristic: check containers last 3897 if (my $realloc = delete $self->{realloc}) {
2817 push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_ 3898 for $widget (values %$realloc) {
2818 for values %{delete $self->{check_size}} 3899 $widget->{visible} or next; # do not resize invisible widgets
3900
3901 $queue{$widget+0}++ and next; # duplicates are common
3902
3903 push @{ $queue[$widget->{visible}] }, $widget;
3904 }
2819 } 3905 }
2820 3906
2821 my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last; 3907 while () {
3908 @queue or last outer;
2822 3909
2823 my ($w, $h) = $widget->{user_w} && $widget->{user_h} 3910 $widget = pop @{ $queue[-1] || [] }
2824 ? @$widget{qw(user_w user_h)} 3911 and last;
2825 : $widget->size_request;
2826
2827 if (delete $widget->{force_alloc}
2828 or $w != $widget->{req_w} or $h != $widget->{req_h}) {
2829 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
2830 3912
3913 pop @queue;
3914 }
3915
3916 delete $queue{$widget+0};
3917
3918 my ($w, $h) = $widget->size_request;
3919
3920 $w = max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3921 $h = max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3922
3923 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3924 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3925
3926 $w = $widget->{force_w} if exists $widget->{force_w};
3927 $h = $widget->{force_h} if exists $widget->{force_h};
3928
3929 if ($widget->{req_w} != $w || $widget->{req_h} != $h
3930 || delete $widget->{force_realloc}) {
2831 $widget->{req_w} = $w; 3931 $widget->{req_w} = $w;
2832 $widget->{req_h} = $h; 3932 $widget->{req_h} = $h;
2833 3933
2834 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h]; 3934 $self->{size_alloc}{$widget+0} = $widget;
2835 3935
2836 $widget->{parent}->check_size
2837 if $widget->{parent}; 3936 if (my $parent = $widget->{parent}) {
3937 $self->{realloc}{$parent+0} = $parent
3938 unless $queue{$parent+0};
3939
3940 $parent->{force_size_alloc} = 1;
3941 $self->{size_alloc}{$parent+0} = $parent;
3942 }
2838 } 3943 }
3944
3945 delete $self->{realloc}{$widget+0};
2839 } 3946 }
2840 } 3947 }
2841 3948
2842 while ($self->{size_alloc}) { 3949 while (my $size_alloc = delete $self->{size_alloc}) {
2843 for (values %{delete $self->{size_alloc}}) { 3950 my @queue = sort { $b->{visible} <=> $a->{visible} }
2844 my ($widget, $w, $h) = @$_; 3951 values %$size_alloc;
3952
3953 while () {
3954 my $widget = pop @queue || last;
3955
3956 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
2845 3957
2846 $w = 0 if $w < 0; 3958 $w = 0 if $w < 0;
2847 $h = 0 if $h < 0; 3959 $h = 0 if $h < 0;
2848 3960
3961 $w = max $widget->{min_w}, $w;
3962 $h = max $widget->{min_h}, $h;
3963
3964# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
3965# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
3966
3967 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3968 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3969
3970 $w = int $w + 0.5;
3971 $h = int $h + 0.5;
3972
3973 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3974 $widget->{old_w} = $widget->{w};
3975 $widget->{old_h} = $widget->{h};
3976
2849 $widget->{w} = $w; 3977 $widget->{w} = $w;
2850 $widget->{h} = $h; 3978 $widget->{h} = $h;
2851 $widget->size_allocate ($w, $h); 3979
2852 $widget->emit (size_allocate => $w, $h); 3980 $widget->emit (size_allocate => $w, $h);
3981 }
2853 } 3982 }
2854 } 3983 }
2855 3984
2856 while ($self->{post_alloc_hook}) { 3985 while ($self->{post_alloc_hook}) {
2857 $_->() 3986 $_->()
2858 for values %{delete $self->{post_alloc_hook}}; 3987 for values %{delete $self->{post_alloc_hook}};
2859 } 3988 }
2860 3989
3990
2861 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3991 glViewport 0, 0, $::WIDTH, $::HEIGHT;
2862 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3992 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2863 glClear GL_COLOR_BUFFER_BIT; 3993 glClear GL_COLOR_BUFFER_BIT;
2864 3994
2865 glMatrixMode GL_PROJECTION; 3995 glMatrixMode GL_PROJECTION;
2866 glLoadIdentity; 3996 glLoadIdentity;
2867 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000; 3997 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
2868 glMatrixMode GL_MODELVIEW; 3998 glMatrixMode GL_MODELVIEW;
2869 glLoadIdentity; 3999 glLoadIdentity;
2870 4000
4001 {
4002 package CFPlus::UI::Base;
4003
4004 local ($draw_x, $draw_y, $draw_w, $draw_h) =
4005 (0, 0, $self->{w}, $self->{h});
4006
2871 $self->_draw; 4007 $self->_draw;
4008 }
2872} 4009}
2873 4010
2874############################################################################# 4011#############################################################################
2875 4012
2876package CFClient::UI; 4013package CFPlus::UI;
2877 4014
2878$ROOT = new CFClient::UI::Root; 4015$ROOT = new CFPlus::UI::Root;
2879$TOOLTIP = new CFClient::UI::Tooltip; 4016$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
2880 4017
28811 40181
2882 4019

Diff Legend

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