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

Diff Legend

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