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.376 by root, Mon Jul 16 20:20:23 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
809 $self->{view_x} = int $x; 991 $self->{view_x} = max 0, min $self->child->{w} - $self->{w}, int $x;
810 $self->{view_y} = int $y; 992 $self->{view_y} = max 0, min $self->child->{h} - $self->{h}, int $y;
811 993
994 $self->emit (changed => $self->{view_x}, $self->{view_y});
812 $self->update; 995 $self->update;
813} 996}
814 997
815# hmm, this does not work for topleft of $self... but we should not ask for that 998# hmm, this does not work for topleft of $self... but we should not ask for that
816sub coord2local { 999sub coord2local {
… …
834 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w} 1017 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
835 && $y >= $self->{y} && $y < $self->{y} + $self->{h} 1018 && $y >= $self->{y} && $y < $self->{y} + $self->{h}
836 ) { 1019 ) {
837 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y}) 1020 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
838 } else { 1021 } else {
839 $self->CFClient::UI::Base::find_widget ($x, $y) 1022 $self->CFPlus::UI::Base::find_widget ($x, $y)
840 } 1023 }
841} 1024}
842 1025
843sub _render { 1026sub _render {
844 my ($self) = @_; 1027 my ($self) = @_;
845 1028
1029 local $CFPlus::UI::Base::draw_x = $CFPlus::UI::Base::draw_x - $self->{view_x};
1030 local $CFPlus::UI::Base::draw_y = $CFPlus::UI::Base::draw_y - $self->{view_y};
1031
846 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 1032 CFPlus::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
847 1033
848 $self->SUPER::_render; 1034 $self->SUPER::_render;
849} 1035}
850 1036
851############################################################################# 1037#############################################################################
852 1038
853package CFClient::UI::ScrolledWindow; 1039package CFPlus::UI::ScrolledWindow;
854 1040
855our @ISA = CFClient::UI::HBox::; 1041our @ISA = CFPlus::UI::Table::;
856 1042
857sub new { 1043sub new {
858 my $class = shift; 1044 my ($class, %arg) = @_;
1045
1046 my $child = delete $arg{child};
859 1047
860 my $self; 1048 my $self;
861 1049
862 my $slider = new CFClient::UI::Slider 1050 my $hslider = new CFPlus::UI::Slider
863 vertical => 1, 1051 vertical => 0,
864 range => [0, 0, 1, 0.01], # HACK fix 1052 range => [0, 0, 1, 0.01], # HACK fix
865 connect_changed => sub { 1053 on_changed => sub {
866 $self->{vp}->set_offset (0, $_[1]); 1054 $self->{hpos} = $_[1];
1055 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
867 }, 1056 },
868 ; 1057 ;
869 1058
1059 my $vslider = new CFPlus::UI::Slider
1060 vertical => 1,
1061 range => [0, 0, 1, 0.01], # HACK fix
1062 on_changed => sub {
1063 $self->{vpos} = $_[1];
1064 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1065 },
1066 ;
1067
870 $self = $class->SUPER::new ( 1068 $self = $class->SUPER::new (
871 vp => (new CFClient::UI::ViewPort expand => 1), 1069 scroll_x => 0,
1070 scroll_y => 1,
1071 can_events => 1,
872 slider => $slider, 1072 hslider => $hslider,
873 @_, 1073 vslider => $vslider,
1074 col_expand => [1, 0],
1075 row_expand => [1, 0],
1076 %arg,
874 ); 1077 );
875 1078
876 $self->{vp}->add ($self->{scrolled}); 1079 $self->{vp} = new CFPlus::UI::ViewPort
1080 expand => 1,
1081 scroll_x => $self->{scroll_x},
1082 scroll_y => $self->{scroll_y},
1083 on_changed => sub {
1084 my ($vp, $x, $y) = @_;
1085 $vp->{parent}{hslider}->set_value ($x);
1086 $vp->{parent}{vslider}->set_value ($y);
1087
1088 0
1089 },
1090 ;
1091
877 $self->add ($self->{vp}); 1092 $self->SUPER::add (0, 0, $self->{vp});
878 $self->add ($self->{slider}); 1093
1094 $self->add ($child) if $child;
879 1095
880 $self 1096 $self
881} 1097}
882 1098
1099#TODO# update range on size_allocate depending on child
1100
1101sub add {
1102 my ($self, $widget) = @_;
1103
1104 $self->{vp}->add ($self->{child} = $widget);
1105}
1106
1107sub update_slider {
1108 my ($self) = @_;
1109
1110 my $child = ($self->{vp} or return)->child;
1111
1112 my ($w1, $w2) = ($child->{w}, $self->{vp}{w});
1113 $self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]);
1114
1115 my $visible = $w1 > $w2;
1116 if ($visible != $self->{hslider}{visible}) {
1117 $visible ? $self->SUPER::add (0, 1, $self->{hslider})
1118 : $self->{hslider}->hide;
1119 }
1120
1121 my ($h1, $h2) = ($child->{h}, $self->{vp}{h});
1122 $self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]);
1123
1124 my $visible = $h1 > $h2;
1125 if ($visible != $self->{vslider}{visible}) {
1126 $visible ? $self->SUPER::add (1, 0, $self->{vslider})
1127 : $self->{vslider}->hide;
1128 }
1129}
1130
883sub update { 1131sub update {
884 my ($self) = @_; 1132 my ($self) = @_;
885 1133
886 $self->SUPER::update; 1134 $self->SUPER::update;
887 1135 $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} 1136}
892 1137
1138sub invoke_mouse_wheel {
1139 my ($self, $ev) = @_;
1140
1141 return 0 unless $ev->{dy}; # only vertical movements for now
1142
1143 $self->{vslider}->emit (mouse_wheel => $ev);
1144
1145 1
1146}
1147
1148sub invoke_button_down {
1149 my ($self, $ev, $x, $y) = @_;
1150
1151 if ($ev->{button} == 2) {
1152 $self->grab_focus;
1153
1154 my $ox = $self->{vp}{view_x} + $ev->{x};
1155 my $oy = $self->{vp}{view_y} + $ev->{y};
1156
1157 $self->{motion} = sub {
1158 my ($ev, $x, $y) = @_;
1159
1160 $self->{vp}->set_offset ($ox - $ev->{x}, $oy - $ev->{y});
1161 $self->update;
1162 };
1163
1164 return 1;
1165 }
1166
1167 0
1168}
1169
1170sub invoke_button_up {
1171 my ($self, $ev, $x, $y) = @_;
1172
1173 if (delete $self->{motion}) {
1174 return 1;
1175 }
1176
1177 0
1178}
1179
1180sub invoke_mouse_motion {
1181 my ($self, $ev, $x, $y) = @_;
1182
1183 if ($self->{motion}) {
1184 $self->{motion}->($ev, $x, $y);
1185 return 1;
1186 }
1187
1188 0
1189}
1190
893sub size_allocate { 1191sub invoke_size_allocate {
894 my ($self, $w, $h) = @_; 1192 my ($self, $w, $h) = @_;
895 1193
1194 $self->update_slider;
896 $self->SUPER::size_allocate ($w, $h); 1195 $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} 1196}
901
902#TODO# update range on size_allocate depending on child
903# update viewport offset on scroll
904 1197
905############################################################################# 1198#############################################################################
906 1199
907package CFClient::UI::Frame; 1200package CFPlus::UI::Frame;
908 1201
909our @ISA = CFClient::UI::Bin::; 1202our @ISA = CFPlus::UI::Bin::;
910 1203
911use CFClient::OpenGL; 1204use CFPlus::OpenGL;
912 1205
913sub new { 1206sub new {
914 my $class = shift; 1207 my $class = shift;
915 1208
916 $class->SUPER::new ( 1209 $class->SUPER::new (
… …
924 1217
925 if ($self->{bg}) { 1218 if ($self->{bg}) {
926 my ($w, $h) = @$self{qw(w h)}; 1219 my ($w, $h) = @$self{qw(w h)};
927 1220
928 glEnable GL_BLEND; 1221 glEnable GL_BLEND;
929 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1222 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
930 glColor @{ $self->{bg} }; 1223 glColor_premultiply @{ $self->{bg} };
931 1224
932 glBegin GL_QUADS; 1225 glBegin GL_QUADS;
933 glVertex 0 , 0; 1226 glVertex 0 , 0;
934 glVertex 0 , $h; 1227 glVertex 0 , $h;
935 glVertex $w, $h; 1228 glVertex $w, $h;
… …
942 $self->SUPER::_draw; 1235 $self->SUPER::_draw;
943} 1236}
944 1237
945############################################################################# 1238#############################################################################
946 1239
947package CFClient::UI::FancyFrame; 1240package CFPlus::UI::FancyFrame;
948 1241
949our @ISA = CFClient::UI::Bin::; 1242our @ISA = CFPlus::UI::Bin::;
950 1243
951use CFClient::OpenGL; 1244use 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 1245
957sub new { 1246sub new {
958 my $class = shift; 1247 my ($class, %arg) = @_;
959 1248
960 # TODO: user_x, user_y, overwrite moveto? 1249 if ((exists $arg{label}) && !ref $arg{label}) {
1250 $arg{label} = new CFPlus::UI::Label
1251 align => 1,
1252 valign => 0,
1253 text => $arg{label},
1254 fontsize => ($arg{border} || 0.8) * 0.75;
1255 }
1256
1257 my $self = $class->SUPER::new (
1258 # label => "",
1259 fg => [0.6, 0.3, 0.1],
1260 border => 0.8,
1261 style => 'single',
1262 %arg,
1263 );
1264
1265 $self
1266}
1267
1268sub add {
1269 my ($self, @widgets) = @_;
1270
1271 $self->SUPER::add (@widgets);
1272 $self->CFPlus::UI::Container::add ($self->{label}) if $self->{label};
1273}
1274
1275sub border {
1276 int $_[0]{border} * $::FONTSIZE
1277}
1278
1279sub size_request {
1280 my ($self) = @_;
1281
1282 ($self->{label_w}, undef) = $self->{label}->size_request
1283 if $self->{label};
1284
1285 my ($w, $h) = $self->SUPER::size_request;
1286
1287 (
1288 $w + $self->border * 2,
1289 $h + $self->border * 2,
1290 )
1291}
1292
1293sub invoke_size_allocate {
1294 my ($self, $w, $h) = @_;
1295
1296 my $border = $self->border;
1297
1298 $w -= List::Util::max 0, $border * 2;
1299 $h -= List::Util::max 0, $border * 2;
1300
1301 if (my $label = $self->{label}) {
1302 $label->{w} = List::Util::max 0, List::Util::min $self->{label_w}, $w - $border * 2;
1303 $label->{h} = List::Util::min $h, $border;
1304 $label->invoke_size_allocate ($label->{w}, $label->{h});
1305 }
1306
1307 $self->child->configure ($border, $border, $w, $h);
1308
1309 1
1310}
1311
1312sub _draw {
1313 my ($self) = @_;
1314
1315 my $child = $self->{children}[0];
1316
1317 my $border = $self->border;
1318 my ($w, $h) = ($self->{w}, $self->{h});
1319
1320 $child->draw;
1321
1322 glColor @{$self->{fg}};
1323 glBegin GL_LINE_STRIP;
1324 glVertex $border * 1.5 , $border * 0.5 + 0.5;
1325 glVertex $border * 0.5 + 0.5, $border * 0.5 + 0.5;
1326 glVertex $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
1327 glVertex $w - $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
1328 glVertex $w - $border * 0.5 + 0.5, $border * 0.5 + 0.5;
1329 glVertex $self->{label} ? $border * 2 + $self->{label}{w} : $border * 1.5, $border * 0.5 + 0.5;
1330 glEnd;
1331
1332 if ($self->{label}) {
1333 glTranslate $border * 2, 0;
1334 $self->{label}->_draw;
1335 }
1336}
1337
1338#############################################################################
1339
1340package CFPlus::UI::Toplevel;
1341
1342our @ISA = CFPlus::UI::Bin::;
1343
1344use CFPlus::OpenGL;
1345
1346my $bg =
1347 new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png",
1348 mipmap => 1, wrap => 1;
1349
1350my @border =
1351 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1352 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1353
1354sub new {
1355 my ($class, %arg) = @_;
961 1356
962 my $self = $class->SUPER::new ( 1357 my $self = $class->SUPER::new (
963 bg => [1, 1, 1, 1], 1358 bg => [1, 1, 1, 1],
964 border_bg => [1, 1, 1, 1], 1359 border_bg => [1, 1, 1, 1],
965 border => 0.6, 1360 border => 0.6,
966 is_toplevel => 1,
967 can_events => 1, 1361 can_events => 1,
968 @_ 1362 min_w => 64,
1363 min_h => 32,
1364 %arg,
969 ); 1365 );
970 1366
971 $self->{title} &&= new CFClient::UI::Label 1367 $self->{title_widget} = new CFPlus::UI::Label
972 align => 0, 1368 align => 0,
973 valign => 1, 1369 valign => 1,
974 text => $self->{title}, 1370 text => $self->{title},
975 fontsize => $self->{border}; 1371 fontsize => $self->{border},
1372 if exists $self->{title};
1373
1374 if ($self->{has_close_button}) {
1375 $self->{close_button} =
1376 new CFPlus::UI::ImageButton
1377 path => 'x1_close.png',
1378 on_activate => sub { $self->emit ("delete") };
1379
1380 $self->CFPlus::UI::Container::add ($self->{close_button});
1381 }
976 1382
977 $self 1383 $self
1384}
1385
1386sub add {
1387 my ($self, @widgets) = @_;
1388
1389 $self->SUPER::add (@widgets);
1390 $self->CFPlus::UI::Container::add ($self->{close_button}) if $self->{close_button};
1391 $self->CFPlus::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
978} 1392}
979 1393
980sub border { 1394sub border {
981 int $_[0]{border} * $::FONTSIZE 1395 int $_[0]{border} * $::FONTSIZE
982} 1396}
983 1397
984sub size_request { 1398sub size_request {
985 my ($self) = @_; 1399 my ($self) = @_;
1400
1401 $self->{title_widget}->size_request
1402 if $self->{title_widget};
1403
1404 $self->{close_button}->size_request
1405 if $self->{close_button};
986 1406
987 my ($w, $h) = $self->SUPER::size_request; 1407 my ($w, $h) = $self->SUPER::size_request;
988 1408
989 ( 1409 (
990 $w + $self->border * 2, 1410 $w + $self->border * 2,
991 $h + $self->border * 2, 1411 $h + $self->border * 2,
992 ) 1412 )
993} 1413}
994 1414
995sub size_allocate { 1415sub invoke_size_allocate {
996 my ($self, $w, $h) = @_; 1416 my ($self, $w, $h) = @_;
997 1417
1418 if ($self->{title_widget}) {
1419 $self->{title_widget}{w} = $w;
1420 $self->{title_widget}{h} = $h;
1421 $self->{title_widget}->invoke_size_allocate ($w, $h);
1422 }
1423
1424 my $border = $self->border;
1425
998 $h -= List::Util::max 0, $self->border * 2; 1426 $h -= List::Util::max 0, $border * 2;
999 $w -= List::Util::max 0, $self->border * 2; 1427 $w -= List::Util::max 0, $border * 2;
1000 1428
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); 1429 $self->child->configure ($border, $border, $w, $h);
1005}
1006 1430
1431 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
1432 if $self->{close_button};
1433
1434 1
1435}
1436
1437sub invoke_delete {
1438 my ($self) = @_;
1439
1440 $self->hide;
1441
1442 1
1443}
1444
1007sub button_down { 1445sub invoke_button_down {
1008 my ($self, $ev, $x, $y) = @_; 1446 my ($self, $ev, $x, $y) = @_;
1009 1447
1010 my ($w, $h) = @$self{qw(w h)}; 1448 my ($w, $h) = @$self{qw(w h)};
1011 my $border = $self->border; 1449 my $border = $self->border;
1012 1450
… …
1025 my ($ev, $x, $y) = @_; 1463 my ($ev, $x, $y) = @_;
1026 1464
1027 my $dx = $ev->{x} - $ox; 1465 my $dx = $ev->{x} - $ox;
1028 my $dy = $ev->{y} - $oy; 1466 my $dy = $ev->{y} - $oy;
1029 1467
1030 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1); 1468 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
1031 $self->{user_h} = $bh + $dy * ($my ? -1 : 1); 1469 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1470
1032 $self->move ($wx + $dx * $mx, $wy + $dy * $my); 1471 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1033 $self->check_size; 1472 $self->realloc;
1034 }; 1473 };
1035 1474
1036 } elsif ($lr ^ $td) { 1475 } elsif ($lr ^ $td) {
1037 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1476 my ($ox, $oy) = ($ev->{x}, $ev->{y});
1038 my ($bx, $by) = ($self->{x}, $self->{y}); 1477 my ($bx, $by) = ($self->{x}, $self->{y});
… …
1040 $self->{motion} = sub { 1479 $self->{motion} = sub {
1041 my ($ev, $x, $y) = @_; 1480 my ($ev, $x, $y) = @_;
1042 1481
1043 ($x, $y) = ($ev->{x}, $ev->{y}); 1482 ($x, $y) = ($ev->{x}, $ev->{y});
1044 1483
1045 $self->move ($bx + $x - $ox, $by + $y - $oy); 1484 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1046 $self->update; 1485 # HACK: the next line is required to enforce placement
1486 $self->{parent}->invoke_size_allocate ($self->{parent}{w}, $self->{parent}{h});
1047 }; 1487 };
1488 } else {
1489 return 0;
1490 }
1491
1048 } 1492 1
1049} 1493}
1050 1494
1051sub button_up { 1495sub invoke_button_up {
1052 my ($self, $ev, $x, $y) = @_; 1496 my ($self, $ev, $x, $y) = @_;
1053 1497
1054 delete $self->{motion}; 1498 ! ! delete $self->{motion}
1055} 1499}
1056 1500
1057sub mouse_motion { 1501sub invoke_mouse_motion {
1058 my ($self, $ev, $x, $y) = @_; 1502 my ($self, $ev, $x, $y) = @_;
1059 1503
1060 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1504 $self->{motion}->($ev, $x, $y) if $self->{motion};
1505
1506 ! ! $self->{motion}
1507}
1508
1509sub invoke_visibility_change {
1510 my ($self, $visible) = @_;
1511
1512 delete $self->{motion} unless $visible;
1513
1514 0
1061} 1515}
1062 1516
1063sub _draw { 1517sub _draw {
1064 my ($self) = @_; 1518 my ($self) = @_;
1065 1519
1520 my $child = $self->{children}[0];
1521
1066 my ($w, $h ) = ($self->{w}, $self->{h}); 1522 my ($w, $h ) = ($self->{w}, $self->{h});
1067 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1523 my ($cw, $ch) = ($child->{w}, $child->{h});
1068 1524
1069 glEnable GL_TEXTURE_2D; 1525 glEnable GL_TEXTURE_2D;
1070 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1526 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1071 1527
1072 my $border = $self->border; 1528 my $border = $self->border;
1073 1529
1074 glColor @{ $self->{border_bg} }; 1530 glColor @{ $self->{border_bg} };
1075 $tex[1]->draw_quad_alpha (0, 0, $w, $border); 1531 $border[0]->draw_quad_alpha (0, 0, $w, $border);
1076 $tex[3]->draw_quad_alpha (0, $border, $border, $ch); 1532 $border[1]->draw_quad_alpha (0, $border, $border, $ch);
1077 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1533 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1078 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border); 1534 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
1079 1535
1080 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1536 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1081 my $bg = $tex[0]; 1537 glColor @{ $self->{bg} };
1082 1538
1083 # TODO: repeat texture not scale 1539 # TODO: repeat texture not scale
1540 # solve this better(?)
1084 my $rep_x = $cw / $bg->{w}; 1541 $bg->{s} = $cw / $bg->{w};
1085 my $rep_y = $ch / $bg->{h}; 1542 $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); 1543 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1093 } 1544 }
1094 1545
1095 glDisable GL_TEXTURE_2D; 1546 glDisable GL_TEXTURE_2D;
1096 1547
1097 $self->{title}->draw if $self->{title};
1098
1099 $self->child->draw; 1548 $child->draw;
1549
1550 if ($self->{title_widget}) {
1551 glTranslate 0, $border - $self->{h};
1552 $self->{title_widget}->_draw;
1553
1554 glTranslate 0, - ($border - $self->{h});
1555 }
1556
1557 $self->{close_button}->draw
1558 if $self->{close_button};
1100} 1559}
1101 1560
1102############################################################################# 1561#############################################################################
1103 1562
1104package CFClient::UI::Table; 1563package CFPlus::UI::Table;
1105 1564
1106our @ISA = CFClient::UI::Base::; 1565our @ISA = CFPlus::UI::Base::;
1107 1566
1108use List::Util qw(max sum); 1567use List::Util qw(max sum);
1109 1568
1110use CFClient::OpenGL; 1569use CFPlus::OpenGL;
1111 1570
1112sub new { 1571sub new {
1113 my $class = shift; 1572 my $class = shift;
1114 1573
1115 $class->SUPER::new ( 1574 $class->SUPER::new (
1575 children => [],
1116 col_expand => [], 1576 col_expand => [],
1577 row_expand => [],
1117 @_, 1578 @_,
1118 ) 1579 )
1119} 1580}
1120 1581
1121sub children { 1582sub children {
1122 grep $_, map @$_, grep $_, @{ $_[0]{children} } 1583 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1123} 1584}
1124 1585
1586# TODO: store row/col info in child widget and use standard add/del
1125sub add { 1587sub add {
1126 my ($self, $x, $y, $child) = @_; 1588 my ($self) = shift;
1127 1589
1590 while (@_) {
1591 my ($x, $y, $child) = splice @_, 0, 3, ();
1128 $child->set_parent ($self); 1592 $child->set_parent ($self);
1129 $self->{children}[$y][$x] = $child; 1593 $self->{children}[$y][$x] = $child;
1594 }
1130 1595
1131 $self->check_size (1); 1596 $self->{force_realloc} = 1;
1597 $self->{force_size_alloc} = 1;
1598 $self->realloc;
1599}
1600
1601sub remove {
1602 my ($self, $child) = @_;
1603
1604 for (@{ $self->{children} }) {
1605 for (@{ $_ || [] }) {
1606 $_ = undef if $_ == $child;
1607 }
1608 }
1132} 1609}
1133 1610
1134# TODO: move to container class maybe? send children a signal on removal? 1611# TODO: move to container class maybe? send children a signal on removal?
1135sub clear { 1612sub clear {
1136 my ($self) = @_; 1613 my ($self) = @_;
… …
1141 for (@children) { 1618 for (@children) {
1142 delete $_->{parent}; 1619 delete $_->{parent};
1143 $_->hide; 1620 $_->hide;
1144 } 1621 }
1145 1622
1146 $self->check_size (1); 1623 $self->realloc;
1147 $self->update;
1148} 1624}
1149 1625
1150sub get_wh { 1626sub get_wh {
1151 my ($self) = @_; 1627 my ($self) = @_;
1152 1628
… …
1178 (sum @$ws), 1654 (sum @$ws),
1179 (sum @$hs), 1655 (sum @$hs),
1180 ) 1656 )
1181} 1657}
1182 1658
1183sub size_allocate { 1659sub invoke_size_allocate {
1184 my ($self, $w, $h) = @_; 1660 my ($self, $w, $h) = @_;
1185 1661
1186 my ($ws, $hs) = $self->get_wh; 1662 my ($ws, $hs) = $self->get_wh;
1187 1663
1188 my $req_w = (sum @$ws) || 1; 1664 my $req_w = (sum @$ws) || 1;
1189 my $req_h = (sum @$hs) || 1; 1665 my $req_h = (sum @$hs) || 1;
1190 1666
1191 # TODO: nicer code && do row_expand 1667 # TODO: nicer code
1192 my @col_expand = @{$self->{col_expand}}; 1668 my @col_expand = @{$self->{col_expand}};
1193 @col_expand = (1) x @$ws unless @col_expand; 1669 @col_expand = (1) x @$ws unless @col_expand;
1194 my $col_expand = (sum @col_expand) || 1; 1670 my $col_expand = (sum @col_expand) || 1;
1195 1671
1196 # linearly scale sizes
1197 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 1672 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1198 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1199 1673
1200 CFClient::UI::harmonize $ws; 1674 CFPlus::UI::harmonize $ws;
1675
1676 my @row_expand = @{$self->{row_expand}};
1677 @row_expand = (1) x @$ws unless @row_expand;
1678 my $row_expand = (sum @row_expand) || 1;
1679
1680 $hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
1681
1201 CFClient::UI::harmonize $hs; 1682 CFPlus::UI::harmonize $hs;
1202 1683
1203 my $y; 1684 my $y;
1204 1685
1205 for my $r (0 .. $#{$self->{children}}) { 1686 for my $r (0 .. $#{$self->{children}}) {
1206 my $row = $self->{children}[$r] 1687 my $row = $self->{children}[$r]
… …
1220 } 1701 }
1221 1702
1222 $y += $row_h; 1703 $y += $row_h;
1223 } 1704 }
1224 1705
1706 1
1225} 1707}
1226 1708
1227sub find_widget { 1709sub find_widget {
1228 my ($self, $x, $y) = @_; 1710 my ($self, $x, $y) = @_;
1229 1711
… …
1248 } 1730 }
1249} 1731}
1250 1732
1251############################################################################# 1733#############################################################################
1252 1734
1253package CFClient::UI::HBox; 1735package CFPlus::UI::Fixed;
1254 1736
1255# TODO: wrap into common Box base class 1737use List::Util qw(min max);
1256 1738
1257our @ISA = CFClient::UI::Container::; 1739our @ISA = CFPlus::UI::Container::;
1740
1741sub add {
1742 my ($self, $child, $posmode, $x, $y, $sizemode, $w, $h) = @_;
1743
1744 $child->{_fixed} = [$posmode, $x, $y, $sizemode, $w, $h];
1745 $self->SUPER::add ($child);
1746}
1747
1748sub _scale($$$) {
1749 my ($mode, $val, $max) = @_;
1750
1751 $mode eq "abs" ? $val
1752 : $mode eq "rel" ? $val * $max
1753 : 0
1754}
1258 1755
1259sub size_request { 1756sub size_request {
1260 my ($self) = @_; 1757 my ($self) = @_;
1261 1758
1262 my @alloc = map [$_->size_request], @{$self->{children}}; 1759 my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0);
1263 1760
1761 # determine overall size by querying abs widgets
1762 for my $child ($self->visible_children) {
1763 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
1764
1765 if ($pos eq "abs") {
1766 $w = _scale $size, $w, $child->{req_w};
1767 $h = _scale $size, $h, $child->{req_h};
1768
1769 $x1 = min $x1, $x; $x2 = max $x2, $x + $w;
1770 $y1 = min $y1, $y; $y2 = max $y2, $y + $h;
1771 }
1264 ( 1772 }
1265 (List::Util::sum map $_->[0], @alloc), 1773
1266 (List::Util::max map $_->[1], @alloc), 1774 my $W = $x2 - $x1;
1775 my $H = $y2 - $y1;
1776
1777 # now layout remaining widgets
1778 for my $child ($self->visible_children) {
1779 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
1780
1781 if ($pos ne "abs") {
1782 $x = _scale $pos, $x, $W;
1783 $y = _scale $pos, $x, $H;
1784 $w = _scale $size, $w, $child->{req_w};
1785 $h = _scale $size, $h, $child->{req_h};
1786
1787 $x1 = min $x1, $x; $x2 = max $x2, $x + $w;
1788 $y1 = min $y1, $y; $y2 = max $y2, $y + $h;
1789 }
1790 }
1791
1792 my $W = $x2 - $x1;
1793 my $H = $y2 - $y1;
1794
1795 ($W, $H)
1796}
1797
1798sub invoke_size_allocate {
1799 my ($self, $W, $H) = @_;
1800
1801 for my $child ($self->visible_children) {
1802 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
1803
1804 $x = _scale $pos, $x, $W;
1805 $y = _scale $pos, $x, $H;
1806 $w = _scale $size, $w, $child->{req_w};
1807 $h = _scale $size, $h, $child->{req_h};
1808
1809 $child->configure ($x, $y, $w, $h);
1810 }
1811
1812 1
1813}
1814
1815#############################################################################
1816
1817package CFPlus::UI::Box;
1818
1819our @ISA = CFPlus::UI::Container::;
1820
1821sub size_request {
1822 my ($self) = @_;
1823
1824 $self->{vertical}
1825 ? (
1826 (List::Util::max map $_->{req_w}, @{$self->{children}}),
1827 (List::Util::sum map $_->{req_h}, @{$self->{children}}),
1828 )
1829 : (
1830 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1831 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1832 )
1833}
1834
1835sub invoke_size_allocate {
1836 my ($self, $w, $h) = @_;
1837
1838 my $space = $self->{vertical} ? $h : $w;
1839 my @children = $self->visible_children;
1840
1841 my @req;
1842
1843 if ($self->{homogeneous}) {
1844 @req = ($space / (@children || 1)) x @children;
1845 } else {
1846 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @children;
1847 my $req = List::Util::sum @req;
1848
1849 if ($req > $space) {
1850 # ah well, not enough space
1851 $_ *= $space / $req for @req;
1852 } else {
1853 my $expand = (List::Util::sum map $_->{expand}, @children) || 1;
1854
1855 $space = ($space - $req) / $expand; # remaining space to give away
1856
1857 $req[$_] += $space * $children[$_]{expand}
1858 for 0 .. $#children;
1859 }
1860 }
1861
1862 CFPlus::UI::harmonize \@req;
1863
1864 my $pos = 0;
1865 for (0 .. $#children) {
1866 my $alloc = $req[$_];
1867 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1868
1869 $pos += $alloc;
1870 }
1871
1872 1
1873}
1874
1875#############################################################################
1876
1877package CFPlus::UI::HBox;
1878
1879our @ISA = CFPlus::UI::Box::;
1880
1881sub new {
1882 my $class = shift;
1883
1884 $class->SUPER::new (
1885 vertical => 0,
1886 @_,
1267 ) 1887 )
1268} 1888}
1269 1889
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############################################################################# 1890#############################################################################
1312 1891
1313package CFClient::UI::VBox; 1892package CFPlus::UI::VBox;
1314 1893
1315# TODO: wrap into common Box base class 1894our @ISA = CFPlus::UI::Box::;
1316 1895
1317our @ISA = CFClient::UI::Container::; 1896sub new {
1897 my $class = shift;
1318 1898
1319sub size_request { 1899 $class->SUPER::new (
1320 my ($self) = @_; 1900 vertical => 1,
1321 1901 @_,
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 ) 1902 )
1328} 1903}
1329 1904
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############################################################################# 1905#############################################################################
1370 1906
1371package CFClient::UI::Label; 1907package CFPlus::UI::Label;
1372 1908
1373our @ISA = CFClient::UI::DrawBG::; 1909our @ISA = CFPlus::UI::DrawBG::;
1374 1910
1375use CFClient::OpenGL; 1911use CFPlus::OpenGL;
1376 1912
1377sub new { 1913sub new {
1378 my ($class, %arg) = @_; 1914 my ($class, %arg) = @_;
1379 1915
1380 my $self = $class->SUPER::new ( 1916 my $self = $class->SUPER::new (
… …
1383 #active_bg => none 1919 #active_bg => none
1384 #font => default_font 1920 #font => default_font
1385 #text => initial text 1921 #text => initial text
1386 #markup => initial narkup 1922 #markup => initial narkup
1387 #max_w => maximum pixel width 1923 #max_w => maximum pixel width
1924 #style => 0, # render flags
1388 ellipsise => 3, # end 1925 ellipsise => 3, # end
1389 layout => (new CFClient::Layout), 1926 layout => (new CFPlus::Layout),
1390 fontsize => 1, 1927 fontsize => 1,
1391 align => -1, 1928 align => -1,
1392 valign => -1, 1929 valign => -1,
1393 padding => 2, 1930 padding_x => 2,
1931 padding_y => 2,
1394 can_events => 0, 1932 can_events => 0,
1395 %arg 1933 %arg
1396 ); 1934 );
1397 1935
1398 if (exists $self->{template}) { 1936 if (exists $self->{template}) {
1399 my $layout = new CFClient::Layout; 1937 my $layout = new CFPlus::Layout;
1400 $layout->set_text (delete $self->{template}); 1938 $layout->set_text (delete $self->{template});
1401 $self->{template} = $layout; 1939 $self->{template} = $layout;
1402 } 1940 }
1403 1941
1404 if (exists $self->{markup}) { 1942 if (exists $self->{markup}) {
… …
1408 } 1946 }
1409 1947
1410 $self 1948 $self
1411} 1949}
1412 1950
1413sub escape($) {
1414 local $_ = $_[0];
1415
1416 s/&/&amp;/g;
1417 s/>/&gt;/g;
1418 s/</&lt;/g;
1419
1420 $_
1421}
1422
1423sub update { 1951sub update {
1424 my ($self) = @_; 1952 my ($self) = @_;
1425 1953
1426 delete $self->{texture}; 1954 delete $self->{texture};
1427 $self->SUPER::update; 1955 $self->SUPER::update;
1428} 1956}
1429 1957
1958sub realloc {
1959 my ($self) = @_;
1960
1961 delete $self->{ox};
1962 $self->SUPER::realloc;
1963}
1964
1430sub set_text { 1965sub set_text {
1431 my ($self, $text) = @_; 1966 my ($self, $text) = @_;
1432 1967
1433 return if $self->{text} eq "T$text"; 1968 return if $self->{text} eq "T$text";
1434 $self->{text} = "T$text"; 1969 $self->{text} = "T$text";
1435 1970
1436 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1437 $self->{layout}->set_text ($text); 1971 $self->{layout}->set_text ($text);
1438 1972
1973 delete $self->{size_req};
1974 $self->realloc;
1439 $self->update; 1975 $self->update;
1440 $self->check_size;
1441} 1976}
1442 1977
1443sub set_markup { 1978sub set_markup {
1444 my ($self, $markup) = @_; 1979 my ($self, $markup) = @_;
1445 1980
1446 return if $self->{text} eq "M$markup"; 1981 return if $self->{text} eq "M$markup";
1447 $self->{text} = "M$markup"; 1982 $self->{text} = "M$markup";
1448 1983
1449 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1984 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1450 1985
1451 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1452 $self->{layout}->set_markup ($markup); 1986 $self->{layout}->set_markup ($markup);
1453 1987
1988 delete $self->{size_req};
1989 $self->realloc;
1454 $self->update; 1990 $self->update;
1455 $self->check_size;
1456} 1991}
1457 1992
1458sub size_request { 1993sub size_request {
1459 my ($self) = @_; 1994 my ($self) = @_;
1460 1995
1996 $self->{size_req} ||= do {
1461 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1997 $self->{layout}->set_font ($self->{font}) if $self->{font};
1462 $self->{layout}->set_width ($self->{max_w} || -1); 1998 $self->{layout}->set_width ($self->{max_w} || -1);
1463 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1999 $self->{layout}->set_ellipsise ($self->{ellipsise});
1464 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 2000 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1465 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2001 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1466 2002
1467 my ($w, $h) = $self->{layout}->size; 2003 my ($w, $h) = $self->{layout}->size;
1468 2004
1469 if (exists $self->{template}) { 2005 if (exists $self->{template}) {
1470 $self->{template}->set_font ($self->{font}) if $self->{font}; 2006 $self->{template}->set_font ($self->{font}) if $self->{font};
2007 $self->{template}->set_width ($self->{max_w} || -1);
1471 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 2008 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1472 2009
1473 my ($w2, $h2) = $self->{template}->size; 2010 my ($w2, $h2) = $self->{template}->size;
1474 2011
1475 $w = List::Util::max $w, $w2; 2012 $w = List::Util::max $w, $w2;
1476 $h = List::Util::max $h, $h2; 2013 $h = List::Util::max $h, $h2;
2014 }
2015
2016 [$w, $h]
1477 } 2017 };
1478 2018
1479 ( 2019 @{ $self->{size_req} }
1480 $w + $self->{padding} * 2,
1481 $h + $self->{padding} * 2,
1482 )
1483} 2020}
1484 2021
2022sub baseline_shift {
2023 $_[0]{layout}->descent
2024}
2025
1485sub size_allocate { 2026sub invoke_size_allocate {
1486 my ($self, $w, $h) = @_; 2027 my ($self, $w, $h) = @_;
1487 2028
2029 delete $self->{ox};
2030
1488 delete $self->{texture}; 2031 delete $self->{texture}
2032 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
2033
2034 1
1489} 2035}
1490 2036
1491sub set_fontsize { 2037sub set_fontsize {
1492 my ($self, $fontsize) = @_; 2038 my ($self, $fontsize) = @_;
1493 2039
1494 $self->{fontsize} = $fontsize; 2040 $self->{fontsize} = $fontsize;
2041 delete $self->{size_req};
1495 delete $self->{texture}; 2042 delete $self->{texture};
1496 2043
1497 $self->update; 2044 $self->realloc;
1498 $self->check_size; 2045}
2046
2047sub reconfigure {
2048 my ($self) = @_;
2049
2050 delete $self->{size_req};
2051 delete $self->{texture};
2052
2053 $self->SUPER::reconfigure;
1499} 2054}
1500 2055
1501sub _draw { 2056sub _draw {
1502 my ($self) = @_; 2057 my ($self) = @_;
1503 2058
1504 $self->SUPER::_draw; # draw background, if applicable 2059 $self->SUPER::_draw; # draw background, if applicable
1505 2060
1506 my $tex = $self->{texture} ||= do { 2061 my $size = $self->{texture} ||= do {
1507 $self->{layout}->set_foreground (@{$self->{fg}}); 2062 $self->{layout}->set_foreground (@{$self->{fg}});
1508 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2063 $self->{layout}->set_font ($self->{font}) if $self->{font};
1509 $self->{layout}->set_width ($self->{w}); 2064 $self->{layout}->set_width ($self->{w});
1510 $self->{layout}->set_ellipsise ($self->{ellipsise}); 2065 $self->{layout}->set_ellipsise ($self->{ellipsise});
1511 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 2066 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1512 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2067 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1513 2068
1514 my $tex = new_from_layout CFClient::Texture $self->{layout}; 2069 [$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 }; 2070 };
1526 2071
1527 glEnable GL_TEXTURE_2D; 2072 unless (exists $self->{ox}) {
1528 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2073 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
2074 : $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
2075 : ($self->{w} - $size->[0]) * 0.5);
1529 2076
1530 if ($tex->{format} == GL_ALPHA) { 2077 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1531 glColor @{$self->{fg}}; 2078 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1532 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}); 2079 : ($self->{h} - $size->[1]) * 0.5);
1533 } else {
1534 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1535 } 2080 };
1536 2081
1537 glDisable GL_TEXTURE_2D; 2082 my $w = List::Util::min $self->{w} + 4, $size->[0];
2083 my $h = List::Util::min $self->{h} + 2, $size->[1];
2084
2085 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1538} 2086}
1539 2087
1540############################################################################# 2088#############################################################################
1541 2089
1542package CFClient::UI::EntryBase; 2090package CFPlus::UI::EntryBase;
1543 2091
1544our @ISA = CFClient::UI::Label::; 2092our @ISA = CFPlus::UI::Label::;
1545 2093
1546use CFClient::OpenGL; 2094use CFPlus::OpenGL;
1547 2095
1548sub new { 2096sub new {
1549 my $class = shift; 2097 my $class = shift;
1550 2098
1551 $class->SUPER::new ( 2099 $class->SUPER::new (
… …
1555 active_fg => [0, 0, 0], 2103 active_fg => [0, 0, 0],
1556 can_hover => 1, 2104 can_hover => 1,
1557 can_focus => 1, 2105 can_focus => 1,
1558 valign => 0, 2106 valign => 0,
1559 can_events => 1, 2107 can_events => 1,
2108 ellipsise => 0,
1560 #text => ... 2109 #text => ...
2110 #hidden => "*",
1561 @_ 2111 @_
1562 ) 2112 )
1563} 2113}
1564 2114
1565sub _set_text { 2115sub _set_text {
… …
1567 2117
1568 delete $self->{cur_h}; 2118 delete $self->{cur_h};
1569 2119
1570 return if $self->{text} eq $text; 2120 return if $self->{text} eq $text;
1571 2121
1572 delete $self->{texture};
1573
1574 $self->{last_activity} = $::NOW; 2122 $self->{last_activity} = $::NOW;
1575 $self->{text} = $text; 2123 $self->{text} = $text;
1576 2124
1577 $text =~ s/./*/g if $self->{hidden}; 2125 $text =~ s/./*/g if $self->{hidden};
1578 $self->{layout}->set_text ("$text "); 2126 $self->{layout}->set_text ("$text ");
2127 delete $self->{size_req};
1579 2128
1580 $self->_emit (changed => $self->{text}); 2129 $self->emit (changed => $self->{text});
2130
2131 $self->realloc;
2132 $self->update;
1581} 2133}
1582 2134
1583sub set_text { 2135sub set_text {
1584 my ($self, $text) = @_; 2136 my ($self, $text) = @_;
1585 2137
1586 $self->{cursor} = length $text; 2138 $self->{cursor} = length $text;
1587 $self->_set_text ($text); 2139 $self->_set_text ($text);
1588 $self->update;
1589 $self->check_size;
1590} 2140}
1591 2141
1592sub get_text { 2142sub get_text {
1593 $_[0]{text} 2143 $_[0]{text}
1594} 2144}
… …
1599 my ($w, $h) = $self->SUPER::size_request; 2149 my ($w, $h) = $self->SUPER::size_request;
1600 2150
1601 ($w + 1, $h) # add 1 for cursor 2151 ($w + 1, $h) # add 1 for cursor
1602} 2152}
1603 2153
1604sub key_down { 2154sub invoke_key_down {
1605 my ($self, $ev) = @_; 2155 my ($self, $ev) = @_;
1606 2156
1607 my $mod = $ev->{mod}; 2157 my $mod = $ev->{mod};
1608 my $sym = $ev->{sym}; 2158 my $sym = $ev->{sym};
1609 my $uni = $ev->{unicode}; 2159 my $uni = $ev->{unicode};
1610 2160
1611 my $text = $self->get_text; 2161 my $text = $self->get_text;
2162
2163 $self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;
1612 2164
1613 if ($uni == 8) { 2165 if ($uni == 8) {
1614 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 2166 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1615 } elsif ($uni == 127) { 2167 } elsif ($uni == 127) {
1616 substr $text, $self->{cursor}, 1, ""; 2168 substr $text, $self->{cursor}, 1, "";
1617 } elsif ($sym == CFClient::SDLK_LEFT) { 2169 } elsif ($sym == CFPlus::SDLK_LEFT) {
1618 --$self->{cursor} if $self->{cursor}; 2170 --$self->{cursor} if $self->{cursor};
1619 } elsif ($sym == CFClient::SDLK_RIGHT) { 2171 } elsif ($sym == CFPlus::SDLK_RIGHT) {
1620 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 2172 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1621 } elsif ($sym == CFClient::SDLK_HOME) { 2173 } elsif ($sym == CFPlus::SDLK_HOME) {
2174 # what a hack
2175 $self->{cursor} =
2176 (substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/
2177 ? length $1
2178 : 0;
2179 } elsif ($sym == CFPlus::SDLK_END) {
2180 # uh, again
2181 $self->{cursor} =
2182 (substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/
2183 ? $self->{cursor} + length $1
2184 : length $self->{text};
2185 } elsif ($uni == 21) { # ctrl-u
2186 $text = "";
1622 $self->{cursor} = 0; 2187 $self->{cursor} = 0;
1623 } elsif ($sym == CFClient::SDLK_END) {
1624 $self->{cursor} = length $text;
1625 } elsif ($uni == 27) { 2188 } elsif ($uni == 27) {
1626 $self->_emit ('escape'); 2189 $self->emit ('escape');
1627 } elsif ($uni) { 2190 } elsif ($uni == 0x0d) {
2191 substr $text, $self->{cursor}++, 0, "\012";
2192 } elsif ($uni >= 0x20) {
1628 substr $text, $self->{cursor}++, 0, chr $uni; 2193 substr $text, $self->{cursor}++, 0, chr $uni;
2194 } else {
2195 return 0;
1629 } 2196 }
1630 2197
1631 $self->_set_text ($text); 2198 $self->_set_text ($text);
2199
2200 $self->realloc;
1632 $self->update; 2201 $self->update;
1633 $self->check_size;
1634}
1635 2202
2203 1
2204}
2205
1636sub focus_in { 2206sub invoke_focus_in {
1637 my ($self) = @_; 2207 my ($self) = @_;
1638 2208
1639 $self->{last_activity} = $::NOW; 2209 $self->{last_activity} = $::NOW;
1640 2210
1641 $self->SUPER::focus_in; 2211 $self->SUPER::invoke_focus_in
1642} 2212}
1643 2213
1644sub button_down { 2214sub invoke_button_down {
1645 my ($self, $ev, $x, $y) = @_; 2215 my ($self, $ev, $x, $y) = @_;
1646 2216
1647 $self->SUPER::button_down ($ev, $x, $y); 2217 $self->SUPER::invoke_button_down ($ev, $x, $y);
1648 2218
1649 my $idx = $self->{layout}->xy_to_index ($x, $y); 2219 my $idx = $self->{layout}->xy_to_index ($x, $y);
1650 2220
1651 # byte-index to char-index 2221 # byte-index to char-index
1652 my $text = $self->{text}; 2222 my $text = $self->{text};
1653 utf8::encode $text; 2223 utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1654 $self->{cursor} = length substr $text, 0, $idx; 2224 $self->{cursor} = length $text;
1655 2225
1656 $self->_set_text ($self->{text}); 2226 $self->_set_text ($self->{text});
1657 $self->update; 2227 $self->update;
2228
2229 1
1658} 2230}
1659 2231
1660sub mouse_motion { 2232sub invoke_mouse_motion {
1661 my ($self, $ev, $x, $y) = @_; 2233 my ($self, $ev, $x, $y) = @_;
1662# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 2234# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
2235
2236 1
1663} 2237}
1664 2238
1665sub _draw { 2239sub _draw {
1666 my ($self) = @_; 2240 my ($self) = @_;
1667 2241
1668 local $self->{fg} = $self->{fg}; 2242 local $self->{fg} = $self->{fg};
1669 2243
1670 if ($FOCUS == $self) { 2244 if ($FOCUS == $self) {
1671 glColor @{$self->{active_bg}}; 2245 glColor_premultiply @{$self->{active_bg}};
1672 $self->{fg} = $self->{active_fg}; 2246 $self->{fg} = $self->{active_fg};
1673 } else { 2247 } else {
1674 glColor @{$self->{bg}}; 2248 glColor_premultiply @{$self->{bg}};
1675 } 2249 }
1676 2250
1677 glEnable GL_BLEND; 2251 glEnable GL_BLEND;
1678 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2252 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1679 glBegin GL_QUADS; 2253 glBegin GL_QUADS;
1680 glVertex 0 , 0; 2254 glVertex 0 , 0;
1681 glVertex 0 , $self->{h}; 2255 glVertex 0 , $self->{h};
1682 glVertex $self->{w}, $self->{h}; 2256 glVertex $self->{w}, $self->{h};
1683 glVertex $self->{w}, 0; 2257 glVertex $self->{w}, 0;
… …
1694 utf8::encode $text; 2268 utf8::encode $text;
1695 2269
1696 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text) 2270 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)
1697 } 2271 }
1698 2272
1699 glColor @{$self->{fg}};
1700 glBegin GL_LINES; 2273 glBegin GL_LINES;
1701 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy}; 2274 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}; 2275 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1703 glEnd; 2276 glEnd;
1704 } 2277 }
1705} 2278}
1706 2279
2280#############################################################################
2281
1707package CFClient::UI::Entry; 2282package CFPlus::UI::Entry;
1708 2283
1709our @ISA = CFClient::UI::EntryBase::; 2284our @ISA = CFPlus::UI::EntryBase::;
1710 2285
1711use CFClient::OpenGL; 2286use CFPlus::OpenGL;
1712 2287
1713sub key_down { 2288sub invoke_key_down {
1714 my ($self, $ev) = @_; 2289 my ($self, $ev) = @_;
1715 2290
1716 my $sym = $ev->{sym}; 2291 my $sym = $ev->{sym};
1717 2292
1718 if ($sym == 13) { 2293 if ($ev->{uni} == 0x0d || $sym == 13) {
1719 unshift @{$self->{history}}, 2294 unshift @{$self->{history}},
1720 my $txt = $self->get_text; 2295 my $txt = $self->get_text;
2296
1721 $self->{history_pointer} = -1; 2297 $self->{history_pointer} = -1;
1722 $self->{history_saveback} = ''; 2298 $self->{history_saveback} = '';
1723 $self->_emit (activate => $txt); 2299 $self->emit (activate => $txt);
1724 $self->update; 2300 $self->update;
1725 2301
1726 } elsif ($sym == CFClient::SDLK_UP) { 2302 } elsif ($sym == CFPlus::SDLK_UP) {
1727 if ($self->{history_pointer} < 0) { 2303 if ($self->{history_pointer} < 0) {
1728 $self->{history_saveback} = $self->get_text; 2304 $self->{history_saveback} = $self->get_text;
1729 } 2305 }
1730 if (@{$self->{history} || []} > 0) { 2306 if (@{$self->{history} || []} > 0) {
1731 $self->{history_pointer}++; 2307 $self->{history_pointer}++;
… …
1733 $self->{history_pointer} = @{$self->{history} || []} - 1; 2309 $self->{history_pointer} = @{$self->{history} || []} - 1;
1734 } 2310 }
1735 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2311 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1736 } 2312 }
1737 2313
1738 } elsif ($sym == CFClient::SDLK_DOWN) { 2314 } elsif ($sym == CFPlus::SDLK_DOWN) {
1739 $self->{history_pointer}--; 2315 $self->{history_pointer}--;
1740 $self->{history_pointer} = -1 if $self->{history_pointer} < 0; 2316 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1741 2317
1742 if ($self->{history_pointer} >= 0) { 2318 if ($self->{history_pointer} >= 0) {
1743 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2319 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1744 } else { 2320 } else {
1745 $self->set_text ($self->{history_saveback}); 2321 $self->set_text ($self->{history_saveback});
1746 } 2322 }
1747 2323
1748 } else { 2324 } else {
1749 $self->SUPER::key_down ($ev); 2325 return $self->SUPER::invoke_key_down ($ev)
2326 }
2327
1750 } 2328 1
1751
1752} 2329}
1753 2330
1754############################################################################# 2331#############################################################################
1755 2332
2333package CFPlus::UI::TextEdit;
2334
2335our @ISA = CFPlus::UI::EntryBase::;
2336
2337use CFPlus::OpenGL;
2338
2339sub move_cursor_ver {
2340 my ($self, $dy) = @_;
2341
2342 my ($y, $x) = $self->{layout}->index_to_line_x ($self->{cursor});
2343
2344 $y += $dy;
2345
2346 if (defined (my $index = $self->{layout}->line_x_to_index ($y, $x))) {
2347 $self->{cursor} = $index;
2348 delete $self->{cur_h};
2349 $self->update;
2350 return;
2351 }
2352}
2353
2354sub invoke_key_down {
2355 my ($self, $ev) = @_;
2356
2357 my $sym = $ev->{sym};
2358
2359 if ($sym == CFPlus::SDLK_UP) {
2360 $self->move_cursor_ver (-1);
2361 } elsif ($sym == CFPlus::SDLK_DOWN) {
2362 $self->move_cursor_ver (+1);
2363 } else {
2364 return $self->SUPER::invoke_key_down ($ev)
2365 }
2366
2367 1
2368}
2369
2370#############################################################################
2371
1756package CFClient::UI::Button; 2372package CFPlus::UI::Button;
1757 2373
1758our @ISA = CFClient::UI::Label::; 2374our @ISA = CFPlus::UI::Label::;
1759 2375
1760use CFClient::OpenGL; 2376use CFPlus::OpenGL;
1761 2377
1762my @tex = 2378my @tex =
1763 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2379 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1764 qw(b1_button_active.png); 2380 qw(b1_button_active.png);
1765 2381
1766sub new { 2382sub new {
1767 my $class = shift; 2383 my $class = shift;
1768 2384
1769 $class->SUPER::new ( 2385 $class->SUPER::new (
1770 padding => 4, 2386 padding_x => 4,
2387 padding_y => 4,
1771 fg => [1, 1, 1], 2388 fg => [1, 1, 1],
1772 active_fg => [0, 0, 1], 2389 active_fg => [0, 0, 1],
1773 can_hover => 1, 2390 can_hover => 1,
1774 align => 0, 2391 align => 0,
1775 valign => 0, 2392 valign => 0,
1776 can_events => 1, 2393 can_events => 1,
1777 @_ 2394 @_
1778 ) 2395 )
1779} 2396}
1780 2397
1781sub activate { }
1782
1783sub button_up { 2398sub invoke_button_up {
1784 my ($self, $ev, $x, $y) = @_; 2399 my ($self, $ev, $x, $y) = @_;
1785 2400
1786 $self->emit ("activate") 2401 $self->emit ("activate")
1787 if $x >= 0 && $x < $self->{w} 2402 if $x >= 0 && $x < $self->{w}
1788 && $y >= 0 && $y < $self->{h}; 2403 && $y >= 0 && $y < $self->{h};
2404
2405 1
1789} 2406}
1790 2407
1791sub _draw { 2408sub _draw {
1792 my ($self) = @_; 2409 my ($self) = @_;
1793 2410
1794 local $self->{fg} = $self->{fg}; 2411 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1795
1796 if ($GRAB == $self) {
1797 $self->{fg} = $self->{active_fg};
1798 }
1799 2412
1800 glEnable GL_TEXTURE_2D; 2413 glEnable GL_TEXTURE_2D;
1801 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2414 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1802 glColor 0, 0, 0, 1; 2415 glColor 0, 0, 0, 1;
1803 2416
… …
1808 $self->SUPER::_draw; 2421 $self->SUPER::_draw;
1809} 2422}
1810 2423
1811############################################################################# 2424#############################################################################
1812 2425
1813package CFClient::UI::CheckBox; 2426package CFPlus::UI::CheckBox;
1814 2427
1815our @ISA = CFClient::UI::DrawBG::; 2428our @ISA = CFPlus::UI::DrawBG::;
1816 2429
1817my @tex = 2430my @tex =
1818 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2431 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1819 qw(c1_checkbox_bg.png c1_checkbox_active.png); 2432 qw(c1_checkbox_bg.png c1_checkbox_active.png);
1820 2433
1821use CFClient::OpenGL; 2434use CFPlus::OpenGL;
1822 2435
1823sub new { 2436sub new {
1824 my $class = shift; 2437 my $class = shift;
1825 2438
1826 $class->SUPER::new ( 2439 $class->SUPER::new (
1827 padding => 2, 2440 padding_x => 2,
2441 padding_y => 2,
1828 fg => [1, 1, 1], 2442 fg => [1, 1, 1],
1829 active_fg => [1, 1, 0], 2443 active_fg => [1, 1, 0],
1830 bg => [0, 0, 0, 0.2], 2444 bg => [0, 0, 0, 0.2],
1831 active_bg => [1, 1, 1, 0.5], 2445 active_bg => [1, 1, 1, 0.5],
1832 state => 0, 2446 state => 0,
… …
1836} 2450}
1837 2451
1838sub size_request { 2452sub size_request {
1839 my ($self) = @_; 2453 my ($self) = @_;
1840 2454
1841 ($self->{padding} * 2 + 6) x 2 2455 (6) x 2
1842} 2456}
1843 2457
2458sub toggle {
2459 my ($self) = @_;
2460
2461 $self->{state} = !$self->{state};
2462 $self->emit (changed => $self->{state});
2463 $self->update;
2464}
2465
1844sub button_down { 2466sub invoke_button_down {
1845 my ($self, $ev, $x, $y) = @_; 2467 my ($self, $ev, $x, $y) = @_;
1846 2468
1847 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 2469 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1848 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 2470 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1849 $self->{state} = !$self->{state}; 2471 $self->toggle;
1850 $self->_emit (changed => $self->{state}); 2472 } else {
2473 return 0
2474 }
2475
1851 } 2476 1
1852} 2477}
1853 2478
1854sub _draw { 2479sub _draw {
1855 my ($self) = @_; 2480 my ($self) = @_;
1856 2481
1857 $self->SUPER::_draw; 2482 $self->SUPER::_draw;
1858 2483
1859 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 2484 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1860 2485
1861 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; 2486 my ($w, $h) = @$self{qw(w h)};
2487
2488 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
1862 2489
1863 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 2490 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1864 2491
1865 my $tex = $self->{state} ? $tex[1] : $tex[0]; 2492 my $tex = $self->{state} ? $tex[1] : $tex[0];
1866 2493
… …
1869 glDisable GL_TEXTURE_2D; 2496 glDisable GL_TEXTURE_2D;
1870} 2497}
1871 2498
1872############################################################################# 2499#############################################################################
1873 2500
1874package CFClient::UI::Image; 2501package CFPlus::UI::Image;
1875 2502
1876our @ISA = CFClient::UI::Base::; 2503our @ISA = CFPlus::UI::Base::;
1877 2504
1878use CFClient::OpenGL; 2505use CFPlus::OpenGL;
1879use Carp qw/confess/;
1880 2506
1881our %loaded_images; 2507our %texture_cache;
1882 2508
1883sub new { 2509sub new {
1884 my $class = shift; 2510 my $class = shift;
1885 2511
1886 my $self = $class->SUPER::new (can_events => 0, @_); 2512 my $self = $class->SUPER::new (
2513 can_events => 0,
2514 @_,
2515 );
1887 2516
1888 $self->{image} or confess "Image has 'image' not set. This is a fatal error!"; 2517 $self->{path} || $self->{tex}
2518 or Carp::croak "'path' or 'tex' attributes required";
1889 2519
1890 $loaded_images{$self->{image}} ||= 2520 $self->{tex} ||= $texture_cache{$self->{path}} ||=
1891 new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1; 2521 new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;
1892 2522
1893 my $tex = $self->{tex} = $loaded_images{$self->{image}}; 2523 CFPlus::weaken $texture_cache{$self->{path}};
1894 2524
1895 Scalar::Util::weaken $loaded_images{$self->{image}}; 2525 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
1896
1897 $self->{aspect} = $tex->{w} / $tex->{h};
1898 2526
1899 $self 2527 $self
1900} 2528}
1901 2529
2530sub STORABLE_freeze {
2531 my ($self, $cloning) = @_;
2532
2533 $self->{path}
2534 or die "cannot serialise CFPlus::UI::Image on non-loadable images\n";
2535
2536 $self->{path}
2537}
2538
2539sub STORABLE_attach {
2540 my ($self, $cloning, $path) = @_;
2541
2542 $self->new (path => $path)
2543}
2544
1902sub size_request { 2545sub size_request {
1903 my ($self) = @_; 2546 my ($self) = @_;
1904 2547
1905 ($self->{tex}->{w}, $self->{tex}->{h}) 2548 ($self->{tex}{w}, $self->{tex}{h})
1906} 2549}
1907 2550
1908sub _draw { 2551sub _draw {
1909 my ($self) = @_; 2552 my ($self) = @_;
1910 2553
… …
1920 } 2563 }
1921 2564
1922 glEnable GL_TEXTURE_2D; 2565 glEnable GL_TEXTURE_2D;
1923 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2566 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1924 2567
1925 $tex->draw_quad_alpha (0, 0, $w, $h); 2568 $tex->draw_quad (0, 0, $w, $h);
1926 2569
1927 glDisable GL_TEXTURE_2D; 2570 glDisable GL_TEXTURE_2D;
1928} 2571}
1929 2572
1930############################################################################# 2573#############################################################################
1931 2574
2575package CFPlus::UI::ImageButton;
2576
2577our @ISA = CFPlus::UI::Image::;
2578
2579use CFPlus::OpenGL;
2580
2581my %textures;
2582
2583sub new {
2584 my $class = shift;
2585
2586 my $self = $class->SUPER::new (
2587 padding_x => 4,
2588 padding_y => 4,
2589 fg => [1, 1, 1],
2590 active_fg => [0, 0, 1],
2591 can_hover => 1,
2592 align => 0,
2593 valign => 0,
2594 can_events => 1,
2595 @_
2596 );
2597}
2598
2599sub invoke_button_up {
2600 my ($self, $ev, $x, $y) = @_;
2601
2602 $self->emit ("activate")
2603 if $x >= 0 && $x < $self->{w}
2604 && $y >= 0 && $y < $self->{h};
2605
2606 1
2607}
2608
2609#############################################################################
2610
1932package CFClient::UI::VGauge; 2611package CFPlus::UI::VGauge;
1933 2612
1934our @ISA = CFClient::UI::Base::; 2613our @ISA = CFPlus::UI::Base::;
1935 2614
1936use List::Util qw(min max); 2615use List::Util qw(min max);
1937 2616
1938use CFClient::OpenGL; 2617use CFPlus::OpenGL;
1939 2618
1940my %tex = ( 2619my %tex = (
1941 food => [ 2620 food => [
1942 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2621 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1943 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ 2622 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
1944 ], 2623 ],
1945 grace => [ 2624 grace => [
1946 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2625 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/ 2626 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
1948 ], 2627 ],
1949 hp => [ 2628 hp => [
1950 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2629 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1951 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/ 2630 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
1952 ], 2631 ],
1953 mana => [ 2632 mana => [
1954 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2633 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/ 2634 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
1956 ], 2635 ],
1957); 2636);
1958 2637
1959# eg. VGauge->new (gauge => 'food'), default gauge: food 2638# eg. VGauge->new (gauge => 'food'), default gauge: food
… …
2019 my $ycut1 = max 0, min 1, $ycut; 2698 my $ycut1 = max 0, min 1, $ycut;
2020 my $ycut2 = max 0, min 1, $ycut - 1; 2699 my $ycut2 = max 0, min 1, $ycut - 1;
2021 2700
2022 my $h1 = $self->{h} * (1 - $ycut1); 2701 my $h1 = $self->{h} * (1 - $ycut1);
2023 my $h2 = $self->{h} * (1 - $ycut2); 2702 my $h2 = $self->{h} * (1 - $ycut2);
2703 my $h3 = $self->{h};
2704
2705 $_ = $_ * (284-4)/288 + 4/288 for ($h1, $h2, $h3);
2024 2706
2025 glEnable GL_BLEND; 2707 glEnable GL_BLEND;
2026 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2708 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2709 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2027 glEnable GL_TEXTURE_2D; 2710 glEnable GL_TEXTURE_2D;
2028 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2711 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2029 2712
2030 glBindTexture GL_TEXTURE_2D, $t1->{name}; 2713 glBindTexture GL_TEXTURE_2D, $t1->{name};
2031 glBegin GL_QUADS; 2714 glBegin GL_QUADS;
… …
2046 2729
2047 if ($t3) { 2730 if ($t3) {
2048 glBindTexture GL_TEXTURE_2D, $t3->{name}; 2731 glBindTexture GL_TEXTURE_2D, $t3->{name};
2049 glBegin GL_QUADS; 2732 glBegin GL_QUADS;
2050 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2; 2733 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2051 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h}; 2734 glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2052 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h}; 2735 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2053 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2; 2736 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2054 glEnd; 2737 glEnd;
2055 } 2738 }
2056 2739
2057 glDisable GL_BLEND; 2740 glDisable GL_BLEND;
2058 glDisable GL_TEXTURE_2D; 2741 glDisable GL_TEXTURE_2D;
2059} 2742}
2060 2743
2061############################################################################# 2744#############################################################################
2062 2745
2063package CFClient::UI::Gauge; 2746package CFPlus::UI::Gauge;
2064 2747
2065our @ISA = CFClient::UI::VBox::; 2748our @ISA = CFPlus::UI::VBox::;
2066 2749
2067sub new { 2750sub new {
2068 my ($class, %arg) = @_; 2751 my ($class, %arg) = @_;
2069 2752
2070 my $self = $class->SUPER::new ( 2753 my $self = $class->SUPER::new (
… …
2072 can_hover => 1, 2755 can_hover => 1,
2073 can_events => 1, 2756 can_events => 1,
2074 %arg, 2757 %arg,
2075 ); 2758 );
2076 2759
2077 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999"); 2760 $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); 2761 $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"); 2762 $self->add ($self->{max} = new CFPlus::UI::Label valign => -1, align => 0, template => "999");
2080 2763
2081 $self 2764 $self
2082} 2765}
2083 2766
2084sub set_fontsize { 2767sub set_fontsize {
… …
2105 $self->{value}->set_text ($val); 2788 $self->{value}->set_text ($val);
2106} 2789}
2107 2790
2108############################################################################# 2791#############################################################################
2109 2792
2110package CFClient::UI::Slider; 2793package CFPlus::UI::Slider;
2111 2794
2112use strict; 2795use strict;
2113 2796
2114use CFClient::OpenGL; 2797use CFPlus::OpenGL;
2115 2798
2116our @ISA = CFClient::UI::DrawBG::; 2799our @ISA = CFPlus::UI::DrawBG::;
2117 2800
2118my @tex = 2801my @tex =
2119 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 2802 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
2120 qw(s1_slider.png s1_slider_bg.png); 2803 qw(s1_slider.png s1_slider_bg.png);
2121 2804
2122sub new { 2805sub new {
2123 my $class = shift; 2806 my $class = shift;
2124 2807
… …
2131 fg => [1, 1, 1], 2814 fg => [1, 1, 1],
2132 active_fg => [0, 0, 0], 2815 active_fg => [0, 0, 0],
2133 bg => [0, 0, 0, 0.2], 2816 bg => [0, 0, 0, 0.2],
2134 active_bg => [1, 1, 1, 0.5], 2817 active_bg => [1, 1, 1, 0.5],
2135 range => [0, 0, 100, 10, 0], 2818 range => [0, 0, 100, 10, 0],
2136 req_w => $::WIDTH / 80, 2819 min_w => $::WIDTH / 80,
2137 req_h => $::WIDTH / 80, 2820 min_h => $::WIDTH / 80,
2138 vertical => 0, 2821 vertical => 0,
2139 can_hover => 1, 2822 can_hover => 1,
2140 inner_pad => 0.02, 2823 inner_pad => 0.02,
2141 @_ 2824 @_
2142 ); 2825 );
… …
2150sub set_range { 2833sub set_range {
2151 my ($self, $range) = @_; 2834 my ($self, $range) = @_;
2152 2835
2153 ($range, $self->{range}) = ($self->{range}, $range); 2836 ($range, $self->{range}) = ($self->{range}, $range);
2154 2837
2155 $self->update
2156 if "@$range" ne "@{$self->{range}}"; 2838 if ("@$range" ne "@{$self->{range}}") {
2839 $self->update;
2840 $self->set_value ($self->{range}[0]);
2841 }
2157} 2842}
2158 2843
2159sub set_value { 2844sub set_value {
2160 my ($self, $value) = @_; 2845 my ($self, $value) = @_;
2161 2846
… …
2172 if $unit; 2857 if $unit;
2173 2858
2174 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2859 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2175 2860
2176 if ($value != $old_value) { 2861 if ($value != $old_value) {
2177 $self->_emit (changed => $value); 2862 $self->emit (changed => $value);
2178 $self->update; 2863 $self->update;
2179 } 2864 }
2180} 2865}
2181 2866
2182sub size_request { 2867sub size_request {
2183 my ($self) = @_; 2868 my ($self) = @_;
2184 2869
2185 my $w = $self->{req_w}; 2870 ($self->{req_w}, $self->{req_h})
2186 my $h = $self->{req_h};
2187
2188 $self->{vertical} ? ($h, $w) : ($w, $h)
2189} 2871}
2190 2872
2191sub button_down { 2873sub invoke_button_down {
2192 my ($self, $ev, $x, $y) = @_; 2874 my ($self, $ev, $x, $y) = @_;
2193 2875
2194 $self->SUPER::button_down ($ev, $x, $y); 2876 $self->SUPER::invoke_button_down ($ev, $x, $y);
2195 2877
2196 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2878 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2197 2879
2198 $self->mouse_motion ($ev, $x, $y); 2880 $self->invoke_mouse_motion ($ev, $x, $y)
2199} 2881}
2200 2882
2201sub mouse_motion { 2883sub invoke_mouse_motion {
2202 my ($self, $ev, $x, $y) = @_; 2884 my ($self, $ev, $x, $y) = @_;
2203 2885
2204 if ($GRAB == $self) { 2886 if ($GRAB == $self) {
2205 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2887 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2206 2888
2207 my (undef, $lo, $hi, $page) = @{$self->{range}}; 2889 my (undef, $lo, $hi, $page) = @{$self->{range}};
2208 2890
2209 $x = ($x - $self->{click}[1]) / ($w * $self->{scale}); 2891 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2210 2892
2211 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo)); 2893 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2894 } else {
2895 return 0;
2896 }
2897
2212 } 2898 1
2899}
2900
2901sub invoke_mouse_wheel {
2902 my ($self, $ev) = @_;
2903
2904 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
2905
2906 my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
2907
2908 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
2909
2910 ! ! $delta
2213} 2911}
2214 2912
2215sub update { 2913sub update {
2216 my ($self) = @_; 2914 my ($self) = @_;
2217 2915
2218 $CFClient::UI::ROOT->on_post_alloc ($self => sub { 2916 delete $self->{knob_w};
2917 $self->SUPER::update;
2918}
2919
2920sub _draw {
2921 my ($self) = @_;
2922
2923 unless ($self->{knob_w}) {
2219 $self->set_value ($self->{range}[0]); 2924 $self->set_value ($self->{range}[0]);
2220 2925
2221 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2926 my ($value, $lo, $hi, $page) = @{$self->{range}};
2222 my $range = ($hi - $page - $lo) || 1e-100; 2927 my $range = ($hi - $page - $lo) || 1e-100;
2223 2928
… …
2229 $value = ($value - $lo) / $range; 2934 $value = ($value - $lo) / $range;
2230 $value = $value * $self->{scale} + $self->{offset}; 2935 $value = $value * $self->{scale} + $self->{offset};
2231 2936
2232 $self->{knob_x} = $value - $knob_w * 0.5; 2937 $self->{knob_x} = $value - $knob_w * 0.5;
2233 $self->{knob_w} = $knob_w; 2938 $self->{knob_w} = $knob_w;
2234 }); 2939 }
2235
2236 $self->SUPER::update;
2237}
2238
2239sub _draw {
2240 my ($self) = @_;
2241 2940
2242 $self->SUPER::_draw (); 2941 $self->SUPER::_draw ();
2243 2942
2244 glScale $self->{w}, $self->{h}; 2943 glScale $self->{w}, $self->{h};
2245 2944
… …
2265 glDisable GL_TEXTURE_2D; 2964 glDisable GL_TEXTURE_2D;
2266} 2965}
2267 2966
2268############################################################################# 2967#############################################################################
2269 2968
2270package CFClient::UI::ValSlider; 2969package CFPlus::UI::ValSlider;
2271 2970
2272our @ISA = CFClient::UI::HBox::; 2971our @ISA = CFPlus::UI::HBox::;
2273 2972
2274sub new { 2973sub new {
2275 my ($class, %arg) = @_; 2974 my ($class, %arg) = @_;
2276 2975
2277 my $range = delete $arg{range}; 2976 my $range = delete $arg{range};
2278 2977
2279 my $self = $class->SUPER::new ( 2978 my $self = $class->SUPER::new (
2280 slider => (new CFClient::UI::Slider expand => 1, range => $range), 2979 slider => (new CFPlus::UI::Slider expand => 1, range => $range),
2281 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}), 2980 entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
2282 to_value => sub { shift }, 2981 to_value => sub { shift },
2283 from_value => sub { shift }, 2982 from_value => sub { shift },
2284 %arg, 2983 %arg,
2285 ); 2984 );
2286 2985
… …
2306sub set_range { shift->{slider}->set_range (@_) } 3005sub set_range { shift->{slider}->set_range (@_) }
2307sub set_value { shift->{slider}->set_value (@_) } 3006sub set_value { shift->{slider}->set_value (@_) }
2308 3007
2309############################################################################# 3008#############################################################################
2310 3009
2311package CFClient::UI::TextView; 3010package CFPlus::UI::TextScroller;
2312 3011
2313our @ISA = CFClient::UI::HBox::; 3012our @ISA = CFPlus::UI::HBox::;
2314 3013
2315use CFClient::OpenGL; 3014use CFPlus::OpenGL;
2316 3015
2317sub new { 3016sub new {
2318 my $class = shift; 3017 my $class = shift;
2319 3018
2320 my $self = $class->SUPER::new ( 3019 my $self = $class->SUPER::new (
2321 fontsize => 1, 3020 fontsize => 1,
2322 can_events => 0, 3021 can_events => 1,
3022 indent => 0,
2323 #font => default_font 3023 #font => default_font
2324 @_, 3024 @_,
2325 3025
2326 layout => (new CFClient::Layout 1), 3026 layout => (new CFPlus::Layout),
2327 par => [], 3027 par => [],
3028 max_par => 0,
2328 height => 0, 3029 height => 0,
2329 children => [ 3030 children => [
2330 (new CFClient::UI::Empty expand => 1), 3031 (new CFPlus::UI::Empty expand => 1),
2331 (new CFClient::UI::Slider vertical => 1), 3032 (new CFPlus::UI::Slider vertical => 1),
2332 ], 3033 ],
2333 ); 3034 );
2334 3035
2335 $self->{children}[1]->connect (changed => sub { $self->update }); 3036 $self->{children}[1]->connect (changed => sub { $self->update });
2336 3037
… …
2342 3043
2343 $self->{fontsize} = $fontsize; 3044 $self->{fontsize} = $fontsize;
2344 $self->reflow; 3045 $self->reflow;
2345} 3046}
2346 3047
3048sub size_request {
3049 my ($self) = @_;
3050
3051 my ($empty, $slider) = @{ $self->{children} };
3052
3053 local $self->{children} = [$empty, $slider];
3054 $self->SUPER::size_request
3055}
3056
2347sub size_allocate { 3057sub invoke_size_allocate {
2348 my ($self, $w, $h) = @_; 3058 my ($self, $w, $h) = @_;
2349 3059
2350 $self->SUPER::size_allocate ($w, $h); 3060 my ($empty, $slider, @other) = @{ $self->{children} };
3061 $_->configure (@$_{qw(x y req_w req_h)}) for @other;
2351 3062
2352 $self->{layout}->set_font ($self->{font}) if $self->{font}; 3063 $self->{layout}->set_font ($self->{font}) if $self->{font};
2353 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 3064 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2354 $self->{layout}->set_width ($self->{children}[0]{w}); 3065 $self->{layout}->set_width ($empty->{w});
3066 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2355 3067
2356 $self->reflow; 3068 $self->reflow;
2357}
2358 3069
2359sub text_size { 3070 local $self->{children} = [$empty, $slider];
3071 $self->SUPER::invoke_size_allocate ($w, $h)
3072}
3073
3074sub invoke_mouse_wheel {
2360 my ($self, $text, $indent) = @_; 3075 my ($self, $ev) = @_;
3076
3077 return 0 unless $ev->{dy}; # only vertical movements
3078
3079 $self->{children}[1]->emit (mouse_wheel => $ev);
3080
3081 1
3082}
3083
3084sub get_layout {
3085 my ($self, $para) = @_;
2361 3086
2362 my $layout = $self->{layout}; 3087 my $layout = $self->{layout};
2363 3088
3089 $layout->set_font ($self->{font}) if $self->{font};
3090 $layout->set_foreground (@{$para->{fg}});
2364 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 3091 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2365 $layout->set_width ($self->{children}[0]{w} - $indent); 3092 $layout->set_width ($self->{children}[0]{w} - $para->{indent});
3093 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2366 $layout->set_markup ($text); 3094 $layout->set_markup ($para->{markup});
3095
3096 $layout->set_shapes (
3097 map
3098 +(0, $_->baseline_shift +$_->{padding_y} - $_->{h}, $_->{w}, $_->{h}),
3099 @{$para->{widget}}
2367 3100 );
3101
2368 $layout->size 3102 $layout
2369} 3103}
2370 3104
2371sub reflow { 3105sub reflow {
2372 my ($self) = @_; 3106 my ($self) = @_;
2373 3107
… …
2380 3114
2381 # todo: base offset on lines or so, not on pixels 3115 # todo: base offset on lines or so, not on pixels
2382 $self->{children}[1]->set_value ($offset); 3116 $self->{children}[1]->set_value ($offset);
2383} 3117}
2384 3118
3119sub current_paragraph {
3120 my ($self) = @_;
3121
3122 $self->{top_paragraph} - 1
3123}
3124
3125sub scroll_to {
3126 my ($self, $para) = @_;
3127
3128 $para = List::Util::max 0, List::Util::min $#{$self->{par}}, $para;
3129
3130 $self->{scroll_to} = $para;
3131 $self->update;
3132}
3133
2385sub clear { 3134sub clear {
2386 my ($self) = @_; 3135 my ($self) = @_;
3136
3137 my (undef, undef, @other) = @{ $self->{children} };
3138 $self->remove ($_) for @other;
2387 3139
2388 $self->{par} = []; 3140 $self->{par} = [];
2389 $self->{height} = 0; 3141 $self->{height} = 0;
2390 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]); 3142 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2391} 3143}
2392 3144
2393sub add_paragraph { 3145sub add_paragraph {
2394 my ($self, $color, $text, $indent) = @_; 3146 my $self = shift;
2395 3147
2396 for my $line (split /\n/, $text) { 3148 for my $para (@_) {
2397 my ($w, $h) = $self->text_size ($line); 3149 $para = {
3150 fg => [1, 1, 1, 1],
3151 indent => 0,
3152 markup => "",
3153 widget => [],
3154 ref $para ? %$para : (markup => $para),
3155 w => 1e10,
3156 wrapped => 1,
3157 };
3158
3159 $self->add (@{ $para->{widget} }) if @{ $para->{widget} };
3160 push @{$self->{par}}, $para;
3161 }
3162
3163 if (my $max = $self->{max_par}) {
3164 shift @{$self->{par}} while @{$self->{par}} > $max;
3165 }
3166
3167 $self->{need_reflow}++;
3168 $self->update;
3169}
3170
3171sub scroll_to_bottom {
3172 my ($self) = @_;
3173
3174 $self->{scroll_to} = $#{$self->{par}};
3175 $self->update;
3176}
3177
3178sub force_uptodate {
3179 my ($self) = @_;
3180
3181 if (delete $self->{need_reflow}) {
3182 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
3183
3184 my $height = 0;
3185
3186 for my $para (@{$self->{par}}) {
3187 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
3188 my $layout = $self->get_layout ($para);
3189 my ($w, $h) = $layout->size;
3190
3191 $para->{w} = $w + $para->{indent};
3192 $para->{h} = $h;
3193 $para->{wrapped} = $layout->has_wrapped;
3194 }
3195
3196 $para->{y} = $height;
3197 $height += $para->{h};
3198 }
3199
2398 $self->{height} += $h; 3200 $self->{height} = $height;
2399 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line]; 3201 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2400 }
2401 3202
2402 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]); 3203 delete $self->{texture};
3204 }
3205
3206 if (my $paridx = delete $self->{scroll_to}) {
3207 $self->{children}[1]->set_value ($self->{par}[$paridx]{y});
3208 }
2403} 3209}
2404 3210
2405sub update { 3211sub update {
2406 my ($self) = @_; 3212 my ($self) = @_;
2407 3213
… …
2409 3215
2410 return unless $self->{h} > 0; 3216 return unless $self->{h} > 0;
2411 3217
2412 delete $self->{texture}; 3218 delete $self->{texture};
2413 3219
2414 $ROOT->on_post_alloc ($self, sub { 3220 $ROOT->on_post_alloc ($self => sub {
3221 $self->force_uptodate;
3222
2415 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 3223 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2416 3224
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 { 3225 $self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2444 glClearColor 0.5, 0.5, 0.5, 0; 3226 glClearColor 0, 0, 0, 0;
2445 glClear GL_COLOR_BUFFER_BIT; 3227 glClear GL_COLOR_BUFFER_BIT;
2446 3228
3229 package CFPlus::UI::Base;
3230 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3231 (0, 0, $self->{w}, $self->{h});
3232
3233 my $top = int $self->{children}[1]{range}[0];
3234
3235 my $paridx = 0;
3236 my $top_paragraph;
2447 my $top = int $self->{children}[1]{range}[0]; 3237 my $top = int $self->{children}[1]{range}[0];
2448 3238
2449 my $y0 = $top; 3239 my $y0 = $top;
2450 my $y1 = $top + $H; 3240 my $y1 = $top + $H;
2451 3241
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}}) { 3242 for my $para (@{$self->{par}}) {
2463 my $h = $par->[1]; 3243 my $h = $para->{h};
3244 my $y = $para->{y};
2464 3245
2465 if ($y0 < $y + $h && $y < $y1) { 3246 if ($y0 < $y + $h && $y < $y1) {
2466 $layout->set_foreground (@{ $par->[2] }); 3247 my $layout = $self->get_layout ($para);
2467 $layout->set_width ($W - $par->[3]);
2468 $layout->set_markup ($par->[4]);
2469 3248
2470 my ($w, $h, $data, $format, $internalformat) = $layout->render; 3249 $layout->render ($para->{indent}, $y - $y0);
2471 3250
2472 glRasterPos $par->[3], $y - $y0; 3251 if (my @w = @{ $para->{widget} }) {
2473 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data; 3252 my @s = $layout->get_shapes;
3253
3254 for (@w) {
3255 my ($dx, $dy) = splice @s, 0, 2, ();
3256
3257 $_->{x} = $dx + $para->{indent};
3258 $_->{y} = $dy + $y - $y0;
3259
3260 $_->draw;
3261 }
3262 }
2474 } 3263 }
2475 3264
2476 $y += $h; 3265 $paridx++;
3266 $top_paragraph ||= $paridx if $y >= $top;
2477 } 3267 }
2478 3268
2479 glDisable GL_BLEND; 3269 $self->{top_paragraph} = $top_paragraph;
2480 }; 3270 };
2481 }); 3271 });
2482} 3272}
2483 3273
3274sub reconfigure {
3275 my ($self) = @_;
3276
3277 $self->SUPER::reconfigure;
3278
3279 $_->{w} = 1e10 for @{ $self->{par} };
3280 $self->reflow;
3281}
3282
2484sub _draw { 3283sub _draw {
2485 my ($self) = @_; 3284 my ($self) = @_;
2486 3285
2487 glEnable GL_TEXTURE_2D; 3286 glEnable GL_TEXTURE_2D;
2488 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3287 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2489 glColor 1, 1, 1, 1; 3288 glColor 0, 0, 0, 1;
2490 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 3289 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2491 glDisable GL_TEXTURE_2D; 3290 glDisable GL_TEXTURE_2D;
2492 3291
2493 $self->{children}[1]->draw; 3292 $self->{children}[1]->draw;
2494
2495} 3293}
2496 3294
2497############################################################################# 3295#############################################################################
2498 3296
2499package CFClient::UI::Animator; 3297package CFPlus::UI::Animator;
2500 3298
2501use CFClient::OpenGL; 3299use CFPlus::OpenGL;
2502 3300
2503our @ISA = CFClient::UI::Bin::; 3301our @ISA = CFPlus::UI::Bin::;
2504 3302
2505sub moveto { 3303sub moveto {
2506 my ($self, $x, $y) = @_; 3304 my ($self, $x, $y) = @_;
2507 3305
2508 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y]; 3306 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
… …
2536 glPopMatrix; 3334 glPopMatrix;
2537} 3335}
2538 3336
2539############################################################################# 3337#############################################################################
2540 3338
2541package CFClient::UI::Flopper; 3339package CFPlus::UI::Flopper;
2542 3340
2543our @ISA = CFClient::UI::Button::; 3341our @ISA = CFPlus::UI::Button::;
2544 3342
2545sub new { 3343sub new {
2546 my $class = shift; 3344 my $class = shift;
2547 3345
2548 my $self = $class->SUPER::new ( 3346 my $self = $class->SUPER::new (
2549 state => 0, 3347 state => 0,
2550 connect_activate => \&toggle_flopper, 3348 on_activate => \&toggle_flopper,
2551 @_ 3349 @_
2552 ); 3350 );
2553 3351
2554 if ($self->{state}) {
2555 $self->{state} = 0;
2556 $self->toggle_flopper;
2557 }
2558
2559 $self 3352 $self
2560} 3353}
2561 3354
2562sub toggle_flopper { 3355sub toggle_flopper {
2563 my ($self) = @_; 3356 my ($self) = @_;
2564 3357
2565 # TODO: use animation 3358 $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} 3359}
2577 3360
2578############################################################################# 3361#############################################################################
2579 3362
2580package CFClient::UI::Tooltip; 3363package CFPlus::UI::Tooltip;
2581 3364
2582our @ISA = CFClient::UI::Bin::; 3365our @ISA = CFPlus::UI::Bin::;
2583 3366
2584use CFClient::OpenGL; 3367use CFPlus::OpenGL;
2585 3368
2586sub new { 3369sub new {
2587 my $class = shift; 3370 my $class = shift;
2588 3371
2589 $class->SUPER::new ( 3372 $class->SUPER::new (
… …
2593} 3376}
2594 3377
2595sub set_tooltip_from { 3378sub set_tooltip_from {
2596 my ($self, $widget) = @_; 3379 my ($self, $widget) = @_;
2597 3380
3381 $widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
3382 if $widget->{tooltip} =~ /^#(.*)$/;
3383
3384 my $tooltip = $widget->{tooltip};
3385
3386 if ($ENV{CFPLUS_DEBUG} & 2) {
3387 $tooltip .= "\n\n" . (ref $widget) . "\n"
3388 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
3389 . "req $widget->{req_w} $widget->{req_h}\n"
3390 . "visible $widget->{visible}";
3391 }
3392
3393 $tooltip =~ s/^\n+//;
3394 $tooltip =~ s/\n+$//;
3395
2598 $self->add (new CFClient::UI::Label 3396 $self->add (new CFPlus::UI::Label
2599 markup => $widget->{tooltip}, 3397 markup => $tooltip,
2600 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 3398 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2601 fontsize => 0.8, 3399 fontsize => 0.8,
2602 fg => [0, 0, 0, 1], 3400 style => 1, # FLAG_INVERSE
2603 ellipsise => 0, 3401 ellipsise => 0,
2604 font => ($widget->{tooltip_font} || $::FONT_PROP), 3402 font => ($widget->{tooltip_font} || $::FONT_PROP),
2605 ); 3403 );
2606} 3404}
2607 3405
… …
2611 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 3409 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2612 3410
2613 ($w + 4, $h + 4) 3411 ($w + 4, $h + 4)
2614} 3412}
2615 3413
2616sub size_allocate { 3414sub invoke_size_allocate {
2617 my ($self, $w, $h) = @_; 3415 my ($self, $w, $h) = @_;
2618 3416
2619 $self->SUPER::size_allocate ($w - 4, $h - 4); 3417 $self->SUPER::invoke_size_allocate ($w - 4, $h - 4)
3418}
3419
3420sub invoke_visibility_change {
3421 my ($self, $visible) = @_;
3422
3423 return unless $visible;
3424
3425 $self->{root}->on_post_alloc ("move_$self" => sub {
3426 my $widget = $self->{owner}
3427 or return;
3428
3429 if ($widget->{visible}) {
3430 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
3431
3432 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
3433 if $x + $self->{w} > $self->{root}{w};
3434
3435 $self->move_abs ($x, $y);
3436 } else {
3437 $self->hide;
3438 }
3439 });
2620} 3440}
2621 3441
2622sub _draw { 3442sub _draw {
2623 my ($self) = @_; 3443 my ($self) = @_;
2624 3444
… …
2641 glVertex $w, $h; 3461 glVertex $w, $h;
2642 glVertex $w, 0; 3462 glVertex $w, 0;
2643 glEnd; 3463 glEnd;
2644 3464
2645 glTranslate 2 - 0.375, 2 - 0.375; 3465 glTranslate 2 - 0.375, 2 - 0.375;
3466
2646 $self->SUPER::_draw; 3467 $self->SUPER::_draw;
2647} 3468}
2648 3469
2649############################################################################# 3470#############################################################################
2650 3471
2651package CFClient::UI::Face; 3472package CFPlus::UI::Face;
2652 3473
2653our @ISA = CFClient::UI::Base::; 3474our @ISA = CFPlus::UI::DrawBG::;
2654 3475
2655use CFClient::OpenGL; 3476use CFPlus::OpenGL;
2656 3477
2657sub new { 3478sub new {
2658 my $class = shift; 3479 my $class = shift;
2659 3480
2660 my $self = $class->SUPER::new ( 3481 my $self = $class->SUPER::new (
3482 size_w => 32,
3483 size_h => 8,
2661 aspect => 1, 3484 aspect => 1,
2662 can_events => 0, 3485 can_events => 0,
2663 @_, 3486 @_,
2664 ); 3487 );
2665 3488
2666 if ($self->{anim} && $self->{animspeed}) { 3489 if ($self->{anim} && $self->{animspeed}) {
2667 Scalar::Util::weaken (my $widget = $self); 3490 CFPlus::weaken (my $widget = $self);
2668 3491
2669 $self->{timer} = Event->timer ( 3492 $self->{timer} = Event->timer (
2670 at => $self->{animspeed} * int $::NOW / $self->{animspeed}, 3493 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2671 hard => 1, 3494 hard => 1,
2672 interval => $self->{animspeed}, 3495 interval => $self->{animspeed},
2673 cb => sub { 3496 cb => sub {
3497 return unless $::CONN;
3498
2674 ++$widget->{frame}; 3499 ++$widget->{frame};
3500 $self->update_face;
2675 $widget->update; 3501 $self->update;
2676 }, 3502 },
2677 ); 3503 );
3504
3505 $self->update_face;
2678 } 3506 }
2679 3507
2680 $self 3508 $self
2681} 3509}
2682 3510
3511sub update_face {
3512 my ($self) = @_;
3513
3514 return unless $::CONN;
3515
3516 if (my $anim = $::CONN->{anim}[$self->{anim}]) {
3517 if ($anim && @$anim) {
3518 delete $self->{wait_face};
3519 $self->{face} = $anim->[ $self->{frame} % @$anim ];
3520 }
3521 }
3522}
3523
2683sub size_request { 3524sub size_request {
2684 (32, 8) 3525 my ($self) = @_;
3526
3527 if ($::CONN) {
3528 if (my $faceid = $::CONN->{faceid}[$self->{face}]) {
3529 if (my $tex = $::CONN->{texture}[$faceid]) {
3530 return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
3531 } else {
3532 $self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub {
3533 $self->realloc;
3534 });
3535 }
3536 }
3537 }
3538
3539 ($self->{size_w} || 8, $self->{size_h} || 8)
2685} 3540}
2686 3541
2687sub update { 3542sub update {
2688 my ($self) = @_; 3543 my ($self) = @_;
2689 3544
… …
2695sub _draw { 3550sub _draw {
2696 my ($self) = @_; 3551 my ($self) = @_;
2697 3552
2698 return unless $::CONN; 3553 return unless $::CONN;
2699 3554
2700 my $face; 3555 $self->SUPER::_draw;
2701 3556
2702 if ($self->{frame}) {
2703 my $anim = $::CONN->{anim}[$self->{anim}]; 3557 my $faceid = $::CONN->{faceid}[$self->{face}]
2704 3558 or return;
2705 $face = $anim->[ $self->{frame} % @$anim ]
2706 if $anim && @$anim;
2707 }
2708 3559
2709 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 3560 my $tex = $::CONN->{texture}[$faceid];
2710 3561
2711 if ($tex) { 3562 if ($tex) {
2712 glEnable GL_TEXTURE_2D; 3563 glEnable GL_TEXTURE_2D;
2713 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3564 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2714 glColor 1, 1, 1, 1; 3565 glColor 0, 0, 0, 1;
2715 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3566 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2716 glDisable GL_TEXTURE_2D; 3567 glDisable GL_TEXTURE_2D;
2717 } 3568 }
2718} 3569}
2719 3570
2720sub DESTROY { 3571sub destroy {
2721 my ($self) = @_; 3572 my ($self) = @_;
2722 3573
2723 $self->{timer}->cancel 3574 $self->{timer}->cancel
2724 if $self->{timer}; 3575 if $self->{timer};
2725 3576
2726 $self->SUPER::DESTROY; 3577 $self->SUPER::destroy;
2727} 3578}
2728 3579
2729############################################################################# 3580#############################################################################
2730 3581
2731package CFClient::UI::Inventory; 3582package CFPlus::UI::Buttonbar;
2732 3583
2733our @ISA = CFClient::UI::ScrolledWindow::; 3584our @ISA = CFPlus::UI::HBox::;
2734 3585
2735sub new { 3586# 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 3587
2776############################################################################# 3588#############################################################################
2777 3589
2778package CFClient::UI::Menu; 3590package CFPlus::UI::Menu;
2779 3591
2780our @ISA = CFClient::UI::FancyFrame::; 3592our @ISA = CFPlus::UI::Toplevel::;
2781 3593
2782use CFClient::OpenGL; 3594use CFPlus::OpenGL;
2783 3595
2784sub new { 3596sub new {
2785 my $class = shift; 3597 my $class = shift;
2786 3598
2787 my $self = $class->SUPER::new ( 3599 my $self = $class->SUPER::new (
2788 items => [], 3600 items => [],
2789 z => 100, 3601 z => 100,
2790 @_, 3602 @_,
2791 ); 3603 );
2792 3604
2793 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3605 $self->add ($self->{vbox} = new CFPlus::UI::VBox);
2794 3606
2795 for my $item (@{ $self->{items} }) { 3607 for my $item (@{ $self->{items} }) {
2796 my ($widget, $cb) = @$item; 3608 my ($widget, $cb, $tooltip) = @$item;
2797 3609
2798 # handle various types of items, only text for now 3610 # handle various types of items, only text for now
2799 if (!ref $widget) { 3611 if (!ref $widget) {
3612 if ($widget =~ /\t/) {
3613 my ($left, $right) = split /\t/, $widget, 2;
3614
2800 $widget = new CFClient::UI::Label 3615 $widget = new CFPlus::UI::HBox
2801 can_hover => 1, 3616 can_hover => 1,
2802 can_events => 1, 3617 can_events => 1,
3618 tooltip => $tooltip,
3619 children => [
3620 (new CFPlus::UI::Label markup => $left, expand => 1),
3621 (new CFPlus::UI::Label markup => $right, align => +1),
3622 ],
3623 ;
3624
3625 } else {
3626 $widget = new CFPlus::UI::Label
3627 can_hover => 1,
3628 can_events => 1,
2803 text => $widget; 3629 markup => $widget,
3630 tooltip => $tooltip;
3631 }
2804 } 3632 }
2805 3633
2806 $self->{item}{$widget} = $item; 3634 $self->{item}{$widget} = $item;
2807 3635
2808 $self->{vbox}->add ($widget); 3636 $self->{vbox}->add ($widget);
… …
2813 3641
2814# popup given the event (must be a mouse button down event currently) 3642# popup given the event (must be a mouse button down event currently)
2815sub popup { 3643sub popup {
2816 my ($self, $ev) = @_; 3644 my ($self, $ev) = @_;
2817 3645
2818 $self->_emit ("popdown"); 3646 $self->emit ("popdown");
2819 3647
2820 # maybe save $GRAB? must be careful about events... 3648 # maybe save $GRAB? must be careful about events...
2821 $GRAB = $self; 3649 $GRAB = $self;
2822 $self->{button} = $ev->{button}; 3650 $self->{button} = $ev->{button};
2823 3651
2824 $self->show; 3652 $self->show;
2825 $self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 3653 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2826} 3654}
2827 3655
2828sub mouse_motion { 3656sub invoke_mouse_motion {
2829 my ($self, $ev, $x, $y) = @_; 3657 my ($self, $ev, $x, $y) = @_;
2830 3658
2831 # TODO: should use vbox->find_widget or so 3659 # TODO: should use vbox->find_widget or so
2832 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 3660 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2833 $self->{hover} = $self->{item}{$HOVER}; 3661 $self->{hover} = $self->{item}{$HOVER};
2834}
2835 3662
3663 0
3664}
3665
2836sub button_up { 3666sub invoke_button_up {
2837 my ($self, $ev, $x, $y) = @_; 3667 my ($self, $ev, $x, $y) = @_;
2838 3668
2839 if ($ev->{button} == $self->{button}) { 3669 if ($ev->{button} == $self->{button}) {
2840 undef $GRAB; 3670 undef $GRAB;
2841 $self->hide; 3671 $self->hide;
2842 3672
2843 $self->_emit ("popdown"); 3673 $self->emit ("popdown");
2844 $self->{hover}[1]->() if $self->{hover}; 3674 $self->{hover}[1]->() if $self->{hover};
3675 } else {
3676 return 0
3677 }
3678
2845 } 3679 1
2846} 3680}
2847 3681
2848############################################################################# 3682#############################################################################
2849 3683
2850package CFClient::UI::Statusbox; 3684package CFPlus::UI::Multiplexer;
2851 3685
2852our @ISA = CFClient::UI::VBox::; 3686our @ISA = CFPlus::UI::Container::;
2853 3687
2854sub new { 3688sub new {
2855 my $class = shift; 3689 my $class = shift;
2856 3690
2857 $class->SUPER::new ( 3691 my $self = $class->SUPER::new (
3692 @_,
3693 );
3694
3695 $self->{current} = $self->{children}[0]
3696 if @{ $self->{children} };
3697
3698 $self
3699}
3700
3701sub add {
3702 my ($self, @widgets) = @_;
3703
3704 $self->SUPER::add (@widgets);
3705
3706 $self->{current} = $self->{children}[0]
3707 if @{ $self->{children} };
3708}
3709
3710sub get_current_page {
3711 my ($self) = @_;
3712
3713 $self->{current}
3714}
3715
3716sub set_current_page {
3717 my ($self, $page_or_widget) = @_;
3718
3719 my $widget = ref $page_or_widget
3720 ? $page_or_widget
3721 : $self->{children}[$page_or_widget];
3722
3723 $self->{current} = $widget;
3724 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
3725
3726 $self->emit (page_changed => $self->{current});
3727
3728 $self->realloc;
3729}
3730
3731sub visible_children {
3732 $_[0]{current}
3733}
3734
3735sub size_request {
3736 my ($self) = @_;
3737
3738 $self->{current}->size_request
3739}
3740
3741sub invoke_size_allocate {
3742 my ($self, $w, $h) = @_;
3743
3744 $self->{current}->configure (0, 0, $w, $h);
3745
3746 1
3747}
3748
3749sub _draw {
3750 my ($self) = @_;
3751
3752 $self->{current}->draw;
3753}
3754
3755#############################################################################
3756
3757package CFPlus::UI::Notebook;
3758
3759our @ISA = CFPlus::UI::VBox::;
3760
3761sub new {
3762 my $class = shift;
3763
3764 my $self = $class->SUPER::new (
3765 buttonbar => (new CFPlus::UI::Buttonbar),
3766 multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3767 # filter => # will be put between multiplexer and $self
3768 @_,
3769 );
3770
3771 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3772 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3773
3774 $self
3775}
3776
3777sub add {
3778 my ($self, $title, $widget, $tooltip) = @_;
3779
3780 CFPlus::weaken $self;
3781
3782 $self->{buttonbar}->add (new CFPlus::UI::Button
3783 markup => $title,
3784 tooltip => $tooltip,
3785 on_activate => sub { $self->set_current_page ($widget) },
3786 );
3787
3788 $self->{multiplexer}->add ($widget);
3789}
3790
3791sub get_current_page {
3792 my ($self) = @_;
3793
3794 $self->{multiplexer}->get_current_page
3795}
3796
3797sub set_current_page {
3798 my ($self, $page) = @_;
3799
3800 $self->{multiplexer}->set_current_page ($page);
3801 $self->emit (page_changed => $self->{multiplexer}{current});
3802}
3803
3804#############################################################################
3805
3806package CFPlus::UI::Selector;
3807
3808use utf8;
3809
3810our @ISA = CFPlus::UI::Button::;
3811
3812sub new {
3813 my $class = shift;
3814
3815 my $self = $class->SUPER::new (
3816 options => [], # [value, title, longdesc], ...
3817 value => undef,
3818 @_,
3819 );
3820
3821 $self->_set_value ($self->{value});
3822
3823 $self
3824}
3825
3826sub invoke_button_down {
3827 my ($self, $ev) = @_;
3828
3829 my @menu_items;
3830
3831 for (@{ $self->{options} }) {
3832 my ($value, $title, $tooltip) = @$_;
3833
3834 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3835 }
3836
3837 CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
3838}
3839
3840sub _set_value {
3841 my ($self, $value) = @_;
3842
3843 my ($item) = grep $_->[0] eq $value, @{ $self->{options} }
3844 or return;
3845
3846 $self->{value} = $item->[0];
3847 $self->set_markup ("$item->[1] ⇓");
3848 $self->set_tooltip ($item->[2]);
3849}
3850
3851sub set_value {
3852 my ($self, $value) = @_;
3853
3854 return unless $self->{value} ne $value;
3855
3856 $self->_set_value ($value);
3857 $self->emit (changed => $value);
3858}
3859
3860#############################################################################
3861
3862package CFPlus::UI::Statusbox;
3863
3864our @ISA = CFPlus::UI::VBox::;
3865
3866sub new {
3867 my $class = shift;
3868
3869 my $self = $class->SUPER::new (
2858 fontsize => 0.8, 3870 fontsize => 0.8,
2859 @_, 3871 @_,
2860 ) 3872 );
3873
3874 CFPlus::weaken (my $this = $self);
3875
3876 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3877
3878 $self
2861} 3879}
2862 3880
2863sub reorder { 3881sub reorder {
2864 my ($self) = @_; 3882 my ($self) = @_;
2865 my $NOW = time; 3883 my $NOW = Time::HiRes::time;
3884
3885 # freeze display when hovering over any label
3886 return if $CFPlus::UI::TOOLTIP->{owner}
3887 && grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},
3888 values %{ $self->{item} };
2866 3889
2867 while (my ($k, $v) = each %{ $self->{item} }) { 3890 while (my ($k, $v) = each %{ $self->{item} }) {
2868 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3891 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2869 } 3892 }
2870 3893
… …
2873 my @items = sort { 3896 my @items = sort {
2874 $a->{pri} <=> $b->{pri} 3897 $a->{pri} <=> $b->{pri}
2875 or $b->{id} <=> $a->{id} 3898 or $b->{id} <=> $a->{id}
2876 } values %{ $self->{item} }; 3899 } values %{ $self->{item} };
2877 3900
3901 $self->{timer}->interval (1);
3902
2878 my $count = 10 + 1; 3903 my $count = 10 + 1;
2879 for my $item (@items) { 3904 for my $item (@items) {
2880 last unless --$count; 3905 last unless --$count;
2881 3906
2882 push @widgets, $item->{label} ||= do { 3907 my $label = $item->{label} ||= do {
2883 # TODO: doesn't handle markup well (read as: at all) 3908 # TODO: doesn't handle markup well (read as: at all)
2884 my $short = $item->{count} > 1 3909 my $short = $item->{count} > 1
2885 ? "<b>$item->{count} ×</b> $item->{text}" 3910 ? "<b>$item->{count} ×</b> $item->{text}"
2886 : $item->{text}; 3911 : $item->{text};
2887 3912
2888 for ($short) { 3913 for ($short) {
2889 s/^\s+//; 3914 s/^\s+//;
2890 s/\s+/ /g; 3915 s/\s+/ /g;
2891 } 3916 }
2892 3917
2893 new CFClient::UI::Label 3918 new CFPlus::UI::Label
2894 markup => $short, 3919 markup => $short,
2895 tooltip => $item->{tooltip}, 3920 tooltip => $item->{tooltip},
2896 tooltip_font => $::FONT_PROP, 3921 tooltip_font => $::FONT_PROP,
2897 tooltip_width => 0.67, 3922 tooltip_width => 0.67,
2898 fontsize => $item->{fontsize} || $self->{fontsize}, 3923 fontsize => $item->{fontsize} || $self->{fontsize},
2899 max_w => $::WIDTH * 0.44, 3924 max_w => $::WIDTH * 0.44,
2900 fg => $item->{fg}, 3925 fg => [@{ $item->{fg} }],
2901 can_events => 1, 3926 can_events => 1,
2902 can_hover => 1 3927 can_hover => 1
2903 }; 3928 };
3929
3930 if ((my $diff = $item->{timeout} - $NOW) < 2) {
3931 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
3932 $label->update;
3933 $label->set_max_size (undef, $label->{req_h} * $diff)
3934 if $diff < 1;
3935 $self->{timer}->interval (1/30);
3936 } else {
3937 $label->{fg}[3] = $item->{fg}[3] || 1;
3938 }
3939
3940 push @widgets, $label;
2904 } 3941 }
2905 3942
2906 $self->clear; 3943 $self->clear;
2907 $self->SUPER::add (reverse @widgets); 3944 $self->SUPER::add (reverse @widgets);
2908} 3945}
… …
2913 $text =~ s/^\s+//; 3950 $text =~ s/^\s+//;
2914 $text =~ s/\s+$//; 3951 $text =~ s/\s+$//;
2915 3952
2916 return unless $text; 3953 return unless $text;
2917 3954
2918 my $timeout = time + ((delete $arg{timeout}) || 60); 3955 my $timeout = (int time) + ((delete $arg{timeout}) || 60);
2919 3956
2920 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 3957 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2921 3958
2922 if (my $item = $self->{item}{$group}) { 3959 if (my $item = $self->{item}{$group}) {
2923 if ($item->{text} eq $text) { 3960 if ($item->{text} eq $text) {
2924 $item->{count}++; 3961 $item->{count}++;
2925 } else { 3962 } else {
2926 $item->{count} = 1; 3963 $item->{count} = 1;
2927 $item->{text} = $item->{tooltip} = $text; 3964 $item->{text} = $item->{tooltip} = $text;
2928 } 3965 }
2929 $item->{id} = ++$self->{id}; 3966 $item->{id} += 0.2;#d#
2930 $item->{timeout} = $timeout; 3967 $item->{timeout} = $timeout;
2931 delete $item->{label}; 3968 delete $item->{label};
2932 } else { 3969 } else {
2933 $self->{item}{$group} = { 3970 $self->{item}{$group} = {
2934 id => ++$self->{id}, 3971 id => ++$self->{id},
… …
2940 count => 1, 3977 count => 1,
2941 %arg, 3978 %arg,
2942 }; 3979 };
2943 } 3980 }
2944 3981
3982 $ROOT->on_refresh (reorder => sub {
2945 $self->reorder; 3983 $self->reorder;
3984 });
2946} 3985}
2947 3986
2948sub reconfigure { 3987sub reconfigure {
2949 my ($self) = @_; 3988 my ($self) = @_;
2950 3989
… …
2953 3992
2954 $self->reorder; 3993 $self->reorder;
2955 $self->SUPER::reconfigure; 3994 $self->SUPER::reconfigure;
2956} 3995}
2957 3996
3997sub destroy {
3998 my ($self) = @_;
3999
4000 $self->{timer}->cancel;
4001
4002 $self->SUPER::destroy;
4003}
4004
2958############################################################################# 4005#############################################################################
2959 4006
2960package CFClient::UI::Root; 4007package CFPlus::UI::Root;
2961 4008
2962our @ISA = CFClient::UI::Container::; 4009our @ISA = CFPlus::UI::Container::;
2963 4010
4011use List::Util qw(min max);
4012
2964use CFClient::OpenGL; 4013use CFPlus::OpenGL;
2965 4014
2966sub new { 4015sub new {
2967 my $class = shift; 4016 my $class = shift;
2968 4017
2969 $class->SUPER::new ( 4018 my $self = $class->SUPER::new (
2970 visible => 1, 4019 visible => 1,
2971 @_, 4020 @_,
2972 ) 4021 );
2973}
2974 4022
2975sub configure { 4023 CFPlus::weaken ($self->{root} = $self);
2976 my ($self, $x, $y, $w, $h) = @_;
2977 4024
2978 $self->{w} = $w; 4025 $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} 4026}
2988 4027
2989sub size_request { 4028sub size_request {
2990 my ($self) = @_; 4029 my ($self) = @_;
2991 4030
2992 ($self->{w}, $self->{h}) 4031 ($self->{w}, $self->{h})
2993} 4032}
2994 4033
4034sub _to_pixel {
4035 my ($coord, $size, $max) = @_;
4036
4037 $coord =
4038 $coord eq "center" ? ($max - $size) * 0.5
4039 : $coord eq "max" ? $max
4040 : $coord;
4041
4042 $coord = 0 if $coord < 0;
4043 $coord = $max - $size if $coord > $max - $size;
4044
4045 int $coord + 0.5
4046}
4047
2995sub size_allocate { 4048sub invoke_size_allocate {
2996 my ($self, $w, $h) = @_; 4049 my ($self, $w, $h) = @_;
2997 4050
2998 for my $child ($self->children) { 4051 for my $child ($self->children) {
2999 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 4052 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3000 4053
3001 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1 4054 $X = $child->{force_x} if exists $child->{force_x};
3002 if exists $child->{req_x}; 4055 $Y = $child->{force_y} if exists $child->{force_y};
3003 4056
3004 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1 4057 $X = _to_pixel $X, $W, $self->{w};
3005 if exists $child->{req_y}; 4058 $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 4059
3010 $child->configure ($X, $Y, $W, $H); 4060 $child->configure ($X, $Y, $W, $H);
3011 } 4061 }
4062
4063 1
3012} 4064}
3013 4065
3014sub coord2local { 4066sub coord2local {
3015 my ($self, $x, $y) = @_; 4067 my ($self, $x, $y) = @_;
3016 4068
… …
3024} 4076}
3025 4077
3026sub update { 4078sub update {
3027 my ($self) = @_; 4079 my ($self) = @_;
3028 4080
3029 $self->check_size;
3030 $::WANT_REFRESH++; 4081 $::WANT_REFRESH++;
3031} 4082}
3032 4083
3033sub add { 4084sub add {
3034 my ($self, @children) = @_; 4085 my ($self, @children) = @_;
3035 4086
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; 4087 $_->{is_toplevel} = 1
3044 4088 for @children;
3045 # integerise window positions
3046 $child->{x} = int $child->{x};
3047 $child->{y} = int $child->{y};
3048 }
3049 4089
3050 $self->SUPER::add (@children); 4090 $self->SUPER::add (@children);
3051} 4091}
3052 4092
3053sub remove { 4093sub remove {
3054 my ($self, @children) = @_; 4094 my ($self, @children) = @_;
3055 4095
3056 $self->SUPER::remove (@children); 4096 $self->SUPER::remove (@children);
4097
4098 delete $self->{is_toplevel}
4099 for @children;
3057 4100
3058 while (@children) { 4101 while (@children) {
3059 my $w = pop @children; 4102 my $w = pop @children;
3060 push @children, $w->children; 4103 push @children, $w->children;
3061 $w->set_invisible; 4104 $w->set_invisible;
… …
3080 while ($self->{refresh_hook}) { 4123 while ($self->{refresh_hook}) {
3081 $_->() 4124 $_->()
3082 for values %{delete $self->{refresh_hook}}; 4125 for values %{delete $self->{refresh_hook}};
3083 } 4126 }
3084 4127
3085 if ($self->{check_size}) { 4128 if ($self->{realloc}) {
3086 my @queue = ([], []); 4129 my %queue;
4130 my @queue;
4131 my $widget;
3087 4132
3088 for (;;) { 4133 outer:
3089 if ($self->{check_size}) { 4134 while () {
3090 # heuristic: check containers last 4135 if (my $realloc = delete $self->{realloc}) {
3091 push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_ 4136 for $widget (values %$realloc) {
3092 for values %{delete $self->{check_size}} 4137 $widget->{visible} or next; # do not resize invisible widgets
4138
4139 $queue{$widget+0}++ and next; # duplicates are common
4140
4141 push @{ $queue[$widget->{visible}] }, $widget;
4142 }
3093 } 4143 }
3094 4144
3095 my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last; 4145 while () {
4146 @queue or last outer;
3096 4147
3097 my ($w, $h) = $widget->{user_w} && $widget->{user_h} 4148 $widget = pop @{ $queue[-1] || [] }
3098 ? @$widget{qw(user_w user_h)} 4149 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 4150
4151 pop @queue;
4152 }
4153
4154 delete $queue{$widget+0};
4155
4156 my ($w, $h) = $widget->size_request;
4157
4158 $w = max $widget->{min_w}, $w + $widget->{padding_x} * 2;
4159 $h = max $widget->{min_h}, $h + $widget->{padding_y} * 2;
4160
4161 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
4162 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
4163
4164 $w = $widget->{force_w} if exists $widget->{force_w};
4165 $h = $widget->{force_h} if exists $widget->{force_h};
4166
4167 if ($widget->{req_w} != $w || $widget->{req_h} != $h
4168 || delete $widget->{force_realloc}) {
3105 $widget->{req_w} = $w; 4169 $widget->{req_w} = $w;
3106 $widget->{req_h} = $h; 4170 $widget->{req_h} = $h;
3107 4171
3108 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h]; 4172 $self->{size_alloc}{$widget+0} = $widget;
3109 4173
3110 $widget->{parent}->check_size
3111 if $widget->{parent}; 4174 if (my $parent = $widget->{parent}) {
4175 $self->{realloc}{$parent+0} = $parent
4176 unless $queue{$parent+0};
4177
4178 $parent->{force_size_alloc} = 1;
4179 $self->{size_alloc}{$parent+0} = $parent;
4180 }
3112 } 4181 }
4182
4183 delete $self->{realloc}{$widget+0};
3113 } 4184 }
3114 } 4185 }
3115 4186
3116 while ($self->{size_alloc}) { 4187 while (my $size_alloc = delete $self->{size_alloc}) {
3117 for (values %{delete $self->{size_alloc}}) { 4188 my @queue = sort { $b->{visible} <=> $a->{visible} }
3118 my ($widget, $w, $h) = @$_; 4189 values %$size_alloc;
4190
4191 while () {
4192 my $widget = pop @queue || last;
4193
4194 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3119 4195
3120 $w = 0 if $w < 0; 4196 $w = 0 if $w < 0;
3121 $h = 0 if $h < 0; 4197 $h = 0 if $h < 0;
3122 4198
4199 $w = max $widget->{min_w}, $w;
4200 $h = max $widget->{min_h}, $h;
4201
4202# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
4203# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
4204
4205 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
4206 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
4207
4208 $w = int $w + 0.5;
4209 $h = int $h + 0.5;
4210
4211 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
4212 $widget->{old_w} = $widget->{w};
4213 $widget->{old_h} = $widget->{h};
4214
3123 $widget->{w} = $w; 4215 $widget->{w} = $w;
3124 $widget->{h} = $h; 4216 $widget->{h} = $h;
4217
3125 $widget->emit (size_allocate => $w, $h); 4218 $widget->emit (size_allocate => $w, $h);
4219 }
3126 } 4220 }
3127 } 4221 }
3128 4222
3129 while ($self->{post_alloc_hook}) { 4223 while ($self->{post_alloc_hook}) {
3130 $_->() 4224 $_->()
3131 for values %{delete $self->{post_alloc_hook}}; 4225 for values %{delete $self->{post_alloc_hook}};
3132 } 4226 }
4227
3133 4228
3134 glViewport 0, 0, $::WIDTH, $::HEIGHT; 4229 glViewport 0, 0, $::WIDTH, $::HEIGHT;
3135 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 4230 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3136 glClear GL_COLOR_BUFFER_BIT; 4231 glClear GL_COLOR_BUFFER_BIT;
3137 4232
… …
3139 glLoadIdentity; 4234 glLoadIdentity;
3140 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 4235 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3141 glMatrixMode GL_MODELVIEW; 4236 glMatrixMode GL_MODELVIEW;
3142 glLoadIdentity; 4237 glLoadIdentity;
3143 4238
4239 {
4240 package CFPlus::UI::Base;
4241
4242 local ($draw_x, $draw_y, $draw_w, $draw_h) =
4243 (0, 0, $self->{w}, $self->{h});
4244
3144 $self->_draw; 4245 $self->_draw;
4246 }
3145} 4247}
3146 4248
3147############################################################################# 4249#############################################################################
3148 4250
3149package CFClient::UI; 4251package CFPlus::UI;
3150 4252
3151$ROOT = new CFClient::UI::Root; 4253$ROOT = new CFPlus::UI::Root;
3152$TOOLTIP = new CFClient::UI::Tooltip z => 900; 4254$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
3153 4255
31541 42561
3155 4257

Diff Legend

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