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

Diff Legend

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