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

Diff Legend

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