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.49 by root, Sun Apr 9 22:26:51 2006 UTC vs.
Revision 1.85 by elmex, Wed Apr 12 12:55:56 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 ();
7
8use CFClient;
9
10our ($FOCUS, $HOVER, $GRAB); # various widgets
11
12our $TOPLEVEL;
13our $BUTTON_STATE;
14
15# class methods for events
16sub feed_sdl_key_down_event {
17 $FOCUS->key_down ($_[0]) if $FOCUS;
18}
19
20sub feed_sdl_key_up_event {
21 $FOCUS->key_up ($_[0]) if $FOCUS;
22}
23
24sub feed_sdl_button_down_event {
25 my ($ev) = @_;
26 my ($x, $y) = ($ev->motion_x, $ev->motion_y);
27
28 if (!$BUTTON_STATE) {
29 my $widget = $TOPLEVEL->find_widget ($x, $y);
30
31 $GRAB = $widget;
32 $GRAB->update if $GRAB;
33 }
34
35 $BUTTON_STATE |= 1 << ($ev->button - 1);
36
37 $GRAB->button_down ($ev, $GRAB->translate ($x, $y)) if $GRAB;
38}
39
40sub feed_sdl_button_up_event {
41 my ($ev) = @_;
42 my ($x, $y) = ($ev->motion_x, $ev->motion_y);
43
44 my $widget = $GRAB || $TOPLEVEL->find_widget ($x, $y);
45
46 $BUTTON_STATE &= ~(1 << ($ev->button - 1));
47
48 $GRAB->button_up ($ev, $GRAB->translate ($x, $y)) if $GRAB;
49
50 if (!$BUTTON_STATE) {
51 my $grab = $GRAB; undef $GRAB;
52 $grab->update if $grab;
53 $GRAB->update if $GRAB;
54 }
55}
56
57sub feed_sdl_motion_event {
58 my ($ev) = @_;
59 my ($x, $y) = ($ev->motion_x, $ev->motion_y);
60
61 my $widget = $GRAB || $TOPLEVEL->find_widget ($x, $y);
62
63 if ($widget != $HOVER) {
64 my $hover = $HOVER; $HOVER = $widget;
65
66 $hover->update if $hover;
67 $HOVER->update if $HOVER;
68 }
69
70 $HOVER->mouse_motion ($ev, $HOVER->translate ($x, $y)) if $HOVER;
71}
72
73#############################################################################
74
75package CFClient::UI::Base;
76
77use strict;
6 78
7use SDL::OpenGL; 79use SDL::OpenGL;
8use SDL::OpenGL::Constants;
9
10use Crossfire::Client;
11
12# class methods for events
13sub feed_sdl_key_down_event { $::FOCUS->key_down ($_[0]) if $::FOCUS }
14sub feed_sdl_key_up_event { $::FOCUS->key_up ($_[0]) if $::FOCUS }
15sub feed_sdl_button_down_event { }
16sub feed_sdl_button_up_event { }
17 80
18sub new { 81sub new {
19 my $class = shift; 82 my $class = shift;
20 83
21 bless { @_ }, $class 84 my $self = bless {
85 x => 0,
86 y => 0,
87 z => 0,
88 w => -1,
89 h => -1,
90 @_
91 }, $class;
92
93 for (keys %$self) {
94 if (/^connect_(.*)$/) {
95 $self->connect ($1 => delete $self->{$_});
96 }
97 }
98
99 $self
22} 100}
23 101
24sub move { 102sub move {
25 my ($self, $x, $y, $z) = @_; 103 my ($self, $x, $y, $z) = @_;
26 $self->{x} = $x; 104 $self->{x} = $x;
… …
35sub size_request { 113sub size_request {
36 require Carp; 114 require Carp;
37 Carp::confess "size_request is abtract"; 115 Carp::confess "size_request is abtract";
38} 116}
39 117
40sub size_allocate { 118sub _size_allocate {
41 my ($self, $w, $h) = @_; 119 my ($self, $x, $y, $w, $h) = @_;
120
121 $self->{x} = $x;
122 $self->{y} = $y;
123
124 return unless $self->{w} != $w || $self->{h} != $h;
42 125
43 $self->{w} = $w; 126 $self->{w} = $w;
44 $self->{h} = $h; 127 $self->{h} = $h;
128
129 1
130}
131
132sub size_allocate {
133 my ($self, $x, $y, $w, $h) = @_;
134
135 $self->_size_allocate ($x, $y, $w, $h);
136}
137
138# translate global coordinates to local coordinate system
139sub translate {
140 my ($self, $x, $y) = @_;
141
142 $self->{parent}->translate ($x - $self->{x}, $y - $self->{y});
45} 143}
46 144
47sub focus_in { 145sub focus_in {
48 my ($widget) = @_; 146 my ($self) = @_;
49 $::FOCUS = $widget; 147
148 return if $FOCUS == $self;
149
150 my $focus = $FOCUS; $FOCUS = $self;
151 $focus->update if $focus;
152 $FOCUS->update;
50} 153}
51 154
52sub focus_out { 155sub focus_out {
53 my ($widget) = @_; 156 my ($self) = @_;
54}
55 157
158 return unless $FOCUS == $self;
159
160 my $focus = $FOCUS; undef $FOCUS;
161 $focus->update if $focus; #?
162}
163
164sub mouse_motion { }
165sub button_up { }
56sub key_down { 166sub key_down { }
57 my ($widget, $sdlev) = @_;
58}
59
60sub key_up { 167sub key_up { }
61 my ($widget, $sdlev) = @_;
62}
63 168
64sub button_down { 169sub button_down {
65 my ($widget, $sdlev) = @_; 170 my ($self, $ev, $x, $y) = @_;
66}
67 171
68sub button_up { 172 $self->focus_in;
69 my ($widget, $sdlev) = @_;
70} 173}
71 174
72sub w { $_[0]->{w} = $_[1] if $_[1]; $_[0]->{w} } 175sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} }
73sub h { $_[0]->{h} = $_[1] if $_[1]; $_[0]->{h} } 176sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} }
74sub x { $_[0]->{x} = $_[1] if $_[1]; $_[0]->{x} } 177sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} }
75sub y { $_[0]->{y} = $_[1] if $_[1]; $_[0]->{y} } 178sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} }
76sub z { $_[0]->{z} = $_[1] if $_[1]; $_[0]->{z} } 179sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} }
77 180
78sub draw { 181sub draw {
79 my ($self) = @_; 182 my ($self) = @_;
183
184 return unless $self->{h} && $self->{w};
80 185
81 glPushMatrix; 186 glPushMatrix;
82 glTranslate $self->{x}, $self->{y}, 0; 187 glTranslate $self->{x}, $self->{y}, 0;
83 $self->_draw; 188 $self->_draw;
189 glPopMatrix;
190
84 if ($self == $::HOVER) { 191 if ($self == $HOVER) {
85 glColor 1, 1, 1, 0.4; 192 my ($x, $y) = @$self{qw(x y)};
193
194 glColor 0, 0, 1, 0.2;
195 glEnable GL_BLEND;
196 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
86 glBegin GL_QUADS; 197 glBegin GL_QUADS;
87 glVertex 0, 0; 198 glVertex $x , $y;
88 glVertex $self->{w} - 1, 0; 199 glVertex $x + $self->{w}, $y;
89 glVertex $self->{w} - 1, $self->{h} - 1; 200 glVertex $x + $self->{w}, $y + $self->{h};
90 glVertex 0, $self->{h} - 1; 201 glVertex $x , $y + $self->{h};
91 glEnd; 202 glEnd;
203 glDisable GL_BLEND;
92 } 204 }
93 glPopMatrix;
94} 205}
95 206
96sub _draw { 207sub _draw {
97 my ($self) = @_; 208 my ($self) = @_;
98 209
99 warn "no draw defined for $self\n"; 210 warn "no draw defined for $self\n";
100}
101
102sub bbox {
103 my ($self) = @_;
104 my ($w, $h) = $self->size_request;
105 (
106 $self->{x},
107 $self->{y},
108 $self->{x} = $w,
109 $self->{y} = $h
110 )
111} 211}
112 212
113sub find_widget { 213sub find_widget {
114 my ($self, $x, $y) = @_; 214 my ($self, $x, $y) = @_;
115 215
… …
118 && $y >= $self->{y} && $y < $self->{y} + $self->{h}; 218 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
119 219
120 () 220 ()
121} 221}
122 222
123sub del_parent { $_[0]->{parent} = undef }
124
125sub set_parent { 223sub set_parent {
126 my ($self, $par) = @_; 224 my ($self, $par) = @_;
127 225
128 $self->{parent} = $par; 226 $self->{parent} = $par;
129 Scalar::Util::weaken $self->{parent}; 227 Scalar::Util::weaken $self->{parent};
… …
138 236
139 $self->{parent}->update 237 $self->{parent}->update
140 if $self->{parent}; 238 if $self->{parent};
141} 239}
142 240
241sub connect {
242 my ($self, $signal, $cb) = @_;
243
244 push @{ $self->{cb}{$signal} }, $cb;
245}
246
247sub emit {
248 my ($self, $signal, @args) = @_;
249
250 $_->($self, @args)
251 for @{$self->{cb}{$signal} || []};
252}
253
143sub DESTROY { 254sub DESTROY {
144 my ($self) = @_; 255 my ($self) = @_;
145 256
146 #$self->deactivate; 257 #$self->deactivate;
147} 258}
148 259
149############################################################################# 260#############################################################################
150 261
151package Crossfire::Client::Widget::Container; 262package CFClient::UI::DrawBG;
152 263
153our @ISA = Crossfire::Client::Widget::; 264our @ISA = CFClient::UI::Base::;
265
266use strict;
267use SDL::OpenGL;
154 268
155sub new { 269sub new {
270 my $class = shift;
271
272 # range [value, low, high, page]
273
274 $class->SUPER::new (
275 bg => [0, 0, 0, 0.2],
276 active_bg => [1, 1, 1, 0.5],
277 @_
278 )
279}
280
281sub _draw {
282 my ($self) = @_;
283
284 my ($w, $h) = @$self{qw(w h)};
285
286 glEnable GL_BLEND;
287 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
288 glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} };
289
290 glBegin GL_QUADS;
291 glVertex 0 , 0;
292 glVertex 0 , $h;
293 glVertex $w, $h;
294 glVertex $w, 0;
295 glEnd;
296
297 glDisable GL_BLEND;
298}
299
300#############################################################################
301
302package CFClient::UI::Empty;
303
304our @ISA = CFClient::UI::Base::;
305
306sub size_request {
307 (0, 0)
308}
309
310sub draw { }
311
312#############################################################################
313
314package CFClient::UI::Container;
315
316our @ISA = CFClient::UI::Base::;
317
318sub new {
156 my ($class, @widgets) = @_; 319 my ($class, %arg) = @_;
157 320
321 my $children = delete $arg{children} || [];
322
158 my $self = $class->SUPER::new (children => []); 323 my $self = $class->SUPER::new (children => [], %arg);
159 $self->add ($_) for @widgets; 324 $self->add ($_) for @$children;
160 325
161 $self 326 $self
162} 327}
163 328
164sub add { 329sub add {
165 my ($self, $chld, $expand) = @_; 330 my ($self, $chld) = @_;
166 331
167 $chld->{expand} = $expand;
168 $chld->set_parent ($self); 332 $chld->set_parent ($self);
169 333
170 @{$self->{children}} = 334 $self->{children} = [
171 sort { $a->{z} <=> $b->{z} } 335 sort { $a->{z} <=> $b->{z} }
172 @{$self->{children}}, $chld; 336 @{$self->{children}}, $chld
337 ];
173 338
174 $self->size_allocate ($self->{w}, $self->{h}) 339 $self->{w} = $self->{h} = -1;
175 if $self->{w}; #TODO: check for "realised state" 340 $self->update;
176} 341}
177 342
178sub remove { 343sub remove {
179 my ($self, $widget) = @_; 344 my ($self, $widget) = @_;
180 345
181 $self->{children} = [ grep $_ != $widget, @{ $self->{children} } ]; 346 $self->{children} = [ grep $_ != $widget, @{ $self->{children} } ];
182 347
183 $self->size_allocate ($self->{w}, $self->{h}); 348 $self->size_allocate (0, 0, $self->{w}, $self->{h});
184} 349}
185 350
186sub find_widget { 351sub find_widget {
187 my ($self, $x, $y) = @_; 352 my ($self, $x, $y) = @_;
188 353
… …
205 $_->draw for @{$self->{children}}; 370 $_->draw for @{$self->{children}};
206} 371}
207 372
208############################################################################# 373#############################################################################
209 374
210package Crossfire::Client::Widget::Bin; 375package CFClient::UI::Bin;
211 376
212our @ISA = Crossfire::Client::Widget::Container::; 377our @ISA = CFClient::UI::Container::;
213 378
214sub child { $_[0]->{children}[0] } 379sub new {
380 my ($class, %arg) = @_;
215 381
216sub size_request { 382 my $child = (delete $arg{child}) || new CFClient::UI::Empty::;
217 $_[0]{children}[0]->size_request if $_[0]{children}[0];
218}
219 383
220sub size_allocate { 384 $class->SUPER::new (children => [$child], %arg)
221 my ($self, $w, $h) = @_;
222
223 $self->SUPER::size_allocate ($w, $h);
224 $self->{children}[0]->size_allocate ($w, $h)
225 if $self->{children}[0]
226}
227
228#############################################################################
229
230package Crossfire::Client::Widget::Toplevel;
231
232our @ISA = Crossfire::Client::Widget::Container::;
233
234sub update {
235 my ($self) = @_;
236
237 ::refresh ();
238} 385}
239 386
240sub add { 387sub add {
241 my ($self, $widget) = @_; 388 my ($self, $widget) = @_;
242 389
390 $self->{children} = [];
391
243 $self->SUPER::add ($widget); 392 $self->SUPER::add ($widget);
244
245 $widget->size_allocate ($widget->size_request);
246} 393}
247 394
248############################################################################# 395sub remove {
396 my ($self, $widget) = @_;
249 397
250package Crossfire::Client::Widget::Window; 398 $self->SUPER::remove ($widget);
251 399
252our @ISA = Crossfire::Client::Widget::Bin::; 400 $self->{children} = [new CFClient::UI::Empty]
401 unless @{$self->{children}};
402}
403
404sub child { $_[0]->{children}[0] }
405
406sub size_request {
407 $_[0]{children}[0]->size_request
408}
409
410sub size_allocate {
411 my ($self, $x, $y, $w, $h) = @_;
412
413 $self->_size_allocate ($x, $y, $w, $h) or return;
414
415 $self->{children}[0]->size_allocate (0, 0, $w, $h);
416}
417
418#############################################################################
419
420package CFClient::UI::Window;
421
422our @ISA = CFClient::UI::Bin::;
253 423
254use SDL::OpenGL; 424use SDL::OpenGL;
255 425
256sub new { 426sub new {
257 my ($class, $x, $y, $z, $w, $h) = @_; 427 my ($class, %arg) = @_;
258 428
259 my $self = $class->SUPER::new; 429 my $self = $class->SUPER::new (%arg);
260
261 @$self{qw(x y z w h)} = ($x, $y, $z, $w, $h);
262} 430}
263 431
264sub update { 432sub update {
265 my ($self) = @_; 433 my ($self) = @_;
266 434
435 # we want to do this delayed...
267 $self->render_chld; 436 $self->render_chld;
268 $self->SUPER::update; 437 $self->SUPER::update;
269} 438}
270 439
271sub render_chld { 440sub render_chld {
272 my ($self) = @_; 441 my ($self) = @_;
273 442
274 $self->{texture} = 443 $self->{texture} =
275 Crossfire::Client::Texture->new_from_opengl ( 444 CFClient::Texture->new_from_opengl (
276 $self->{w}, $self->{h}, sub { $self->child->draw } 445 $self->{w}, $self->{h}, sub { $self->child->draw }
277 ); 446 );
278} 447}
279 448
280sub size_allocate { 449sub size_allocate {
281 my ($self, $w, $h) = @_; 450 my ($self, $x, $y, $w, $h) = @_;
282 451
283 $self->{w} = $w; 452 $self->_size_allocate ($x, $y, $w, $h) or return;
284 $self->{h} = $h;
285 453
286 $self->child->size_allocate ($w, $h); 454 $self->child->size_allocate (0, 0, $w, $h);
287 455
288 $self->render_chld; 456 $self->render_chld;
289} 457}
290 458
291sub _draw { 459sub _draw {
… …
295 463
296 my $tex = $self->{texture} 464 my $tex = $self->{texture}
297 or return; 465 or return;
298 466
299 glEnable GL_BLEND; 467 glEnable GL_BLEND;
468 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
300 glEnable GL_TEXTURE_2D; 469 glEnable GL_TEXTURE_2D;
301 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 470 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
302 glBindTexture GL_TEXTURE_2D, $tex->{name};
303 471
304 glBegin GL_QUADS; 472 $tex->draw_quad (0, 0, $w, $h);
305 glTexCoord 0, 0; glVertex 0, 0;
306 glTexCoord 0, 1; glVertex 0, $h;
307 glTexCoord 1, 1; glVertex $w, $h;
308 glTexCoord 1, 0; glVertex $w, 0;
309 glEnd;
310 473
311 glDisable GL_BLEND; 474 glDisable GL_BLEND;
312 glDisable GL_TEXTURE_2D; 475 glDisable GL_TEXTURE_2D;
313} 476}
314 477
315############################################################################# 478#############################################################################
316 479
317package Crossfire::Client::Widget::Frame; 480package CFClient::UI::Frame;
318 481
319our @ISA = Crossfire::Client::Widget::Bin::; 482our @ISA = CFClient::UI::Bin::;
320 483
321use SDL::OpenGL; 484use SDL::OpenGL;
322 485
323sub size_request { 486sub size_request {
324 my ($self) = @_; 487 my ($self) = @_;
… …
329 492
330 map { $_ + 4 } $chld->size_request; 493 map { $_ + 4 } $chld->size_request;
331} 494}
332 495
333sub size_allocate { 496sub size_allocate {
334 my ($self, $w, $h) = @_; 497 my ($self, $x, $y, $w, $h) = @_;
335 498
336 $self->{w} = $w; 499 $self->_size_allocate ($x, $y, $w, $h) or return;
337 $self->{h} = $h;
338 500
339 $self->child->size_allocate ($w - 4, $h - 4); 501 $self->child->size_allocate (2, 2, $w - 4, $h - 4);
340 $self->child->move (2, 2);
341} 502}
342 503
343sub _draw { 504sub _draw {
344 my ($self) = @_; 505 my ($self) = @_;
345 506
… …
347 508
348 my ($w, $h) = $chld->size_request; 509 my ($w, $h) = $chld->size_request;
349 510
350 glBegin GL_QUADS; 511 glBegin GL_QUADS;
351 glColor 0, 0, 0; 512 glColor 0, 0, 0;
352 glTexCoord 0, 0; glVertex 0 , 0; 513 glVertex 0 , 0;
353 glTexCoord 0, 1; glVertex 0 , $h + 4; 514 glVertex 0 , $h + 4;
354 glTexCoord 1, 1; glVertex $w + 4 , $h + 4; 515 glVertex $w + 4 , $h + 4;
355 glTexCoord 1, 0; glVertex $w + 4 , 0; 516 glVertex $w + 4 , 0;
356 glEnd; 517 glEnd;
357 518
358 $chld->draw; 519 $chld->draw;
359} 520}
360 521
361############################################################################# 522#############################################################################
362 523
363package Crossfire::Client::Widget::FancyFrame; 524package CFClient::UI::FancyFrame;
364 525
365our @ISA = Crossfire::Client::Widget::Bin::; 526our @ISA = CFClient::UI::Bin::;
366 527
367use SDL::OpenGL; 528use SDL::OpenGL;
368 529
369my @tex = 530my @tex =
370 map { new_from_file Crossfire::Client::Texture Crossfire::Client::find_rcfile $_ } 531 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
371 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 532 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
372 533
373sub size_request { 534sub size_request {
374 my ($self) = @_; 535 my ($self) = @_;
375 536
537 return ($self->{user_w}, $self->{user_h}) if $self->{user_w} && $self->{user_h};
538
376 my ($w, $h) = $self->SUPER::size_request; 539 my ($w, $h) = $self->SUPER::size_request;
377 540
378 $h += $tex[1]->{height}; 541 $h += $tex[1]->{h};
379 $h += $tex[4]->{height}; 542 $h += $tex[4]->{h};
380 $w += $tex[2]->{width}; 543 $w += $tex[2]->{w};
381 $w += $tex[3]->{width}; 544 $w += $tex[3]->{w};
382 545
383 ($w, $h) 546 ($w, $h)
384} 547}
385 548
386sub size_allocate { 549sub size_allocate {
387 my ($self, $w, $h) = @_; 550 my ($self, $x, $y, $w, $h) = @_;
388 551
389 $self->SUPER::size_allocate ($w, $h); 552 $self->_size_allocate ($x, $y, $w, $h) or return;
390 553
391 $h -= $tex[1]->{height}; 554 $h -= $tex[1]{h};
392 $h -= $tex[4]->{height}; 555 $h -= $tex[4]{h};
393 $w -= $tex[2]->{width}; 556 $w -= $tex[2]{w};
394 $w -= $tex[3]->{width}; 557 $w -= $tex[3]{w};
395 558
396 $h = $h < 0 ? 0 : $h; 559 $h = $h < 0 ? 0 : $h;
397 $w = $w < 0 ? 0 : $w; 560 $w = $w < 0 ? 0 : $w;
398 561
399 $self->child->size_allocate ($w, $h); 562 my $child = $self->child;
400 $self->child->move ($tex[3]->{width}, $tex[1]->{height}); 563
564 $child->size_allocate ($tex[3]->{w}, $tex[1]->{h}, $w, $h);
565}
566
567sub button_down {
568 my ($self, $ev, $x, $y) = @_;
569
570 if ($x < $self->{w} && $x >= $self->{w} - $tex[2]{w}
571 && $y < $self->{h} && $y >= $self->{h} - $tex[4]{h}) {
572
573 my ($ox, $oy) = ($ev->button_x, $ev->button_y);
574 my ($bw, $bh) = ($self->{w}, $self->{h});
575
576 $self->{motion} = sub {
577 my ($ev, $x, $y) = @_;
578
579 ($x, $y) = ($ev->motion_x, $ev->motion_y);
580
581 $self->{user_w} = $bw + $x - $ox;
582 $self->{user_h} = $bh + $y - $oy;
583 $self->update;
584 };
585
586 } elsif ($x >= 0 && $x < $self->{w}
587 && $y >= 0 && $y < $tex[1]{h}) {
588
589 my ($ox, $oy) = ($ev->button_x, $ev->button_y);
590 my ($bx, $by) = ($self->{x}, $self->{y});
591
592 $self->{motion} = sub {
593 my ($ev, $x, $y) = @_;
594
595 ($x, $y) = ($ev->motion_x, $ev->motion_y);
596
597 $self->move ($bx + $x - $ox, $by + $y - $oy);
598 $self->update;
599 };
600 }
601}
602
603sub button_up {
604 my ($self, $ev, $x, $y) = @_;
605
606 delete $self->{motion};
607}
608
609sub mouse_motion {
610 my ($self, $ev, $x, $y) = @_;
611
612 $self->{motion}->($ev, $x, $y) if $self->{motion};
401} 613}
402 614
403sub _draw { 615sub _draw {
404 my ($self) = @_; 616 my ($self) = @_;
405 617
406 my ($w, $h) = ($self->{w}, $self->{h}); 618 my ($w, $h) = ($self->{w}, $self->{h});
407 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 619 my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
408 620
409 glEnable GL_BLEND; 621 glEnable GL_BLEND;
622 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
410 glEnable GL_TEXTURE_2D; 623 glEnable GL_TEXTURE_2D;
411 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
412 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 624 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
413 625
414 my $top = $tex[1]; 626 my $top = $tex[1];
415 glBindTexture GL_TEXTURE_2D, $top->{name}; 627 $top->draw_quad (0, 0, $w, $top->{h});
416
417 glBegin GL_QUADS;
418 glTexCoord 0, 0; glVertex 0 , 0;
419 glTexCoord 0, 1; glVertex 0 , $top->{height};
420 glTexCoord 1, 1; glVertex $w , $top->{height};
421 glTexCoord 1, 0; glVertex $w , 0;
422 glEnd;
423 628
424 my $left = $tex[3]; 629 my $left = $tex[3];
425 glBindTexture GL_TEXTURE_2D, $left->{name}; 630 $left->draw_quad (0, $top->{h}, $left->{w}, $ch);
426
427 glBegin GL_QUADS;
428 glTexCoord 0, 0; glVertex 0 , $top->{height};
429 glTexCoord 0, 1; glVertex 0 , $top->{height} + $ch;
430 glTexCoord 1, 1; glVertex $left->{width}, $top->{height} + $ch;
431 glTexCoord 1, 0; glVertex $left->{width}, $top->{height};
432 glEnd;
433 631
434 my $right = $tex[2]; 632 my $right = $tex[2];
435 glBindTexture GL_TEXTURE_2D, $right->{name}; 633 $right->draw_quad ($w - $right->{w}, $top->{h}, $right->{w}, $ch);
436
437 glBegin GL_QUADS;
438 glTexCoord 0, 0; glVertex $w - $right->{width}, $top->{height};
439 glTexCoord 0, 1; glVertex $w - $right->{width}, $top->{height} + $ch;
440 glTexCoord 1, 1; glVertex $w , $top->{height} + $ch;
441 glTexCoord 1, 0; glVertex $w , $top->{height};
442 glEnd;
443 634
444 my $bottom = $tex[4]; 635 my $bottom = $tex[4];
445 glBindTexture GL_TEXTURE_2D, $bottom->{name}; 636 $bottom->draw_quad (0, $h - $bottom->{h}, $w, $bottom->{h});
446
447 glBegin GL_QUADS;
448 glTexCoord 0, 0; glVertex 0 , $h - $bottom->{height};
449 glTexCoord 0, 1; glVertex 0 , $h;
450 glTexCoord 1, 1; glVertex $w , $h;
451 glTexCoord 1, 0; glVertex $w , $h - $bottom->{height};
452 glEnd;
453 637
454 my $bg = $tex[0]; 638 my $bg = $tex[0];
639
455 glBindTexture GL_TEXTURE_2D, $bg->{name}; 640 glBindTexture GL_TEXTURE_2D, $bg->{name};
456 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 641 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
457 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT;
458 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT;
459 642
460 my $rep_x = $cw / $bg->{width}; 643 my $rep_x = $cw / $bg->{w};
461 my $rep_y = $ch / $bg->{height}; 644 my $rep_y = $ch / $bg->{h};
462 645
463 glBegin GL_QUADS; 646 $bg->draw_quad ($left->{w}, $top->{h}, $cw, $ch);
464 glTexCoord 0, 0; glVertex $left->{width}, $top->{height};
465 glTexCoord 0, $rep_y; glVertex $left->{width}, $top->{height} + $ch;
466 glTexCoord $rep_x, $rep_y; glVertex $left->{width} + $cw , $top->{height} + $ch;
467 glTexCoord $rep_x, 0; glVertex $left->{width} + $cw , $top->{height};
468 glEnd;
469 647
648 glDisable GL_TEXTURE_2D;
470 glDisable GL_BLEND; 649 glDisable GL_BLEND;
471 glDisable GL_TEXTURE_2D;
472 650
473 $self->child->draw; 651 $self->child->draw;
474 652
475} 653}
476 654
477############################################################################# 655#############################################################################
478 656
479package Crossfire::Client::Widget::Table; 657package CFClient::UI::Table;
480 658
481our @ISA = Crossfire::Client::Widget::Bin::; 659our @ISA = CFClient::UI::Base::;
660
661use List::Util qw(max sum);
482 662
483use SDL::OpenGL; 663use SDL::OpenGL;
664
665sub new {
666 my $class = shift;
667
668 $class->SUPER::new (
669 col_expand => [],
670 @_
671 )
672}
484 673
485sub add { 674sub add {
486 my ($self, $x, $y, $chld) = @_; 675 my ($self, $x, $y, $chld) = @_;
487 my $old_chld = $self->{children}[$y][$x];
488 676
489 $self->{children}[$y][$x] = $chld; 677 $self->{children}[$y][$x] = $chld;
490 $chld->set_parent ($self); 678 $chld->set_parent ($self);
679
680 $self->{w} = $self->{h} = -1;
491 $self->update; 681 $self->update;
492} 682}
493 683
494sub max_row_height { 684sub get_wh {
495 my ($self, $row) = @_; 685 my ($self) = @_;
496 686
497 my $hs = 0; 687 my (@w, @h);
498 for (my $xi = 0; $xi <= $#{$self->{children}->[$row] || []}; $xi++) { 688
689 for my $y (0 .. $#{$self->{children}}) {
499 my $c = $self->{children}->[$row]->[$xi]; 690 my $row = $self->{children}[$y]
500 if ($c) { 691 or next;
692
693 for my $x (0 .. $#$row) {
694 my $widget = $row->[$x]
695 or next;
501 my ($w, $h) = $c->size_request; 696 my ($w, $h) = $widget->size_request;
502 if ($hs < $h) { $hs = $h } 697
698 $w[$x] = max $w[$x], $w;
699 $h[$y] = max $h[$y], $h;
503 } 700 }
504 } 701 }
505 return $hs;
506}
507 702
508sub max_col_width { 703 (\@w, \@h)
704}
705
706sub size_request {
509 my ($self, $col) = @_; 707 my ($self) = @_;
510 708
709 my ($ws, $hs) = $self->get_wh;
710
711 (
712 (sum @$ws),
713 (sum @$hs),
714 )
715}
716
717sub size_allocate {
718 my ($self, $x, $y, $w, $h) = @_;
719
720 $self->_size_allocate ($x, $y, $w, $h) or return;
721
722 my ($ws, $hs) = $self->get_wh;
723
724 my $req_w = sum @$ws;
725 my $req_h = sum @$hs;
726
727 # TODO: nicer code && do row_expand
728 my @col_expand = @{$self->{col_expand}};
729 @col_expand = (1) x @$ws unless @col_expand;
730 my $col_expand = (sum @col_expand) || 1;
731
732 # linearly scale sizes
733 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
734 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
735
736 my $y;
737
738 for my $r (0 .. $#{$self->{children}}) {
739 my $row = $self->{children}[$r]
740 or next;
741
511 my $ws = 0; 742 my $x = 0;
512 for (my $yi = 0; $yi <= $#{$self->{children} || []}; $yi++) { 743 my $row_h = $hs->[$r];
513 my $c = ($self->{children}->[$yi] || [])->[$col]; 744
514 if ($c) { 745 for my $c (0 .. $#$row) {
515 my ($w, $h) = $c->size_request; 746 my $col_w = $ws->[$c];
516 if ($ws < $w) { $ws = $w } 747
748 if (my $widget = $row->[$c]) {
749 $widget->size_allocate ($x, $y, $col_w, $row_h);
750 }
751
752 $x += $col_w;
517 } 753 }
754
755 $y += $row_h;
518 } 756 }
519 return $ws; 757
520} 758}
759
760sub find_widget {
761 my ($self, $x, $y) = @_;
762
763 $x -= $self->{x};
764 $y -= $self->{y};
765
766 my $res;
767
768 for (grep $_, map @$_, grep $_, @{ $self->{children} }) {
769 $res = $_->find_widget ($x, $y)
770 and return $res;
771 }
772
773 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
774}
775
776sub _draw {
777 my ($self) = @_;
778
779 for (grep $_, @{$self->{children}}) {
780 $_->draw for grep $_, @$_;
781 }
782}
783
784#############################################################################
785
786package CFClient::UI::HBox;
787
788# TODO: wrap into common Box base class
789
790our @ISA = CFClient::UI::Container::;
521 791
522sub size_request { 792sub size_request {
523 my ($self) = @_; 793 my ($self) = @_;
524 794
795 my @alloc = map [$_->size_request], @{$self->{children}};
796
797 (
798 (List::Util::sum map $_->[0], @alloc),
799 (List::Util::max map $_->[1], @alloc),
800 )
801}
802
803sub size_allocate {
804 my ($self, $x, $y, $w, $h) = @_;
805
806 $self->_size_allocate ($x, $y, $w, $h) or return;
807
808 return unless $self->{w};
809
525 my ($hs, $ws) = (0, 0); 810 ($h, $w) = ($w, $h);
526 811
527 for (my $yi = 0; $yi <= $#{$self->{children}}; $yi++) { 812 my $children = $self->{children};
528 $hs += $self->max_row_height ($yi);
529 }
530 813
531 for (my $yi = 0; $yi <= $#{$self->{children}}; $yi++) { 814 my @h = map +($_->size_request)[0], @$children;
532 my $wm = 0; 815
533 for (my $xi = 0; $xi <= $#{$self->{children}->[$yi]}; $xi++) { 816 my $req_h = List::Util::sum @h;
534 $wm += $self->max_col_width ($xi) 817
818 if ($req_h > $h) {
819 # ah well, not enough space
820 $_ *= $h / $req_h for @h;
821 } else {
822 my $exp = List::Util::sum map $_->{expand}, @$children;
823 $exp ||= 1;
824
825 for (0 .. $#$children) {
826 my $child = $children->[$_];
827
828 my $alloc_h = $h[$_];
829 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
830 $h[$_] = $alloc_h;
535 } 831 }
536 if ($ws < $wm) { $ws = $wm }
537 } 832 }
538
539 return ($ws, $hs);
540}
541
542sub _draw {
543 my ($self) = @_;
544 833
545 my $y = 0; 834 my $y = 0;
546 for (my $yi = 0; $yi <= $#{$self->{children}}; $yi++) { 835 for (0 .. $#$children) {
836 my $child = $children->[$_];
547 my $x = 0; 837 my $h = $h[$_];
838 $child->size_allocate ($y, 0, $h, $w);
548 839
549 for (my $xi = 0; $xi <= $#{$self->{children}->[$yi]}; $xi++) { 840 $y += $h;
550
551 my $c = $self->{children}->[$yi]->[$xi];
552 if ($c) {
553 $c->move ($x, $y, 0); #TODO: Move to size_request
554 $c->draw if $c;
555 }
556
557 $x += $self->max_col_width ($xi);
558 }
559
560 $y += $self->max_row_height ($yi);
561 } 841 }
562} 842}
563 843
564############################################################################# 844#############################################################################
565 845
566package Crossfire::Client::Widget::VBox; 846package CFClient::UI::VBox;
567 847
848# TODO: wrap into common Box base class
849
568our @ISA = Crossfire::Client::Widget::Container::; 850our @ISA = CFClient::UI::Container::;
569
570use SDL::OpenGL;
571 851
572sub size_request { 852sub size_request {
573 my ($self) = @_; 853 my ($self) = @_;
574 854
575 my @alloc = map [$_->size_request], @{$self->{children}}; 855 my @alloc = map [$_->size_request], @{$self->{children}};
… …
579 (List::Util::sum map $_->[1], @alloc), 859 (List::Util::sum map $_->[1], @alloc),
580 ) 860 )
581} 861}
582 862
583sub size_allocate { 863sub size_allocate {
584 my ($self, $w, $h) = @_; 864 my ($self, $x, $y, $w, $h) = @_;
585 865
586 $self->w ($w); 866 $self->_size_allocate ($x, $y, $w, $h) or return;
587 $self->h ($h);
588 867
589 my $exp; 868 return unless $self->{h};
590 my @oth; 869
591 # find expand widget 870 my $children = $self->{children};
592 for (@{$self->{children}}) { 871
593 if ($_->{expand}) { 872 my @h = map +($_->size_request)[1], @$children;
873
874 my $req_h = List::Util::sum @h;
875
876 if ($req_h > $h) {
877 # ah well, not enough space
878 $_ *= $h / $req_h for @h;
879 } else {
880 my $exp = List::Util::sum map $_->{expand}, @$children;
594 $exp = $_; 881 $exp ||= 1;
595 last; 882
883 for (0 .. $#$children) {
884 my $child = $children->[$_];
885
886 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
596 } 887 }
597 push @oth, $_;
598 }
599
600 my ($ow, $oh);
601
602 # get sizes of other widgets
603 for (@oth) {
604 my ($w, $h) = $_->size_request;
605 $oh += $h;
606 if ($ow < $w) { $ow = $w }
607 } 888 }
608 889
609 my $y = 0; 890 my $y = 0;
610 for (@{$self->{children}}) { 891 for (0 .. $#$children) {
611 $_->move (0, $y); 892 my $child = $children->[$_];
612 893 my $h = $h[$_];
613 if ($_ == $exp) {
614 $_->size_allocate ($w, $h - $oh);
615 $y += $h - $oh;
616 } else {
617 my ($cw, $h) = $_->size_request;
618 $_->size_allocate ($w, $h); 894 $child->size_allocate (0, $y, $w, $h);
895
619 $y += $h; 896 $y += $h;
620 }
621 } 897 }
622} 898}
623 899
624############################################################################# 900#############################################################################
625 901
626package Crossfire::Client::Widget::Label; 902package CFClient::UI::Label;
627 903
628our @ISA = Crossfire::Client::Widget::; 904our @ISA = CFClient::UI::Base::;
629 905
630use SDL::OpenGL; 906use SDL::OpenGL;
631 907
632sub new { 908sub new {
633 my ($class, $x, $y, $z, $height, $text) = @_; 909 my ($class, %arg) = @_;
634 910
635 # TODO: color, and make height, xyz etc. optional 911 my $self = $class->SUPER::new (
636 my $self = $class->SUPER::new (x => $x, y => $y, z => $z, height => $height); 912 fg => [1, 1, 1],
913 height => $::FONTSIZE,
914 text => "",
915 align => -1,
916 padding => 2,
917 layout => new CFClient::Layout,
918 %arg
919 );
637 920
638 $self->set_text ($text); 921 $self->set_text ($self->{text});
639 922
640 $self 923 $self
924}
925
926sub escape_text {
927 local $_ = $_[1];
928
929 s/&/&amp;/g;
930 s/>/&gt;/g;
931 s/</&lt;/g;
932
933 $_[1]
641} 934}
642 935
643sub set_text { 936sub set_text {
644 my ($self, $text) = @_; 937 my ($self, $text) = @_;
645 938
646 $self->{text} = $text; 939 $self->{text} = $text;
647 $self->{texture} = new_from_text Crossfire::Client::Texture $text, $self->{height}; 940 $self->{layout}->set_markup ($text);
648 941
942 delete $self->{texture};
943# $self->{w} = $self->{h} = -1;
649 $self->update; 944 $self->update;
650} 945}
651 946
652sub get_text { 947sub get_text {
653 my ($self, $text) = @_; 948 my ($self, $text) = @_;
… …
656} 951}
657 952
658sub size_request { 953sub size_request {
659 my ($self) = @_; 954 my ($self) = @_;
660 955
956 $self->{layout}->set_width;
957 $self->{layout}->set_height ($self->{height});
958 my ($w, $h) = $self->{layout}->size;
959
661 ( 960 (
662 $self->{texture}{width}, 961 $w + $self->{padding} * 2,
663 $self->{texture}{height}, 962 $h + $self->{padding} * 2,
664 ) 963 )
665} 964}
666 965
966sub size_allocate {
967 my ($self, $x, $y, $w, $h) = @_;
968
969 $self->_size_allocate ($x, $y, $w, $h) or return;
970
971 delete $self->{texture};
972}
973
974sub update {
975 my ($self) = @_;
976
977 delete $self->{texture};
978 $self->SUPER::update;
979}
980
667sub _draw { 981sub _draw {
668 my ($self) = @_; 982 my ($self) = @_;
669 983
984 my $tex = $self->{texture} ||= do {
985 $self->{layout}->set_width ($self->{w});
986 $self->{layout}->set_height (List::Util::min $self->{h} - $self->{padding} * 2, $self->{height});
987 new_from_layout CFClient::Texture $self->{layout}
988 };
989
990 glEnable GL_BLEND;
991 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
992 glEnable GL_TEXTURE_2D;
993 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
994
995 glColor @{$self->{fg}};
996
997 my $x =
998 $self->{align} < 0 ? $self->{padding}
999 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1000 : ($self->{w} - $tex->{w}) * 0.5;
1001
1002 glTranslate $x, ($self->{h} - $tex->{h}) * 0.5, 0;
1003 $tex->draw_quad (0, 0);
1004
1005 glDisable GL_TEXTURE_2D;
1006 glDisable GL_BLEND;
1007}
1008
1009#############################################################################
1010
1011package CFClient::UI::Entry;
1012
1013our @ISA = CFClient::UI::Label::;
1014
1015use SDL;
1016use SDL::OpenGL;
1017
1018sub new {
1019 my $class = shift;
1020
1021 $class->SUPER::new (
1022 fg => [1, 1, 1],
1023 bg => [0, 0, 0, 0.2],
1024 active_bg => [1, 1, 1, 0.5],
1025 active_fg => [0, 0, 0],
1026 @_
1027 )
1028}
1029
1030sub _set_text {
1031 my ($self, $text) = @_;
1032
1033 $self->{last_activity} = $::NOW;
1034
1035 $self->{text} = $text;
1036 $self->{layout}->set_width ($self->{w});
1037 $self->{layout}->set_height (List::Util::min $self->{h} - $self->{padding} * 2, $self->{height});
1038
1039 $text =~ s/./*/g if $self->{hidden};
1040
1041 $self->{layout}->set_markup ($self->escape_text ($text) . " ");
1042
1043 $text = substr $text, 0, $self->{cursor};
1044 utf8::encode $text;
1045
1046 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text);
1047}
1048
1049sub size_request {
1050 my ($self) = @_;
1051
1052 my ($w, $h) = $self->SUPER::size_request;
1053
1054 ($w + 1, $h) # add 1 for cursor
1055}
1056
1057sub size_allocate {
1058 my ($self, $x, $y, $w, $h) = @_;
1059
1060 $self->SUPER::size_allocate ($x, $y, $w, $h);
1061
1062 $self->_set_text ($self->{text});
1063}
1064
1065sub set_text {
1066 my ($self, $text) = @_;
1067
1068 $self->{cursor} = length $text;
1069 $self->_set_text ($text);
1070 $self->update;
1071}
1072
1073sub key_down {
1074 my ($self, $ev) = @_;
1075
1076 my $mod = $ev->key_mod;
1077 my $sym = $ev->key_sym;
1078
1079 my $uni = $ev->key_unicode;
1080
1081 my $text = $self->get_text;
1082
1083 if ($sym == SDLK_BACKSPACE) {
1084 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1085 } elsif ($sym == SDLK_DELETE) {
1086 substr $text, $self->{cursor}, 1, "";
1087 } elsif ($sym == SDLK_LEFT) {
1088 --$self->{cursor} if $self->{cursor};
1089 } elsif ($sym == SDLK_RIGHT) {
1090 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1091 } elsif ($sym == SDLK_HOME) {
1092 $self->{cursor} = 0;
1093 } elsif ($sym == SDLK_END) {
1094 $self->{cursor} = length $text;
1095 } elsif ($uni) {
1096 substr $text, $self->{cursor}++, 0, chr $uni;
1097 }
1098
1099 $self->_set_text ($text);
1100 $self->update;
1101}
1102
1103sub focus_in {
1104 my ($self) = @_;
1105
1106 $self->{last_activity} = $::NOW;
1107
1108 $self->SUPER::focus_in;
1109}
1110
1111sub button_down {
1112 my ($self, $ev, $x, $y) = @_;
1113
1114 $self->SUPER::button_down ($ev, $x, $y);
1115
1116 my $idx = $self->{layout}->xy_to_index ($x, $y);
1117
1118 # byte-index to char-index
670 my $tex = $self->{texture}; 1119 my $text = $self->{text};
1120 utf8::encode $text;
1121 $self->{cursor} = length substr $text, 0, $idx;
1122
1123 $self->_set_text ($self->{text});
1124 $self->update;
1125}
1126
1127sub mouse_motion {
1128 my ($self, $ev, $x, $y) = @_;
1129# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1130}
1131
1132sub _draw {
1133 my ($self) = @_;
1134
1135 local $self->{fg} = $self->{fg};
1136
1137 if ($FOCUS == $self) {
1138 glColor @{$self->{active_bg}};
1139 $self->{fg} = $self->{active_fg};
1140 } else {
1141 glColor @{$self->{bg}};
1142 }
1143
1144 glEnable GL_BLEND;
1145 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1146 glBegin GL_QUADS;
1147 glVertex 0 , 0;
1148 glVertex 0 , $self->{h};
1149 glVertex $self->{w}, $self->{h};
1150 glVertex $self->{w}, 0;
1151 glEnd;
1152 glDisable GL_BLEND;
1153
1154 $self->SUPER::_draw;
1155
1156 #TODO: force update every cursor change :(
1157 if ($FOCUS == $self && (($::NOW - $self->{last_activity}) & 1023) < 600) {
1158 glColor @{$self->{fg}};
1159 glBegin GL_LINES;
1160 glVertex $self->{cur_x}, $self->{cur_y};
1161 glVertex $self->{cur_x}, $self->{cur_y} + $self->{cur_h};
1162 glEnd;
1163 }
1164}
1165
1166#############################################################################
1167
1168package CFClient::UI::Button;
1169
1170our @ISA = CFClient::UI::Label::;
1171
1172use SDL;
1173use SDL::OpenGL;
1174
1175my @tex =
1176 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
1177 qw(b1_button_active.png);
1178
1179sub new {
1180 my $class = shift;
1181
1182 $class->SUPER::new (
1183 padding => 4,
1184 fg => [1, 1, 1],
1185 bg => [1, 1, 1, 0.2],
1186 active_fg => [1, 1, 0],
1187# active_bg => [0, 0, 0, 0.5],
1188# border_fg => [1, 1, 0],
1189 @_
1190 )
1191}
1192
1193sub button_up {
1194 my ($self, $ev, $x, $y) = @_;
1195
1196 if ($x >= 0 && $x < $self->{w}
1197 && $y >= 0 && $y < $self->{h}) {
1198 $self->emit ("activate");
1199 }
1200}
1201
1202sub _draw {
1203 my ($self) = @_;
1204
1205 local $self->{fg} = $self->{fg};
1206 my $tex = $tex[0];
671 1207
672 glEnable GL_BLEND; 1208 glEnable GL_BLEND;
673 glEnable GL_TEXTURE_2D; 1209 glEnable GL_TEXTURE_2D;
674 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1210 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
675 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1211
1212 if ($GRAB == $self) {
1213 $self->{fg} = $self->{active_fg};
1214 }
1215
676 glBindTexture GL_TEXTURE_2D, $tex->{name}; 1216 glBindTexture GL_TEXTURE_2D, $tex->{name};
1217 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
677 1218
678 glColor 1, 0, 0, 1; # TODO color 1219 $tex->draw_quad (0, 0, $self->{w}, $self->{h});
1220
1221 glDisable GL_TEXTURE_2D;
1222 glDisable GL_BLEND;
1223
1224 $self->SUPER::_draw;
1225}
1226
1227#############################################################################
1228
1229package CFClient::UI::Slider;
1230
1231use strict;
1232
1233use SDL::OpenGL;
1234
1235our @ISA = CFClient::UI::DrawBG::;
1236
1237sub new {
1238 my $class = shift;
1239
1240 # range [value, low, high, page]
1241
1242 my $self = $class->SUPER::new (
1243 fg => [1, 1, 1],
1244 active_fg => [0, 0, 0],
1245 range => [0, 0, 100, 10],
1246 req_w => 40,
1247 req_h => 10,
1248 vertical => 0,
1249 @_
1250 );
1251
1252 $self
1253}
1254
1255sub size_request {
1256 my ($self) = @_;
1257
1258 my $w = $self->{req_w};
1259 my $h = $self->{req_h};
1260
1261 $self->{vertical} ? ($h, $w) : ($w, $h)
1262}
1263
1264sub button_down {
1265 my ($self, $ev, $x, $y) = @_;
1266
1267 $self->SUPER::button_down ($ev, $x, $y);
1268 $self->mouse_motion ($ev, $x, $y);
1269}
1270
1271sub mouse_motion {
1272 my ($self, $ev, $x, $y) = @_;
1273
1274 if ($GRAB == $self) {
1275 my ($value, $lo, $hi, $page) = @{$self->{range}};
1276
1277 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
1278
1279 $x = $x * ($hi - $lo) / $w + $lo;
1280 $x = $lo if $x < $lo;
1281 $x = $hi - $page if $x > $hi - $page;
1282 $self->{range}[0] = $x;
1283
1284 $self->emit (changed => $x);
1285 $self->update;
1286 }
1287}
1288
1289sub _draw {
1290 my ($self) = @_;
1291
1292 $self->SUPER::_draw ();
1293
1294 my ($w, $h) = @$self{qw(w h)};
1295
1296 if ($self->{vertical}) {
1297 # draw a vertical slider like a rotated horizontal slider
1298
1299 glRotate 90, 0, 0, 1;
1300 glTranslate 0, -$self->{w}, 0;
1301
1302 ($w, $h) = ($h, $w);
1303 }
1304
1305 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
1306 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
1307
1308 my ($value, $lo, $hi, $page) = @{$self->{range}};
1309
1310 $page = int $page * $w / ($hi - $lo);
1311 $value = int +($value - $lo) * $w / ($hi - $lo);
1312
1313 $w -= $page;
1314 $page &= ~1;
1315 glTranslate $page * 0.5, 0, 0;
1316 $page ||= 2;
1317
1318 glColor @$fg;
1319 glBegin GL_LINES;
1320 glVertex 0, 0; glVertex 0, $h;
1321 glVertex $w - 1, 0; glVertex $w - 1, $h;
1322 glVertex 0, $h * 0.5; glVertex $w, $h * 0.5;
1323 glEnd;
1324
1325 my $knob_a = $value - $page * 0.5;
1326 my $knob_b = $value + $page * 0.5;
679 1327
680 glBegin GL_QUADS; 1328 glBegin GL_QUADS;
681 glTexCoord 0, 0; glVertex 0 , 0; 1329 glColor @$fg;
682 glTexCoord 0, 1; glVertex 0 , $tex->{height}; 1330 glVertex $knob_a, 0;
683 glTexCoord 1, 1; glVertex $tex->{width}, $tex->{height}; 1331 glVertex $knob_a, $h;
684 glTexCoord 1, 0; glVertex $tex->{width}, 0; 1332 glVertex $knob_b, $h;
1333 glVertex $knob_b, 0;
1334
1335 if ($knob_a < $knob_b - 2) {
1336 glColor @$bg;
1337 glVertex $knob_a + 1, 1;
1338 glVertex $knob_a + 1, $h - 1;
1339 glVertex $knob_b - 1, $h - 1;
1340 glVertex $knob_b - 1, 1;
1341 }
685 glEnd; 1342 glEnd;
686
687 glDisable GL_BLEND;
688 glDisable GL_TEXTURE_2D;
689} 1343}
690 1344
691############################################################################# 1345#############################################################################
692 1346
693package Crossfire::Client::Widget::TextEntry; 1347package CFClient::UI::MapWidget;
694 1348
695our @ISA = Crossfire::Client::Widget::Label::; 1349use strict;
1350
1351use List::Util qw(min max);
696 1352
697use SDL; 1353use SDL;
698use SDL::OpenGL; 1354use SDL::OpenGL;
699 1355
700sub key_down { 1356our @ISA = CFClient::UI::Base::;
701 my ($self, $ev) = @_;
702 1357
703 my $mod = $ev->key_mod; 1358sub new {
704 my $sym = $ev->key_sym; 1359 my $class = shift;
705 1360
706 $ev->set_unicode (1); 1361 $class->SUPER::new (
707 my $uni = $ev->key_unicode; 1362 z => -1,
708 1363 list => (glGenLists 1),
709 my $text = $self->get_text; 1364 @_
710
711 if ($sym == SDLK_BACKSPACE) {
712 substr $text, -1, 1, '';
713
714 } elsif ($uni) {
715 $text .= chr $uni;
716 } 1365 )
717 $self->set_text ($text);
718} 1366}
719
720#############################################################################
721
722package Crossfire::Client::Widget::MapWidget;
723
724use strict;
725
726use List::Util qw(min max);
727
728use SDL;
729use SDL::OpenGL;
730use SDL::OpenGL::Constants;
731
732our @ISA = Crossfire::Client::Widget::;
733 1367
734sub key_down { 1368sub key_down {
735 print "MAPKEYDOWN\n"; 1369 print "MAPKEYDOWN\n";
736} 1370}
737 1371
738sub key_up { 1372sub key_up {
739} 1373}
740 1374
741sub size_request { 1375sub size_request {
742 1376 (
1377 1 + 32 * int $::WIDTH / 32,
1378 1 + 32 * int $::HEIGHT / 32,
1379 )
743} 1380}
744 1381
745sub size_allocate { 1382sub update {
746} 1383 my ($self) = @_;
747 1384
1385 $self->{need_update} = 1;
1386 $self->SUPER::update;
1387}
1388
748sub _draw { 1389sub draw {
749 my ($self) = @_; 1390 my ($self) = @_;
750 1391
1392 if (delete $self->{need_update}) {
1393 glNewList $self->{list}, GL_COMPILE;
1394
751 my $mx = $::CONN->{mapx}; 1395 my $mx = $::CONN->{mapx};
752 my $my = $::CONN->{mapy}; 1396 my $my = $::CONN->{mapy};
753 1397
754 my $map = $::CONN->{map}; 1398 my $map = $::CONN->{map};
755 1399
756 my ($xofs, $yofs); 1400 my ($xofs, $yofs);
757 1401
758 my $sw = 1 + int $::WIDTH / 32; 1402 my $sw = 1 + int $::WIDTH / 32;
759 my $sh = 1 + int $::HEIGHT / 32; 1403 my $sh = 1 + int $::HEIGHT / 32;
760 1404
761 if ($::CONN->{mapw} > $sw) { 1405 if ($::CONN->{mapw} > $sw) {
762 $xofs = $mx + ($::CONN->{mapw} - $sw) * 0.5; 1406 $xofs = $mx + ($::CONN->{mapw} - $sw) * 0.5;
763 } else { 1407 } else {
764 $xofs = $self->{xofs} = min $mx, max $mx + $::CONN->{mapw} - $sw + 1, $self->{xofs}; 1408 $xofs = $self->{xofs} = min $mx, max $mx + $::CONN->{mapw} - $sw + 1, $self->{xofs};
765 } 1409 }
766 1410
767 if ($::CONN->{maph} > $sh) { 1411 if ($::CONN->{maph} > $sh) {
768 $yofs = $my + ($::CONN->{maph} - $sh) * 0.5; 1412 $yofs = $my + ($::CONN->{maph} - $sh) * 0.5;
769 } else { 1413 } else {
770 $yofs = $self->{yofs} = min $my, max $my + $::CONN->{maph} - $sh + 1, $self->{yofs}; 1414 $yofs = $self->{yofs} = min $my, max $my + $::CONN->{maph} - $sh + 1, $self->{yofs};
771 } 1415 }
772 1416
773 glEnable GL_TEXTURE_2D; 1417 glEnable GL_TEXTURE_2D;
774 glEnable GL_BLEND; 1418 glEnable GL_BLEND;
1419 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
775 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1420 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
776 1421
777 my $sw4 = ($sw + 3) & ~3; 1422 my $sw4 = ($sw + 3) & ~3;
778 my $lighting = "\x00" x ($sw4 * $sh); 1423 my $darkness = "\x00" x ($sw4 * $sh);
779 1424
780 for my $x (0 .. $sw - 1) { 1425 for my $x (0 .. $sw - 1) {
1426 my $row = $map->[$x + $xofs];
781 for my $y (0 .. $sh - 1) { 1427 for my $y (0 .. $sh - 1) {
782 1428
783 my $cell = $map->[$x + $xofs][$y + $yofs] 1429 my $cell = $row->[$y + $yofs]
784 or next; 1430 or next;
785 1431
786 my $darkness = $cell->[0] * (1 / 255); 1432 my $dark = $cell->[0];
787 if ($darkness < 0) { 1433 if ($dark < 0) {
788 $darkness = 0.15; 1434 substr $darkness, $y * $sw4 + $x, 1, chr 224;
1435 } else {
1436 substr $darkness, $y * $sw4 + $x, 1, chr 255 - $dark;
789 } 1437 }
790 substr $lighting, $y * $sw4 + $x, 1, chr 255 - $darkness * 255;
791 1438
792 for my $num (grep $_, @$cell[1,2,3]) { 1439 for my $num (grep $_, @$cell[1,2,3]) {
793 my $tex = $::CONN->{face}[$num]{texture} || next; 1440 my $tex = $::CONN->{face}[$num]{texture} || next;
1441
1442 my ($w, $h) = @$tex{qw(w h)};
794 1443
795 glBindTexture GL_TEXTURE_2D, $tex->{name}; 1444 $tex->draw_quad (($x + 1) * 32 - $w, ($y + 1) * 32 - $h, $w, $h);
796
797 my $w = $tex->{width};
798 my $h = $tex->{height};
799
800 my $px = ($x + 1) * 32 - $w;
801 my $py = ($y + 1) * 32 - $h;
802
803 glBegin GL_QUADS;
804 glTexCoord 0, 0; glVertex $px , $py;
805 glTexCoord 0, 1; glVertex $px , $py + $h;
806 glTexCoord 1, 1; glVertex $px + $w, $py + $h;
807 glTexCoord 1, 0; glVertex $px + $w, $py;
808 glEnd; 1445 }
809 } 1446 }
810 } 1447 }
811 }
812 1448
813# if (1) { # higher quality darkness 1449# if (1) { # higher quality darkness
814# $lighting =~ s/(.)/$1$1$1/gs; 1450# $lighting =~ s/(.)/$1$1$1/gs;
815# my $pb = new_from_data Gtk2::Gdk::Pixbuf $lighting, "rgb", 0, 8, $sw4, $sh, $sw4 * 3; 1451# my $pb = new_from_data Gtk2::Gdk::Pixbuf $lighting, "rgb", 0, 8, $sw4, $sh, $sw4 * 3;
816# 1452#
… …
818# 1454#
819# $lighting = $pb->get_pixels; 1455# $lighting = $pb->get_pixels;
820# $lighting =~ s/(.)../$1/gs; 1456# $lighting =~ s/(.)../$1/gs;
821# } 1457# }
822 1458
823 $lighting = new Crossfire::Client::Texture
824 width => $sw4,
825 height => $sh,
826 data => $lighting,
827 internalformat => GL_ALPHA4,
828 format => GL_ALPHA;
829
830 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
831 glColor 0, 0, 0, 0.75;
832 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1459 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
833 glBindTexture GL_TEXTURE_2D, $lighting->{name};
834 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR;
835 glBegin GL_QUADS;
836 glTexCoord 0, 0; glVertex 0 , 0;
837 glTexCoord 0, 1; glVertex 0 , $sh * 32;
838 glTexCoord 1, 1; glVertex $sw4 * 32, $sh * 32;
839 glTexCoord 1, 0; glVertex $sw4 * 32, 0;
840 glEnd;
841 1460
1461 $darkness = new CFClient::Texture
1462 w => $sw4,
1463 h => $sh,
1464 data => $darkness,
1465 internalformat => GL_ALPHA,
1466 format => GL_ALPHA;
1467
1468 glColor 0.45, 0.45, 0.45, 1;
1469 $darkness->draw_quad (0, 0, $sw4 * 32, $sh * 32);
1470
842 glDisable GL_TEXTURE_2D; 1471 glDisable GL_TEXTURE_2D;
843 glDisable GL_BLEND; 1472 glDisable GL_BLEND;
1473
1474 glEndList;
1475 }
1476
1477 glCallList $self->{list};
844} 1478}
845 1479
846my %DIR = ( 1480my %DIR = (
847 SDLK_KP8, [1, "north"], 1481 SDLK_KP8, [1, "north"],
848 SDLK_KP9, [2, "northeast"], 1482 SDLK_KP9, [2, "northeast"],
… …
865 my $mod = $ev->key_mod; 1499 my $mod = $ev->key_mod;
866 my $sym = $ev->key_sym; 1500 my $sym = $ev->key_sym;
867 1501
868 if ($sym == SDLK_KP5) { 1502 if ($sym == SDLK_KP5) {
869 $::CONN->send ("command stay fire"); 1503 $::CONN->send ("command stay fire");
1504 } elsif ($sym == SDLK_a) {
1505 $::CONN->send ("command apply");
870 } elsif (exists $DIR{$sym}) { 1506 } elsif (exists $DIR{$sym}) {
871 if ($mod & KMOD_SHIFT) { 1507 if ($mod & KMOD_SHIFT) {
872 $self->{shft}++; 1508 $self->{shft}++;
873 $::CONN->send ("command fire $DIR{$sym}[0]"); 1509 $::CONN->send ("command fire $DIR{$sym}[0]");
874 } elsif ($mod & KMOD_CTRL) { 1510 } elsif ($mod & KMOD_CTRL) {
… …
894 } 1530 }
895} 1531}
896 1532
897############################################################################# 1533#############################################################################
898 1534
899package Crossfire::Client::Widget::Animator; 1535package CFClient::UI::Animator;
900 1536
901use SDL::OpenGL; 1537use SDL::OpenGL;
902 1538
903our @ISA = Crossfire::Client::Widget::Bin::; 1539our @ISA = CFClient::UI::Bin::;
904 1540
905sub moveto { 1541sub moveto {
906 my ($self, $x, $y) = @_; 1542 my ($self, $x, $y) = @_;
907 1543
908 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y]; 1544 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
909 $self->{speed} = 0.2; 1545 $self->{speed} = 0.001;
910 $self->{time} = 1; 1546 $self->{time} = 1;
911 1547
912 ::animation_start $self; 1548 ::animation_start $self;
913} 1549}
914 1550
… …
929 1565
930sub _draw { 1566sub _draw {
931 my ($self) = @_; 1567 my ($self) = @_;
932 1568
933 glPushMatrix; 1569 glPushMatrix;
934 glRotate $self->{time} * 10000, 0, 1, 0; 1570 glRotate $self->{time} * 1000, 0, 1, 0;
935 $self->{children}[0]->draw; 1571 $self->{children}[0]->draw;
936 glPopMatrix; 1572 glPopMatrix;
937} 1573}
938 1574
9391; 1575#############################################################################
940 1576
1577package CFClient::UI::Toplevel;
1578
1579our @ISA = CFClient::UI::Container::;
1580
1581sub size_request {
1582 ($::WIDTH, $::HEIGHT)
1583}
1584
1585sub size_allocate {
1586 my ($self, $x, $y, $w, $h) = @_;
1587
1588 $self->_size_allocate ($x, $y, $w, $h);
1589
1590 $_->size_allocate ($_->{x}, $_->{y}, $_->size_request)
1591 for @{$self->{children}};
1592}
1593
1594sub translate {
1595 my ($self, $x, $y) = @_;
1596
1597 ($x, $y)
1598}
1599
1600sub update {
1601 my ($self) = @_;
1602
1603 $self->size_allocate (0, 0, $::WIDTH, $::HEIGHT);
1604 ::refresh ();
1605}
1606
1607sub add {
1608 my ($self, $widget) = @_;
1609
1610 $self->SUPER::add ($widget);
1611
1612 $widget->size_allocate ($widget->{x}, $widget->{y}, $widget->size_request);
1613}
1614
1615sub draw {
1616 my ($self) = @_;
1617
1618 $self->_draw;
1619}
1620
1621#############################################################################
1622
1623package CFClient::UI;
1624
1625$TOPLEVEL = new CFClient::UI::Toplevel;
1626
16271
1628

Diff Legend

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