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.207 by elmex, Mon May 15 18:23:33 2006 UTC vs.
Revision 1.376 by root, Mon Jul 16 20:20:23 2007 UTC

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

Diff Legend

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