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

Diff Legend

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