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.67 by root, Tue Apr 11 14:36:59 2006 UTC vs.
Revision 1.114 by root, Sat Apr 15 13:56:25 2006 UTC

1package CFClient::Widget; 1package CFClient::UI;
2 2
3use strict; 3use strict;
4 4
5use Scalar::Util; 5use Scalar::Util ();
6 6use List::Util ();
7use SDL::OpenGL;
8use SDL::OpenGL::Constants;
9 7
10use CFClient; 8use CFClient;
11 9
12our ($FOCUS, $HOVER, $GRAB); # various widgets 10our ($FOCUS, $HOVER, $GRAB); # various widgets
13 11
14our $TOPLEVEL; 12our $ROOT;
15our $BUTTON_STATE; 13our $BUTTON_STATE;
16 14
17# class methods for events 15# class methods for events
18sub feed_sdl_key_down_event { 16sub feed_sdl_key_down_event {
19 $FOCUS->key_down ($_[0]) if $FOCUS; 17 $FOCUS->key_down ($_[0]) if $FOCUS;
… …
26sub feed_sdl_button_down_event { 24sub feed_sdl_button_down_event {
27 my ($ev) = @_; 25 my ($ev) = @_;
28 my ($x, $y) = ($ev->motion_x, $ev->motion_y); 26 my ($x, $y) = ($ev->motion_x, $ev->motion_y);
29 27
30 if (!$BUTTON_STATE) { 28 if (!$BUTTON_STATE) {
31 my $widget = $TOPLEVEL->find_widget ($x, $y); 29 my $widget = $ROOT->find_widget ($x, $y);
32 30
33 $GRAB = $widget; 31 $GRAB = $widget;
34 $GRAB->update if $GRAB; 32 $GRAB->update if $GRAB;
35 } 33 }
36 34
37 $BUTTON_STATE |= 1 << ($ev->button - 1); 35 $BUTTON_STATE |= 1 << ($ev->button - 1);
38 36
39 $GRAB->button_down ($ev, $GRAB->translate ($x, $y)) if $GRAB; 37 $GRAB->button_down ($ev, $GRAB->coord2local ($x, $y)) if $GRAB;
40} 38}
41 39
42sub feed_sdl_button_up_event { 40sub feed_sdl_button_up_event {
43 my ($ev) = @_; 41 my ($ev) = @_;
44 my ($x, $y) = ($ev->motion_x, $ev->motion_y); 42 my ($x, $y) = ($ev->motion_x, $ev->motion_y);
45 43
46 my $widget = $GRAB || $TOPLEVEL->find_widget ($x, $y); 44 my $widget = $GRAB || $ROOT->find_widget ($x, $y);
47 45
48 $BUTTON_STATE &= ~(1 << ($ev->button - 1)); 46 $BUTTON_STATE &= ~(1 << ($ev->button - 1));
49 47
50 $GRAB->button_down ($ev, $GRAB->translate ($x, $y)) if $GRAB; 48 $GRAB->button_up ($ev, $GRAB->coord2local ($x, $y)) if $GRAB;
51 49
52 if (!$BUTTON_STATE) { 50 if (!$BUTTON_STATE) {
53 my $grab = $GRAB; undef $GRAB; 51 my $grab = $GRAB; undef $GRAB;
54 $grab->update if $grab; 52 $grab->update if $grab;
55 $GRAB->update if $GRAB; 53 $GRAB->update if $GRAB;
… …
58 56
59sub feed_sdl_motion_event { 57sub feed_sdl_motion_event {
60 my ($ev) = @_; 58 my ($ev) = @_;
61 my ($x, $y) = ($ev->motion_x, $ev->motion_y); 59 my ($x, $y) = ($ev->motion_x, $ev->motion_y);
62 60
63 my $widget = $GRAB || $TOPLEVEL->find_widget ($x, $y); 61 my $widget = $GRAB || $ROOT->find_widget ($x, $y);
64 62
65 if ($widget != $HOVER) { 63 if ($widget != $HOVER) {
66 my $hover = $HOVER; $HOVER = $widget; 64 my $hover = $HOVER; $HOVER = $widget;
67 65
68 $hover->update if $hover; 66 $hover->update if $hover && $hover->{can_hover};
69 $HOVER->update if $HOVER; 67 $HOVER->update if $HOVER && $HOVER->{can_hover};
70 } 68 }
71 69
72 $HOVER->mouse_motion ($ev, $HOVER->translate ($x, $y)) if $HOVER; 70 $HOVER->mouse_motion ($ev, $HOVER->coord2local ($x, $y)) if $HOVER;
73} 71}
72
73# convert position array to integers
74sub harmonize {
75 my ($vals) = @_;
76
77 my $rem = 0;
78
79 for ($vals) {
80 my $i = int $_ + $rem;
81 $rem += $_ - $i;
82 $_ = $i;
83 }
84}
85
86#############################################################################
87
88package CFClient::UI::Base;
89
90use strict;
91
92use SDL::OpenGL;
74 93
75sub new { 94sub new {
76 my $class = shift; 95 my $class = shift;
77 96
78 bless { 97 my $self = bless {
79 x => 0, 98 x => 0,
80 y => 0, 99 y => 0,
81 z => 0, 100 z => 0,
101 w => -1,
102 h => -1,
82 @_ 103 @_
83 }, $class 104 }, $class;
105
106 for (keys %$self) {
107 if (/^connect_(.*)$/) {
108 $self->connect ($1 => delete $self->{$_});
109 }
110 }
111
112 $self
84} 113}
85 114
86sub move { 115sub move {
87 my ($self, $x, $y, $z) = @_; 116 my ($self, $x, $y, $z) = @_;
88 $self->{x} = $x; 117 $self->{x} = $x;
… …
97sub size_request { 126sub size_request {
98 require Carp; 127 require Carp;
99 Carp::confess "size_request is abtract"; 128 Carp::confess "size_request is abtract";
100} 129}
101 130
102sub size_allocate { 131sub _size_allocate {
103 my ($self, $w, $h) = @_; 132 my ($self, $x, $y, $w, $h) = @_;
133
134 $self->{x} = $x;
135 $self->{y} = $y;
136
137 return unless $self->{w} != $w || $self->{h} != $h;
104 138
105 $self->{w} = $w; 139 $self->{w} = $w;
106 $self->{h} = $h; 140 $self->{h} = $h;
107}
108 141
109# translate global koordinates to local coordinate system 142 1
110sub translate { 143}
144
145sub size_allocate {
146 my ($self, $x, $y, $w, $h) = @_;
147
148 $self->_size_allocate ($x, $y, $w, $h);
149}
150
151# return top left coordinates
152sub _topleft {
111 my ($self, $x, $y) = @_; 153 my ($self, $x, $y) = @_;
112 154
113 $self->{parent}->translate ($x - $self->{x}, $y - $self->{y}); 155 $self->{parent}->_topleft ($x + $self->{x}, $y + $self->{y});
156}
157
158# translate global coordinates to local coordinate system
159sub coord2local {
160 my ($self, $x, $y) = @_;
161
162 my ($X, $Y) = $self->_topleft;
163 ($x - $X, $y - $Y)
164}
165
166# translate local coordinates to global coordinate system
167sub coord2global {
168 my ($self, $x, $y) = @_;
169
170 my ($X, $Y) = $self->_topleft;
171 ($x + $X, $y + $Y)
114} 172}
115 173
116sub focus_in { 174sub focus_in {
117 my ($self) = @_; 175 my ($self) = @_;
176
177 return if $FOCUS == $self;
178 return unless $self->{can_focus};
118 179
119 my $focus = $FOCUS; $FOCUS = $self; 180 my $focus = $FOCUS; $FOCUS = $self;
120 $focus->update if $focus; 181 $focus->update if $focus;
121 $FOCUS->update; 182 $FOCUS->update;
122} 183}
… …
130 $focus->update if $focus; #? 191 $focus->update if $focus; #?
131} 192}
132 193
133sub mouse_motion { } 194sub mouse_motion { }
134sub button_up { } 195sub button_up { }
135sub button_down { }
136sub key_down { } 196sub key_down { }
137sub key_up { } 197sub key_up { }
198
199sub button_down {
200 my ($self, $ev, $x, $y) = @_;
201
202 $self->focus_in;
203}
138 204
139sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} } 205sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} }
140sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } 206sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} }
141sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} } 207sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} }
142sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} } 208sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} }
143sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} } 209sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} }
144 210
145sub draw { 211sub draw {
146 my ($self) = @_; 212 my ($self) = @_;
147 213
214 return unless $self->{h} && $self->{w};
215
148 glPushMatrix; 216 glPushMatrix;
149 glTranslate $self->{x}, $self->{y}, 0; 217 glTranslate $self->{x}, $self->{y}, 0;
150 $self->_draw; 218 $self->_draw;
151 if ($self == $HOVER) { 219 glPopMatrix;
152 glColor 1, 1, 1, 0.4; 220
221 if ($self == $HOVER && $self->{can_hover}) {
222 my ($x, $y) = @$self{qw(x y)};
223
224 glColor 0, 0, 1, 0.2;
153 glEnable GL_BLEND; 225 glEnable GL_BLEND;
226 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
154 glBegin GL_QUADS; 227 glBegin GL_QUADS;
155 glVertex 0 , 0; 228 glVertex $x , $y;
156 glVertex $self->{w}, 0; 229 glVertex $x + $self->{w}, $y;
157 glVertex $self->{w}, $self->{h}; 230 glVertex $x + $self->{w}, $y + $self->{h};
158 glVertex 0 , $self->{h}; 231 glVertex $x , $y + $self->{h};
159 glEnd; 232 glEnd;
160 glDisable GL_BLEND; 233 glDisable GL_BLEND;
161 } 234 }
162 glPopMatrix;
163} 235}
164 236
165sub _draw { 237sub _draw {
166 my ($self) = @_; 238 my ($self) = @_;
167 239
168 warn "no draw defined for $self\n"; 240 warn "no draw defined for $self\n";
169}
170
171sub bbox {
172 my ($self) = @_;
173 my ($w, $h) = $self->size_request;
174 (
175 $self->{x},
176 $self->{y},
177 $self->{x} = $w,
178 $self->{y} = $h
179 )
180} 241}
181 242
182sub find_widget { 243sub find_widget {
183 my ($self, $x, $y) = @_; 244 my ($self, $x, $y) = @_;
184 245
… …
187 && $y >= $self->{y} && $y < $self->{y} + $self->{h}; 248 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
188 249
189 () 250 ()
190} 251}
191 252
192sub del_parent { $_[0]->{parent} = undef }
193
194sub set_parent { 253sub set_parent {
195 my ($self, $par) = @_; 254 my ($self, $parent) = @_;
196 255
197 $self->{parent} = $par;
198 Scalar::Util::weaken $self->{parent}; 256 Scalar::Util::weaken ($self->{parent} = $parent);
199}
200
201sub get_parent {
202 $_[0]->{parent}
203} 257}
204 258
205sub update { 259sub update {
206 my ($self) = @_; 260 my ($self) = @_;
207 261
208 $self->{parent}->update 262 $self->{parent}->update
209 if $self->{parent}; 263 if $self->{parent};
210} 264}
211 265
266sub connect {
267 my ($self, $signal, $cb) = @_;
268
269 push @{ $self->{cb}{$signal} }, $cb;
270}
271
272sub emit {
273 my ($self, $signal, @args) = @_;
274
275 $_->($self, @args)
276 for @{$self->{cb}{$signal} || []};
277}
278
212sub DESTROY { 279sub DESTROY {
213 my ($self) = @_; 280 my ($self) = @_;
214 281
215 #$self->deactivate; 282 #$self->deactivate;
216} 283}
217 284
218############################################################################# 285#############################################################################
219 286
287package CFClient::UI::DrawBG;
288
289our @ISA = CFClient::UI::Base::;
290
291use strict;
292use SDL::OpenGL;
293
294sub new {
295 my $class = shift;
296
297 # range [value, low, high, page]
298
299 $class->SUPER::new (
300 bg => [0, 0, 0, 0.2],
301 active_bg => [1, 1, 1, 0.5],
302 @_
303 )
304}
305
306sub _draw {
307 my ($self) = @_;
308
309 my ($w, $h) = @$self{qw(w h)};
310
311 glEnable GL_BLEND;
312 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
313 glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} };
314
315 glBegin GL_QUADS;
316 glVertex 0 , 0;
317 glVertex 0 , $h;
318 glVertex $w, $h;
319 glVertex $w, 0;
320 glEnd;
321
322 glDisable GL_BLEND;
323}
324
325#############################################################################
326
220package CFClient::Widget::Empty; 327package CFClient::UI::Empty;
221 328
222our @ISA = CFClient::Widget::; 329our @ISA = CFClient::UI::Base::;
223 330
224sub size_request { 331sub size_request {
225 (0, 0) 332 (0, 0)
226} 333}
227 334
228sub draw { } 335sub draw { }
229 336
230############################################################################# 337#############################################################################
231 338
232package CFClient::Widget::Container; 339package CFClient::UI::Container;
233 340
234our @ISA = CFClient::Widget::; 341our @ISA = CFClient::UI::Base::;
235 342
236sub new { 343sub new {
237 my ($class, %arg) = @_; 344 my ($class, %arg) = @_;
238 345
239 my $children = delete $arg{children} || []; 346 my $children = delete $arg{children} || [];
… …
243 350
244 $self 351 $self
245} 352}
246 353
247sub add { 354sub add {
248 my ($self, $chld, $expand) = @_; 355 my ($self, $child) = @_;
249 356
250 $chld->{expand} = $expand;
251 $chld->set_parent ($self); 357 $child->set_parent ($self);
358
359 use sort 'stable';
252 360
253 $self->{children} = [ 361 $self->{children} = [
254 sort { $a->{z} <=> $b->{z} } 362 sort { $a->{z} <=> $b->{z} }
255 @{$self->{children}}, $chld 363 @{$self->{children}}, $child
256 ]; 364 ];
257 365
258 $self->size_allocate ($self->{w}, $self->{h}) 366 $self->{w} = $self->{h} = -1;
259 if $self->{w}; #TODO: check for "realised state" 367 $self->update;
260} 368}
261 369
262sub remove { 370sub remove {
263 my ($self, $widget) = @_; 371 my ($self, $widget) = @_;
264 372
265 $self->{children} = [ grep $_ != $widget, @{ $self->{children} } ]; 373 $self->{children} = [ grep $_ != $widget, @{ $self->{children} } ];
266 374
267 $self->size_allocate ($self->{w}, $self->{h}); 375 $self->size_allocate (0, 0, $self->{w}, $self->{h});
268} 376}
269 377
270sub find_widget { 378sub find_widget {
271 my ($self, $x, $y) = @_; 379 my ($self, $x, $y) = @_;
272 380
… …
289 $_->draw for @{$self->{children}}; 397 $_->draw for @{$self->{children}};
290} 398}
291 399
292############################################################################# 400#############################################################################
293 401
294package CFClient::Widget::Bin; 402package CFClient::UI::Bin;
295 403
296our @ISA = CFClient::Widget::Container::; 404our @ISA = CFClient::UI::Container::;
297 405
298sub new { 406sub new {
299 my ($class, %arg) = @_; 407 my ($class, %arg) = @_;
300 408
301 my $child = (delete $arg{child}) || new CFClient::Widget::Empty::; 409 my $child = (delete $arg{child}) || new CFClient::UI::Empty::;
302 410
303 $class->SUPER::new (children => [$child], %arg) 411 $class->SUPER::new (children => [$child], %arg)
304} 412}
305 413
306sub add { 414sub add {
… …
314sub remove { 422sub remove {
315 my ($self, $widget) = @_; 423 my ($self, $widget) = @_;
316 424
317 $self->SUPER::remove ($widget); 425 $self->SUPER::remove ($widget);
318 426
319 $self->{children} = [new CFClient::Widget::Empty] 427 $self->{children} = [new CFClient::UI::Empty]
320 unless @{$self->{children}}; 428 unless @{$self->{children}};
321} 429}
322 430
323sub child { $_[0]->{children}[0] } 431sub child { $_[0]->{children}[0] }
324 432
325sub size_request { 433sub size_request {
326 $_[0]{children}[0]->size_request if $_[0]{children}[0]; 434 $_[0]{children}[0]->size_request
327} 435}
328 436
329sub size_allocate { 437sub size_allocate {
330 my ($self, $w, $h) = @_; 438 my ($self, $x, $y, $w, $h) = @_;
331 439
332 $self->SUPER::size_allocate ($w, $h); 440 $self->_size_allocate ($x, $y, $w, $h) or return;
441
333 $self->{children}[0]->size_allocate ($w, $h) 442 $self->{children}[0]->size_allocate (0, 0, $w, $h);
334 if $self->{children}[0]
335} 443}
336 444
337############################################################################# 445#############################################################################
338 446
339package CFClient::Widget::Window; 447package CFClient::UI::Window;
340 448
341our @ISA = CFClient::Widget::Bin::; 449our @ISA = CFClient::UI::Bin::;
342 450
343use SDL::OpenGL; 451use SDL::OpenGL;
344 452
345sub new { 453sub new {
346 my ($class, %arg) = @_; 454 my ($class, %arg) = @_;
… …
357} 465}
358 466
359sub render_chld { 467sub render_chld {
360 my ($self) = @_; 468 my ($self) = @_;
361 469
362 $self->{texture} = 470 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
363 CFClient::Texture->new_from_opengl ( 471 glClearColor 0, 0, 0, 1;
364 $self->{w}, $self->{h}, sub { $self->child->draw } 472 glClear GL_COLOR_BUFFER_BIT;
365 ); 473 $self->child->draw;
474 };
366} 475}
367 476
368sub size_allocate { 477sub size_allocate {
369 my ($self, $w, $h) = @_; 478 my ($self, $x, $y, $w, $h) = @_;
370 479
371 $self->{w} = $w; 480 $self->_size_allocate ($x, $y, $w, $h) or return;
372 $self->{h} = $h;
373 481
374 $self->child->size_allocate ($w, $h); 482 $self->child->size_allocate (0, 0, $w, $h);
375 483
376 $self->render_chld; 484 $self->render_chld;
377} 485}
378 486
379sub _draw { 487sub _draw {
… …
383 491
384 my $tex = $self->{texture} 492 my $tex = $self->{texture}
385 or return; 493 or return;
386 494
387 glEnable GL_BLEND; 495 glEnable GL_BLEND;
496 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
388 glEnable GL_TEXTURE_2D; 497 glEnable GL_TEXTURE_2D;
389 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 498 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
390 499
391 $tex->draw_quad (0, 0, $w, $h); 500 $tex->draw_quad (0, 0, $w, $h);
392 501
… …
394 glDisable GL_TEXTURE_2D; 503 glDisable GL_TEXTURE_2D;
395} 504}
396 505
397############################################################################# 506#############################################################################
398 507
399package CFClient::Widget::Frame; 508package CFClient::UI::Frame;
400 509
401our @ISA = CFClient::Widget::Bin::; 510our @ISA = CFClient::UI::Bin::;
402 511
403use SDL::OpenGL; 512use SDL::OpenGL;
404 513
405sub size_request { 514sub size_request {
406 my ($self) = @_; 515 my ($self) = @_;
… …
411 520
412 map { $_ + 4 } $chld->size_request; 521 map { $_ + 4 } $chld->size_request;
413} 522}
414 523
415sub size_allocate { 524sub size_allocate {
416 my ($self, $w, $h) = @_; 525 my ($self, $x, $y, $w, $h) = @_;
417 526
418 $self->{w} = $w; 527 $self->_size_allocate ($x, $y, $w, $h) or return;
419 $self->{h} = $h;
420 528
421 $self->child->size_allocate ($w - 4, $h - 4); 529 $self->child->size_allocate (2, 2, $w - 4, $h - 4);
422 $self->child->move (2, 2);
423} 530}
424 531
425sub _draw { 532sub _draw {
426 my ($self) = @_; 533 my ($self) = @_;
427 534
… …
440 $chld->draw; 547 $chld->draw;
441} 548}
442 549
443############################################################################# 550#############################################################################
444 551
445package CFClient::Widget::FancyFrame; 552package CFClient::UI::FancyFrame;
446 553
447our @ISA = CFClient::Widget::Bin::; 554our @ISA = CFClient::UI::Bin::;
448 555
449use SDL::OpenGL; 556use SDL::OpenGL;
450 557
451my @tex = 558my @tex =
452 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 559 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
453 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 560 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
454 561
562sub new {
563 my $class = shift;
564
565 # TODO: user_x, user_y, overwrite moveto?
566
567 $class->SUPER::new (
568 bg => [1, 1, 1, 1],
569 border_bg => [1, 1, 1, 1],
570 border => $::FONTSIZE * 0.8,
571 @_
572 )
573}
574
455sub size_request { 575sub size_request {
456 my ($self) = @_; 576 my ($self) = @_;
457 577
578 return ($self->{user_w}, $self->{user_h}) if $self->{user_w} && $self->{user_h};
579
458 my ($w, $h) = $self->SUPER::size_request; 580 my ($w, $h) = $self->SUPER::size_request;
459 581
460 $h += $tex[1]->{height}; 582 (
461 $h += $tex[4]->{height}; 583 $w + $self->{border} * 2,
462 $w += $tex[2]->{width}; 584 $h + $self->{border} * 2,
463 $w += $tex[3]->{width}; 585 )
464
465 ($w, $h)
466} 586}
467 587
468sub size_allocate { 588sub size_allocate {
469 my ($self, $w, $h) = @_; 589 my ($self, $x, $y, $w, $h) = @_;
470 590
471 $self->SUPER::size_allocate ($w, $h); 591 $self->_size_allocate ($x, $y, $w, $h) or return;
472 592
473 $h -= $tex[1]->{height}; 593 $h -= List::Util::max 0, $self->{border} * 2;
474 $h -= $tex[4]->{height}; 594 $w -= List::Util::max 0, $self->{border} * 2;
475 $w -= $tex[2]->{width};
476 $w -= $tex[3]->{width};
477 595
478 $h = $h < 0 ? 0 : $h; 596 $self->child->size_allocate ($self->{border}, $self->{border}, $w, $h);
479 $w = $w < 0 ? 0 : $w; 597}
480 598
481 my $child = $self->child; 599sub button_down {
600 my ($self, $ev, $x, $y) = @_;
482 601
483 $child->size_allocate ($w, $h); 602 if ($x < $self->{w} && $x >= $self->{w} - $self->{border}
484 $child->move ($tex[3]->{width}, $tex[1]->{height}); 603 && $y < $self->{h} && $y >= $self->{h} - $self->{border}) {
604
605 my ($ox, $oy) = ($ev->button_x, $ev->button_y);
606 my ($bw, $bh) = ($self->{w}, $self->{h});
607
608 $self->{motion} = sub {
609 my ($ev, $x, $y) = @_;
610
611 ($x, $y) = ($ev->motion_x, $ev->motion_y);
612
613 $self->{user_w} = $bw + $x - $ox;
614 $self->{user_h} = $bh + $y - $oy;
615 $self->update;
616 };
617
618 } elsif ($x >= 0 && $x < $self->{w}
619 && $y >= 0 && $y < $self->{border}) {
620
621 my ($ox, $oy) = ($ev->button_x, $ev->button_y);
622 my ($bx, $by) = ($self->{x}, $self->{y});
623
624 $self->{motion} = sub {
625 my ($ev, $x, $y) = @_;
626
627 ($x, $y) = ($ev->motion_x, $ev->motion_y);
628
629 $self->move ($bx + $x - $ox, $by + $y - $oy);
630 $self->update;
631 };
632 }
633}
634
635sub button_up {
636 my ($self, $ev, $x, $y) = @_;
637
638 delete $self->{motion};
639}
640
641sub mouse_motion {
642 my ($self, $ev, $x, $y) = @_;
643
644 $self->{motion}->($ev, $x, $y) if $self->{motion};
485} 645}
486 646
487sub _draw { 647sub _draw {
488 my ($self) = @_; 648 my ($self) = @_;
489 649
490 my ($w, $h) = ($self->{w}, $self->{h}); 650 my ($w, $h ) = ($self->{w}, $self->{h});
491 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 651 my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
492 652
493 glEnable GL_BLEND; 653 glEnable GL_BLEND;
654 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
494 glEnable GL_TEXTURE_2D; 655 glEnable GL_TEXTURE_2D;
495 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
496 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 656 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
497 657
498 my $top = $tex[1]; 658 glColor @{ $self->{border_bg} };
499 $top->draw_quad (0, 0, $w, $top->{height}); 659 $tex[1]->draw_quad (0, 0, $w, $self->{border});
500 660 $tex[3]->draw_quad (0, $self->{border}, $self->{border}, $ch);
501 my $left = $tex[3]; 661 $tex[2]->draw_quad ($w - $self->{border}, $self->{border}, $self->{border}, $ch);
502 $left->draw_quad (0, $top->{height}, $left->{width}, $ch); 662 $tex[4]->draw_quad (0, $h - $self->{border}, $w, $self->{border});
503
504 my $right = $tex[2];
505 $right->draw_quad ($w - $right->{width}, $top->{height}, $right->{width}, $ch);
506
507 my $bottom = $tex[4];
508 $bottom->draw_quad (0, $h - $bottom->{height}, $w, $bottom->{height});
509 663
510 my $bg = $tex[0]; 664 my $bg = $tex[0];
511 glBindTexture GL_TEXTURE_2D, $bg->{name};
512 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
513 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT;
514 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT;
515 665
666 # TODO: repeat texture not scale
516 my $rep_x = $cw / $bg->{width}; 667 my $rep_x = $cw / $bg->{w};
517 my $rep_y = $ch / $bg->{height}; 668 my $rep_y = $ch / $bg->{h};
518 669
670 glColor @{ $self->{bg} };
671
672 $bg->{s} = $rep_x;
673 $bg->{t} = $rep_y;
674 $bg->{wrap_mode} = 1;
519 $bg->draw_quad ($left->{width}, $top->{height}, $cw, $ch); 675 $bg->draw_quad ($self->{border}, $self->{border}, $cw, $ch);
520 676
677 glDisable GL_TEXTURE_2D;
521 glDisable GL_BLEND; 678 glDisable GL_BLEND;
522 glDisable GL_TEXTURE_2D;
523 679
524 $self->child->draw; 680 $self->child->draw;
525
526} 681}
527 682
528############################################################################# 683#############################################################################
529 684
530package CFClient::Widget::Table; 685package CFClient::UI::Table;
531 686
532our @ISA = CFClient::Widget::Bin::; 687our @ISA = CFClient::UI::Base::;
688
689use List::Util qw(max sum);
533 690
534use SDL::OpenGL; 691use SDL::OpenGL;
535 692
693sub new {
694 my $class = shift;
695
696 $class->SUPER::new (
697 col_expand => [],
698 @_
699 )
700}
701
536sub add { 702sub add {
537 my ($self, $x, $y, $chld) = @_; 703 my ($self, $x, $y, $child) = @_;
538 my $old_chld = $self->{children}[$y][$x];
539 704
705 $child->set_parent ($self);
540 $self->{children}[$y][$x] = $chld; 706 $self->{children}[$y][$x] = $child;
541 $chld->set_parent ($self); 707
708 $self->{w} = $self->{h} = -1;
542 $self->update; 709 $self->update;
543} 710}
544 711
545sub max_row_height { 712sub get_wh {
546 my ($self, $row) = @_; 713 my ($self) = @_;
547 714
548 my $hs = 0; 715 my (@w, @h);
549 for (my $xi = 0; $xi <= $#{$self->{children}->[$row] || []}; $xi++) { 716
717 for my $y (0 .. $#{$self->{children}}) {
550 my $c = $self->{children}->[$row]->[$xi]; 718 my $row = $self->{children}[$y]
551 if ($c) { 719 or next;
720
721 for my $x (0 .. $#$row) {
722 my $widget = $row->[$x]
723 or next;
552 my ($w, $h) = $c->size_request; 724 my ($w, $h) = $widget->size_request;
553 if ($hs < $h) { $hs = $h } 725
726 $w[$x] = max $w[$x], $w;
727 $h[$y] = max $h[$y], $h;
554 } 728 }
555 } 729 }
556 return $hs;
557}
558 730
559sub max_col_width { 731 (\@w, \@h)
732}
733
734sub size_request {
560 my ($self, $col) = @_; 735 my ($self) = @_;
561 736
737 my ($ws, $hs) = $self->get_wh;
738
739 (
740 (sum @$ws),
741 (sum @$hs),
742 )
743}
744
745sub size_allocate {
746 my ($self, $x, $y, $w, $h) = @_;
747
748 $self->_size_allocate ($x, $y, $w, $h) or return;
749
750 my ($ws, $hs) = $self->get_wh;
751
752 my $req_w = sum @$ws;
753 my $req_h = sum @$hs;
754
755 # TODO: nicer code && do row_expand
756 my @col_expand = @{$self->{col_expand}};
757 @col_expand = (1) x @$ws unless @col_expand;
758 my $col_expand = (sum @col_expand) || 1;
759
760 # linearly scale sizes
761 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
762 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
763
764 CFClient::UI::harmonize $ws;
765 CFClient::UI::harmonize $hs;
766
767 my $y;
768
769 for my $r (0 .. $#{$self->{children}}) {
770 my $row = $self->{children}[$r]
771 or next;
772
562 my $ws = 0; 773 my $x = 0;
563 for (my $yi = 0; $yi <= $#{$self->{children} || []}; $yi++) { 774 my $row_h = $hs->[$r];
564 my $c = ($self->{children}->[$yi] || [])->[$col]; 775
565 if ($c) { 776 for my $c (0 .. $#$row) {
566 my ($w, $h) = $c->size_request; 777 my $col_w = $ws->[$c];
567 if ($ws < $w) { $ws = $w } 778
779 if (my $widget = $row->[$c]) {
780 $widget->size_allocate ($x, $y, $col_w, $row_h);
781 }
782
783 $x += $col_w;
568 } 784 }
785
786 $y += $row_h;
569 } 787 }
570 return $ws; 788
571} 789}
790
791sub find_widget {
792 my ($self, $x, $y) = @_;
793
794 $x -= $self->{x};
795 $y -= $self->{y};
796
797 my $res;
798
799 for (grep $_, map @$_, grep $_, @{ $self->{children} }) {
800 $res = $_->find_widget ($x, $y)
801 and return $res;
802 }
803
804 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
805}
806
807sub _draw {
808 my ($self) = @_;
809
810 for (grep $_, @{$self->{children}}) {
811 $_->draw for grep $_, @$_;
812 }
813}
814
815#############################################################################
816
817package CFClient::UI::HBox;
818
819# TODO: wrap into common Box base class
820
821our @ISA = CFClient::UI::Container::;
572 822
573sub size_request { 823sub size_request {
574 my ($self) = @_; 824 my ($self) = @_;
575 825
826 my @alloc = map [$_->size_request], @{$self->{children}};
827
828 (
829 (List::Util::sum map $_->[0], @alloc),
830 (List::Util::max map $_->[1], @alloc),
831 )
832}
833
834sub size_allocate {
835 my ($self, $x, $y, $w, $h) = @_;
836
837 $self->_size_allocate ($x, $y, $w, $h);
838
576 my ($hs, $ws) = (0, 0); 839 ($h, $w) = ($w, $h);
577 840
578 for (my $yi = 0; $yi <= $#{$self->{children}}; $yi++) { 841 my $children = $self->{children};
579 $hs += $self->max_row_height ($yi);
580 }
581 842
582 for (my $yi = 0; $yi <= $#{$self->{children}}; $yi++) { 843 my @h = map +($_->size_request)[0], @$children;
583 my $wm = 0; 844
584 for (my $xi = 0; $xi <= $#{$self->{children}->[$yi]}; $xi++) { 845 my $req_h = List::Util::sum @h;
585 $wm += $self->max_col_width ($xi) 846
847 if ($req_h > $h) {
848 # ah well, not enough space
849 $_ *= $h / $req_h for @h;
850 } else {
851 my $exp = List::Util::sum map $_->{expand}, @$children;
852 $exp ||= 1;
853
854 for (0 .. $#$children) {
855 my $child = $children->[$_];
856
857 my $alloc_h = $h[$_];
858 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
859 $h[$_] = $alloc_h;
586 } 860 }
587 if ($ws < $wm) { $ws = $wm }
588 } 861 }
589 862
590 return ($ws, $hs); 863 CFClient::UI::harmonize \@h;
591}
592
593sub _draw {
594 my ($self) = @_;
595 864
596 my $y = 0; 865 my $y = 0;
597 for (my $yi = 0; $yi <= $#{$self->{children}}; $yi++) { 866 for (0 .. $#$children) {
867 my $child = $children->[$_];
598 my $x = 0; 868 my $h = $h[$_];
869 $child->size_allocate ($y, 0, $h, $w);
599 870
600 for (my $xi = 0; $xi <= $#{$self->{children}->[$yi]}; $xi++) { 871 $y += $h;
601
602 my $c = $self->{children}->[$yi]->[$xi];
603 if ($c) {
604 $c->move ($x, $y, 0); #TODO: Move to size_request
605 $c->draw if $c;
606 }
607
608 $x += $self->max_col_width ($xi);
609 }
610
611 $y += $self->max_row_height ($yi);
612 } 872 }
613} 873}
614 874
615############################################################################# 875#############################################################################
616 876
617package CFClient::Widget::VBox; 877package CFClient::UI::VBox;
618 878
879# TODO: wrap into common Box base class
880
619our @ISA = CFClient::Widget::Container::; 881our @ISA = CFClient::UI::Container::;
620
621use SDL::OpenGL;
622 882
623sub size_request { 883sub size_request {
624 my ($self) = @_; 884 my ($self) = @_;
625 885
626 my @alloc = map [$_->size_request], @{$self->{children}}; 886 my @alloc = map [$_->size_request], @{$self->{children}};
… …
630 (List::Util::sum map $_->[1], @alloc), 890 (List::Util::sum map $_->[1], @alloc),
631 ) 891 )
632} 892}
633 893
634sub size_allocate { 894sub size_allocate {
635 my ($self, $w, $h) = @_; 895 my ($self, $x, $y, $w, $h) = @_;
636 896
637 $self->w ($w); 897 $self->_size_allocate ($x, $y, $w, $h);
638 $self->h ($h);
639 898
640 my $exp; 899 my $children = $self->{children};
641 my @oth; 900
642 # find expand widget 901 my @h = map +($_->size_request)[1], @$children;
643 for (@{$self->{children}}) { 902
644 if ($_->{expand}) { 903 my $req_h = List::Util::sum @h;
904
905 if ($req_h > $h) {
906 # ah well, not enough space
907 $_ *= $h / $req_h for @h;
908 } else {
909 my $exp = List::Util::sum map $_->{expand}, @$children;
645 $exp = $_; 910 $exp ||= 1;
646 last; 911
912 for (0 .. $#$children) {
913 my $child = $children->[$_];
914
915 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
647 } 916 }
648 push @oth, $_;
649 } 917 }
650 918
651 my ($ow, $oh); 919 CFClient::UI::harmonize \@h;
652
653 # get sizes of other widgets
654 for (@oth) {
655 my ($w, $h) = $_->size_request;
656 $oh += $h;
657 if ($ow < $w) { $ow = $w }
658 }
659 920
660 my $y = 0; 921 my $y = 0;
661 for (@{$self->{children}}) { 922 for (0 .. $#$children) {
662 $_->move (0, $y); 923 my $child = $children->[$_];
663 924 my $h = $h[$_];
664 if ($_ == $exp) {
665 $_->size_allocate ($w, $h - $oh);
666 $y += $h - $oh;
667 } else {
668 my ($cw, $h) = $_->size_request;
669 $_->size_allocate ($w, $h); 925 $child->size_allocate (0, $y, $w, $h);
926
670 $y += $h; 927 $y += $h;
671 }
672 } 928 }
673} 929}
674 930
675############################################################################# 931#############################################################################
676 932
677package CFClient::Widget::Label; 933package CFClient::UI::Label;
678 934
679our @ISA = CFClient::Widget::; 935our @ISA = CFClient::UI::Base::;
680 936
681use SDL::OpenGL; 937use SDL::OpenGL;
682 938
683sub new { 939sub new {
684 my ($class, %arg) = @_; 940 my ($class, %arg) = @_;
685 941
686 # TODO: color, and make height, xyz etc. optional
687 my $self = $class->SUPER::new ( 942 my $self = $class->SUPER::new (
688 color => [1, 1, 1], 943 fg => [1, 1, 1],
689 height => $::FONTSIZE, 944 fontsize => $::FONTSIZE,
690 text => "", 945 text => "",
946 align => -1,
947 padding => 2,
691 layout => new CFClient::Layout, 948 layout => new CFClient::Layout,
692 %arg 949 %arg
693 ); 950 );
694 951
695 $self->set_text ($self->{text}); 952 $self->set_text ($self->{text});
696 953
697 $self 954 $self
698} 955}
699 956
957sub escape_text {
958 local $_ = $_[1];
959
960 s/&/&amp;/g;
961 s/>/&gt;/g;
962 s/</&lt;/g;
963
964 $_[1]
965}
966
700sub set_text { 967sub set_text {
701 my ($self, $text) = @_; 968 my ($self, $text) = @_;
702 969
703 $self->{text} = $text; 970 $self->{text} = $text;
704 $self->{layout}->set_markup ($text); 971 $self->{layout}->set_markup ($text);
705 972
706 delete $self->{texture}; 973 delete $self->{texture};
974# $self->{w} = $self->{h} = -1;
975 $self->update;
707} 976}
708 977
709sub get_text { 978sub get_text {
710 my ($self, $text) = @_; 979 my ($self, $text) = @_;
711 980
… …
714 983
715sub size_request { 984sub size_request {
716 my ($self) = @_; 985 my ($self) = @_;
717 986
718 $self->{layout}->set_width; 987 $self->{layout}->set_width;
719 $self->{layout}->set_height ($self->{height}); 988 $self->{layout}->set_height ($self->{fontsize});
720 $self->{layout}->size 989 my ($w, $h) = $self->{layout}->size;
721# if ($self->{texture}{width} > 1 && $self->{texture}{height} > 1) { #TODO: hack 990
722# ( 991 (
723# $self->{texture}{width}, 992 $w + $self->{padding} * 2,
724# $self->{texture}{height}, 993 $h + $self->{padding} * 2,
725# ) 994 )
726# } else {
727# my ($w, $h, $data) = CFClient::font_render "Yy", $self->{height};
728#
729# ($w, $h)
730# }
731} 995}
732 996
733sub size_allocate { 997sub size_allocate {
734 my ($self, $w, $h) = @_; 998 my ($self, $x, $y, $w, $h) = @_;
735 999
736 $self->SUPER::size_allocate ($w, $h); 1000 $self->_size_allocate ($x, $y, $w, $h) or return;
1001
737 delete $self->{texture}; 1002 delete $self->{texture};
1003}
1004
1005sub update {
1006 my ($self) = @_;
1007
1008 delete $self->{texture};
1009 $self->SUPER::update;
738} 1010}
739 1011
740sub _draw { 1012sub _draw {
741 my ($self) = @_; 1013 my ($self) = @_;
742 1014
743 my $tex = $self->{texture} ||= do { 1015 my $tex = $self->{texture} ||= do {
744 $self->{layout}->set_width ($self->{w}); 1016 $self->{layout}->set_width ($self->{w});
1017 $self->{layout}->set_height (List::Util::min $self->{h} - $self->{padding} * 2, $self->{fontsize});
745 new_from_layout CFClient::Texture $self->{layout}; 1018 new_from_layout CFClient::Texture $self->{layout}
746 }; 1019 };
1020
1021 glEnable GL_BLEND;
1022 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1023 glEnable GL_TEXTURE_2D;
1024 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1025
1026 glColor @{$self->{fg}};
1027
1028 my $x =
1029 $self->{align} < 0 ? $self->{padding}
1030 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1031 : ($self->{w} - $tex->{w}) * 0.5;
1032
1033 $tex->draw_quad (int $x, int +($self->{h} - $tex->{h}) * 0.5);
1034
1035 glDisable GL_TEXTURE_2D;
1036 glDisable GL_BLEND;
1037}
1038
1039#############################################################################
1040
1041package CFClient::UI::Entry;
1042
1043our @ISA = CFClient::UI::Label::;
1044
1045use SDL;
1046use SDL::OpenGL;
1047
1048sub new {
1049 my $class = shift;
1050
1051 $class->SUPER::new (
1052 fg => [1, 1, 1],
1053 bg => [0, 0, 0, 0.2],
1054 active_bg => [1, 1, 1, 0.5],
1055 active_fg => [0, 0, 0],
1056 can_hover => 1,
1057 can_focus => 1,
1058 @_
1059 )
1060}
1061
1062sub _set_text {
1063 my ($self, $text) = @_;
1064
1065 my $old_text = $self->{text};
1066
1067 $self->{last_activity} = $::NOW;
1068
1069 $self->{text} = $text;
1070 $self->{layout}->set_width ($self->{w});
1071 $self->{layout}->set_height (List::Util::min $self->{h} - $self->{padding} * 2, $self->{fontsize});
1072
1073 $text =~ s/./*/g if $self->{hidden};
1074
1075 $self->{layout}->set_markup ($self->escape_text ($text) . " ");
1076
1077 $text = substr $text, 0, $self->{cursor};
1078 utf8::encode $text;
1079
1080 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text);
1081
1082 $self->emit (changed => $self->{text}) # XXX: is this the right place to do this?
1083 if $old_text ne $self->{text};
1084}
1085
1086sub size_request {
1087 my ($self) = @_;
1088
1089 my ($w, $h) = $self->SUPER::size_request;
1090
1091 ($w + 1, $h) # add 1 for cursor
1092}
1093
1094sub size_allocate {
1095 my ($self, $x, $y, $w, $h) = @_;
1096
1097 $self->SUPER::size_allocate ($x, $y, $w, $h);
1098
1099 $self->_set_text ($self->{text});
1100}
1101
1102sub set_text {
1103 my ($self, $text) = @_;
1104
1105 $self->{cursor} = length $text;
1106 $self->_set_text ($text);
1107 $self->update;
1108}
1109
1110sub key_down {
1111 my ($self, $ev) = @_;
1112
1113 my $mod = $ev->key_mod;
1114 my $sym = $ev->key_sym;
1115
1116 my $uni = $ev->key_unicode;
1117
1118 my $text = $self->get_text;
1119
1120 if ($sym == SDLK_BACKSPACE) {
1121 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1122 } elsif ($sym == SDLK_DELETE) {
1123 substr $text, $self->{cursor}, 1, "";
1124 } elsif ($sym == SDLK_LEFT) {
1125 --$self->{cursor} if $self->{cursor};
1126 } elsif ($sym == SDLK_RIGHT) {
1127 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1128 } elsif ($sym == SDLK_HOME) {
1129 $self->{cursor} = 0;
1130 } elsif ($sym == SDLK_END) {
1131 $self->{cursor} = length $text;
1132 } elsif ($sym == SDLK_ESCAPE) {
1133 $self->emit ('escape');
1134 } elsif ($uni) {
1135 substr $text, $self->{cursor}++, 0, chr $uni;
1136 }
1137
1138 $self->_set_text ($text);
1139 $self->update;
1140}
1141
1142sub focus_in {
1143 my ($self) = @_;
1144
1145 $self->{last_activity} = $::NOW;
1146
1147 $self->SUPER::focus_in;
1148}
1149
1150sub button_down {
1151 my ($self, $ev, $x, $y) = @_;
1152
1153 $self->SUPER::button_down ($ev, $x, $y);
1154
1155 my $idx = $self->{layout}->xy_to_index ($x, $y);
1156
1157 # byte-index to char-index
1158 my $text = $self->{text};
1159 utf8::encode $text;
1160 $self->{cursor} = length substr $text, 0, $idx;
1161
1162 $self->_set_text ($self->{text});
1163 $self->update;
1164}
1165
1166sub mouse_motion {
1167 my ($self, $ev, $x, $y) = @_;
1168# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1169}
1170
1171sub _draw {
1172 my ($self) = @_;
1173
1174 local $self->{fg} = $self->{fg};
1175
1176 if ($FOCUS == $self) {
1177 glColor @{$self->{active_bg}};
1178 $self->{fg} = $self->{active_fg};
1179 } else {
1180 glColor @{$self->{bg}};
1181 }
1182
1183 glEnable GL_BLEND;
1184 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1185 glBegin GL_QUADS;
1186 glVertex 0 , 0;
1187 glVertex 0 , $self->{h};
1188 glVertex $self->{w}, $self->{h};
1189 glVertex $self->{w}, 0;
1190 glEnd;
1191 glDisable GL_BLEND;
1192
1193 $self->SUPER::_draw;
1194
1195 #TODO: force update every cursor change :(
1196 if ($FOCUS == $self && (($::NOW - $self->{last_activity}) & 1023) < 600) {
1197 glColor @{$self->{fg}};
1198 glBegin GL_LINES;
1199 glVertex $self->{cur_x}, $self->{cur_y};
1200 glVertex $self->{cur_x}, $self->{cur_y} + $self->{cur_h};
1201 glEnd;
1202 }
1203}
1204
1205package CFClient::UI::LineEntry;
1206
1207our @ISA = CFClient::UI::Entry::;
1208
1209use SDL;
1210use SDL::OpenGL;
1211
1212sub key_down {
1213 my ($self, $ev) = @_;
1214
1215 my $sym = $ev->key_sym;
1216
1217 if ($sym == SDLK_RETURN) {
1218 $self->emit (activate => $self->get_text);
1219 $self->update;
1220
1221 } else {
1222 $self->SUPER::key_down ($ev);
1223 }
1224
1225}
1226
1227#############################################################################
1228
1229package CFClient::UI::Button;
1230
1231our @ISA = CFClient::UI::Label::;
1232
1233use SDL;
1234use SDL::OpenGL;
1235
1236my @tex =
1237 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
1238 qw(b1_button_active.png);
1239
1240sub new {
1241 my $class = shift;
1242
1243 $class->SUPER::new (
1244 padding => 4,
1245 fg => [1, 1, 1],
1246 bg => [1, 1, 1, 0.2],
1247 active_fg => [1, 1, 0],
1248 can_hover => 1,
1249 @_
1250 )
1251}
1252
1253sub button_up {
1254 my ($self, $ev, $x, $y) = @_;
1255
1256 if ($x >= 0 && $x < $self->{w}
1257 && $y >= 0 && $y < $self->{h}) {
1258 $self->emit ("activate");
1259 }
1260}
1261
1262sub _draw {
1263 my ($self) = @_;
1264
1265 local $self->{fg} = $self->{fg};
1266 my $tex = $tex[0];
747 1267
748 glEnable GL_BLEND; 1268 glEnable GL_BLEND;
749 glEnable GL_TEXTURE_2D; 1269 glEnable GL_TEXTURE_2D;
750 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1270 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1271
1272 if ($GRAB == $self) {
1273 $self->{fg} = $self->{active_fg};
1274 }
1275
1276 glBindTexture GL_TEXTURE_2D, $tex->{name};
751 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1277 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
752 1278
753 glColor @{$self->{color}}; 1279 $tex->draw_quad (0, 0, $self->{w}, $self->{h});
754 1280
1281 glDisable GL_TEXTURE_2D;
1282 glDisable GL_BLEND;
1283
1284 $self->SUPER::_draw;
1285}
1286
1287#############################################################################
1288
1289package CFClient::UI::CheckBox;
1290
1291our @ISA = CFClient::UI::DrawBG::;
1292
1293my @tex =
1294 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
1295 qw(c1_checkbox_bg.png c1_checkbox_active.png);
1296
1297use SDL;
1298use SDL::OpenGL;
1299
1300sub new {
1301 my $class = shift;
1302
1303 $class->SUPER::new (
1304 padding => 2,
1305 fg => [1, 1, 1],
1306 active_fg => [1, 1, 0],
1307 state => 0,
1308 can_hover => 1,
1309 @_
1310 )
1311}
1312
1313sub size_request {
1314 my ($self) = @_;
1315
1316 ($self->{padding} * 2 + 6) x 2
1317}
1318
1319sub size_allocate {
1320 my ($self, $x, $y, $w, $h) = @_;
1321
1322 $self->_size_allocate ($x, $y, $w, $h);
1323}
1324
1325sub button_down {
1326 my ($self, $ev, $x, $y) = @_;
1327
1328 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}
1329 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {
1330 $self->{state} = !$self->{state};
1331 $self->emit (changed => $self->{state});
1332 }
1333}
1334
1335sub _draw {
1336 my ($self) = @_;
1337
1338 $self->SUPER::_draw;
1339
1340 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0;
1341
1342 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;
1343
1344 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1345
1346 glEnable GL_BLEND;
1347 glEnable GL_TEXTURE_2D;
1348 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1349
1350 my $tex = $self->{state} ? $tex[1] : $tex[0];
1351
755 $tex->draw_quad (0, 0); 1352 $tex->draw_quad (0, 0, $s, $s);
1353
1354 glDisable GL_TEXTURE_2D;
1355 glDisable GL_BLEND;
1356}
1357
1358#############################################################################
1359
1360package CFClient::UI::Slider;
1361
1362use strict;
1363
1364use SDL::OpenGL;
1365
1366our @ISA = CFClient::UI::DrawBG::;
1367
1368my @tex =
1369 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
1370 qw(s1_slider.png s1_slider_bg.png);
1371
1372sub new {
1373 my $class = shift;
1374
1375 # range [value, low, high, page]
1376
1377 # TODO: 0-width page
1378 # TODO: req_w/h are wrong with vertical
1379 # TODO: calculations are off
1380 my $self = $class->SUPER::new (
1381 fg => [1, 1, 1],
1382 active_fg => [0, 0, 0],
1383 range => [0, 0, 100, 10],
1384 req_w => 40,
1385 req_h => 13,
1386 vertical => 0,
1387 can_hover => 1,
1388 inner_pad => 5,
1389 @_
1390 );
1391
1392 $self
1393}
1394
1395sub size_request {
1396 my ($self) = @_;
1397
1398 my $w = $self->{req_w};
1399 my $h = $self->{req_h};
1400
1401 $self->{vertical} ? ($h, $w) : ($w, $h)
1402}
1403
1404sub button_down {
1405 my ($self, $ev, $x, $y) = @_;
1406
1407 $self->SUPER::button_down ($ev, $x, $y);
1408 $self->mouse_motion ($ev, $x, $y);
1409}
1410
1411sub mouse_motion {
1412 my ($self, $ev, $x, $y) = @_;
1413
1414 if ($GRAB == $self) {
1415 my ($value, $lo, $hi, $page) = @{$self->{range}};
1416
1417 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
1418
1419 my $inner_pad_px = $self->_calc_inner_pad_px ($w);
1420 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
1421
1422 $x -= $inner_pad_px; # substract the padding
1423 $x = $x * ($hi - $lo) / $inner_w + $lo;
1424 $x = $lo if $x < $lo;
1425 $x = $hi - $page if $x > $hi - $page;
1426 $self->{range}[0] = $x;
1427
1428 $self->emit (changed => $x);
1429 $self->update;
1430 }
1431}
1432
1433# the inner_* stuff is for generating a padding for the slider handle,
1434# so that the handle doesn't leave the texture. This calculation isn't 100%
1435# correct propably, but it does the job for now
1436sub _calc_inner_pad_px {
1437 my ($self, $w) = @_;
1438 ($w / 100) * $self->{inner_pad} # % to pixels
1439}
1440
1441sub _draw {
1442 my ($self) = @_;
1443
1444 $self->SUPER::_draw ();
1445
1446 my ($w, $h) = @$self{qw(w h)};
1447
1448 if ($self->{vertical}) {
1449 # draw a vertical slider like a rotated horizontal slider
1450
1451 glRotate 90, 0, 0, 1;
1452 glTranslate 0, -$self->{w}, 0;
1453
1454 ($w, $h) = ($h, $w);
1455 }
1456
1457 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
1458 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
1459
1460 my ($value, $lo, $hi, $page) = @{$self->{range}};
1461
1462 $hi = $value + 1 if $lo == $hi;
1463
1464 my $inner_pad_px = $self->_calc_inner_pad_px ($w);
1465 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
1466
1467 $page = int $page * $inner_w / ($hi - $lo);
1468 $value = int +($value - $lo) * $inner_w / ($hi - $lo);
1469
1470 $w -= $page;
1471 $page &= ~1;
1472 glTranslate $page * 0.5, 0, 0;
1473 $page ||= 2;
1474
1475 my $knob_a = $inner_pad_px + ($value - $page * 0.5);
1476 my $knob_b = $inner_pad_px + ($value + $page * 0.5);
1477
1478 glEnable GL_BLEND;
1479 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1480 glEnable GL_TEXTURE_2D;
1481 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1482
1483 # draw background
1484 $tex[1]->draw_quad (0, 0, $w, $h);
1485
1486 # draw handle
1487 $tex[0]->draw_quad ($knob_a, 0, $knob_b - $knob_a, $h);
756 1488
757 glDisable GL_BLEND; 1489 glDisable GL_BLEND;
758 glDisable GL_TEXTURE_2D; 1490 glDisable GL_TEXTURE_2D;
759} 1491}
760 1492
761############################################################################# 1493#############################################################################
762 1494
1495package CFClient::UI::TextView;
1496
1497our @ISA = CFClient::UI::HBox::;
1498
1499use SDL::OpenGL;
1500
1501sub new {
1502 my $class = shift;
1503
1504 my $self = $class->SUPER::new (
1505 req_w => $::WIDTH / 6,
1506 req_h => $::HEIGHT / 6,
1507 fontsize => $::FONTSIZE,
1508 @_,
1509
1510 layout => (new CFClient::Layout),
1511 par => [],
1512 height => 0,
1513 children => [
1514 (new CFClient::UI::Empty expand => 1),
1515 (new CFClient::UI::Slider vertical => 1),
1516 ],
1517 );
1518
1519 $self->{children}[1]->connect (changed => sub {
1520 $self->update;
1521 });
1522
1523 $self
1524}
1525
1526sub set_fontsize {
1527 my ($self, $fontsize) = @_;
1528
1529 $self->{fontsize} = $fontsize;
1530 $self->reflow;
1531}
1532
1533sub text_height {
1534 my ($self, $text) = @_;
1535
1536 my $layout = $self->{layout};
1537
1538 $layout->set_height ($self->{fontsize});
1539 $layout->set_width ($self->{w});
1540 $layout->set_text ($text);
1541
1542 ($layout->size)[1]
1543}
1544
1545sub reflow {
1546 my ($self) = @_;
1547
1548 $self->{need_reflow}++;
1549 $self->update;
1550}
1551
1552sub size_request {
1553 my ($self) = @_;
1554
1555 ($self->{req_w}, $self->{req_h})
1556}
1557
1558sub size_allocate {
1559 my ($self, $x, $y, $w, $h) = @_;
1560
1561 $self->SUPER::size_allocate ($x, $y, $w, $h);
1562
1563 $self->{layout}->set_height ($self->{fontsize});
1564 $self->{layout}->set_width ($self->{w});
1565
1566 $self->reflow;
1567}
1568
1569sub add_paragraph {
1570 my ($self, $color, $text) = @_;
1571
1572 #TODO: intelligently "reformat" paragraph
1573
1574 my $height = $self->text_height ($text);
1575
1576 $self->{height} += $height;
1577
1578 push @{$self->{par}}, [$height, $color, $text];
1579
1580 $self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}];
1581 $self->{children}[1]->update;
1582}
1583
1584sub update {
1585 my ($self) = @_;
1586
1587 $self->SUPER::update;
1588
1589 return unless $self->{h} > 0;
1590
1591 delete $self->{texture};
1592
1593 $ROOT->on_refresh ($self, sub {
1594 if (delete $self->{need_reflow}) {
1595 my $height = 0;
1596
1597 $height += $_->[0] = $self->text_height ($_->[2])
1598 for @{$self->{par}};
1599
1600 $self->{height} = $height;
1601
1602 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];
1603
1604 delete $self->{texture};
1605 }
1606
1607 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
1608 glClearColor 0, 0, 0, 1;
1609 glClear GL_COLOR_BUFFER_BIT;
1610
1611 glEnable GL_BLEND;
1612 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1613 glEnable GL_TEXTURE_2D;
1614 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1615
1616 my $top = int $self->{children}[1]{range}[0];
1617
1618 my $y0 = $top;
1619 my $y1 = $top + $self->{h};
1620
1621 my $y = 0;
1622
1623 my $layout = $self->{layout};
1624
1625 for my $par (@{$self->{par}}) {
1626 my $h = $par->[0];
1627
1628 if ($y0 < $y + $h && $y < $y1) {
1629 $layout->set_text ($par->[2]);
1630
1631 glColor @{ $par->[1] };
1632 my ($W, $H) = $layout->size;
1633 CFClient::Texture->new_from_layout ($layout)->draw_quad (0, $y - $y0);
1634 }
1635
1636 $y += $h;
1637 }
1638
1639 glDisable GL_TEXTURE_2D;
1640 glDisable GL_BLEND;
1641 };
1642 });
1643}
1644
1645sub _draw {
1646 my ($self) = @_;
1647
1648 if ($self->{texture}) {
1649 glEnable GL_TEXTURE_2D;
1650 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1651 $self->{texture}->draw_quad (0, 0, $self->{w}, $self->{h});
1652 glDisable GL_TEXTURE_2D;
1653 }
1654
1655 $self->{children}[1]->draw;
1656
1657}
1658
1659#############################################################################
1660
763package CFClient::Widget::Entry; 1661package CFClient::UI::MapWidget;
764 1662
765our @ISA = CFClient::Widget::Label::; 1663use strict;
1664
1665use List::Util qw(min max);
766 1666
767use SDL; 1667use SDL;
768use SDL::OpenGL; 1668use SDL::OpenGL;
769 1669
1670our @ISA = CFClient::UI::Base::;
1671
1672sub new {
1673 my $class = shift;
1674
1675 $class->SUPER::new (
1676 z => -1,
1677 can_focus => 1,
1678 list => (glGenLists 1),
1679 @_
1680 )
1681}
1682
770sub key_down { 1683sub key_down {
771 my ($self, $ev) = @_; 1684 print "MAPKEYDOWN\n";
1685}
772 1686
773 my $mod = $ev->key_mod; 1687sub key_up {
774 my $sym = $ev->key_sym;
775
776 my $uni = $ev->key_unicode;
777
778 my $text = $self->get_text;
779
780 if ($sym == SDLK_BACKSPACE) {
781 substr $text, -1, 1, '';
782 } elsif ($uni) {
783 $text .= chr $uni;
784 }
785
786 $self->set_text ($text);
787} 1688}
788 1689
789sub button_down { 1690sub button_down {
790 my ($self, $ev) = @_; 1691 my ($self, $ev, $x, $y) = @_;
791 1692
792 $self->focus_in; 1693 $self->focus_in;
1694
1695 if ($ev->button == 2) {
1696 my ($ox, $oy) = ($ev->button_x, $ev->button_y);
1697 my ($bw, $bh) = ($::CFG->{map_shift_x}, $::CFG->{map_shift_y});
1698
1699 $self->{motion} = sub {
1700 my ($ev, $x, $y) = @_;
1701
1702 ($x, $y) = ($ev->motion_x, $ev->motion_y);
1703
1704 $::CFG->{map_shift_x} = $bw + $x - $ox;
1705 $::CFG->{map_shift_y} = $bh + $y - $oy;
1706
1707 $self->update;
1708 };
1709 }
1710}
1711
1712sub button_up {
1713 my ($self, $ev, $x, $y) = @_;
1714
1715 delete $self->{motion};
793} 1716}
794 1717
795sub mouse_motion { 1718sub mouse_motion {
796 my ($self, $ev, $x, $y) = @_; 1719 my ($self, $ev, $x, $y) = @_;
797 printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
798}
799 1720
800sub _draw { 1721 $self->{motion}->($ev, $x, $y) if $self->{motion};
801 my ($self) = @_;
802
803 if ($FOCUS == $self) {
804 glColor 1, 1, 1;
805 } else {
806 glColor 0.7, 0.7, 0.7;
807 }
808
809 glBegin GL_QUADS;
810 glVertex 0 , 0;
811 glVertex 0 , $self->{h} - 1;
812 glVertex $self->{w} - 1, $self->{h} - 1;
813 glVertex $self->{w} - 1, 0;
814 glEnd;
815
816 $self->SUPER::_draw;
817}
818
819#############################################################################
820
821package CFClient::Widget::MapWidget;
822
823use strict;
824
825use List::Util qw(min max);
826
827use SDL;
828use SDL::OpenGL;
829use SDL::OpenGL::Constants;
830
831our @ISA = CFClient::Widget::;
832
833sub new {
834 my $class = shift;
835
836 $class->SUPER::new (
837 z => -1,
838 list => (glGenLists 1),
839 @_
840 )
841}
842
843sub key_down {
844 print "MAPKEYDOWN\n";
845}
846
847sub key_up {
848} 1722}
849 1723
850sub size_request { 1724sub size_request {
851 ( 1725 (
852 1 + int $::WIDTH / 32, 1726 1 + 32 * int $::WIDTH / 32,
853 1 + int $::HEIGHT / 32, 1727 1 + 32 * int $::HEIGHT / 32,
854 ) 1728 )
855} 1729}
856 1730
857sub update { 1731sub update {
858 my ($self) = @_; 1732 my ($self) = @_;
859 1733
860 $self->{need_update} = 1; 1734 $self->{need_update} = 1;
1735 $self->SUPER::update;
861} 1736}
862 1737
863sub _draw { 1738sub draw {
864 my ($self) = @_; 1739 my ($self) = @_;
865 1740
866 if (delete $self->{need_update}) { 1741 if (delete $self->{need_update}) {
867 glNewList $self->{list}, GL_COMPILE; 1742 glNewList $self->{list}, GL_COMPILE;
868 1743
869 my $mx = $::CONN->{mapx}; 1744 if ($::MAP) {
870 my $my = $::CONN->{mapy};
871
872 my $map = $::CONN->{map};
873
874 my ($xofs, $yofs);
875
876 my $sw = 1 + int $::WIDTH / 32; 1745 my $sw = int $::WIDTH / 32;
877 my $sh = 1 + int $::HEIGHT / 32; 1746 my $sh = int $::HEIGHT / 32;
878 1747
879 if ($::CONN->{mapw} > $sw) { 1748 my $sx = $::CFG->{map_shift_x}; my $sx0 = $sx & 31; $sx = ($sx - $sx0) / 32;
880 $xofs = $mx + ($::CONN->{mapw} - $sw) * 0.5; 1749 my $sy = $::CFG->{map_shift_y}; my $sy0 = $sy & 31; $sy = ($sy - $sy0) / 32;
881 } else { 1750
882 $xofs = $self->{xofs} = min $mx, max $mx + $::CONN->{mapw} - $sw + 1, $self->{xofs}; 1751 glTranslate $sx0 - 32, $sy0 - 32, 0;
1752
1753 my ($w, $h, $data) = $::MAP->draw ($sx, $sy, 0, 0, $sw + 1, $sh + 1);
1754
1755 if ($::CFG->{fow_enable}) {
1756 if ($::CFG->{fow_smooth}) { # smooth fog of war
1757 glConvolutionParameter GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER;
1758 glConvolutionFilter2D
1759 GL_CONVOLUTION_2D,
1760 GL_ALPHA,
1761 3, 3,
1762 GL_ALPHA, GL_FLOAT,
1763 pack "f*",
1764 0.1, 0.1, 0.1,
1765 0.1, 0.2, 0.1,
1766 0.1, 0.1, 0.1,
1767 ;
1768 glEnable GL_CONVOLUTION_2D;
1769 }
1770
1771 my $tex = new CFClient::Texture
1772 w => $w,
1773 h => $h,
1774 data => $data,
1775 internalformat => GL_ALPHA,
1776 format => GL_ALPHA;
1777
1778 glDisable GL_CONVOLUTION_2D if $::CFG->{fow_smooth};
1779
1780 glEnable GL_BLEND;
1781 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1782 glEnable GL_TEXTURE_2D;
1783 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1784
1785 glColor +($::CFG->{fow_intensity}) x 3, 1;
1786 $tex->draw_quad (0, 0, $w * 32, $h * 32);
1787
1788 glDisable GL_TEXTURE_2D;
1789 glDisable GL_BLEND;
1790 }
1791
1792 # HACK BEGIN
1793 {
1794 glTranslate -($sx0 - 32), -($sy0 - 32), 0;#remove
1795 my ($w, $h) = (250, 250);
1796
1797 glEnable GL_BLEND;
1798 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1799 glEnable GL_TEXTURE_2D;
1800 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1801
1802 CFClient::Texture->new (
1803 w => $w,
1804 h => $h,
1805 data => $::MAP->mapmap ($w, $h),
1806 type => GL_UNSIGNED_INT_8_8_8_8_REV
1807 )->draw_quad (100, 100);
1808
1809 glDisable GL_TEXTURE_2D;
1810 glDisable GL_BLEND;
1811 }
1812 # HACK END
883 } 1813 }
884 1814
885 if ($::CONN->{maph} > $sh) {
886 $yofs = $my + ($::CONN->{maph} - $sh) * 0.5;
887 } else {
888 $yofs = $self->{yofs} = min $my, max $my + $::CONN->{maph} - $sh + 1, $self->{yofs};
889 }
890
891 glEnable GL_TEXTURE_2D;
892 glEnable GL_BLEND;
893 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
894
895 my $sw4 = ($sw + 3) & ~3;
896 my $darkness = "\x00" x ($sw4 * $sh);
897
898 for my $x (0 .. $sw - 1) {
899 my $row = $map->[$x + $xofs];
900 for my $y (0 .. $sh - 1) {
901
902 my $cell = $row->[$y + $yofs]
903 or next;
904
905 my $dark = $cell->[0];
906 if ($dark < 0) {
907 substr $darkness, $y * $sw4 + $x, 1, chr 224;
908 } else {
909 substr $darkness, $y * $sw4 + $x, 1, chr 255 - $dark;
910 }
911
912 for my $num (grep $_, @$cell[1,2,3]) {
913 my $tex = $::CONN->{face}[$num]{texture} || next;
914
915 my $w = $tex->{width};
916 my $h = $tex->{height};
917
918 $tex->draw_quad (($x + 1) * 32 - $w, ($y + 1) * 32 - $h, $w, $h);
919 }
920 }
921 }
922
923# if (1) { # higher quality darkness
924# $lighting =~ s/(.)/$1$1$1/gs;
925# my $pb = new_from_data Gtk2::Gdk::Pixbuf $lighting, "rgb", 0, 8, $sw4, $sh, $sw4 * 3;
926#
927# $pb = $pb->scale_simple ($sw4 * 0.5, $sh * 0.5, "bilinear");
928#
929# $lighting = $pb->get_pixels;
930# $lighting =~ s/(.)../$1/gs;
931# }
932
933 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
934 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
935
936 $darkness = new CFClient::Texture
937 width => $sw4,
938 height => $sh,
939 data => $darkness,
940 internalformat => GL_ALPHA,
941 format => GL_ALPHA;
942
943 glColor 0.45, 0.45, 0.45, 1;
944 $darkness->draw_quad (0, 0, $sw4 * 32, $sh * 32);
945
946 glDisable GL_TEXTURE_2D;
947 glDisable GL_BLEND;
948
949 glEndList; 1815 glEndList;
950 } 1816 }
951 1817
1818 glPushMatrix;
952 glCallList $self->{list}; 1819 glCallList $self->{list};
1820 glPopMatrix;
1821
1822 if ($FOCUS != $self) {
1823 glColor 64/255, 64/255, 64/255;
1824 glLogicOp GL_AND;
1825 glEnable GL_COLOR_LOGIC_OP;
1826 glBegin GL_QUADS;
1827 glVertex 0, 0;
1828 glVertex 0, $::HEIGHT;
1829 glVertex $::WIDTH, $::HEIGHT;
1830 glVertex $::WIDTH, 0;
1831 glEnd;
1832 glDisable GL_COLOR_LOGIC_OP;
1833 }
953} 1834}
954 1835
955my %DIR = ( 1836my %DIR = (
956 SDLK_KP8, [1, "north"], 1837 SDLK_KP8, [1, "north"],
957 SDLK_KP9, [2, "northeast"], 1838 SDLK_KP9, [2, "northeast"],
… …
973 1854
974 my $mod = $ev->key_mod; 1855 my $mod = $ev->key_mod;
975 my $sym = $ev->key_sym; 1856 my $sym = $ev->key_sym;
976 1857
977 if ($sym == SDLK_KP5) { 1858 if ($sym == SDLK_KP5) {
978 $::CONN->send ("command stay fire"); 1859 $::CONN->user_send ("command stay fire");
1860 } elsif ($sym == SDLK_a) {
1861 $::CONN->user_send ("command apply");
1862 } elsif ($sym == SDLK_QUOTE) {
1863 $self->emit ('activate_console');
1864 } elsif ($sym == SDLK_SLASH) {
1865 $self->emit ('activate_console' => '/');
979 } elsif (exists $DIR{$sym}) { 1866 } elsif (exists $DIR{$sym}) {
980 if ($mod & KMOD_SHIFT) { 1867 if ($mod & KMOD_SHIFT) {
981 $self->{shft}++; 1868 $self->{shft}++;
982 $::CONN->send ("command fire $DIR{$sym}[0]"); 1869 $::CONN->user_send ("command fire $DIR{$sym}[0]");
983 } elsif ($mod & KMOD_CTRL) { 1870 } elsif ($mod & KMOD_CTRL) {
984 $self->{ctrl}++; 1871 $self->{ctrl}++;
985 $::CONN->send ("command run $DIR{$sym}[0]"); 1872 $::CONN->user_send ("command run $DIR{$sym}[0]");
986 } else { 1873 } else {
987 $::CONN->send ("command $DIR{$sym}[1]"); 1874 $::CONN->user_send ("command $DIR{$sym}[1]");
988 } 1875 }
989 } 1876 }
990} 1877}
991 1878
992sub key_up { 1879sub key_up {
… …
994 1881
995 my $mod = $ev->key_mod; 1882 my $mod = $ev->key_mod;
996 my $sym = $ev->key_sym; 1883 my $sym = $ev->key_sym;
997 1884
998 if (!($mod & KMOD_SHIFT) && delete $self->{shft}) { 1885 if (!($mod & KMOD_SHIFT) && delete $self->{shft}) {
999 $::CONN->send ("command fire_stop"); 1886 $::CONN->user_send ("command fire_stop");
1000 } 1887 }
1001 if (!($mod & KMOD_CTRL ) && delete $self->{ctrl}) { 1888 if (!($mod & KMOD_CTRL ) && delete $self->{ctrl}) {
1002 $::CONN->send ("command run_stop"); 1889 $::CONN->user_send ("command run_stop");
1003 } 1890 }
1004} 1891}
1005 1892
1006############################################################################# 1893#############################################################################
1007 1894
1008package CFClient::Widget::Animator; 1895package CFClient::UI::Animator;
1009 1896
1010use SDL::OpenGL; 1897use SDL::OpenGL;
1011 1898
1012our @ISA = CFClient::Widget::Bin::; 1899our @ISA = CFClient::UI::Bin::;
1013 1900
1014sub moveto { 1901sub moveto {
1015 my ($self, $x, $y) = @_; 1902 my ($self, $x, $y) = @_;
1016 1903
1017 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y]; 1904 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
… …
1045 glPopMatrix; 1932 glPopMatrix;
1046} 1933}
1047 1934
1048############################################################################# 1935#############################################################################
1049 1936
1050package CFClient::Widget::Toplevel; 1937package CFClient::UI::Flopper;
1051 1938
1939our @ISA = CFClient::UI::Button::;
1940
1941sub new {
1942 my $class = shift;
1943
1944 my $self = $class->SUPER::new (
1945 state => 0,
1946 connect_activate => \&toggle_flopper,
1947 @_
1948 );
1949
1950 if ($self->{state}) {
1951 $self->{state} = 0;
1952 $self->toggle_flopper;
1953 }
1954
1955 $self
1956}
1957
1958sub toggle_flopper {
1959 my ($self) = @_;
1960
1961 # TODO: use animation
1962 if ($self->{state} = !$self->{state}) {
1963 $CFClient::UI::ROOT->add ($self->{other});
1964 $self->{other}->move ($self->coord2global (0, $self->{h}));
1965 $self->emit ("open");
1966 } else {
1967 $CFClient::UI::ROOT->remove ($self->{other});
1968 $self->emit ("close");
1969 }
1970
1971 $self->emit (changed => $self->{state});
1972}
1973
1974#############################################################################
1975
1976package CFClient::UI::Root;
1977
1052our @ISA = CFClient::Widget::Container::; 1978our @ISA = CFClient::UI::Container::;
1979
1980use SDL::OpenGL;
1053 1981
1054sub size_request { 1982sub size_request {
1055 ($::WIDTH, $::HEIGHT) 1983 ($::WIDTH, $::HEIGHT)
1056} 1984}
1057 1985
1058sub size_allocate { 1986sub size_allocate {
1059 my ($self, $w, $h) = @_; 1987 my ($self, $x, $y, $w, $h) = @_;
1060 1988
1061 $self->SUPER::size_allocate ($w, $h); 1989 $self->_size_allocate ($x, $y, $w, $h);
1062 1990
1063 $_->size_allocate ($_->size_request) 1991 $_->size_allocate ($_->{x}, $_->{y}, $_->size_request)
1064 for @{$self->{children}}; 1992 for @{$self->{children}};
1065} 1993}
1066 1994
1067sub translate { 1995sub _topleft {
1068 my ($self, $x, $y) = @_; 1996 my ($self, $x, $y) = @_;
1069 1997
1070 ($x, $y) 1998 ($x, $y)
1071} 1999}
1072 2000
1073sub update { 2001sub update {
1074 my ($self) = @_; 2002 my ($self) = @_;
1075 2003
1076 $self->size_allocate ($self->size_request); 2004 $self->size_allocate (0, 0, $::WIDTH, $::HEIGHT);
1077 ::refresh (); 2005 ::refresh ();
1078} 2006}
1079 2007
1080sub add { 2008sub add {
1081 my ($self, $widget) = @_; 2009 my ($self, $widget) = @_;
1082 2010
1083 $self->SUPER::add ($widget); 2011 $self->SUPER::add ($widget);
1084 2012
1085 $widget->size_allocate ($widget->size_request); 2013 $widget->size_allocate ($widget->{x}, $widget->{y}, $widget->size_request);
2014}
2015
2016sub on_refresh {
2017 my ($self, $id, $cb) = @_;
2018
2019 $self->{refresh_hook}{$id} = $cb;
1086} 2020}
1087 2021
1088sub draw { 2022sub draw {
1089 my ($self) = @_; 2023 my ($self) = @_;
1090 2024
2025 while (my $rcb = delete $self->{refresh_hook}) {
2026 $_->() for values %$rcb;
2027 }
2028
2029 glViewport 0, 0, $::WIDTH, $::HEIGHT;
2030 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2031 glClear GL_COLOR_BUFFER_BIT;
2032
2033 glMatrixMode GL_PROJECTION;
2034 glLoadIdentity;
2035 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000;
2036 glMatrixMode GL_MODELVIEW;
2037 glLoadIdentity;
2038
1091 $self->_draw; 2039 $self->_draw;
1092} 2040}
1093 2041
1094############################################################################# 2042#############################################################################
1095 2043
1096package CFClient::Widget; 2044package CFClient::UI;
1097 2045
1098$TOPLEVEL = new CFClient::Widget::Toplevel; 2046$ROOT = new CFClient::UI::Root;
1099 2047
11001 20481
1101 2049

Diff Legend

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