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

Diff Legend

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