ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/DC/UI.pm
(Generate patch)

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

Diff Legend

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