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

Diff Legend

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