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.198 by root, Fri May 12 02:08:52 2006 UTC vs.
Revision 1.435 by root, Wed Aug 22 21:40:43 2007 UTC

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

Diff Legend

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