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.57 by root, Mon Apr 10 22:53:49 2006 UTC vs.
Revision 1.121 by root, Mon Apr 17 19:21:00 2006 UTC

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

Diff Legend

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