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

Diff Legend

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