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

Diff Legend

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